amazon_flex_pay 0.9.12 → 0.9.13

data/lib/amazon_flex_pay.rb

@@ -7,6 +7,7 @@ require 'rest_client'
 require 'multi_xml'
 require 'active_support' # camelcase, underscore
 require 'active_support/inflector'
+require 'active_support/notifications'
 
 require 'amazon_flex_pay/signing'
 require 'amazon_flex_pay/model'
@@ -17,7 +18,7 @@ require 'amazon_flex_pay/api'
 require 'amazon_flex_pay/pipelines'
 
 module AmazonFlexPay
-  VERSION = '0.9.12'
+  VERSION = '0.9.13'
   API_VERSION = '2011-09-20'
   PIPELINE_VERSION = '2009-01-09'
 

data/lib/amazon_flex_pay/api/base_request.rb

@@ -4,14 +4,25 @@ module AmazonFlexPay::API #:nodoc:
     # the response.
     def submit
       url = AmazonFlexPay.api_endpoint + '?' + AmazonFlexPay.query_string(self.to_params)
-      begin
-        response = self.class::Response.from_xml(RestClient.get(url).body)
-        response.request = self
-        response
-      rescue RestClient::BadRequest, RestClient::Unauthorized, RestClient::Forbidden => e
-        er = ErrorResponse.from_xml(e.response.body)
-        klass = AmazonFlexPay::API.const_get(er.errors.first.code)
-        raise klass.new(er.errors.first.code, er.errors.first.message, er.request_id, self)
+      ActiveSupport::Notifications.instrument("amazon_flex_pay.api", :action => action_name, :request => url) do |payload|
+        begin
+          http = RestClient.get(url)
+
+          payload[:response] = http.body
+          payload[:code] = http.code
+
+          response = self.class::Response.from_xml(http.body)
+          response.request = self
+          response
+
+        rescue RestClient::BadRequest, RestClient::Unauthorized, RestClient::Forbidden => e
+          payload[:response] = e.http_body
+          payload[:code] = e.http_code
+
+          er = ErrorResponse.from_xml(e.response.body)
+          klass = AmazonFlexPay::API.const_get(er.errors.first.code)
+          raise klass.new(er.errors.first.code, er.errors.first.message, er.request_id, self)
+        end
       end
     end
 

data/lib/amazon_flex_pay/api/errors.rb

@@ -5,6 +5,10 @@ module AmazonFlexPay::API
     def initialize(code, message, request_id, request)
       @request_id, @request, @code, @message = request_id, request, code, message
     end
+
+    def to_s
+      message
+    end
   end
 
   # generated from http://docs.amazonwebservices.com/AmazonFPS/latest/FPSAPIReference/APIErrorCodesTable.html

data/test/amazon_flex_pay_test.rb

@@ -83,13 +83,31 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
   end
 
   should "store the request in the response" do
-    RestClient.expects(:get).returns(stub(:body => cancel_token_response))
+    RestClient.expects(:get).returns(stub(:body => cancel_token_response, :code => 200))
     response = TestRequest.new(:foo => 'bar').submit
     assert_equal 'bar', response.request.foo
   end
 
+  should "instrument successful responses" do
+    events = []
+    callback = proc{ |*args| events << ActiveSupport::Notifications::Event.new(*args) }
+
+    ActiveSupport::Notifications.subscribed(callback, "amazon_flex_pay.api") do
+      RestClient.expects(:get).returns(stub(:body => cancel_token_response, :code => 200))
+      TestRequest.new(:foo => 'bar').submit
+    end
+
+    assert_equal 1, events.size
+    assert_equal 'TestRequest', events.first.payload[:action]
+    assert_equal 200, events.first.payload[:code]
+    assert events.first.payload.has_key?(:request)
+    assert events.first.payload.has_key?(:response)
+    assert events.first.duration > 0.1, events.first.duration.to_s
+  end
+
   should "catch and parse errors" do
-    http_response = RestClient::Response.create(error_response, nil, nil)
+    net_http_res = stub(:code => 400)
+    http_response = RestClient::Response.create(error_response, net_http_res, nil)
     RestClient.expects(:get).raises(RestClient::BadRequest.new(http_response))
 
     error = nil
@@ -103,6 +121,26 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert error.message.match(/has to be a valid/)
   end
 
+  should "instrument error responses" do
+    events = []
+    callback = proc{ |*args| events << ActiveSupport::Notifications::Event.new(*args) }
+
+    ActiveSupport::Notifications.subscribed(callback, "amazon_flex_pay.api") do
+      net_http_res = stub(:code => 400)
+      http_response = RestClient::Response.create(error_response, net_http_res, nil)
+      RestClient.expects(:get).raises(RestClient::BadRequest.new(http_response))
+
+      TestRequest.new(:foo => 'bar').submit rescue AmazonFlexPay::API::Error
+    end
+
+    assert_equal 1, events.size
+    assert_equal 'TestRequest', events.first.payload[:action]
+    assert_equal 400, events.first.payload[:code]
+    assert events.first.payload.has_key?(:request)
+    assert events.first.payload.has_key?(:response)
+    assert events.first.duration > 0.1, events.first.duration.to_s
+  end
+
   should "not allow unknown values for enumerated attributes" do
     assert_raises ArgumentError do TestRequest.new(:method => 'UNKOWN') end
   end

data/test/test_helper.rb

@@ -1,8 +1,7 @@
 # load the support libraries
 require 'test/unit'
 require 'rubygems'
-#gem 'rails', '2.3.11'
-gem 'rails', '3.0.10'
+gem 'rails', '3.2.5'
 require 'mocha'
 
 # load the gem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon_flex_pay
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70095439663980 !ruby/object:Gem::Requirement
+  requirement: &70160943188200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70095439663980
+  version_requirements: *70160943188200
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70095439662220 !ruby/object:Gem::Requirement
+  requirement: &70160943186600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095439662220
+  version_requirements: *70160943186600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70095439661660 !ruby/object:Gem::Requirement
+  requirement: &70160943185140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: 3.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70095439661660
+  version_requirements: *70160943185140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70095439661160 !ruby/object:Gem::Requirement
+  requirement: &70160943184420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095439661160
+  version_requirements: *70160943184420
 description: A straight-forward REST API for Amazon's Flexible Payments Services.
 email: lance@kickstarter.com
 executables: []