Fixes:

  * Api `put` method
  * raising error on 5xx response
  * gemspec points to quickpay
  * README improvments

Author: dinesh

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Dinesh Yadav
+Copyright (c) 2015 QuickPay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -13,10 +13,10 @@ or install from Rubygems:
 
     $ gem install quickpay-ruby-client
 
-It is currently tested with Ruby 1.9
+It is currently tested with Ruby ( >= 2.1.x)
 
 * MPI
-* Rubinius
+* Rubinius (2.0)
 
 ## Usage
 
@@ -43,7 +43,7 @@ client = Quickpay::Client.new("#{ENV['QUICKPAY_LOGIN']}:#{ENV['QUICKPAY_PASSWORD
 
 ### API Calls
 
-You can afterwards call any method described in QuickPay api with corresponding http method and endpoint. These methods are supported currently: `get`, `post`, `patch` and `delete`.
+You can afterwards call any method described in QuickPay api with corresponding http method and endpoint. These methods are supported currently: `get`, `post`, `put`, `patch` and `delete`.
 
 ```
 client.get("/activities").each do |activity|
@@ -69,7 +69,7 @@ end
 
 ### Handling API exceptions
 
-By default `(get|post|delete|patch)` will return JSON parsed body on success (i.e. non `4xx` response code) otherwise it will raise appropriate error. Your code should handle the errors appropriately. Following error codes are supported currently:
+By default `(get|post|patch|put|delete)` will return JSON parsed body on success (i.e. `2xx` response code) otherwise it will raise appropriate error. Your code should handle the errors appropriately. Following error codes are supported currently:
 
 
 Response status |  Error    |
@@ -95,4 +95,4 @@ rescue Quickpay::Error => e
 end
 ```
 
-You can more about api responses at: [Link](http://tech.quickpay.net/api/)
+You can read more about api responses at: [Link](http://tech.quickpay.net/api/)

Rakefile

@@ -7,7 +7,7 @@ def initialize credential
       @credential = credential
     end
 
-    [:get, :post, :patch, :delete].each do |method|
+    [:get, :post, :patch, :put, :delete].each do |method|
       define_method(method) do |*args|
         Request.new(@credential).request(method, *args)
       end

bin/console

@@ -10,10 +10,11 @@ def initialize secret
 
     def request method, path, data = {}
       raw = data.delete(:raw)
+      
       options = case method
-                when :get
+                when :get, :delete
                   { query: data }
-                when :post, :patch
+                when :post, :patch, :put
                   { body: data }
                 end || {}
 
@@ -23,15 +24,12 @@ def request method, path, data = {}
     end
 
     def create_response raw, res
-      response = res.parsed_response      
       if raw
-        [res.code, response, res.headers]
+        [res.code, res.body, res.headers]
       else
-        raise_error(response, res.code) if res.code.to_s =~ /4\d\d/
-        
-        response.kind_of?(String) ? 
-          JSON.parse(response) : 
-          response
+        response = res.parsed_response
+        raise_error(response, res.code) if res.code >= 400
+        response
       end
     end
 
@@ -52,7 +50,12 @@ def raise_error body, status
     end
 
     private
-    
+      
+      def json_response? res
+        res.headers.key?('content-type') && 
+          res.headers['content-type'].include?('application/json')
+      end
+      
       def error_description msg
         msg
       end

bin/setup

@@ -6,8 +6,8 @@ require 'quickpay/version'
 Gem::Specification.new do |spec|
   spec.name          = "quickpay-ruby-client"
   spec.version       = Quickpay::VERSION
-  spec.authors       = ["Dinesh Yadav"]
-  spec.email         = ["[email protected]"]
+  spec.authors       = ["QuickPay Developers"]
+  spec.email         = ["[email protected]"]
 
   spec.summary       = "Ruby client for QuickPay API"
   spec.description   = "Embed QuickPay's secure payments directly into your Ruby applications. more at https://tech.quickpay.net"

lib/quickpay/client.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Quickpay::Client, wip: true do
+describe Quickpay::Client do
   let(:secret){ 'test:test' }
   let(:client) { Quickpay::Client.new(secret) }
 

lib/quickpay/request.rb

@@ -12,39 +12,56 @@
   describe '.request' do
     context 'when method is get' do
       it {
-        stub_qp_request(:get, '/dummy', 200, { :id => 100 })
+        stub_json_request(:get, '/dummy', 200, { :id => 100 })
         response = handler.request(:get, '/dummy')
         expect(response['id']).to eq(100)
         expect_qp_request(:get, "/dummy", "")
       }
     end
 
-    context 'when method is post/patch' do
+    context 'when method is post/patch/put' do
       it {
-        stub_qp_request(:post, '/dummy', 200, { :id => 100 })
+        stub_json_request(:post, '/dummy', 200, { :id => 100 })
         response = handler.request(:post, '/dummy', { currency: 'DKK' })
         expect(response['id']).to eq(100)
         expect_qp_request(:post, "/dummy", { currency: 'DKK' })        
       }
+      
+      it {
+        stub_json_request(:put, '/dummy', 200, { :id => 100 })
+        response = handler.request(:put, '/dummy', { currency: 'DKK' })
+        expect(response['id']).to eq(100)
+        expect_qp_request(:put, "/dummy", { currency: 'DKK' })        
+      }
+      
+      it {
+        stub_json_request(:patch, '/dummy', 200, { :id => 100 })
+        response = handler.request(:patch, '/dummy', { currency: 'DKK' })
+        expect(response['id']).to eq(100)
+        expect_qp_request(:patch, "/dummy", { currency: 'DKK' })        
+      }
+      
     end
 
     context 'when method is delete' do
       it {
-        stub_qp_request(:delete, '/dummy', 200, { :id => 100 })
+        stub_json_request(:delete, '/dummy?currency=DKK', 200, { :id => 100 })
         response = handler.request(:delete, '/dummy', { currency: 'DKK' })
         expect(response['id']).to eq(100)
-        expect_qp_request(:delete, "/dummy", "")        
+        expect_qp_request(:delete, "/dummy?currency=DKK", "")        
       }      
     end
 
   end
 
   describe '.create_response' do
+
     context 'when raw is true' do
-      it 'should return raw response' do 
+      it 'should return raw response', wip: true do 
         body = { "id" => 100 }
         stub_request(:get, "https://api.quickpay.net/dummy").
-         to_return(:status => 200, :body => body.to_json, :headers => {})
+         to_return(:status => 200, :body => body.to_json, 
+            :headers => { "Content-Type" => 'application/json'})
 
         response = handler.create_response(true, handler.class.get('/dummy'))
 
@@ -54,16 +71,29 @@
       end
     end
 
-    context 'when raw is false' do
-      it 'should return hash' do
+    context 'when raw is not present' do
+      it 'should return http body' do
         body = { "id" => 100 }
         stub_request(:get, "https://api.quickpay.net/dummy").
-         to_return(:status => 200, :body => body.to_json, :headers => {})
+         to_return(:status => 200, :body => body.to_json, 
+          :headers => {"Content-Type" => 'application/json' })
 
         response = handler.create_response(false, handler.class.get('/dummy'))
 
         expect(response).to include("id" => 100)      
       end  
+    end  
+    
+    context 'when content-type is not json' do
+      it 'should return raw response' do
+        body = 'foobar'
+        stub_request(:get, "https://api.quickpay.net/dummy").
+         to_return(:status => 200, :body => 'foobar')
+         
+        response = handler.create_response(false, handler.class.get('/dummy'))
+        
+        expect(response).to eq("foobar")      
+      end  
     end
 
   end

quickpay-ruby-client.gemspec

@@ -9,15 +9,21 @@ def url_with_secret
       "https://#{secret}@#{Quickpay::BASE_URI.split('://').last}"  
     end
 
-    def stub_qp_request(method, path, status, response_body)
+    def stub_qp_request(method, path, status, response_body, response_headers = {})
       url = URI.join(url_with_secret, path)
 
       stub_request(method, url)
         .with(:headers => headers)
-        .to_return(:status => status, :body => response_body.to_json)
+        .to_return(:status => status, 
+                   :headers => response_headers, 
+                   :body => response_body.to_json)
 
     end
 
+    def stub_json_request *args
+      stub_qp_request(*(args << { 'Content-Type' => 'application/json' }))  
+    end
+    
     def expect_qp_request(method, path, body)
       url = URI.join(url_with_secret, path)
 
@@ -26,16 +32,18 @@ def expect_qp_request(method, path, body)
         :headers => headers)
     end    
 
-    def headers
+    def headers options = {}
       user_agent = "quickpay-ruby-client, v#{Quickpay::VERSION}"
       user_agent += ", #{RUBY_VERSION}, #{RUBY_PLATFORM}, #{RUBY_PATCHLEVEL}"
       if defined?(RUBY_ENGINE)
         user_agent += ", #{RUBY_ENGINE}"
       end
 
-      { "Accept-Version" => "v10",
-        "User-Agent"     => user_agent 
-      }
+      {
+        "Accept-Version" => "v10", 
+        "User-Agent" => user_agent 
+      }      
     end        
+        
   end
 end