webpay 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1223d7691b96e04b2b402559469879005904b623
-  data.tar.gz: 06adb123e708121a8344bb27195fc08f0689c5f1
+  metadata.gz: 3b9b26edd82d7f002e5f36526c8ab154add38e73
+  data.tar.gz: f1b94bd1d186e498df8d02f392dfa812af490a8d
 SHA512:
-  metadata.gz: 849b139e4d784eda4c838c22bc3c9cdc6a08ad023b45f8b6a27d9b9e6b9b763164f5285bcc22b92963be2400595e61fe04d7a880c8d791a0752368c558440931
-  data.tar.gz: a09359f1a3229ddc265df98040b78efd90032f4b5b76aef9574ffc178dfe69c97a79b57007fd2e16e3ecb564824e2a9607be987f88ac2541028745ad6908d14b
+  metadata.gz: 2580bf9f090e2691f4c2f97cadeb72449fbdf5c3e4405dd41955f0488d4df2720678ab59386ce6f20aa0dab020cdba6768a4cc343fb28d94379bec6a10e4ffd9
+  data.tar.gz: a8fd487fa7a2addeccae5129e5dce8c15054e6d55ccb022c008dcc2a763b154e7d432b14efae9be401891d2f03763bcc621123834fee6aa4d81441f394397651

data/lib/webpay/account.rb

@@ -5,7 +5,7 @@ class WebPay::Account < WebPay::ApiResource
   # @return [AccountResponse]
   def retrieve(params = {})
     req = WebPay::EmptyRequest.create(params)
-    raw_response = @client.request(:get, 'account', req)
+    raw_response = @client._request(:get, 'account', req)
     WebPay::AccountResponse.new(raw_response)
   end
 
@@ -15,7 +15,7 @@ class WebPay::Account < WebPay::ApiResource
   # @return [DeletedResponse]
   def delete_data(params = {})
     req = WebPay::EmptyRequest.create(params)
-    raw_response = @client.request(:delete, 'account/data', req)
+    raw_response = @client._request(:delete, 'account/data', req)
     WebPay::DeletedResponse.new(raw_response)
   end
 

data/lib/webpay/charge.rb

@@ -6,7 +6,7 @@ class WebPay::Charge < WebPay::ApiResource
   # @return [ChargeResponse]
   def create(params = {})
     req = WebPay::ChargeRequestCreate.create(params)
-    raw_response = @client.request(:post, 'charges', req)
+    raw_response = @client._request(:post, 'charges', req)
     WebPay::ChargeResponse.new(raw_response)
   end
 
@@ -16,7 +16,7 @@ class WebPay::Charge < WebPay::ApiResource
   # @return [ChargeResponse]
   def retrieve(params = {})
     req = WebPay::ChargeIdRequest.create(params)
-    raw_response = @client.request(:get, 'charges/:id', req)
+    raw_response = @client._request(:get, 'charges/:id', req)
     WebPay::ChargeResponse.new(raw_response)
   end
 
@@ -27,7 +27,7 @@ class WebPay::Charge < WebPay::ApiResource
   # @return [ChargeResponse]
   def refund(params = {})
     req = WebPay::ChargeRequestWithAmount.create(params)
-    raw_response = @client.request(:post, 'charges/:id/refund', req)
+    raw_response = @client._request(:post, 'charges/:id/refund', req)
     WebPay::ChargeResponse.new(raw_response)
   end
 
@@ -37,7 +37,7 @@ class WebPay::Charge < WebPay::ApiResource
   # @return [ChargeResponse]
   def capture(params = {})
     req = WebPay::ChargeRequestWithAmount.create(params)
-    raw_response = @client.request(:post, 'charges/:id/capture', req)
+    raw_response = @client._request(:post, 'charges/:id/capture', req)
     WebPay::ChargeResponse.new(raw_response)
   end
 
@@ -47,7 +47,7 @@ class WebPay::Charge < WebPay::ApiResource
   # @return [ChargeResponseList]
   def all(params = {})
     req = WebPay::ChargeListRequest.create(params)
-    raw_response = @client.request(:get, 'charges', req)
+    raw_response = @client._request(:get, 'charges', req)
     WebPay::ChargeResponseList.new(raw_response)
   end
 

data/lib/webpay/customer.rb

@@ -5,7 +5,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponse]
   def create(params = {})
     req = WebPay::CustomerRequestCreate.create(params)
-    raw_response = @client.request(:post, 'customers', req)
+    raw_response = @client._request(:post, 'customers', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 
@@ -16,7 +16,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponse]
   def retrieve(params = {})
     req = WebPay::CustomerIdRequest.create(params)
-    raw_response = @client.request(:get, 'customers/:id', req)
+    raw_response = @client._request(:get, 'customers/:id', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 
@@ -26,7 +26,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponse]
   def update(params = {})
     req = WebPay::CustomerRequestUpdate.create(params)
-    raw_response = @client.request(:post, 'customers/:id', req)
+    raw_response = @client._request(:post, 'customers/:id', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 
@@ -36,7 +36,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponse]
   def delete(params = {})
     req = WebPay::CustomerIdRequest.create(params)
-    raw_response = @client.request(:delete, 'customers/:id', req)
+    raw_response = @client._request(:delete, 'customers/:id', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 
@@ -46,7 +46,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponseList]
   def all(params = {})
     req = WebPay::BasicListRequest.create(params)
-    raw_response = @client.request(:get, 'customers', req)
+    raw_response = @client._request(:get, 'customers', req)
     WebPay::CustomerResponseList.new(raw_response)
   end
 
@@ -56,7 +56,7 @@ class WebPay::Customer < WebPay::ApiResource
   # @return [CustomerResponse]
   def delete_active_card(params = {})
     req = WebPay::CustomerIdRequest.create(params)
-    raw_response = @client.request(:delete, 'customers/:id/active_card', req)
+    raw_response = @client._request(:delete, 'customers/:id/active_card', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 

data/lib/webpay/data_types.rb

@@ -27,6 +27,13 @@ class WebPay
     end
 
     alias_method :inspect, :to_s
+
+    private
+    def copy_if_exists(from, to, key, recurring_fun)
+      v = from[key]
+      return if v == nil
+      to[key] = v.respond_to?(recurring_fun) ? v.__send__(recurring_fun) : v
+    end
   end
 
   class CardRequest < Entity
@@ -52,6 +59,28 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'number', 'request_body');
+
+      copy_if_exists(@attributes, result, 'exp_month', 'request_body');
+
+      copy_if_exists(@attributes, result, 'exp_year', 'request_body');
+
+      copy_if_exists(@attributes, result, 'cvc', 'request_body');
+
+      copy_if_exists(@attributes, result, 'name', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def number
       attributes['number']
@@ -123,6 +152,36 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'amount', 'request_body');
+
+      copy_if_exists(@attributes, result, 'currency', 'request_body');
+
+      copy_if_exists(@attributes, result, 'customer', 'request_body');
+
+      copy_if_exists(@attributes, result, 'shop', 'request_body');
+
+      copy_if_exists(@attributes, result, 'card', 'request_body');
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'capture', 'request_body');
+
+      copy_if_exists(@attributes, result, 'expire_days', 'request_body');
+
+      copy_if_exists(@attributes, result, 'uuid', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def amount
       attributes['amount']
@@ -220,6 +279,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -271,6 +332,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -312,6 +375,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -411,6 +476,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -447,6 +524,20 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'amount', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -490,6 +581,26 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'gt', 'request_body');
+
+      copy_if_exists(@attributes, result, 'gte', 'request_body');
+
+      copy_if_exists(@attributes, result, 'lt', 'request_body');
+
+      copy_if_exists(@attributes, result, 'lte', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def gt
       attributes['gt']
@@ -552,6 +663,30 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+
+      copy_if_exists(@attributes, result, 'count', 'query_params');
+
+      copy_if_exists(@attributes, result, 'offset', 'query_params');
+
+      copy_if_exists(@attributes, result, 'created', 'query_params');
+
+      copy_if_exists(@attributes, result, 'customer', 'query_params');
+
+      copy_if_exists(@attributes, result, 'recursion', 'query_params');
+
+      copy_if_exists(@attributes, result, 'shop', 'query_params');
+      return result
+    end
+
+
     # attributes accessors
     def count
       attributes['count']
@@ -623,6 +758,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -665,6 +802,26 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'card', 'request_body');
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'email', 'request_body');
+
+      copy_if_exists(@attributes, result, 'uuid', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def card
       attributes['card']
@@ -718,6 +875,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -792,6 +951,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -855,6 +1016,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -892,6 +1065,24 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'card', 'request_body');
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'email', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -955,6 +1146,24 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+
+      copy_if_exists(@attributes, result, 'count', 'query_params');
+
+      copy_if_exists(@attributes, result, 'offset', 'query_params');
+
+      copy_if_exists(@attributes, result, 'created', 'query_params');
+      return result
+    end
+
+
     # attributes accessors
     def count
       attributes['count']
@@ -999,6 +1208,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -1042,6 +1253,22 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'card', 'request_body');
+
+      copy_if_exists(@attributes, result, 'uuid', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def card
       attributes['card']
@@ -1077,6 +1304,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1128,6 +1357,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1164,6 +1405,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1197,6 +1450,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -1221,6 +1476,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1279,6 +1536,28 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+
+      copy_if_exists(@attributes, result, 'count', 'query_params');
+
+      copy_if_exists(@attributes, result, 'offset', 'query_params');
+
+      copy_if_exists(@attributes, result, 'created', 'query_params');
+
+      copy_if_exists(@attributes, result, 'type', 'query_params');
+
+      copy_if_exists(@attributes, result, 'shop', 'query_params');
+      return result
+    end
+
+
     # attributes accessors
     def count
       attributes['count']
@@ -1341,6 +1620,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -1382,6 +1663,22 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'details', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def description
       attributes['description']
@@ -1415,6 +1712,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1482,6 +1781,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1518,6 +1829,22 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'details', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1561,6 +1888,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -1602,6 +1931,34 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'amount', 'request_body');
+
+      copy_if_exists(@attributes, result, 'currency', 'request_body');
+
+      copy_if_exists(@attributes, result, 'customer', 'request_body');
+
+      copy_if_exists(@attributes, result, 'period', 'request_body');
+
+      copy_if_exists(@attributes, result, 'description', 'request_body');
+
+      copy_if_exists(@attributes, result, 'shop', 'request_body');
+
+      copy_if_exists(@attributes, result, 'first_scheduled', 'request_body');
+
+      copy_if_exists(@attributes, result, 'uuid', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def amount
       attributes['amount']
@@ -1701,6 +2058,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1737,6 +2106,20 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+
+      copy_if_exists(@attributes, result, 'retry', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1781,6 +2164,30 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+
+      copy_if_exists(@attributes, result, 'count', 'query_params');
+
+      copy_if_exists(@attributes, result, 'offset', 'query_params');
+
+      copy_if_exists(@attributes, result, 'created', 'query_params');
+
+      copy_if_exists(@attributes, result, 'customer', 'query_params');
+
+      copy_if_exists(@attributes, result, 'shop', 'query_params');
+
+      copy_if_exists(@attributes, result, 'suspended', 'query_params');
+      return result
+    end
+
+
     # attributes accessors
     def count
       attributes['count']
@@ -1852,6 +2259,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def object
       attributes['object']
@@ -1893,6 +2302,18 @@ class WebPay
       @attributes = hash
     end
 
+
+    def request_body
+      result = {}
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
     # attributes accessors
   end
   class AccountResponse < Entity
@@ -1908,6 +2329,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def id
       attributes['id']
@@ -1955,6 +2378,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def deleted
       attributes['deleted']
@@ -1965,7 +2390,7 @@ class WebPay
     attr_reader :attributes
 
     def self.fields
-      ['message', 'type', 'code', 'param']
+      ['message', 'type', 'code', 'param', 'charge']
     end
 
 
@@ -1974,6 +2399,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def message
       attributes['message']
@@ -1991,6 +2418,10 @@ class WebPay
       attributes['param']
     end
 
+    def charge
+      attributes['charge']
+    end
+
   end
   class ErrorData < Entity
     attr_reader :attributes
@@ -2006,6 +2437,8 @@ class WebPay
       @attributes = hash
     end
 
+
+
     # attributes accessors
     def error
       attributes['error']

data/lib/webpay/event.rb

@@ -5,7 +5,7 @@ class WebPay::Event < WebPay::ApiResource
   # @return [EventResponse]
   def retrieve(params = {})
     req = WebPay::EventIdRequest.create(params)
-    raw_response = @client.request(:get, 'events/:id', req)
+    raw_response = @client._request(:get, 'events/:id', req)
     WebPay::EventResponse.new(raw_response)
   end
 
@@ -15,7 +15,7 @@ class WebPay::Event < WebPay::ApiResource
   # @return [EventResponseList]
   def all(params = {})
     req = WebPay::EventListRequest.create(params)
-    raw_response = @client.request(:get, 'events', req)
+    raw_response = @client._request(:get, 'events', req)
     WebPay::EventResponseList.new(raw_response)
   end
 

data/lib/webpay/recursion.rb

@@ -5,7 +5,7 @@ class WebPay::Recursion < WebPay::ApiResource
   # @return [RecursionResponse]
   def create(params = {})
     req = WebPay::RecursionRequestCreate.create(params)
-    raw_response = @client.request(:post, 'recursions', req)
+    raw_response = @client._request(:post, 'recursions', req)
     WebPay::RecursionResponse.new(raw_response)
   end
 
@@ -16,7 +16,7 @@ class WebPay::Recursion < WebPay::ApiResource
   # @return [RecursionResponse]
   def retrieve(params = {})
     req = WebPay::RecursionIdRequest.create(params)
-    raw_response = @client.request(:get, 'recursions/:id', req)
+    raw_response = @client._request(:get, 'recursions/:id', req)
     WebPay::RecursionResponse.new(raw_response)
   end
 
@@ -26,7 +26,7 @@ class WebPay::Recursion < WebPay::ApiResource
   # @return [RecursionResponse]
   def resume(params = {})
     req = WebPay::RecursionRequestResume.create(params)
-    raw_response = @client.request(:post, 'recursions/:id/resume', req)
+    raw_response = @client._request(:post, 'recursions/:id/resume', req)
     WebPay::RecursionResponse.new(raw_response)
   end
 
@@ -36,7 +36,7 @@ class WebPay::Recursion < WebPay::ApiResource
   # @return [RecursionResponse]
   def delete(params = {})
     req = WebPay::RecursionIdRequest.create(params)
-    raw_response = @client.request(:delete, 'recursions/:id', req)
+    raw_response = @client._request(:delete, 'recursions/:id', req)
     WebPay::RecursionResponse.new(raw_response)
   end
 
@@ -46,7 +46,7 @@ class WebPay::Recursion < WebPay::ApiResource
   # @return [RecursionResponseList]
   def all(params = {})
     req = WebPay::RecursionListRequest.create(params)
-    raw_response = @client.request(:get, 'recursions', req)
+    raw_response = @client._request(:get, 'recursions', req)
     WebPay::RecursionResponseList.new(raw_response)
   end
 

data/lib/webpay/shop.rb

@@ -5,7 +5,7 @@ class WebPay::Shop < WebPay::ApiResource
   # @return [ShopResponse]
   def create(params = {})
     req = WebPay::ShopRequestCreate.create(params)
-    raw_response = @client.request(:post, 'shops', req)
+    raw_response = @client._request(:post, 'shops', req)
     WebPay::ShopResponse.new(raw_response)
   end
 
@@ -15,7 +15,7 @@ class WebPay::Shop < WebPay::ApiResource
   # @return [ShopResponse]
   def retrieve(params = {})
     req = WebPay::ShopIdRequest.create(params)
-    raw_response = @client.request(:get, 'shops/:id', req)
+    raw_response = @client._request(:get, 'shops/:id', req)
     WebPay::ShopResponse.new(raw_response)
   end
 
@@ -25,7 +25,7 @@ class WebPay::Shop < WebPay::ApiResource
   # @return [ShopResponse]
   def update(params = {})
     req = WebPay::ShopRequestUpdate.create(params)
-    raw_response = @client.request(:post, 'shops/:id', req)
+    raw_response = @client._request(:post, 'shops/:id', req)
     WebPay::ShopResponse.new(raw_response)
   end
 
@@ -35,7 +35,7 @@ class WebPay::Shop < WebPay::ApiResource
   # @return [ShopResponseList]
   def all(params = {})
     req = WebPay::BasicListRequest.create(params)
-    raw_response = @client.request(:get, 'shops', req)
+    raw_response = @client._request(:get, 'shops', req)
     WebPay::ShopResponseList.new(raw_response)
   end
 

data/lib/webpay/token.rb

@@ -5,7 +5,7 @@ class WebPay::Token < WebPay::ApiResource
   # @return [TokenResponse]
   def create(params = {})
     req = WebPay::TokenRequestCreate.create(params)
-    raw_response = @client.request(:post, 'tokens', req)
+    raw_response = @client._request(:post, 'tokens', req)
     WebPay::TokenResponse.new(raw_response)
   end
 
@@ -15,7 +15,7 @@ class WebPay::Token < WebPay::ApiResource
   # @return [TokenResponse]
   def retrieve(params = {})
     req = WebPay::TokenIdRequest.create(params)
-    raw_response = @client.request(:get, 'tokens/:id', req)
+    raw_response = @client._request(:get, 'tokens/:id', req)
     WebPay::TokenResponse.new(raw_response)
   end
 

data/lib/webpay.rb

@@ -25,9 +25,13 @@ class WebPay
 
     connection_options = options['faraday_options'] || {}
     connection_options['headers'] = {
+
       "Content-Type" => "application/json",
+
       "Accept" => "application/json",
-      "User-Agent" => "Apipa-webpay/3.0.1 ruby",
+
+      "User-Agent" => "Apipa-webpay/3.0.2 ruby",
+
       "Accept-Language" => "en",
     }
     connection_options['url'] = options['api_base'] || 'https://api.webpay.jp/v1'
@@ -52,6 +56,37 @@ class WebPay
     @conn.headers['Accept-Language'] = value
   end
 
+  def _request(method, url_pattern ,param_data)
+    url = url_pattern.gsub(/:([[:alnum:]]+)/) { |name| param_data.__send__(name[1..-1]) }
+    begin
+      response = @conn.__send__(method) do |req|
+        req.url(url)
+        req.params = param_data.query_params
+        req.body = JSON.dump(param_data.request_body)
+      end
+    rescue Faraday::Error::ClientError, URI::InvalidURIError => e
+      raise WebPay::ApiConnectionError.in_request(e)
+    end
+    handle_response(response)
+  end
+
+  private
+
+  # Infer encoding from response
+  #
+  # @param response [Faraday::Response]
+  # @return [Encoding]
+  def infer_encoding(response)
+    unless (type = response.headers['content-type']) &&
+        (charset = type.split(';').find { |field| field.include?('charset=') })
+      return Encoding.default_external
+    end
+
+    encoding_string = charset.split('=', 2).last.strip
+    Encoding.find(encoding_string)
+  rescue
+    Encoding.default_external
+  end
 
   # Convert faraday response to a hash by decoding JSON.
   # This raises error if the response indicates error status.
@@ -90,34 +125,6 @@ class WebPay
       raise "Unknown error is returned"
     end
   end
-
-  def request(method, url_pattern ,params)
-    url = url_pattern.gsub(/:([[:alnum:]]+)/) { |name| params.__send__(name[1..-1]) }
-    begin
-      response = @conn.__send__(method, url, [:get, :delete].include?(method) ? params.to_h : JSON.dump(params.to_h))
-    rescue Faraday::Error::ClientError, URI::InvalidURIError => e
-      raise WebPay::ApiConnectionError.in_request(e)
-    end
-    handle_response(response)
-  end
-
-  private
-
-  # Infer encoding from response
-  #
-  # @param response [Faraday::Response]
-  # @return [Encoding]
-  def infer_encoding(response)
-    unless (type = response.headers['content-type']) &&
-        (charset = type.split(';').find { |field| field.include?('charset=') })
-      return Encoding.default_external
-    end
-
-    encoding_string = charset.split('=', 2).last.strip
-    Encoding.find(encoding_string)
-  rescue
-    Encoding.default_external
-  end
 end
 
 require 'webpay/api_resource'

data/webpay.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'webpay'
-  spec.version       = '3.0.1'
+  spec.version       = '3.0.2'
   spec.authors       = ['webpay', 'tomykaira']
   spec.email         = ['administrators@webpay.jp', 'tomykaira@webpay.jp']
   spec.description   = 'WebPay is payment gateway service in Japan. see also https://webpay.jp/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpay
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - webpay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -101,4 +101,3 @@ signing_key:
 specification_version: 4
 summary: Bindings of WebPay API
 test_files: []
-has_rdoc: