api-model 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e41c1272409fdd0188dea83e2ee242b0b092cc8
-  data.tar.gz: 13473a46e7d27da470c303f21a294b7d12efcb61
+  metadata.gz: 36ea07b796d901145f5cbe7624c653d94cf4c0aa
+  data.tar.gz: ba894307e7de0f3f24a1e18615276d826ca5f0dd
 SHA512:
-  metadata.gz: 398b23a5b722f8ee17dfd9a7d41905784baa472fd638d04f3c7e4dcb34d972815f417e5eb849d38a18856d20e6a49c1b3ea097b5ff6b7c7bfd72da8ab7c49e8d
-  data.tar.gz: 54abb47e9d2ac4f36f2f172a71304e1366f3d5b04a88090b604a36c4c8757f5ed581369a2d83ca88e2d874c3ad6ece34534b9fff717305c800dee254b927a584
+  metadata.gz: 8a2f5c4663d3e8fe15b5fd3dc8675cb1972dc3b8970a8c995e4ec5ba0aae91781e7587995e1973016e09b03b6701e204e3c591e238caa0e4a58309500e9c6ca7
+  data.tar.gz: 322e4d2cdba72b00469abc60cb84a72a17283dd023c41a2d1c4b8dfeba2415219e478da53ba6eb87a6b2aa385a38879d9c14e0b316b54050d7f974d37f222e86

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.7.1)
+    api-model (2.7.2)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)
@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activesupport (4.2.3)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -35,21 +35,21 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.24)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
-    ethon (0.8.0)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
-    ffi (1.9.10)
-    hash-pipe (0.3.0)
+    ffi (1.9.13)
+    hash-pipe (0.4.0)
       activesupport (~> 4.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.1)
+    minitest (5.9.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -71,7 +71,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
     vcr (2.8.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -93,4 +93,4 @@ DEPENDENCIES
   webmock (= 1.15.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

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.1"
+  s.version     = "2.7.2"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api-model.rb

@@ -14,6 +14,7 @@ require 'api_model/http_request'
 require 'api_model/response'
 require 'api_model/class_methods'
 require 'api_model/instance_methods'
+require 'api_model/error_message_formatter'
 require 'api_model/configuration'
 require 'api_model/cache_stategy/no_cache'
 require 'api_model/response_parser/json'

data/lib/api_model/configuration.rb

@@ -4,7 +4,7 @@ module ApiModel
 
     attr_accessor :host, :json_root, :headers, :raise_on_unauthenticated, :cache_settings,
                   :raise_on_not_found, :cache_strategy, :parser, :builder, :raise_on_server_error,
-                  :json_errors_root
+                  :json_errors_root, :error_message_formatter
 
     def self.from_inherited_config(config)
       new config.instance_values.reject {|k,v| v.blank? }
@@ -31,6 +31,10 @@ module ApiModel
     def json_errors_root
       @json_errors_root ||= "errors"
     end
+
+    def error_message_formatter
+      @error_message_formatter ||= ApiModel::ErrorMessageFormatter
+    end
   end
 
   module ConfigurationMethods

data/lib/api_model/error_message_formatter.rb

@@ -0,0 +1,9 @@
+module ApiModel
+  class ErrorMessageFormatter
+
+    def self.format(http_response)
+      "#{http_response.api_call.response_code}: #{http_response.api_call.request.url}"
+    end
+
+  end
+end

data/lib/api_model/response.rb

@@ -120,18 +120,16 @@ module ApiModel
     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
+        raise UnauthenticatedError, @_config.error_message_formatter.format(http_response)
       end
 
       if @_config.raise_on_not_found && http_response.api_call.response_code == 404
-        raise NotFoundError, error_message
+        raise NotFoundError, @_config.error_message_formatter.format(http_response)
       end
 
       if @_config.raise_on_server_error && http_response.api_call.response_code.between?(500, 599)
-        raise ServerError, error_message
+        raise ServerError, @_config.error_message_formatter.format(http_response)
       end
     end
 

data/spec/api-model/configuration_spec.rb

@@ -47,6 +47,17 @@ describe ApiModel, "Configuration" do
     end
   end
 
+  describe "error_message_formatter" do
+    it 'should default to ApiModel::ErrorMessageFormatter' do
+      Banana.api_model_configuration.error_message_formatter.should eq ApiModel::ErrorMessageFormatter
+    end
+
+    it 'should be possible to set on a class' do
+      Banana.api_config { |c| c.error_message_formatter = "foo" }
+      Banana.api_model_configuration.error_message_formatter.should eq "foo"
+    end
+  end
+
   describe "headers" do
     it 'should create default headers for content type and accepts' do
       headers = Banana.api_model_configuration.headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Damien Timewell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,7 @@ files:
 - lib/api_model/cache_stategy/no_cache.rb
 - lib/api_model/class_methods.rb
 - lib/api_model/configuration.rb
+- lib/api_model/error_message_formatter.rb
 - lib/api_model/http_request.rb
 - lib/api_model/initializer.rb
 - lib/api_model/instance_methods.rb
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple way of interacting with rest APIs