webpay 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ca7bfa04c0ed68afb5b9d18d21fc794512a981
-  data.tar.gz: 83ca5f17ae63b12de47a2be3a1588bed74235b49
+  metadata.gz: 1223d7691b96e04b2b402559469879005904b623
+  data.tar.gz: 06adb123e708121a8344bb27195fc08f0689c5f1
 SHA512:
-  metadata.gz: 5a0f1c55019eba364a5f2c1b3d855e2d85704e9a668781268854cb8291cc3555cfad2612c82a34900e31b28f09834afbab85ae1e79aed6bf6c4b0c2c67d62e57
-  data.tar.gz: fe64c67d719db5755d6876915c9b66f6a2ce75c16b80fd3002c82e7611d992fd2dfd274f580c0eb268648cd3b3b2f09d443ceb028e0760afa15c60b159eef244
+  metadata.gz: 849b139e4d784eda4c838c22bc3c9cdc6a08ad023b45f8b6a27d9b9e6b9b763164f5285bcc22b92963be2400595e61fe04d7a880c8d791a0752368c558440931
+  data.tar.gz: a09359f1a3229ddc265df98040b78efd90032f4b5b76aef9574ffc178dfe69c97a79b57007fd2e16e3ecb564824e2a9607be987f88ac2541028745ad6908d14b

data/lib/webpay.rb

@@ -20,14 +20,14 @@ class WebPay
   # Initialize client
   #
   # @param options [Hash] options
-  def initialize(options)
+  def initialize(auth_token, options = {})
     options = options.each_with_object({}) { |kv, obj| k,v = kv; obj[k.to_s] = v }
 
     connection_options = options['faraday_options'] || {}
     connection_options['headers'] = {
       "Content-Type" => "application/json",
       "Accept" => "application/json",
-      "User-Agent" => "Apipa-webpay/3.0.0 ruby",
+      "User-Agent" => "Apipa-webpay/3.0.1 ruby",
       "Accept-Language" => "en",
     }
     connection_options['url'] = options['api_base'] || 'https://api.webpay.jp/v1'
@@ -37,7 +37,7 @@ class WebPay
     end
 
 
-    @conn.authorization(:Bearer, options['api_key'])
+    @conn.authorization(:Bearer, auth_token)
 
     @charge = WebPay::Charge.new(self)
     @customer = WebPay::Customer.new(self)

data/lib/webpay/charge.rb

@@ -43,10 +43,10 @@ class WebPay::Charge < WebPay::ApiResource
 
   # List charges filtered by params
   #
-  # @param params [ListRequestWithCustomer|Hash] Parameters to API call
+  # @param params [ChargeListRequest|Hash] Parameters to API call
   # @return [ChargeResponseList]
   def all(params = {})
-    req = WebPay::ListRequestWithCustomer.create(params)
+    req = WebPay::ChargeListRequest.create(params)
     raw_response = @client.request(:get, 'charges', req)
     WebPay::ChargeResponseList.new(raw_response)
   end

data/lib/webpay/customer.rb

@@ -42,10 +42,10 @@ class WebPay::Customer < WebPay::ApiResource
 
   # List customers filtered by params
   #
-  # @param params [ListRequest|Hash] Parameters to API call
+  # @param params [BasicListRequest|Hash] Parameters to API call
   # @return [CustomerResponseList]
   def all(params = {})
-    req = WebPay::ListRequest.create(params)
+    req = WebPay::BasicListRequest.create(params)
     raw_response = @client.request(:get, 'customers', req)
     WebPay::CustomerResponseList.new(raw_response)
   end

data/lib/webpay/data_types.rb

@@ -103,7 +103,7 @@ class WebPay
     attr_reader :attributes
 
     def self.fields
-      ['amount', 'currency', 'customer', 'card', 'description', 'capture', 'expire_days', 'uuid']
+      ['amount', 'currency', 'customer', 'shop', 'card', 'description', 'capture', 'expire_days', 'uuid']
     end
 
 
@@ -151,6 +151,15 @@ class WebPay
       attributes['customer'] = value
     end
 
+    def shop
+      attributes['shop']
+    end
+
+
+    def shop=(value)
+      attributes['shop'] = value
+    end
+
     def card
       attributes['card']
     end
@@ -519,11 +528,11 @@ class WebPay
     end
 
   end
-  class ListRequestWithCustomer < Entity
+  class ChargeListRequest < Entity
     attr_reader :attributes
 
     def self.fields
-      ['count', 'offset', 'created', 'customer', 'recursion']
+      ['count', 'offset', 'created', 'customer', 'recursion', 'shop']
     end
 
 
@@ -590,6 +599,15 @@ class WebPay
       attributes['recursion'] = value
     end
 
+    def shop
+      attributes['shop']
+    end
+
+
+    def shop=(value)
+      attributes['shop'] = value
+    end
+
   end
   class ChargeResponseList < Entity
     attr_reader :attributes
@@ -913,7 +931,7 @@ class WebPay
     end
 
   end
-  class ListRequest < Entity
+  class BasicListRequest < Entity
     attr_reader :attributes
 
     def self.fields
@@ -1237,11 +1255,11 @@ class WebPay
     end
 
   end
-  class ListRequestWithEventType < Entity
+  class EventListRequest < Entity
     attr_reader :attributes
 
     def self.fields
-      ['count', 'offset', 'created', 'type']
+      ['count', 'offset', 'created', 'type', 'shop']
     end
 
 
@@ -1299,6 +1317,15 @@ class WebPay
       attributes['type'] = value
     end
 
+    def shop
+      attributes['shop']
+    end
+
+
+    def shop=(value)
+      attributes['shop'] = value
+    end
+
   end
   class EventResponseList < Entity
     attr_reader :attributes
@@ -1336,7 +1363,7 @@ class WebPay
     attr_reader :attributes
 
     def self.fields
-      ['description', 'details', 'live']
+      ['description', 'details']
     end
 
 
@@ -1374,15 +1401,6 @@ class WebPay
       attributes['details'] = value
     end
 
-    def live
-      attributes['live']
-    end
-
-
-    def live=(value)
-      attributes['live'] = value
-    end
-
   end
   class ShopResponse < Entity
     attr_reader :attributes
@@ -1443,7 +1461,7 @@ class WebPay
     attr_reader :attributes
 
     def self.fields
-      ['id', 'live']
+      ['id']
     end
 
 
@@ -1474,21 +1492,12 @@ class WebPay
       attributes['id'] = value
     end
 
-    def live
-      attributes['live']
-    end
-
-
-    def live=(value)
-      attributes['live'] = value
-    end
-
   end
   class ShopRequestUpdate < Entity
     attr_reader :attributes
 
     def self.fields
-      ['id', 'description', 'details', 'live']
+      ['id', 'description', 'details']
     end
 
 
@@ -1537,78 +1546,6 @@ class WebPay
       attributes['details'] = value
     end
 
-    def live
-      attributes['live']
-    end
-
-
-    def live=(value)
-      attributes['live'] = value
-    end
-
-  end
-  class ListRequestWithLive < Entity
-    attr_reader :attributes
-
-    def self.fields
-      ['count', 'offset', 'created', 'live']
-    end
-
-
-    def self.create(params)
-      return params if params.is_a?(self)
-      hash = case params
-        when Hash; params
-        else
-          raise WebPay::InvalidRequestError.new("#{self} does not accept the given value", params)
-        end
-      self.new(hash)
-    end
-
-    def initialize(hash = {})
-      hash = normalize_hash(hash)
-      hash['created'] = hash['created'].is_a?(Hash) ? WebPay::CreatedRange.new(hash['created']) : hash['created']
-      @attributes = hash
-    end
-
-    # attributes accessors
-    def count
-      attributes['count']
-    end
-
-
-    def count=(value)
-      attributes['count'] = value
-    end
-
-    def offset
-      attributes['offset']
-    end
-
-
-    def offset=(value)
-      attributes['offset'] = value
-    end
-
-    def created
-      attributes['created']
-    end
-
-
-    def created=(value)
-      value = value.is_a?(Hash) ? WebPay::CreatedRange.new(value) : value
-      attributes['created'] = value
-    end
-
-    def live
-      attributes['live']
-    end
-
-
-    def live=(value)
-      attributes['live'] = value
-    end
-
   end
   class ShopResponseList < Entity
     attr_reader :attributes
@@ -1820,11 +1757,11 @@ class WebPay
     end
 
   end
-  class ListRequestWithCustomerAndSuspended < Entity
+  class RecursionListRequest < Entity
     attr_reader :attributes
 
     def self.fields
-      ['count', 'offset', 'created', 'customer', 'suspended']
+      ['count', 'offset', 'created', 'customer', 'shop', 'suspended']
     end
 
 
@@ -1882,6 +1819,15 @@ class WebPay
       attributes['customer'] = value
     end
 
+    def shop
+      attributes['shop']
+    end
+
+
+    def shop=(value)
+      attributes['shop'] = value
+    end
+
     def suspended
       attributes['suspended']
     end

data/lib/webpay/event.rb

@@ -11,10 +11,10 @@ class WebPay::Event < WebPay::ApiResource
 
   # List events filtered by params
   #
-  # @param params [ListRequestWithEventType|Hash] Parameters to API call
+  # @param params [EventListRequest|Hash] Parameters to API call
   # @return [EventResponseList]
   def all(params = {})
-    req = WebPay::ListRequestWithEventType.create(params)
+    req = WebPay::EventListRequest.create(params)
     raw_response = @client.request(:get, 'events', req)
     WebPay::EventResponseList.new(raw_response)
   end

data/lib/webpay/recursion.rb

@@ -42,10 +42,10 @@ class WebPay::Recursion < WebPay::ApiResource
 
   # List recursions filtered by params
   #
-  # @param params [ListRequestWithCustomerAndSuspended|Hash] Parameters to API call
+  # @param params [RecursionListRequest|Hash] Parameters to API call
   # @return [RecursionResponseList]
   def all(params = {})
-    req = WebPay::ListRequestWithCustomerAndSuspended.create(params)
+    req = WebPay::RecursionListRequest.create(params)
     raw_response = @client.request(:get, 'recursions', req)
     WebPay::RecursionResponseList.new(raw_response)
   end

data/lib/webpay/shop.rb

@@ -31,10 +31,10 @@ class WebPay::Shop < WebPay::ApiResource
 
   # List shops filtered by params
   #
-  # @param params [ListRequestWithLive|Hash] Parameters to API call
+  # @param params [BasicListRequest|Hash] Parameters to API call
   # @return [ShopResponseList]
   def all(params = {})
-    req = WebPay::ListRequestWithLive.create(params)
+    req = WebPay::BasicListRequest.create(params)
     raw_response = @client.request(:get, 'shops', req)
     WebPay::ShopResponseList.new(raw_response)
   end

data/webpay.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'webpay'
-  spec.version       = '3.0.0'
+  spec.version       = '3.0.1'
   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.0
+  version: 3.0.1
 platform: ruby
 authors:
 - webpay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday