webpay 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a075f6a1468835721458f3a2d098432e49d04a9
-  data.tar.gz: e1c2e70fbc9c19f7996da49e8f52a807a7f3c998
+  metadata.gz: f3dbcdcba5bf87d216b11728ffecfc1b730cde60
+  data.tar.gz: b3cb7981d1dab7149c1a8a4d8d6285e51ed793a3
 SHA512:
-  metadata.gz: d40776a7fadd4200881fe6364cca35d3e69430dfc6a4c6da2cb7b38b3460ad4de7a4af559016affcf9ce19bb2baa1ec6347538b486356b9275b807841a5bfb6e
-  data.tar.gz: 454167830c75728e220f7c2eb38772af5ccd54b429393f3083362799da8fe1bc16d7ea3aab0c4e3db51da4dfe56e96413dea75ef58697d04926542a7bfa388e2
+  metadata.gz: b29a88e162e1389f75dabf0163525f37b8869317c350d79bf00b23a1f7f30568187813e1ac888712fa1ab0615a5261efcfc44b19d6d97fa8930a899a3b0f5db9
+  data.tar.gz: 7f252649b327693f313b690e72672042fa4787910926cf76762119274d085dfb38ff9f8f0d25cbf0554c11e7677cbc9e5550a18c0fb360ffd6403c521f38bf6a

data/lib/webpay.rb

@@ -30,7 +30,7 @@ class WebPay
 
       "Accept" => "application/json",
 
-      "User-Agent" => "Apipa-webpay/3.1.2 ruby",
+      "User-Agent" => "Apipa-webpay/3.2.0 ruby",
 
       "Accept-Language" => "en",
     }
@@ -68,11 +68,10 @@ class WebPay
     WebPay::EventResponse.new(json_data)
   end
 
-  def _request(method, url_pattern ,param_data)
-    url = url_pattern.gsub(/:([[:alnum:]]+)/) { |name| param_data.__send__(name[1..-1]) }
+  def _request(method, path ,param_data)
     begin
       response = @conn.__send__(method) do |req|
-        req.url(url)
+        req.url(path)
         req.params = param_data.query_params
         req.body = JSON.dump(param_data.request_body)
       end

data/lib/webpay/account.rb

@@ -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

@@ -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' + '/' + req.id.to_s, 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' + '/' + req.id.to_s + '/' + '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' + '/' + req.id.to_s + '/' + 'capture', req)
     WebPay::ChargeResponse.new(raw_response)
   end
 

data/lib/webpay/customer.rb

@@ -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' + '/' + req.id.to_s, 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' + '/' + req.id.to_s, 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' + '/' + req.id.to_s, req)
     WebPay::CustomerResponse.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' + '/' + req.id.to_s + '/' + 'active_card', req)
     WebPay::CustomerResponse.new(raw_response)
   end
 

data/lib/webpay/data_types.rb

@@ -1166,7 +1166,7 @@ class WebPay
     attr_reader :attributes
 
     def self.fields
-      ['card', 'uuid']
+      ['card', 'customer', 'uuid']
     end
 
 
@@ -1191,6 +1191,7 @@ class WebPay
     def request_body
       result = {}
       copy_if_exists(@attributes, result, 'card', 'request_body');
+      copy_if_exists(@attributes, result, 'customer', 'request_body');
       copy_if_exists(@attributes, result, 'uuid', 'request_body');
       result
     end
@@ -1211,6 +1212,14 @@ class WebPay
       attributes['card'] = value
     end
 
+    def customer
+      attributes['customer']
+    end
+
+    def customer=(value)
+      attributes['customer'] = value
+    end
+
     def uuid
       attributes['uuid']
     end
@@ -1781,6 +1790,62 @@ class WebPay
       attributes['details'] = value
     end
 
+  end
+  class ShopRequestAlterStatus < Entity
+    attr_reader :attributes
+
+    def self.fields
+      ['id', 'status']
+    end
+
+
+    def self.create(params)
+      return params if params.is_a?(self)
+      hash = case params
+        when Hash; params
+        when WebPay::ShopResponse; {'id' => params.id}
+        when String; {'id' => 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)
+      @attributes = hash
+    end
+
+
+    def request_body
+      result = {}
+      copy_if_exists(@attributes, result, 'status', 'request_body');
+      result
+    end
+
+    def query_params
+      result = {}
+      return result
+    end
+
+
+    # attributes accessors
+    def id
+      attributes['id']
+    end
+
+    def id=(value)
+      attributes['id'] = value
+    end
+
+    def status
+      attributes['status']
+    end
+
+    def status=(value)
+      attributes['status'] = value
+    end
+
   end
   class ShopResponseList < Entity
     attr_reader :attributes

data/lib/webpay/error.rb

@@ -32,36 +32,41 @@ class WebPay
   end
 
   module ErrorResponse
-    class InvalidRequestError < WebPay::ApiError
+    class ErrorResponseError < WebPay::ApiError
       attr_reader :status, :data
-      def initialize(status, raw_data)
+      def initialize(message, status, data)
+        super(message)
         @status = status
-        @data = WebPay::ErrorData.new(raw_data)
-        super(sprintf('%s: %s', 'InvalidRequestError', data.error.message))
+        @data = data
       end
     end
-    class AuthenticationError < WebPay::ApiError
-      attr_reader :status, :data
+
+    class InvalidRequestError < ErrorResponseError
       def initialize(status, raw_data)
-        @status = status
-        @data = WebPay::ErrorData.new(raw_data)
-        super(sprintf('%s: %s', 'AuthenticationError', data.error.message))
+        data = WebPay::ErrorData.new(raw_data)
+        message = sprintf('%s: %s', 'InvalidRequestError', data.error.message)
+        super(message, status, data)
       end
     end
-    class CardError < WebPay::ApiError
-      attr_reader :status, :data
+    class AuthenticationError < ErrorResponseError
       def initialize(status, raw_data)
-        @status = status
-        @data = WebPay::ErrorData.new(raw_data)
-        super(sprintf('%s: %s', 'CardError', data.error.message))
+        data = WebPay::ErrorData.new(raw_data)
+        message = sprintf('%s: %s', 'AuthenticationError', data.error.message)
+        super(message, status, data)
       end
     end
-    class ApiError < WebPay::ApiError
-      attr_reader :status, :data
+    class CardError < ErrorResponseError
       def initialize(status, raw_data)
-        @status = status
-        @data = WebPay::ErrorData.new(raw_data)
-        super(sprintf('%s: %s', 'ApiError', data.error.message))
+        data = WebPay::ErrorData.new(raw_data)
+        message = sprintf('%s: %s', 'CardError', data.error.message)
+        super(message, status, data)
+      end
+    end
+    class ApiError < ErrorResponseError
+      def initialize(status, raw_data)
+        data = WebPay::ErrorData.new(raw_data)
+        message = sprintf('%s: %s', 'ApiError', data.error.message)
+        super(message, status, data)
       end
     end
   end

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' + '/' + req.id.to_s, req)
     WebPay::EventResponse.new(raw_response)
   end
 

data/lib/webpay/recursion.rb

@@ -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' + '/' + req.id.to_s, 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' + '/' + req.id.to_s + '/' + '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' + '/' + req.id.to_s, req)
     WebPay::RecursionResponse.new(raw_response)
   end
 

data/lib/webpay/shop.rb

@@ -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' + '/' + req.id.to_s, req)
     WebPay::ShopResponse.new(raw_response)
   end
 
@@ -25,7 +25,17 @@ 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' + '/' + req.id.to_s, req)
+    WebPay::ShopResponse.new(raw_response)
+  end
+
+  # Alter the test shop's status to the specified one
+  #
+  # @param params [ShopRequestAlterStatus|Hash] Parameters to API call
+  # @return [ShopResponse]
+  def alter_status(params = {})
+    req = WebPay::ShopRequestAlterStatus.create(params)
+    raw_response = @client._request(:post, 'shops' + '/' + req.id.to_s + '/' + 'alter_status', req)
     WebPay::ShopResponse.new(raw_response)
   end
 

data/lib/webpay/token.rb

@@ -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' + '/' + req.id.to_s, req)
     WebPay::TokenResponse.new(raw_response)
   end
 

data/webpay.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'webpay'
-  spec.version       = '3.1.2'
+  spec.version       = '3.2.0'
   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/'
@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 1.9'
+
   spec.add_dependency 'faraday', '~> 0.9'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpay
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - webpay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bindings of WebPay API