amazon_flex_pay 0.9.2 → 0.9.3

data/README.rdoc

@@ -21,14 +21,14 @@ Note that while the examples are shown using Rails methods, the only Rails requi
 
 2. Then on the return page, take the sender token and run a Pay request:
 
-     response = AmazonFlexPay.pay('12.99', 'USD', 'STOKEN', 'myrequest3292')
-     if response.error?
+     begin
+       response = AmazonFlexPay.pay('12.99', 'USD', 'STOKEN', 'myrequest3292')
+       flash[:notice] = "Thanks! Your payment is processing."
+     rescue AmazonFlexPay::API::ErrorResponse => e
        flash[:error] = "Sorry, something went wrong."
-       response.errors.each do |error|
+       e.errors.each do |error|
          # notify yourself about error.code and error.message
        end
-     else
-       flash[:notice] = "Thanks! Your payment is processing."
      end
      redirect_to product_path
 

data/lib/amazon_flex_pay.rb

@@ -16,7 +16,7 @@ require 'amazon_flex_pay/api'
 require 'amazon_flex_pay/pipelines'
 
 module AmazonFlexPay
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
   API_VERSION = '2010-08-28'
   PIPELINE_VERSION = '2009-01-09'
 
@@ -50,4 +50,3 @@ module AmazonFlexPay
   end
 
 end
-

data/lib/amazon_flex_pay/api/base.rb

@@ -1,16 +1,47 @@
 module AmazonFlexPay::API #:nodoc:
+  class ErrorResponse < StandardError
+    # Re-implements the XML parsing because ErrorResponse does not inherit from BaseResponse.
+    def self.from_xml(xml)
+      new(MultiXml.parse(xml)['Response'])
+    end
+
+    def initialize(hash)
+      self.request_id = hash['RequestID']
+      self.errors     = hash['Errors']
+    end
+
+    attr_accessor :request
+    attr_accessor :request_id
+
+    attr_reader :errors
+    def errors=(val)
+      @errors = [val['Error']].flatten.map{|e| Error.new(e)}
+    end
+
+    def to_s
+      errors.map{|e| "#{e.code}: #{e.message}"}.join(', ')
+    end
+
+    class Error < AmazonFlexPay::Model #:nodoc:
+      attribute :code
+      attribute :message
+    end
+  end
+
   class Base < AmazonFlexPay::Model
     # This compiles an API request object into a URL, sends it to Amazon, and processes
     # the response.
     def submit
       url = AmazonFlexPay.api_endpoint + '?' + AmazonFlexPay.query_string(self.to_params)
-      response = begin
-        self.class::Response.from_xml(RestClient.get(url).body)
+      begin
+        response = self.class::Response.from_xml(RestClient.get(url).body)
+        response.request = self
+        response
       rescue RestClient::BadRequest, RestClient::Unauthorized, RestClient::Forbidden => e
-        ErrorResponse.from_xml(e.response.body)
+        er = ErrorResponse.from_xml(e.response.body)
+        er.request = self
+        raise er
       end
-      response.request = self
-      response
     end
 
     # Converts the API request object into parameters and signs them.
@@ -33,11 +64,6 @@ module AmazonFlexPay::API #:nodoc:
       attribute :request
       attribute :request_id
 
-      # Check response.error? to determine whether it's an ErrorResponse or not.
-      def error?
-        false
-      end
-
       # Parses Amazon's XML response to REST requests and instantiates the response.
       def self.from_xml(xml)
         response = MultiXml.parse(xml)
@@ -52,31 +78,6 @@ module AmazonFlexPay::API #:nodoc:
       end
     end
 
-    class ErrorResponse < AmazonFlexPay::Model #:nodoc:
-      # Re-implements the XML parsing because ErrorResponse does not inherit from BaseResponse.
-      def self.from_xml(xml)
-        new(MultiXml.parse(xml)['Response'])
-      end
-
-      # Check response.error? to determine whether Amazon accepted the request.
-      def error?
-        true
-      end
-
-      attribute :request
-      attribute :request_id
-
-      attr_reader :errors
-      def errors=(val)
-        @errors = [val['Error']].flatten.map{|e| Error.new(e)}
-      end
-
-      class Error < AmazonFlexPay::Model #:nodoc:
-        attribute :code
-        attribute :message
-      end
-    end
-
     protected
 
     def action_name #:nodoc:

data/lib/amazon_flex_pay/model.rb

@@ -32,9 +32,6 @@ module AmazonFlexPay
         attribute_names << attr.to_s.camelcase
         name = attr.to_s.underscore
 
-        # reader
-        attr_reader name
-
         # writer
         if options[:enumeration]
           enumerated_attribute(name, options[:enumeration])
@@ -43,7 +40,7 @@ module AmazonFlexPay
         elsif options[:collection]
           collection_attribute(name, options[:collection])
         else
-          attr_writer name
+          attr_accessor name
         end
       end
 
@@ -55,6 +52,10 @@ module AmazonFlexPay
       def enumerated_attribute(attr, source = nil) #:nodoc:
         source ||= attr
         class_eval <<-END
+          def #{attr}
+            @#{attr}
+          end
+
           def #{attr}=(val)
             options = AmazonFlexPay::Enumerations::#{source.to_s.camelcase}
             unless options.include?(val)
@@ -68,6 +69,10 @@ module AmazonFlexPay
       def complex_attribute(attr, data_type = nil) #:nodoc:
         data_type ||= attr
         class_eval <<-END
+          def #{attr}
+            @#{attr} ||= AmazonFlexPay::DataTypes::#{data_type.to_s.camelcase}.new
+          end
+
           def #{attr}=(hash)
             @#{attr} = AmazonFlexPay::DataTypes::#{data_type.to_s.camelcase}.new(hash)
           end
@@ -76,6 +81,10 @@ module AmazonFlexPay
 
       def collection_attribute(attr, data_type = nil) #:nodoc:
         class_eval <<-END
+          def #{attr}
+            @#{attr} ||= []
+          end
+
           def #{attr}=(array)
             @#{attr} = [array].flatten.map{|hash| AmazonFlexPay::DataTypes::#{data_type.to_s.camelcase}.new(hash)}
           end
@@ -93,7 +102,7 @@ module AmazonFlexPay
     def to_hash
       self.class.attribute_names.inject({}) do |hash, name|
         val = send(name.underscore)
-        if val.nil? or val == ''
+        if val.nil? or val == '' or val == []
           hash
         else
           hash.merge(format_key(name) => val.is_a?(AmazonFlexPay::Model) ? val.to_hash : format_value(val))

data/test/amazon_flex_pay_test.rb

@@ -44,9 +44,16 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
   class TestRequest < AmazonFlexPay::API::Base
     attribute :foo
     attribute :amount, :type => :amount
+    attribute :stuffs, :collection => :amount
 
     class Response < AmazonFlexPay::API::Base::BaseResponse; end
   end
+  
+  should "respond with data structures even when models are empty" do
+    tr = TestRequest.new
+    assert tr.stuffs.is_a?(Array)
+    assert tr.amount.respond_to?(:value)
+  end
 
   should "add necessary fields and sign api requests" do
     Time.stubs(:now).returns(Time.parse('Jan 1 2011')) # so the signature remains constant
@@ -82,11 +89,15 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     http_response = RestClient::Response.create(error_response, nil, nil)
     RestClient.expects(:get).raises(RestClient::BadRequest.new(http_response))
 
-    response = TestRequest.new(:foo => 'bar').submit
-    assert response.request_id
-    assert response.error?
-    assert response.errors.first.code
-    assert response.errors.first.message
+    error = nil
+    begin
+      TestRequest.new(:foo => 'bar').submit
+    rescue AmazonFlexPay::API::ErrorResponse => e
+      error = e
+    end
+    assert error.request_id
+    assert error.errors.first.code
+    assert error.errors.first.message
   end
 
   should "not allow unknown values for enumerated attributes" do

data/test/api_test.rb

@@ -17,7 +17,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::Cancel::Response.from_xml(cancel_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert response.transaction_status
@@ -37,7 +36,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::CancelToken::Response.from_xml(cancel_token_response)
     end
-    assert !response.error?
     assert response.request_id
   end
 
@@ -57,7 +55,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetAccountActivity::Response.from_xml(get_account_activity_response)
     end
-    assert !response.error?
     assert response.request_id
     assert_equal 5, response.transactions.count
   end
@@ -76,7 +73,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetAccountBalance::Response.from_xml(get_account_balance_response)
     end
-    assert !response.error?
     assert response.request_id
     assert_equal '7.400000', response.account_balance.total_balance.value
   end
@@ -95,7 +91,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetRecipientVerificationStatus::Response.from_xml(get_recipient_verification_status_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.recipient_verification_status
   end
@@ -121,7 +116,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetTokenByCaller::Response.from_xml(get_token_by_caller_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.token.token_id
     assert response.token.token_status
@@ -177,7 +171,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetTransaction::Response.from_xml(get_transaction_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction.caller_reference
     assert response.transaction.payment_method
@@ -197,7 +190,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::GetTransactionStatus::Response.from_xml(get_transaction_status_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert_equal 'Success', response.transaction_status
@@ -218,7 +210,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::Pay::Response.from_xml(reserve_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert response.transaction_status
@@ -239,7 +230,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::Refund::Response.from_xml(refund_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert response.transaction_status
@@ -261,7 +251,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::Reserve::Response.from_xml(reserve_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert response.transaction_status
@@ -283,7 +272,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::Settle::Response.from_xml(settle_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.transaction_id
     assert response.transaction_status
@@ -303,7 +291,6 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     assert_nothing_raised do
       response = AmazonFlexPay::API::VerifySignature::Response.from_xml(verify_signature_response)
     end
-    assert !response.error?
     assert response.request_id
     assert response.verification_status
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon_flex_pay
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Lance Ivy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency