bitpay-sdk 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 934b96a7f24134990a0cfed00c6e3b50502c3823
-  data.tar.gz: 68a05391e925b79b565f7cc2400ce7a101bc5ebf
+  metadata.gz: 6a0b02cec388fe32a5afd21b0a9ad92340818107
+  data.tar.gz: d539b63ee8a0dca065562a5a5ebb6f539fb8d240
 SHA512:
-  metadata.gz: b9c62e5a6a700b1c73c928f27c5cff0436ddb33bffd2292e18248046b89ce9c54b65918b151a3f9a32559e42c239da02c20fc326d350f1369cedad6748cc9089
-  data.tar.gz: 56ab8bfb2b86bd9e15a5f7165a0e58b98eb92ac987868e9789d6167a19f15645f99157680fe17c313dcf692f21dcd94779507881710198f3738e05a298222698
+  metadata.gz: 4fd3cb6688d3ba5387fccdf67c0cd9f044e7e5fd8978147d3d024831f2dc657ae751afd961418bc3cbfa35992438281bbc624e961bb88b5455cb72e8f55f9769
+  data.tar.gz: ad97799266a00b43413ccb956296ce27121a55201e7d8d7fdff1a4d3bb5295c35898ca56a65145c143f329820df1a3e180f25ad414e3e821a421248feb74a753

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.4.1] - 2015-03-11
+### Fixed
+- GitHub issue 40: error for endpoints that did not return a 'data' field
+
+## [2.4.0] - 2015-03-05
+### Changed
+- Add feature: Accept refunds
+- Fix Bug: Accept bitcoin payments like 0.003

data/features/step_definitions/refund_steps.rb

@@ -1,4 +1,5 @@
 Given(/^the user creates a refund$/) do
+  sleep(1)
   client = new_client_from_stored_values
   @response = client.refund_invoice(id: REFUND_TRANSACTION, params: {amount: 1, currency: 'USD', bitcoinAddress: REFUND_ADDRESS})
 end

data/lib/bitpay/client.rb

@@ -47,7 +47,8 @@ module BitPay
       # => Pass {pairingCode: 'WfD01d2'} to claim a server-initiated pairing code
       #
       def pair_client(params={})
-        post(path: 'tokens', params: params)
+        tokens = post(path: 'tokens', params: params)
+        return tokens["data"]
       end
 
       ## Compatibility method for pos pairing
@@ -69,7 +70,8 @@ module BitPay
         raise BitPay::ArgumentError, "Illegal Argument: Currency is invalid." unless /^[[:upper:]]{3}$/.match(currency)
         params.merge!({price: price, currency: currency})
         token = get_token(facade)
-        post(path: "invoices", token: token, params: params)
+        invoice = post(path: "invoices", token: token, params: params)
+        invoice["data"]
       end
 
       ## Gets the privileged merchant-version of the invoice		
@@ -77,13 +79,15 @@ module BitPay
       #		
       def get_invoice(id:)
         token = get_token('merchant')
-        get(path: "invoices/#{id}", token: token)
+        invoice = get(path: "invoices/#{id}", token: token)
+        invoice["data"]
       end
 
       ## Gets the public version of the invoice
       #
       def get_public_invoice(id:)
-        get(path: "invoices/#{id}", public: true)
+        invoice = get(path: "invoices/#{id}", public: true)
+        invoice["data"]
       end
       
       
@@ -102,7 +106,8 @@ module BitPay
       #
       def refund_invoice(id:, params:{})
         invoice = get_invoice(id: id)
-        post(path: "invoices/#{id}/refunds", token: invoice["token"], params: params)
+        refund = post(path: "invoices/#{id}/refunds", token: invoice["token"], params: params)
+        refund["data"]
       end
       
       ## Get All Refunds for Invoice
@@ -116,7 +121,8 @@ module BitPay
       def get_all_refunds_for_invoice(id:)
         urlpath = "invoices/#{id}/refunds"
         invoice = get_invoice(id: id)
-        get(path: urlpath, token: invoice["token"])
+        refunds = get(path: urlpath, token: invoice["token"])
+        refunds["data"]
       end
 
       ## Get Refund
@@ -128,7 +134,8 @@ module BitPay
       def get_refund(invoice_id:, request_id:)
         urlpath = "invoices/#{invoice_id}/refunds/#{request_id}"
         invoice = get_invoice(id: invoice_id)
-        get(path: urlpath, token: invoice["token"])
+        refund = get(path: urlpath, token: invoice["token"])
+        refund["data"]
       end
       
       ## Cancel Refund
@@ -140,7 +147,8 @@ module BitPay
       def cancel_refund(invoice_id:, request_id:)
         urlpath = "invoices/#{invoice_id}/refunds/#{request_id}"
         refund = get_refund(invoice_id: invoice_id, request_id: request_id)
-        delete(path: urlpath, token: refund["token"])
+        deletion = delete(path: urlpath, token: refund["token"])
+        deletion["data"]
       end      
 
       ## Checks that the passed tokens are valid by

data/lib/bitpay/rest_connector.rb

@@ -67,7 +67,7 @@ module BitPay
       end
 
       if response.kind_of? Net::HTTPSuccess
-        return JSON.parse(response.body)["data"]
+        return JSON.parse(response.body)
       elsif JSON.parse(response.body)["error"]
         raise(BitPayError, "#{response.code}: #{JSON.parse(response.body)['error']}")
       else
@@ -80,7 +80,7 @@ module BitPay
     #  updates @tokens
     #
     def refresh_tokens
-      response = get(path: 'tokens')
+      response = get(path: 'tokens')["data"]
       token_array = response || {}
       tokens = {}
       token_array.each do |t|

data/lib/bitpay/version.rb

@@ -3,5 +3,5 @@
 # or https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
 
 module BitPay
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/spec/client_spec.rb

@@ -25,6 +25,12 @@ describe BitPay::SDK::Client do
         to_return(:body => get_fixture('invoices_{id}_refunds-GET.json'))
       stub_request(:post, "#{BitPay::TEST_API_URI}/invoices/TEST_INVOICE_ID/refunds").
         to_return(:body => get_fixture('invoices_{id}_refunds-POST.json'))
+      stub_request(:post, "#{BitPay::TEST_API_URI}/nuttin").
+        to_return(:body => get_fixture('response-nodata.json'))
+      stub_request(:get, "#{BitPay::TEST_API_URI}/nuttin").
+        to_return(:body => get_fixture('response-nodata.json'))
+      stub_request(:delete, "#{BitPay::TEST_API_URI}/nuttin").
+        to_return(:body => get_fixture('response-nodata.json'))
   end
 
   describe "#initialize" do
@@ -36,6 +42,14 @@ describe BitPay::SDK::Client do
     
   end
 
+  describe "requests to endpoint without data field" do
+    it "should return the json body" do
+      expect(bitpay_client.post(path: "nuttin", params: {})["facile"]).to eq("is easy")
+      expect(bitpay_client.get(path: "nuttin")["facile"]).to eq("is easy")
+      expect(bitpay_client.delete(path: "nuttin")["facile"]).to eq( "is easy")
+    end
+  end
+
   describe "#send_request" do
     before do
       stub_const('ENV', {'BITPAY_PEM' => PEM})

data/spec/fixtures/response-nodata.json

@@ -0,0 +1,10 @@
+{
+  "facile": "is easy",
+  "diti": [
+    {
+      "requestDate": "2015-01-27T00:36:12.360Z",
+      "status": "pending"
+    }
+  ]
+}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitpay-sdk
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Bitpay, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -215,11 +215,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - GUIDE.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- bitpay-sdk-2.4.0.gem
 - bitpay-sdk.gemspec
 - config/capybara.rb
 - config/constants.rb
@@ -243,6 +245,7 @@ files:
 - spec/fixtures/invoices_{id}_refunds-GET.json
 - spec/fixtures/invoices_{id}_refunds-POST.json
 - spec/fixtures/invoices_{id}_refunds_{refund_id}-GET.json
+- spec/fixtures/response-nodata.json
 - spec/key_utils_spec.rb
 - spec/set_constants.sh
 - spec/spec_helper.rb