webpay 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77afac69d89b7df48f6789f19ccd0f27a87f44d8
-  data.tar.gz: 8fe4aaf18f1278fb012dc1dc5856e569513c9009
+  metadata.gz: a7c74b37ee7b237d1f743cc81b96efbf30461e69
+  data.tar.gz: 2d1fbb219485d644d317f3d05b85ec979c9ce730
 SHA512:
-  metadata.gz: 0f651a31916eb056fbf5fd698a189a07a631726f526c2e463d5c4cf22e9f74e1c2e41e27fd269e982c6e152d5c0069d35c83a47974ffa633c894979182c8e2f8
-  data.tar.gz: 5042e230ad4a8525eb3cf8f8806f7de18bc9b3c5ff0ef169b5ed40da8edeeee1cb104766818c11eee2a206fbd83ef7c798184b81dc7e893df8c7c4571cc854b6
+  metadata.gz: 57fc900f7a509d96913fe41902b7b79d9e10e48a4857e19229aaca8d99c17e42828ef5c21871da3d312744bb0e58db625fe023c1fe29d5fe3df5fe6cc3af329a
+  data.tar.gz: 54e6158243f7a2432b86ad3769751dfad61e7bda47efb9a3558417e6f027b5a446b6bbdac28d6981ea1fe5f3e0a7d26a73b4936f5b380374f7c0dedaafca8bbe

data/.travis.yml

@@ -8,6 +8,5 @@ gemfile:
   - gemfiles/no_doc_gems
 script: "bundle exec rake"
 notifications:
-  hipchat:
-    rooms:
-      secure: ykLsXlebzR9nnb+9ttpCySOg2hE4Ve699s2Owd7YahcZyVNxnG4q1P8Mps4jFlOgPNQ6JwkcB4A6QLavavtJlX7vXTDj1GD+zVAScjbtN/6ZV94S2eHA7hBUXHUwBmH0Cw5glrFoPEDBsQdOYbrOrJKwFNEhUTHdY0SRgEXv5Wo=
+  webhooks:
+    secure: Pbqm39Q5UmaN76lEv5xqgrLHgApc+OWsQTFgOAsweBXuIW1fPsoMRq8CwnrZ9Y23XdE1OmK2mi0Y3ncONgptp4yXi+kfaSmMT8LUwJ+Jkk1NWB2teoCYYaRt+da70bjClhSfBdb2+1S300o5NnhdyCdtC1EKP6syakBxgzJkOP0=

data/lib/webpay/client.rb

@@ -15,13 +15,14 @@ module WebPay
     #
     # @example Client for the default endpoint
     #     Client.new('test_secret_XXXX', 'https://api.webpay.jp', '/v1')
-    def initialize(api_key, api_base, api_version)
+    def initialize(api_key, api_base, api_version, api_proxy = nil, lang = :en)
       ssl_options = {ca_file: WebPay.ssl_ca_file}
       default_headers = {
         'Authorization' => "Bearer #{api_key}",
-        'User-Agent' => "WebPay#{api_version} RubyBinding/#{WebPay::VERSION}"
+        'User-Agent' => "WebPay#{api_version} RubyBinding/#{WebPay::VERSION}",
+        'Accept-Language' => lang.to_s
       }
-      @conn = Faraday.new(api_base, ssl: ssl_options, headers: default_headers) do |builder|
+      @conn = Faraday.new(api_base, ssl: ssl_options, headers: default_headers, proxy: api_proxy) do |builder|
         builder.request :url_encoded
         builder.adapter Faraday.default_adapter
       end

data/lib/webpay/version.rb

@@ -1,5 +1,5 @@
 module WebPay
 
   # Version of WebPay gem
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/lib/webpay.rb

@@ -25,6 +25,8 @@ module WebPay
   @api_base = 'https://api.webpay.jp'
   @api_version = '/v1'
   @api_key = nil
+  @api_proxy = nil
+  @language = :en
 
   class << self
     # Absolute path to SSL CA file.
@@ -36,7 +38,7 @@ module WebPay
     # Current client object.
     # client is memoized, and nullified when @api_base or @api_key is modified.
     def client
-      @client ||= Client.new(@api_key, @api_base, @api_version)
+      @client ||= Client.new(@api_key, @api_base, @api_version, @api_proxy, @language)
     end
 
     # Set api_base, the base URL of API.
@@ -54,6 +56,19 @@ module WebPay
       @client = nil
     end
 
+    # Set proxy for connecting to @api_base
+    def api_proxy=(new_value)
+      @api_proxy = new_value
+      @client = nil
+    end
+
+    # Set value of accept-language request header
+    # Currently WebPay API handles :en and :ja
+    def language=(new_value)
+      @language = new_value
+      @client = nil
+    end
+
     # Get current api_base
     def api_base
       @api_base
@@ -63,5 +78,15 @@ module WebPay
     def api_key
       @api_key
     end
+
+    # Get current api_proxy
+    def api_proxy
+      @api_proxy
+    end
+
+    # Get current language
+    def language
+      @language
+    end
   end
 end

data/spec/resources/errors/not_found_ja.txt

@@ -0,0 +1,20 @@
+HTTP/1.1 404 Not Found
+Cache-Control: no-cache, private
+Content-Type: application/json; charset=utf-8
+Date: Sun, 23 Feb 2014 23:53:53 GMT
+Server: nginx/1.4.4
+Status: 404 Not Found
+X-Rack-Cache: miss
+X-Request-Id: b82d843b508fa060a1f1c0bb637e40f6
+X-Runtime: 0.016769
+X-UA-Compatible: IE=Edge,chrome=1
+Content-Length: 151
+Connection: keep-alive
+
+{
+  "error": {
+    "type": "invalid_request_error",
+    "message": "該当する顧客がありません: cus_eS6dGfa8BeUlbS",
+    "param": "id"
+  }
+}

data/spec/webpay_spec.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'uri'
+
+describe WebPay do
+  it 'should set proxy on Faraday client from api_proxy option' do
+    proxy_uri = 'http://test.example.com:8080'
+    WebPay.api_proxy = proxy_uri
+    expect(WebPay.client.instance_variable_get(:@conn).proxy[:uri])
+      .to eq(URI.parse(proxy_uri))
+  end
+
+  describe 'Not Found with Accept-Language: ja' do
+    let(:id) { 'cus_eS6dGfa8BeUlbS' }
+    before do
+      stub_request(:get, 'http://api.example.com/v1/customers/' + id).
+        with(headers: { 'Authorization' => 'Bearer fake_apikey', 'Accept-Language' => 'ja' }).
+        to_return(response_file('errors/not_found_ja'))
+    end
+    subject(:error) {
+      WebPay.api_base = 'http://api.example.com/v1'
+      WebPay.language = :ja
+      begin
+        WebPay::Customer.retrieve(id)
+      rescue => e
+        e
+      end
+    }
+    it { should be_instance_of WebPay::InvalidRequestError }
+    its(:status) { should eq 404 }
+    its(:type) { should eq 'invalid_request_error' }
+    its(:param) { should eq 'id' }
+    its(:message) { should eq '該当する顧客がありません: cus_eS6dGfa8BeUlbS' }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpay
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - webpay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -160,6 +160,7 @@ files:
 - spec/resources/errors/broken_json.txt
 - spec/resources/errors/card_error.txt
 - spec/resources/errors/not_found.txt
+- spec/resources/errors/not_found_ja.txt
 - spec/resources/errors/unauthorized.txt
 - spec/resources/errors/unknown_api_error.txt
 - spec/resources/events/all_with_type.txt
@@ -173,6 +174,7 @@ files:
 - spec/webpay/event_spec.rb
 - spec/webpay/token_spec.rb
 - spec/webpay/webpay_error_spec.rb
+- spec/webpay_spec.rb
 - webpay.gemspec
 homepage: https://webpay.jp
 licenses:
@@ -218,6 +220,7 @@ test_files:
 - spec/resources/errors/broken_json.txt
 - spec/resources/errors/card_error.txt
 - spec/resources/errors/not_found.txt
+- spec/resources/errors/not_found_ja.txt
 - spec/resources/errors/unauthorized.txt
 - spec/resources/errors/unknown_api_error.txt
 - spec/resources/events/all_with_type.txt
@@ -231,3 +234,4 @@ test_files:
 - spec/webpay/event_spec.rb
 - spec/webpay/token_spec.rb
 - spec/webpay/webpay_error_spec.rb
+- spec/webpay_spec.rb