api-model 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d0dd9a26e6eafcc5cfde5f0f7efe1fb7f1ef3e4
-  data.tar.gz: efea549d31e9bc395b67f02f02d0bd9e2761e191
+  metadata.gz: 5e41c1272409fdd0188dea83e2ee242b0b092cc8
+  data.tar.gz: 13473a46e7d27da470c303f21a294b7d12efcb61
 SHA512:
-  metadata.gz: 0151bb44bddbf6764c40719142841857b1ee27d5dd0ce2a67f7dccb541862c54129eef6b035d1a501a13909ac9eb151c3e2efb62a3b08eba11c4882d50a91c1d
-  data.tar.gz: 0d2abb36cbc68bdc02555f99fb8ae9435fc4822b2c76d9ccd682974f91d461a17b1d02f2a90339830718a27e148cd4bfe19b2565ef942268729dcd9bd01c189a
+  metadata.gz: 398b23a5b722f8ee17dfd9a7d41905784baa472fd638d04f3c7e4dcb34d972815f417e5eb849d38a18856d20e6a49c1b3ea097b5ff6b7c7bfd72da8ab7c49e8d
+  data.tar.gz: 54abb47e9d2ac4f36f2f172a71304e1366f3d5b04a88090b604a36c4c8757f5ed581369a2d83ca88e2d874c3ad6ece34534b9fff717305c800dee254b927a584

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.7.0)
+    api-model (2.7.1)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
-    ethon (0.7.4)
+    ethon (0.8.0)
       ffi (>= 1.3.0)
     ffi (1.9.10)
     hash-pipe (0.3.0)
@@ -49,7 +49,7 @@ GEM
     ice_nine (0.11.1)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.7.0)
+    minitest (5.8.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -65,8 +65,8 @@ GEM
     safe_yaml (0.9.7)
     slop (3.4.6)
     thread_safe (0.3.5)
-    typhoeus (0.7.2)
-      ethon (>= 0.7.4)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -91,3 +91,6 @@ DEPENDENCIES
   rspec (~> 2.14)
   vcr (= 2.8.0)
   webmock (= 1.15.0)
+
+BUNDLED WITH
+   1.10.6

data/api-model.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "api-model"
-  s.version     = "2.7.0"
+  s.version     = "2.7.1"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api_model/response.rb

@@ -19,9 +19,7 @@ module ApiModel
     end
 
     def build_objects
-      raise UnauthenticatedError if @_config.raise_on_unauthenticated && http_response.api_call.response_code == 401
-      raise NotFoundError if @_config.raise_on_not_found && http_response.api_call.response_code == 404
-      raise ServerError if @_config.raise_on_server_error && http_response.api_call.response_code == 500
+      handle_response_errors
       return self if response_body.nil?
 
       if response_build_hash.is_a? Array
@@ -119,5 +117,23 @@ module ApiModel
       end
     end
 
+    private
+
+    def handle_response_errors
+      error_message = "#{http_response.api_call.response_code}: #{http_response.api_call.request.url}"
+
+      if @_config.raise_on_unauthenticated && http_response.api_call.response_code == 401
+        raise UnauthenticatedError, error_message
+      end
+
+      if @_config.raise_on_not_found && http_response.api_call.response_code == 404
+        raise NotFoundError, error_message
+      end
+
+      if @_config.raise_on_server_error && http_response.api_call.response_code.between?(500, 599)
+        raise ServerError, error_message
+      end
+    end
+
   end
 end

data/spec/api-model/response_spec.rb

@@ -138,7 +138,7 @@ describe ApiModel::Response do
         BlogPost.api_config { |c| c.raise_on_unauthenticated = true }
         expect {
           api_request
-        }.to raise_error(ApiModel::UnauthenticatedError)
+        }.to raise_error(ApiModel::UnauthenticatedError, "401: http://api-model-specs.com/needs_auth")
       end
 
       it 'should not raise an ApiModel::UnauthenticatedError if raise_on_unauthenticated is false' do
@@ -160,7 +160,7 @@ describe ApiModel::Response do
         BlogPost.api_config { |c| c.raise_on_not_found = true }
         expect {
           api_request
-        }.to raise_error(ApiModel::NotFoundError)
+        }.to raise_error(ApiModel::NotFoundError, "404: http://api-model-specs.com/not_found")
       end
 
       it 'should not raise an ApiModel::NotFoundError if raise_on_not_found is false' do
@@ -182,7 +182,7 @@ describe ApiModel::Response do
         BlogPost.api_config { |c| c.raise_on_server_error = true }
         expect {
           api_request
-        }.to raise_error(ApiModel::ServerError)
+        }.to raise_error(ApiModel::ServerError, "500: http://api-model-specs.com/server_error")
       end
 
       it 'should not raise an ApiModel::ServerError if raise_on_server_error is false' do
@@ -191,6 +191,15 @@ describe ApiModel::Response do
           api_request
         }.to_not raise_error
       end
+
+      it 'should log any status code in the 500 range when raise_on_server_error is true' do
+        BlogPost.api_config { |c| c.raise_on_server_error = true }
+        expect {
+          VCR.use_cassette('errors') do
+            BlogPost.get_json "http://api-model-specs.com/unavailable"
+          end
+        }.to raise_error(ApiModel::ServerError, "503: http://api-model-specs.com/unavailable")
+      end
     end
   end
 

data/spec/support/fixtures/errors.yml

@@ -81,4 +81,31 @@ http_interactions:
     http_version:
   recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
 
+- request:
+    method: get
+    uri: http://api-model-specs.com/unavailable
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 503
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.1
+      Date:
+      - Thu, 28 Nov 2013 16:02:56 GMT
+      Content-Type:
+      - text/plain; charset=utf-8
+      Content-Length:
+      - '248'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: "Oh no, something went wrong"
+    http_version:
+  recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
+
 recorded_with: VCR 2.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Damien Timewell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport