api-client 1.9.0 → 1.9.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.9.1
+
+* Fix for Net::Http on NotFound Exception
+
 ## v1.9.0
 
 * Added Requested Url to NotFound Exception message

data/lib/api-client/base.rb

@@ -108,7 +108,7 @@ module ApiClient
     protected
 
     def self.method_missing(method, *args)
-      @response = Parser.response(Dispatcher.send(method, *args))
+      @response = Parser.response(Dispatcher.send(method, *args), *args[0])
       case true
         when @response.instance_of?(Array) then return @response.map { |a| new(a.merge(:response => @response)) }
         when @response.key?(remote_object) then return new(@response[remote_object].merge(:response => @response))

data/lib/api-client/exceptions/not_found.rb

@@ -7,4 +7,4 @@ class ApiClient::Exceptions::NotFound < ApiClient::Exceptions::Generic
   def self.initialize(url)
     super("The requested url (#{url}) could not be found!")
   end
-end
+end

data/lib/api-client/parser.rb

@@ -6,8 +6,8 @@ module ApiClient::Parser
   #
   # @param [HTTP] response HTTP object for the request.
   # @return [Hash] the body parsed.
-  def self.response(response)
-    raise_exception(response)
+  def self.response(response, url)
+    raise_exception(response, url)
     begin
       object = ::JSON.parse(response.body)
     rescue ::JSON::ParserError, TypeError
@@ -18,11 +18,11 @@ module ApiClient::Parser
 
   protected
 
-  def self.raise_exception(response)
+  def self.raise_exception(response, url)
     case response.code.to_i
       when 401 then raise ApiClient::Exceptions::Unauthorized
       when 403 then raise ApiClient::Exceptions::Forbidden
-      when 404 then raise ApiClient::Exceptions::NotFound.new(response.request.url)
+      when 404 then raise ApiClient::Exceptions::NotFound.new(url)
       when 500 then raise ApiClient::Exceptions::InternalServerError
       when 502 then raise ApiClient::Exceptions::BadGateway
       when 503 then raise ApiClient::Exceptions::ServiceUnavailable

data/lib/api-client/version.rb

@@ -1,5 +1,5 @@
 # High Level Namespace of the library ApiClient.
 module ApiClient
   # Version of the library.
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/spec/api-client/parser_spec.rb

@@ -9,7 +9,7 @@ describe ApiClient::Parser do
       end
 
       it "should return the response code and the body parsed" do
-        ApiClient::Parser.response(@response).should == { "base" => { "a" => "b" } }
+        ApiClient::Parser.response(@response, 'http://api.example.com/user/5').should == { "base" => { "a" => "b" } }
       end
     end
 
@@ -20,7 +20,7 @@ describe ApiClient::Parser do
       end
 
       it "should return the response code and an empty hash" do
-        ApiClient::Parser.response(@response).should == {}
+        ApiClient::Parser.response(@response, 'http://api.example.com/user/5').should == {}
       end
     end
 
@@ -32,7 +32,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a Unauthorized exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::Unauthorized)
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::Unauthorized)
         end
       end
 
@@ -43,7 +43,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a Forbidden exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::Forbidden)
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::Forbidden)
         end
       end
 
@@ -54,7 +54,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a NotFound exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::NotFound, "http://api.example.com/user/5")
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::NotFound, "http://api.example.com/user/5")
         end
       end
 
@@ -65,7 +65,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a InternalServerError exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::InternalServerError)
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::InternalServerError)
         end
       end
 
@@ -76,7 +76,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a BadGateway exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::BadGateway)
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::BadGateway)
         end
       end
 
@@ -87,7 +87,7 @@ describe ApiClient::Parser do
         end
 
         it "should return a ServiceUnavailable exception" do
-          lambda { ApiClient::Parser.response(@response) }.should raise_error(ApiClient::Exceptions::ServiceUnavailable)
+          lambda { ApiClient::Parser.response(@response, 'http://api.example.com/user/5') }.should raise_error(ApiClient::Exceptions::ServiceUnavailable)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-client
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 612713952861449012
+      hash: -1190097789751108706
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 612713952861449012
+      hash: -1190097789751108706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24