bitreserve 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bbbbdb0761739cd6c5e1d66a3f0ac5dfa71c498
-  data.tar.gz: d12bcb0e633a3a04665b17d7b778838645d584d7
+  metadata.gz: 695ae2500f15a4407019109e0c7161d4381aa174
+  data.tar.gz: 13176e49bdd283942ba539f0456b61043870115c
 SHA512:
-  metadata.gz: 3e07529048a9d805f6b22460e26f89defe5f7da1b6fe71d3dc49b7b20c3018bac0df8cf0a0b834e59a0191d2c8ded7a7ea99438d4cdb033d3c992de2a4e43a38
-  data.tar.gz: dbd7039f5765587738de721d3dd48d67b3f942948abfa8fd63bea919baa380682c5eafcf98c997237a61131387a769a1236032a7722674978fb8d6889e303eec
+  metadata.gz: cf72f59816f865847b1de5524fcddd83198446404c7e7e2cae056763dd5f5fdeedd958658dd30918ff3a2c8a2302ba544dae3a873ea903044ff5b29825474ca2
+  data.tar.gz: 5b6b367acda03beea52910c90e72fd61f92c38481658839cb51f7d2ee20cc20ec4ad58250ad1a5aa6d2ceb6d3b4769b72f6fa5a243e2e1eb284f66654d397057

data/lib/bitreserve.rb

@@ -32,4 +32,5 @@ require 'bitreserve/entities/phone'
 require 'bitreserve/entities/ticker'
 require 'bitreserve/entities/transaction'
 require 'bitreserve/entities/user'
+require 'bitreserve/entities/oauth_error'
 require 'bitreserve/entities/error'

data/lib/bitreserve/entities/error.rb

@@ -2,8 +2,7 @@ module Bitreserve
   module Entities
     class Error < BaseEntity
       attribute :code
-      attribute :error
-      attribute :error_description
+      attribute :errors
     end
   end
 end

data/lib/bitreserve/entities/oauth_error.rb

@@ -0,0 +1,9 @@
+module Bitreserve
+  module Entities
+    class OAuthError < BaseEntity
+      attribute :code
+      attribute :error
+      attribute :error_description
+    end
+  end
+end

data/lib/bitreserve/request.rb

@@ -44,10 +44,12 @@ module Bitreserve
     attr_reader :path, :data, :auth, :headers
 
     def self.with_valid_response(response)
-      if response.is_a?(Hash) && response['error']
-        Entities::Error.new(response)
+      return yield unless response.code >= 400
+
+      if response['error_description']
+        Entities::OAuthError.new(response)
       else
-        yield
+        Entities::Error.new(response)
       end
     end
 

data/lib/bitreserve/version.rb

@@ -1,3 +1,3 @@
 module Bitreserve
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/support/webmock.rb

@@ -4,8 +4,8 @@ require 'uri'
 WebMock.disable_net_connect!(allow: 'codeclimate.com')
 
 module WebMockHelpers
-  def self.bitreserve_stub_request(method, url, response = [])
+  def self.bitreserve_stub_request(method, url, response = [], status: 200)
     WebMock::API.stub_request(method, Bitreserve::Request.base_uri + url).
-      to_return(body: response.to_json, headers: { 'Content-Type' =>  'application/json' })
+      to_return(body: response.to_json, status: status, headers: { 'Content-Type' =>  'application/json' })
   end
 end

data/spec/unit/request_spec.rb

@@ -58,15 +58,26 @@ module Bitreserve
         expect(Request).to have_received(:get).with(url, headers: headers, body: body)
       end
 
+      it 'handles an auth error response' do
+        fake_error = { code: '401', error: 'invalid_token', error_description: 'A description' }
+        request_data = RequestData.new('/some-url', object_class)
+        WebMockHelpers.bitreserve_stub_request(:get, '/some-url', fake_error, status: 401)
+
+        result = Request.public_send(method_name, :get, request_data)
+
+        expect(result).to be_a(Entities::OAuthError)
+        expect(result.code).to eq '401'
+      end
+
       it 'handles an error response' do
-        fake_error = { code: '401', error: 'message' }
+        fake_error = { code: '400', errors: {} }
         request_data = RequestData.new('/some-url', object_class)
-        WebMockHelpers.bitreserve_stub_request(:get, '/some-url', fake_error)
+        WebMockHelpers.bitreserve_stub_request(:get, '/some-url', fake_error, status: 400)
 
         result = Request.public_send(method_name, :get, request_data)
 
         expect(result).to be_a(Entities::Error)
-        expect(result.code).to eq '401'
+        expect(result.code).to eq '400'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitreserve
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Group Buddies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -170,6 +170,7 @@ files:
 - lib/bitreserve/entities/card.rb
 - lib/bitreserve/entities/contact.rb
 - lib/bitreserve/entities/error.rb
+- lib/bitreserve/entities/oauth_error.rb
 - lib/bitreserve/entities/phone.rb
 - lib/bitreserve/entities/ticker.rb
 - lib/bitreserve/entities/transaction.rb
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A wrapper for the bitreserve API
@@ -288,3 +289,4 @@ test_files:
 - spec/unit/entities/base_entity_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/request_spec.rb
+has_rdoc: