ey_api_hmac 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ey_api_hmac (0.0.8.pre)
+    ey_api_hmac (0.0.10.pre)
       json
       rack-client
 

data/lib/ey_api_hmac/base_connection.rb

@@ -11,14 +11,18 @@ module EY
         @auth_id = auth_id
         @auth_key = auth_key
         @standard_headers = {
-            'CONTENT_TYPE' => 'application/json',
-            'Accept' => 'application/json',
-            'HTTP_DATE' => Time.now.httpdate,
-            'USER_AGENT' => user_agent || default_user_agent
+          'CONTENT_TYPE' => 'application/json',
+          'Accept' => 'application/json',
+          'HTTP_DATE' => Time.now.httpdate,
+          'USER_AGENT' => user_agent || default_user_agent
         }
         @rack_builder_block = rack_builder_block
       end
 
+      def default_user_agent
+        "ApiHMAC"
+      end
+
       class NotFound < StandardError
         def initialize(url)
           super("#{url} not found")
@@ -65,7 +69,11 @@ module EY
         request(:get, url, &block)
       end
 
-      protected
+      def handle_errors_with(error_handler)
+        @error_handler = error_handler
+      end
+
+    protected
 
       def client
         bak = self.backend
@@ -83,19 +91,33 @@ module EY
       end
 
       def request(method, url, body = nil, &block)
+        response = nil
+        request_headers = @standard_headers
         if body
-          response = client.send(method, url, @standard_headers, body.to_json)
+          response = client.send(method, url, request_headers, body.to_json)
         else
-          response = client.send(method, url, @standard_headers)
+          response = client.send(method, url, request_headers)
         end
         handle_response(url, response, &block)
+      rescue => e
+        request_hash = {:method => method, :url => url, :headers => request_headers, :body => body}
+        response_hash = {:status => response.status, :body => response.body} if response
+        handle_error(request_hash, (response_hash || {}), e) || (raise e)
+      end
+
+      def handle_error(request, response, exception)
+        if @error_handler
+          @error_handler.call(request, response, exception)
+        end
       end
 
       def handle_response(url, response)
         case response.status
         when 200, 201
-          json_body = JSON.parse(response.body)
-          yield json_body, response["Location"] if block_given?
+          if block_given?
+            json_body = JSON.parse(response.body)
+            yield json_body, response["Location"]
+          end
         when 404
           raise NotFound.new(url)
         when 400

data/lib/ey_api_hmac/version.rb

@@ -1,5 +1,5 @@
 module EY
   module ApiHMAC
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/spec/base_connection_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+require 'ey_api_hmac'
+
+describe EY::ApiHMAC::BaseConnection do
+  before do
+    @connection = EY::ApiHMAC::BaseConnection.new("123", "456")
+  end
+  describe "handle_error" do
+    describe "on 500" do
+      before do
+        @connection.backend = lambda do |env|
+          ["500", {}, ""]
+        end
+      end
+      it "raises an error" do
+        lambda { @connection.post("/", "blah") }.should raise_exception(EY::ApiHMAC::BaseConnection::UnknownError)
+      end
+      it "calls the error handler if one is registered" do
+        errors = []
+        @connection.handle_errors_with(lambda {|*args| errors << [args]; "handled"})
+        @connection.post("/", "blah").should eq("handled")
+      end
+    end
+    describe "on bad body" do
+      it "calls the error handler" do
+        @connection.backend = lambda do |env|
+          ["200", {"Content-Type" => "application/json"}, "200 OK"]
+        end
+        errors = []
+        @connection.handle_errors_with(lambda {|*args| errors << [args]; false})
+        lambda { @connection.post("/", "blah") {} }.should raise_exception(JSON::ParserError)
+        errors.should_not be_empty
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_api_hmac
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - "Jacob Burkhart & Thorben Schr\xC3\xB6der & David Calavera & others"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack-client
@@ -82,6 +82,7 @@ files:
 - lib/ey_api_hmac/sso.rb
 - lib/ey_api_hmac/version.rb
 - spec/api_auth_spec.rb
+- spec/base_connection_spec.rb
 - spec/spec_helper.rb
 - spec/sso_spec.rb
 homepage: ""
@@ -119,5 +120,6 @@ specification_version: 3
 summary: HMAC Rack basic implementation for Engine Yard services
 test_files: 
 - spec/api_auth_spec.rb
+- spec/base_connection_spec.rb
 - spec/spec_helper.rb
 - spec/sso_spec.rb