webpay 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef4f5f3eee2ae39a2d17886fad71936960b2ef6e
+  data.tar.gz: 0008216204339d22ffe67b068792c69b89f921cf
+SHA512:
+  metadata.gz: 5ffca8da5481be4ffb948c4dd58e99d86e854984e735457769f7d3f697e36a9df2fd3b112c43938b956275f66a3351533ed059f3089a5323fea669aa79f6513d
+  data.tar.gz: 826518c40f8ff23ec697e0913db2626366b93299226fc5762a8588911d8669d2c3e634f1502dec20db7ef9a31393536829fa79afcf3711bc3b343d04d577ee93

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 Gemfile.lock
+gemfiles/*.lock
 lib/bundler/man
 pkg
 rdoc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-head
+  - rbx-19mode
+gemfile:
+  - gemfiles/no_doc_gems
+script: "bundle exec rake"
+notifications:
+  hipchat:
+    rooms:
+      secure: ykLsXlebzR9nnb+9ttpCySOg2hE4Ve699s2Owd7YahcZyVNxnG4q1P8Mps4jFlOgPNQ6JwkcB4A6QLavavtJlX7vXTDj1GD+zVAScjbtN/6ZV94S2eHA7hBUXHUwBmH0Cw5glrFoPEDBsQdOYbrOrJKwFNEhUTHdY0SRgEXv5Wo=

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/gemfiles/no_doc_gems

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'faraday', '~> 0.8.7'
+gem 'rake'
+
+group :test do
+  gem 'rspec', '~> 2.14.0'
+  gem 'webmock', '~> 1.13.0'
+end

data/lib/webpay/client.rb

@@ -39,7 +39,7 @@ module WebPay
       case response.status
       when 200..299
         begin
-          JSON.parse(response.body)
+          JSON.parse(response.body.force_encoding(infer_encoding(response)))
         rescue JSON::ParserError => e
           raise WebPay::APIConnectionError.new("Response JSON is broken. #{e.message}: #{response.body}", e)
         end
@@ -58,5 +58,23 @@ module WebPay
         handle_response(response)
       end
     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
 end

data/lib/webpay/version.rb

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

data/lib/webpay/webpay_error.rb

@@ -1,3 +1,4 @@
+require 'json'
 module WebPay
 
   # Abstract error class for WebPay errors.
@@ -7,7 +8,12 @@ module WebPay
     # @api private
     # @return [WebPayError]
     def self.from_response(status, body)
-      hash = JSON.load(body)
+      hash =
+        begin
+          JSON.load(body)
+        rescue JSON::ParserError => e
+          return WebPay::APIConnectionError.new("Response JSON is broken. #{e.message}: #{body}", e)
+        end
       unless hash['error']
         return APIConnectionError.new("Invalid response #{body}")
       end

data/spec/resources/account/delete.txt

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "ffc2622aa8286367b501554d9625bc7e"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: b90a98ba6c730796bb4651b30eefcf3d
+X-Runtime: 0.030542
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Wed, 11 Sep 2013 12:50:01 GMT
+Content-Length: 22
+Connection: Keep-Alive
+
+{
+  "deleted": true
+}

data/spec/resources/account/retrieve.txt

@@ -0,0 +1,23 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "bfda5f4ce8f4baff2dc95b81d3eeddc8"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: ac424d922fefdd1625e41bda0e13f4b8
+X-Runtime: 0.057802
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Wed, 11 Sep 2013 12:48:50 GMT
+Content-Length: 234
+Connection: Keep-Alive
+
+{
+  "object": "account",
+  "id": "acct_2Cmdexb7J2r78rz",
+  "email": "test-me@example.com",
+  "statement_descriptor": null,
+  "details_submitted": false,
+  "charge_enabled": false,
+  "currencies_supported": [
+    "jpy"
+  ]
+}

data/spec/resources/charges/all.txt

@@ -0,0 +1,102 @@
+HTTP/1.1 200 OK
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 05:37:38 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 200 OK
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "1ef28b71a9c2922209c711d6337dc268"
+Cache-Control: must-revalidate, private, max-age=0
+X-Request-Id: d70772065116ff711cb28778dabd50ed
+X-Runtime: 0.023629
+X-Rack-Cache: miss
+
+{
+  "object": "list",
+  "url": "/v1/charges",
+  "count": 11,
+  "data": [
+    {
+      "id": "ch_2X01NDedxdrRcA3",
+      "object": "charge",
+      "livemode": false,
+      "currency": "jpy",
+      "description": "Test Charge from Java",
+      "amount": 1000,
+      "amount_refunded": 0,
+      "customer": "cus_fgR4vI92r54I6oK",
+      "created": 1378617627,
+      "paid": true,
+      "refunded": false,
+      "failure_message": null,
+      "card": {
+        "object": "card",
+        "exp_year": 2014,
+        "exp_month": 11,
+        "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+        "name": "KEI KUBO",
+        "country": "JP",
+        "type": "Visa",
+        "cvc_check": "pass",
+        "last4": "4242"
+      },
+      "captured": true,
+      "expire_time": 1379222427
+    },
+    {
+      "id": "ch_2SS17Oh1r8d2djE",
+      "object": "charge",
+      "livemode": false,
+      "currency": "jpy",
+      "description": "Test Charge from Java",
+      "amount": 1000,
+      "amount_refunded": 0,
+      "customer": null,
+      "created": 1378609168,
+      "paid": true,
+      "refunded": false,
+      "failure_message": null,
+      "card": {
+        "object": "card",
+        "exp_year": 2015,
+        "exp_month": 12,
+        "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+        "name": "YUUKO SHIONJI",
+        "country": "JP",
+        "type": "Visa",
+        "cvc_check": "pass",
+        "last4": "4242"
+      },
+      "captured": true,
+      "expire_time": null
+    },
+    {
+      "id": "ch_2SS4fK4IL96535y",
+      "object": "charge",
+      "livemode": false,
+      "currency": "jpy",
+      "description": "Test Charge from Java",
+      "amount": 1000,
+      "amount_refunded": 0,
+      "customer": "cus_fgR4vI92r54I6oK",
+      "created": 1378607167,
+      "paid": true,
+      "refunded": false,
+      "failure_message": null,
+      "card": {
+        "object": "card",
+        "exp_year": 2014,
+        "exp_month": 11,
+        "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+        "name": "KEI KUBO",
+        "country": "JP",
+        "type": "Visa",
+        "cvc_check": "pass",
+        "last4": "4242"
+      },
+      "captured": true,
+      "expire_time": null
+    }
+  ]
+}

data/spec/resources/charges/capture.txt

@@ -0,0 +1,41 @@
+HTTP/1.1 200 OK
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 05:22:08 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 200 OK
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "2672411c723a31aaf67ed4fa6ac0aad4"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: ce69847ff19fc25f9376d2affc8e8a44
+X-Runtime: 0.063278
+X-Rack-Cache: invalidate, pass
+
+{
+  "id": "ch_2X01NDedxdrRcA3",
+  "object": "charge",
+  "livemode": false,
+  "currency": "jpy",
+  "description": "Test Charge from Java",
+  "amount": 1000,
+  "amount_refunded": 0,
+  "customer": "cus_fgR4vI92r54I6oK",
+  "created": 1378617627,
+  "paid": true,
+  "refunded": false,
+  "failure_message": null,
+  "card": {
+    "object": "card",
+    "exp_year": 2014,
+    "exp_month": 11,
+    "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+    "name": "KEI KUBO",
+    "country": "JP",
+    "type": "Visa",
+    "cvc_check": "pass",
+    "last4": "4242"
+  },
+  "captured": true,
+  "expire_time": 1379222427
+}

data/spec/resources/charges/create_with_card.txt

@@ -0,0 +1,41 @@
+HTTP/1.1 201 Created
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 02:59:29 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 201 Created
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "12298cbfe1c3cc7943d352edc90582ae"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 7f97fc1c9cbdf3ca648d0460bd381b93
+X-Runtime: 0.078686
+X-Rack-Cache: invalidate, pass
+
+{
+  "id": "ch_2SS17Oh1r8d2djE",
+  "object": "charge",
+  "livemode": false,
+  "currency": "jpy",
+  "description": "Test Charge from Java",
+  "amount": 1000,
+  "amount_refunded": 0,
+  "customer": null,
+  "created": 1378609168,
+  "paid": true,
+  "refunded": false,
+  "failure_message": null,
+  "card": {
+    "object": "card",
+    "exp_year": 2015,
+    "exp_month": 12,
+    "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+    "name": "YUUKO SHIONJI",
+    "country": "JP",
+    "type": "Visa",
+    "cvc_check": "pass",
+    "last4": "4242"
+  },
+  "captured": true,
+  "expire_time": null
+}

data/spec/resources/charges/create_with_customer.txt

@@ -0,0 +1,41 @@
+HTTP/1.1 201 Created
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 02:26:07 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 201 Created
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "2fdfa89815507564c93a11caffc5c609"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: afd5d071121b5b0ca28b1e1ad96ec40a
+X-Runtime: 0.129481
+X-Rack-Cache: invalidate, pass
+
+{
+  "id": "ch_2SS4fK4IL96535y",
+  "object": "charge",
+  "livemode": false,
+  "currency": "jpy",
+  "description": "Test Charge from Java",
+  "amount": 1000,
+  "amount_refunded": 0,
+  "customer": "cus_fgR4vI92r54I6oK",
+  "created": 1378607167,
+  "paid": true,
+  "refunded": false,
+  "failure_message": null,
+  "card": {
+    "object": "card",
+    "exp_year": 2014,
+    "exp_month": 11,
+    "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+    "name": "KEI KUBO",
+    "country": "JP",
+    "type": "Visa",
+    "cvc_check": "pass",
+    "last4": "4242"
+  },
+  "captured": true,
+  "expire_time": null
+}

data/spec/resources/charges/refund.txt

@@ -0,0 +1,41 @@
+HTTP/1.1 200 OK
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 04:49:14 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 200 OK
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "00ea9522e0f29d3e2a494f30105fe841"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 20141aa82edd1939c6b0ce64d5a87fa7
+X-Runtime: 0.055769
+X-Rack-Cache: invalidate, pass
+
+{
+  "id": "ch_bWp5EG9smcCYeEx",
+  "object": "charge",
+  "livemode": false,
+  "currency": "jpy",
+  "description": "アイテムの購入",
+  "amount": 400,
+  "amount_refunded": 400,
+  "customer": null,
+  "created": 1370746452,
+  "paid": true,
+  "refunded": true,
+  "failure_message": null,
+  "card": {
+    "object": "card",
+    "exp_year": 2014,
+    "exp_month": 11,
+    "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+    "name": "KEI KUBO",
+    "country": "JP",
+    "type": "Visa",
+    "cvc_check": "pass",
+    "last4": "4242"
+  },
+  "captured": true,
+  "expire_time": null
+}

data/spec/resources/charges/retrieve.txt

@@ -0,0 +1,39 @@
+HTTP/1.1 200 OK
+Server: nginx/1.4.1
+Date: Sun, 08 Sep 2013 04:22:03 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Status: 200 OK
+X-UA-Compatible: IE=Edge,chrome=1
+ETag: "e1d70d19ea7666f4a7016055b3274b43"
+Cache-Control: must-revalidate, private, max-age=0
+X-Request-Id: 8ea33d9a3dc18348206d68f2408c7866
+
+{
+  "id": "ch_bWp5EG9smcCYeEx",
+  "object": "charge",
+  "livemode": false,
+  "currency": "jpy",
+  "description": "アイテムの購入",
+  "amount": 400,
+  "amount_refunded": 0,
+  "customer": null,
+  "created": 1370746452,
+  "paid": true,
+  "refunded": false,
+  "failure_message": null,
+  "card": {
+    "object": "card",
+    "exp_year": 2014,
+    "exp_month": 11,
+    "fingerprint": "215b5b2fe460809b8bb90bae6eeac0e0e0987bd7",
+    "name": "KEI KUBO",
+    "country": "JP",
+    "type": "Visa",
+    "cvc_check": "pass",
+    "last4": "4242"
+  },
+  "captured": true,
+  "expire_time": null
+}