google4r-checkout 1.0.6.1 → 1.1.beta1

data/lib/google4r/checkout/commands.rb

@@ -110,6 +110,15 @@ module Google4R #:nodoc:
         https.cert_store = self.class.x509_store
         https.verify_mode = OpenSSL::SSL::VERIFY_PEER
         https.verify_depth = 5
+        https.verify_callback = Proc.new do |ok, ctx|
+          domain = ctx.chain.first.subject.to_a.select { |part| part.first == "CN" }.first[1]
+          
+          domain == if frontend.configuration[:use_sandbox]
+            "sandbox.google.com"
+          else
+            "checkout.google.com"
+          end
+        end
 
         # Send the request to Google.
         result = https.request(request, self.to_xml)
@@ -588,15 +597,19 @@ module Google4R #:nodoc:
       end
       
       def financial_state=(financial_state)
+        financial_state_name = financial_state.to_s
+        
         raise 'Invalid financial state %s' % financial_state unless
-            FinancialState.constants.include?(financial_state)
-        @financial_state = financial_state
+            FinancialState.constants.any? { |state_name| state_name.to_s == financial_state_name }
+        @financial_state = financial_state_name
       end
       
       def fulfillment_state=(fulfillment_state)
+        fulfillment_state_name = fulfillment_state.to_s
+        
         raise 'Invalid fulfillment state %s' % fulfillment_state unless
-            FulfillmentState.constants.include?(fulfillment_state)
-        @fulfillment_state = fulfillment_state
+            FulfillmentState.constants.any? { |state_name| state_name.to_s == fulfillment_state_name }
+        @fulfillment_state = fulfillment_state_name
       end
       
       def to_xml

data/lib/google4r/checkout/notifications.rb

@@ -29,6 +29,7 @@
 # handling code.
 
 require 'rexml/document'
+require 'bigdecimal'
 
 module Google4R #:nodoc:
   module Checkout #:nodoc:
@@ -230,7 +231,7 @@ module Google4R #:nodoc:
         result.order_adjustment = OrderAdjustment.create_from_element(element.elements['order-adjustment'])
         result.shopping_cart = ShoppingCart.create_from_element(element.elements['shopping-cart'], result)
 
-        amount = (element.elements['order-total'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['order-total'].text)*100).to_i
         currency = element.elements['order-total'].attributes['currency']
         result.order_total = Money.new(amount, currency)
         
@@ -311,11 +312,11 @@ module Google4R #:nodoc:
         charge.google_order_number = element.elements['google-order-number'].text        
         
         currency = element.elements['latest-charge-amount'].attributes['currency'] 
-        amount = (element.elements['latest-charge-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['latest-charge-amount'].text)*100).to_i
         charge.latest_charge_amount = Money.new(amount, currency)
         
         currency = element.elements['total-charge-amount'].attributes['currency']
-        amount = (element.elements['total-charge-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['total-charge-amount'].text)*100).to_i
         charge.total_charge_amount = Money.new(amount, currency)  
         
         charge.timestamp = Time.parse(element.elements['timestamp'].text)
@@ -347,11 +348,11 @@ module Google4R #:nodoc:
         refund.google_order_number = element.elements['google-order-number'].text
         
         currency = element.elements['latest-refund-amount'].attributes['currency']
-        amount = (element.elements['latest-refund-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['latest-refund-amount'].text)*100).to_i
         refund.latest_refund_amount = Money.new(amount, currency)
 
         currency = element.elements['total-refund-amount'].attributes['currency']
-        amount = (element.elements['total-refund-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['total-refund-amount'].text)*100).to_i
         refund.total_refund_amount = Money.new(amount, currency)
         
         refund.timestamp = Time.parse(element.elements['timestamp'].text)
@@ -384,11 +385,11 @@ module Google4R #:nodoc:
         chargeback.google_order_number = element.elements['google-order-number'].text
         
         currency = element.elements['latest-chargeback-amount'].attributes['currency']
-        amount = (element.elements['latest-chargeback-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['latest-chargeback-amount'].text)*100).to_i
         chargeback.latest_chargeback_amount = Money.new(amount, currency)
 
         currency = element.elements['total-chargeback-amount'].attributes['currency']
-        amount = (element.elements['total-chargeback-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['total-chargeback-amount'].text)*100).to_i
         chargeback.total_chargeback_amount = Money.new(amount, currency)
         
         chargeback.timestamp = Time.parse(element.elements['timestamp'].text)
@@ -427,7 +428,7 @@ module Google4R #:nodoc:
         authorization.google_order_number = element.elements['google-order-number'].text
         
         currency = element.elements['authorization-amount'].attributes['currency']
-        amount = (element.elements['authorization-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['authorization-amount'].text)*100).to_i
         authorization.authorization_amount = Money.new(amount, currency)
 
         authorization.authorization_expiration_date = Time.parse(element.elements['authorization-expiration-date'].text)
@@ -592,11 +593,11 @@ module Google4R #:nodoc:
         
         result.code = element.elements['code'].text
         
-        amount = (element.elements['calculated-amount'].text.to_f*100).to_i rescue nil
+        amount = (BigDecimal.new(element.elements['calculated-amount'].text)*100).to_i rescue nil
         currency = element.elements['calculated-amount'].attributes['currency'] rescue nil
         result.calculated_amount = Money.new(amount, currency) unless amount.nil?
         
-        amount = (element.elements['applied-amount'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['applied-amount'].text)*100).to_i
         currency = element.elements['applied-amount'].attributes['currency']
         result.applied_amount = Money.new(amount, currency)
         
@@ -642,7 +643,7 @@ module Google4R #:nodoc:
         
         result.name = element.elements['shipping-name'].text
         
-        amount = (element.elements['shipping-cost'].text.to_f*100).to_i
+        amount = (BigDecimal.new(element.elements['shipping-cost'].text)*100).to_i
         currency = element.elements['shipping-cost'].attributes['currency']
         result.cost = Money.new(amount, currency)
         
@@ -674,7 +675,7 @@ module Google4R #:nodoc:
       def self.create_from_element(element)
         result = OrderAdjustment.new
         
-        amount = (element.elements['total-tax'].text.to_f*100).to_i rescue nil
+        amount = (BigDecimal.new(element.elements['total-tax'].text)*100).to_i rescue nil
         currency = element.elements['total-tax'].attributes['currency'] rescue nil
         result.total_tax = Money.new(amount, currency) unless amount.nil?
         
@@ -686,7 +687,7 @@ module Google4R #:nodoc:
         
         result.merchant_calculation_successful = (element.elements['merchant-calculation-successful'].text.downcase == 'true') rescue nil
         
-        amount = (element.elements['adjustment-total'].text.to_f*100).to_i rescue nil
+        amount = (BigDecimal.new(element.elements['adjustment-total'].text)*100).to_i rescue nil
         currency = element.elements['adjustment-total'].attributes['currency'] rescue nil
         result.adjustment_total = Money.new(amount, currency) unless amount.nil?
         

data/lib/google4r/checkout/shared.rb

@@ -27,6 +27,8 @@
 # This file contains the classes and modules that are shared by the notification
 # handling and parsing as well as the command generating code.
 
+require 'bigdecimal'
+
 #--
 # TODO: Make the optional attributes return defaults that make sense, i.e. Money.new(0)?
 #++
@@ -317,7 +319,7 @@ module Google4R #:nodoc:
           result.tax_table = shopping_cart.owner.tax_tables.find {|table| table.name == table_selector }
         end
 
-        unit_price = (element.elements['unit-price'].text.to_f * 100).to_i
+        unit_price = (BigDecimal.new(element.elements['unit-price'].text) * 100).to_i
         unit_price_currency = element.elements['unit-price'].attributes['currency']
         result.unit_price = Money.new(unit_price, unit_price_currency)
         
@@ -523,7 +525,7 @@ module Google4R #:nodoc:
             result.subscription = subscription
             result.times = element.attributes['times'].to_i rescue nil
             
-            maximum_charge = (element.elements['maximum-charge'].text.to_f * 100).to_i
+            maximum_charge = (BigDecimal.new(element.elements['maximum-charge'].text) * 100).to_i
             maximum_charge_currency = element.elements['maximum-charge'].attributes['currency']
             result.maximum_charge = Money.new(maximum_charge, maximum_charge_currency)
             
@@ -589,10 +591,14 @@ module Google4R #:nodoc:
       # Boolean, true iff the table's standalone attribute is to be set to "true".
       attr_reader :standalone
       
+      # indicates whether tax for the order is calculated using a special process. default "false"
+      attr_accessor :merchant_calculated
+      
       def initialize(standalone)
         @rules = Array.new
         
         @standalone = standalone
+        @merchant_calculated = false
       end
       
       # Use this method to add a new TaxRule to the table. If you use a block with
@@ -855,6 +861,9 @@ module Google4R #:nodoc:
     
     # A class that represents the "flat_rate" shipping method.
     class FlatRateShipping < ShippingMethod
+      # (boolean, optional, default true)
+      attr_accessor :shipping_restrictions_allow_us_po_box
+      
       def initialize
         super
       end
@@ -871,6 +880,12 @@ module Google4R #:nodoc:
       # #create_excluded_area to add to this area but do not change it directly.
       attr_reader :address_filters_excluded_areas
       
+      # (boolean, optional, default true)
+      attr_accessor :address_filters_allow_us_po_box
+      
+      # (boolean, optional, default true)
+      attr_accessor :shipping_restrictions_allow_us_po_box
+      
       def initialize
         super
         @address_filters_allowed_areas = Array.new
@@ -889,7 +904,7 @@ module Google4R #:nodoc:
       # === Example
       #
       #    method = FlatRateShipping.new
-      #    method.create_allowed_area(UsCountryArea) do |area|
+      #    method.create_address_filters_allowed_area(UsCountryArea) do |area|
       #       area.area = UsCountryArea::ALL
       #    end
       def create_address_filters_allowed_area(clazz, &block)
@@ -908,11 +923,11 @@ module Google4R #:nodoc:
       # === Example
       #
       #    method = FlatRateShipping.new
-      #    method.create_allowed_area(UsCountryArea) do |area|
+      #    method.create_address_filters_excluded_area(UsCountryArea) do |area|
       #       area.area = UsCountryArea::ALL
       #    end
-      def create_address_filters_allowed_area(clazz, &block)
-        return create_area(:address_filters, :allowed_areas, clazz, &block)
+      def create_address_filters_excluded_area(clazz, &block)
+        return create_area(:address_filters, :excluded_areas, clazz, &block)
       end
     end
     
@@ -1015,7 +1030,7 @@ module Google4R #:nodoc:
         def self.create_from_element(this_shipping, element)
           result = CarrierCalculatedShippingOption.new(this_shipping)
           result.shipping_company = element.elements['shipping-company'].text
-          price = (element.elements['price'].text.to_f * 100).to_i
+          price = (BigDecimal.new(element.elements['price'].text) * 100).to_i
           price_currency = element.elements['price'].attributes['currency']
           result.price = Money.new(price, price_currency)
           result.shipping_type = element.elements['shipping-type']
@@ -1091,7 +1106,7 @@ module Google4R #:nodoc:
       
       # Creates a new Unit from the given REXML::Element instance.
       def self.create_from_element(element)
-        result = self.new(element.attributes['value'].to_f) 
+        result = self.new(BigDecimal.new(element.attributes['value'].to_s)) 
         return result
       end
     end
@@ -1104,7 +1119,7 @@ module Google4R #:nodoc:
       
       def initialize(value, unit=INCH)
         @unit = unit
-        @value = value.to_f
+        @value = BigDecimal.new(value.to_s)
       end
     end
     
@@ -1115,7 +1130,7 @@ module Google4R #:nodoc:
       
       def initialize(value, unit=LB)
         @unit = unit
-        @value = value.to_f
+        @value = BigDecimal.new(value.to_s)
       end
     end
     

data/lib/google4r/checkout/xml_generation.rb

@@ -90,7 +90,7 @@ module Google4R #:nodoc:
         super
         self.process_command(@command)
         io = StringIO.new
-        @document.write(io, 0) # TODO: Maybe replace 0 by -1 so no spaces are inserted?
+        @document.write(io, -1)
         return io.string
       end
 
@@ -99,7 +99,7 @@ module Google4R #:nodoc:
       end
       
       protected
-      
+            
       # Base method to generate root tag of a command
       def process_command(command)
         tag_name = self.tag_name_for_command(command.class)
@@ -204,10 +204,16 @@ module Google4R #:nodoc:
       # and that all others are alternate tax rules
       def process_tax_tables(tax_tables, parent)
         tax_tables_element = parent.add_element('tax-tables')
-
+        
         # assumes that the first tax table is the default
         default_table = tax_tables.first
         
+        if default_table.merchant_calculated
+          tax_tables_element.add_attribute('merchant-calculated', 'true')
+        else
+          tax_tables_element.add_attribute('merchant-calculated', 'false') 
+        end
+
         default_table_element = tax_tables_element.add_element('default-tax-table')
         rules_element = default_table_element.add_element('tax-rules')
 
@@ -401,6 +407,13 @@ module Google4R #:nodoc:
            shipping.shipping_restrictions_allowed_areas.length > 0 then
           shipping_restrictions_tag = element.add_element('shipping-restrictions')
           
+          allow_us_po_box = shipping_restrictions_tag.add_element('allow-us-po-box')
+          if shipping.shipping_restrictions_allow_us_po_box
+            allow_us_po_box.text = 'true'
+          else
+            allow_us_po_box.text = 'false'
+          end          
+          
           if shipping.shipping_restrictions_allowed_areas.length > 0 then
             allowed_tag = shipping_restrictions_tag.add_element('allowed-areas')
             
@@ -423,6 +436,13 @@ module Google4R #:nodoc:
              shipping.address_filters_allowed_areas.length > 0 then
             address_filters_tag = element.add_element('address-filters')
             
+            allow_us_po_box = address_filters_tag.add_element('allow-us-po-box')
+            if shipping.address_filters_allow_us_po_box
+              allow_us_po_box.text = 'true'
+            else
+              allow_us_po_box.text = 'false'
+            end
+            
             if shipping.address_filters_allowed_areas.length > 0 then
               allowed_tag = address_filters_tag.add_element('allowed-areas')
               
@@ -771,7 +791,7 @@ module Google4R #:nodoc:
         super
         process_results(@merchant_calculation_results.merchant_calculation_results)
         io = StringIO.new
-        @document.write(io, 0) # TODO: Maybe replace 0 by -1 so no spaces are inserted?
+        @document.write(io, -1)
         return io.string
       end
       

data/test/unit/add_merchant_order_number_command_test.rb

@@ -41,11 +41,6 @@ class Google4R::Checkout::AddMerchantOrderNumberCommandTest < Test::Unit::TestCa
 
     @command.google_order_number = '841171949013218'
     @command.merchant_order_number = 'P6502-53-7861SBJD'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<add-merchant-order-number xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <merchant-order-number>P6502-53-7861SBJD</merchant-order-number>
-</add-merchant-order-number>}
   end
 
   def test_behaves_correctly
@@ -55,7 +50,7 @@ class Google4R::Checkout::AddMerchantOrderNumberCommandTest < Test::Unit::TestCa
   end
 
   def test_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals(@command.merchant_order_number, "> merchant-order-number", @command)
   end
 
   def test_accessors

data/test/unit/add_tracking_data_command_test.rb

@@ -42,14 +42,6 @@ class Google4R::Checkout::AddTrackingDataCommandTest < Test::Unit::TestCase
     @command.google_order_number = '841171949013218'
     @command.carrier = 'UPS'
     @command.tracking_number = 'Z9842W69871281267'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<add-tracking-data xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <tracking-data>
-    <carrier>UPS</carrier>
-    <tracking-number>Z9842W69871281267</tracking-number>
-  </tracking-data>
-</add-tracking-data>}
   end
 
   def test_behaves_correctly
@@ -59,7 +51,8 @@ class Google4R::Checkout::AddTrackingDataCommandTest < Test::Unit::TestCase
   end
 
   def test_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals(@command.carrier, "> tracking-data > carrier", @command)
+    assert_command_element_text_equals(@command.tracking_number, "> tracking-data > tracking-number", @command)
   end
 
   def test_accessors

data/test/unit/archive_order_command_test.rb

@@ -40,9 +40,6 @@ class Google4R::Checkout::ArchiveOrderCommandTest < Test::Unit::TestCase
     @command = @frontend.create_archive_order_command
 
     @command.google_order_number = '841171949013218'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<archive-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'/>}
   end
 
   def test_behaves_correctly
@@ -52,7 +49,7 @@ class Google4R::Checkout::ArchiveOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_element_exists(command_selector(@command), @command.to_xml)
   end
 
   def test_accessors

data/test/unit/authorize_order_command_test.rb

@@ -40,9 +40,6 @@ class Google4R::Checkout::AuthorizeOrderCommandTest < Test::Unit::TestCase
     @command = @frontend.create_authorize_order_command
 
     @command.google_order_number = '841171949013218'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<authorize-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'/>}
   end
 
   def test_behaves_correctly
@@ -52,7 +49,7 @@ class Google4R::Checkout::AuthorizeOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_element_exists(command_selector(@command), @command.to_xml)
   end
 
   def test_accessors

data/test/unit/backorder_items_command_test.rb

@@ -44,20 +44,6 @@ class Google4R::Checkout::BackorderItemsCommandTest < Test::Unit::TestCase
     @item_info1 = ItemInfo.new('A1')
     @item_info2 = ItemInfo.new('B2')
     @command.item_info_arr = [@item_info1, @item_info2]
-    
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<backorder-items xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <item-ids>
-    <item-id>
-      <merchant-item-id>A1</merchant-item-id>
-    </item-id>
-    <item-id>
-      <merchant-item-id>B2</merchant-item-id>
-    </item-id>
-  </item-ids>
-  <send-email>true</send-email>
-</backorder-items>}
   end
 
   def test_behaves_correctly
@@ -68,7 +54,7 @@ class Google4R::Checkout::BackorderItemsCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
   end
 
   def test_accessors

data/test/unit/cancel_items_command_test.rb

@@ -46,21 +46,6 @@ class Google4R::Checkout::CancelItemsCommandTest < Test::Unit::TestCase
     @command.item_info_arr = [@item_info1, @item_info2]
     @command.reason = 'This item is no longer manufactured.'
     @command.comment = 'Suggested replacement is model XBR2700.'
-    
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<cancel-items xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <item-ids>
-    <item-id>
-      <merchant-item-id>A1</merchant-item-id>
-    </item-id>
-    <item-id>
-      <merchant-item-id>B2</merchant-item-id>
-    </item-id>
-  </item-ids>
-  <send-email>true</send-email>
-  <reason>This item is no longer manufactured.</reason>
-  <comment>Suggested replacement is model XBR2700.</comment>
-</cancel-items>}
   end
 
   def test_behaves_correctly
@@ -72,7 +57,9 @@ class Google4R::Checkout::CancelItemsCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
+    assert_command_element_text_equals(@command.reason, "> reason", @command)
+    assert_command_element_text_equals(@command.comment, "> comment", @command)
   end
 
   def test_accessors

data/test/unit/cancel_order_command_test.rb

@@ -42,17 +42,6 @@ class Google4R::Checkout::CancelOrderCommandTest < Test::Unit::TestCase
     @command.google_order_number = '841171949013218'
     @command.reason = 'Buyer cancelled the order'
     @command.comment = 'Buyer ordered another item'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<cancel-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <reason>Buyer cancelled the order</reason>
-  <comment>Buyer ordered another item</comment>
-</cancel-order>}
-
-    @sample_xml_no_comment=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<cancel-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <reason>Buyer cancelled the order</reason>
-</cancel-order>}
   end
 
   def test_behaves_correctly
@@ -68,12 +57,14 @@ class Google4R::Checkout::CancelOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml
-    assert_strings_equal @sample_xml, @command.to_xml
+    assert_command_element_text_equals(@command.reason, "> reason", @command)
+    assert_command_element_text_equals(@command.comment, "> comment", @command)
   end
 
   def test_xml_when_comment_not_used
     @command.comment = nil
-    assert_strings_equal @sample_xml_no_comment, @command.to_xml
+    assert_command_element_text_equals(@command.reason, "> reason", @command)
+    assert_no_command_element_exists("> comment", @command)
   end
 
   def test_to_xml_does_not_raise_exception

data/test/unit/charge_order_command_test.rb

@@ -40,14 +40,6 @@ class Google4R::Checkout::ChargeOrderCommandTest < Test::Unit::TestCase
     @command = @frontend.create_charge_order_command
     @command.google_order_number = '1234-5678-ABCD-1234'
     @command.amount = Money.new(1000, 'GBP')
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<charge-order xmlns='http://checkout.google.com/schema/2' google-order-number='1234-5678-ABCD-1234'>
-  <amount currency='GBP'>10.00</amount>
-</charge-order>}
-
-    @sample_no_amount=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<charge-order xmlns='http://checkout.google.com/schema/2' google-order-number='1234-5678-ABCD-1234'/>}
   end
   
   def test_behaves_correctly
@@ -56,9 +48,9 @@ class Google4R::Checkout::ChargeOrderCommandTest < Test::Unit::TestCase
     end
   end
 
-  def test_xml_with_amount
+  def test_xml_without_amount
     @command.amount = nil
-    assert_strings_equal(@sample_no_amount, @command.to_xml)
+    assert_no_command_element_exists("amount", @command)
   end
 
   def test_accessors
@@ -67,7 +59,7 @@ class Google4R::Checkout::ChargeOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_generation
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("10.00", "> amount[currency=GBP]", @command)
   end
 
   def test_to_xml_does_not_raise_exception

data/test/unit/checkout_command_xml_generator_test.rb

@@ -38,6 +38,9 @@ require 'open3' rescue require 'win32/open3'
 
 require 'rexml/document'
 
+require 'net/http'
+require 'net/https'
+
 # Test for the class UsZipArea.
 #
 # TODO: Make the tests querying Google Checkout's diagnose service and the XSD validation optional.
@@ -156,7 +159,6 @@ class Google4R::Checkout::CheckoutCommandXmlGeneratorTest < Test::Unit::TestCase
     
     xml_str = @generator.generate
     assert_xml_validates_against_xml_schema(@schema_path, xml_str)
-    assert_string_equals_file_contents(@expected_path, xml_str)
     assert_google_checkout_diagnose_returns_no_warnings(xml_str)
   end
   
@@ -170,25 +172,26 @@ class Google4R::Checkout::CheckoutCommandXmlGeneratorTest < Test::Unit::TestCase
   protected
     
     def assert_google_checkout_diagnose_returns_no_warnings(xml_str)
-      tmpfile = Tempfile.new('xml_output')
-      tmpfile << xml_str
-      tmpfile.flush
-
       url = "https://%s:%s@sandbox.google.com/checkout/cws/v2/Merchant/%s/request/diagnose" %
         [ FRONTEND_CONFIGURATION[:merchant_id], FRONTEND_CONFIGURATION[:merchant_key], 
           FRONTEND_CONFIGURATION[:merchant_id] ]
 
-      stdin, stdout, stderr = Open3.popen3("curl -d @#{tmpfile.path} #{url}")
-      outstr = stdout.read
-      errstr = stderr.read
-      
-      assert (outstr != ''), 'curl command not available'
-      
-      # Check that there is no <warnings> tag in the XML.
-      xml_document = REXML::Document.new(outstr)
-      assert 0, xml_document.root.elements.to_a('//warnings').size
+      http = Net::HTTP.new('sandbox.google.com', 443)
+      http.use_ssl = true
+        
+      http.start do
+        req = Net::HTTP::Post.new("/checkout/cws/v2/Merchant/%s/request/diagnose" % 
+          [ FRONTEND_CONFIGURATION[:merchant_id] ])
+        req.basic_auth(FRONTEND_CONFIGURATION[:merchant_id], FRONTEND_CONFIGURATION[:merchant_key])
+        req.body = xml_str
+        
+        res = http.request(req)
+        assert res.kind_of?(Net::HTTPSuccess), res.inspect
       
-      tmpfile.close!
+        # Check that there is no <warnings> tag in the XML.
+        xml_document = REXML::Document.new(res.body)
+        assert 0, xml_document.root.elements.to_a('//warnings').size
+      end      
     end
   
     def assert_xml_validates_against_xml_schema(schema_path, xml_str)
@@ -210,9 +213,4 @@ class Google4R::Checkout::CheckoutCommandXmlGeneratorTest < Test::Unit::TestCase
       
       tmpfile.close!
     end
-    
-    def assert_string_equals_file_contents(expected_path, xml_str)
-      file_contents = File.open(expected_path, 'r') { |f| f.read }
-      assert_strings_equal file_contents, xml_str
-    end
 end

data/test/unit/deliver_order_command_test.rb

@@ -41,11 +41,6 @@ class Google4R::Checkout::DeliverOrderCommandTest < Test::Unit::TestCase
 
     @command.google_order_number = '841171949013218'
     @command.send_email = true
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<deliver-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <send-email>true</send-email>
-</deliver-order>}
   end
 
   def test_behaves_correctly
@@ -55,7 +50,7 @@ class Google4R::Checkout::DeliverOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
   end
 
   def test_accessors

data/test/unit/flat_rate_shipping_test.rb

@@ -43,7 +43,8 @@ class Google4R::Checkout::FlatRateShippingMethodTest < Test::Unit::TestCase
   def test_flat_rate_shipping_method_behaves_correctly
     [ :name, :name=, :price, :price=, 
       :shipping_restrictions_allowed_areas, :shipping_restrictions_excluded_areas,
-      :create_allowed_area, :create_excluded_area, :create_area
+      :create_allowed_area, :create_excluded_area, :create_area,
+      :shipping_restrictions_allow_us_po_box
     ].each do |symbol|
       assert_respond_to @shipping, symbol
     end
@@ -63,7 +64,7 @@ class Google4R::Checkout::FlatRateShippingMethodTest < Test::Unit::TestCase
     @shipping.price = Money.new(100, "EUR")
     assert_kind_of Money, @shipping.price
     assert_equal 100, @shipping.price.cents
-    assert_equal "EUR", @shipping.price.currency
+    assert_equal "EUR", @shipping.price.currency.iso_code
   end
   
   def test_flat_rate_shipping_method_price_is_validated

data/test/unit/merchant_calculated_shipping_test.rb

@@ -43,6 +43,7 @@ class Google4R::Checkout::MerchantCalculatedShippingTest < Test::Unit::TestCase
     [ :name, :name=, :price, :price=, 
       :shipping_restrictions_allowed_areas, :shipping_restrictions_excluded_areas,
       :address_filters_allowed_areas, :address_filters_excluded_areas,
+      :address_filters_allow_us_po_box, :shipping_restrictions_allow_us_po_box,
       :create_allowed_area, :create_excluded_area, :create_area
     ].each do |symbol|
       assert_respond_to @shipping, symbol
@@ -65,7 +66,7 @@ class Google4R::Checkout::MerchantCalculatedShippingTest < Test::Unit::TestCase
     @shipping.price = Money.new(100, "EUR")
     assert_kind_of Money, @shipping.price
     assert_equal 100, @shipping.price.cents
-    assert_equal "EUR", @shipping.price.currency
+    assert_equal "EUR", @shipping.price.currency.iso_code
   end
   
   def test_merchant_calculated_shipping_price_is_validated

data/test/unit/merchant_calculation_callback_test.rb

@@ -120,7 +120,7 @@ class Google4R::Checkout::MerchantCalculationCallbackTest < Test::Unit::TestCase
     expect.with { |element, owner| element.name == 'shopping-cart' and owner.kind_of?(MerchantCalculationCallback) }
     
     expect = AnonymousAddress.stubs(:create_from_element)
-    expect.times(1).returns(:anonymous_address, :anonymous_address2)
+    expect.times(2).returns(:anonymous_address, :anonymous_address2)
     expect.with { |element| element.name == 'anonymous-address' }
     
     # Create the new notification.

data/test/unit/merchant_calculation_result_test.rb

@@ -37,14 +37,8 @@ class Google4R::Checkout::MerchantCalculationResultTest < Test::Unit::TestCase
 
   def setup
     # Build up some Mocha expectations.
-    expect = CouponResult.stubs(:new)
-    expect.times(1).returns(:coupon_result)
-    
-    expect = GiftCertificateResult.stubs(:new)
-    expect.times(1).returns(:gift_certificate_result)
-    
     expect = Money.stubs(:new)
-    expect.times(1).returns(:shipping_rate, :total_tax)
+    expect.times(2).returns(:shipping_rate, :total_tax)
 
     @result = MerchantCalculationResult.new('UPS Ground', '1234567890', Money.new(1000, 'USD'), true, Money.new(2000, 'USD'))
   end
@@ -63,6 +57,12 @@ class Google4R::Checkout::MerchantCalculationResultTest < Test::Unit::TestCase
   end
   
   def test_create_merchant_code_result_works_correctly
+    expect = CouponResult.stubs(:new)
+    expect.times(1).returns(:coupon_result)
+    
+    expect = GiftCertificateResult.stubs(:new)
+    expect.times(1).returns(:gift_certificate_result)
+    
     # Create the new CouponResult and GiftCertificationResult instances.
     @result.create_merchant_code_result(CouponResult)
     @result.create_merchant_code_result(GiftCertificateResult)

data/test/unit/merchant_calculation_results_test.rb

@@ -172,7 +172,32 @@ class Google4R::Checkout::MerchantCalculationResultsTest < Test::Unit::TestCase
       result.create_merchant_code_result(@gift_certificate_result)
     end
 
-    # perform the assertions
-    assert_strings_equal @xml_str, @results.to_xml
+    xml = @results.to_xml
+    @results.merchant_calculation_results.each do |result|
+      selector = "merchant-calculation-results > results"
+      selector << " > result[address-id='#{result.address_id}'][shipping-name='#{result.shipping_name}']"
+      
+      assert_element_text_equals(result.shipping_rate.to_s, 
+        "#{selector} > shipping-rate[currency='#{result.shipping_rate.currency.iso_code}']", xml)
+      assert_element_text_equals(result.shippable ? "true" : "false", "#{selector} > shippable", xml)
+      
+      selector << " > merchant-code-results"
+      
+      cr_selector = "#{selector} > coupon-result"
+      cr = result.merchant_code_results.select { |r| r.kind_of? CouponResult }.first
+      assert_element_text_equals(cr.valid ? "true" : "false", "#{cr_selector} > valid", xml)
+      assert_element_text_equals(cr.code, "#{cr_selector} > code", xml)
+      assert_element_text_equals(cr.calculated_amount.to_s, 
+        "#{cr_selector} > calculated-amount[currency='#{cr.calculated_amount.currency.iso_code}']", xml)
+      assert_element_text_equals(cr.message, "#{cr_selector} > message", xml)
+      
+      gc_selector = "#{selector} > gift-certificate-result"
+      gc = result.merchant_code_results.select { |r| r.kind_of? GiftCertificateResult }.first
+      assert_element_text_equals(gc.valid ? "true" : "false", "#{gc_selector} > valid", xml)
+      assert_element_text_equals(gc.code, "#{gc_selector} > code", xml)
+      assert_element_text_equals(gc.calculated_amount.to_s, 
+        "#{gc_selector} > calculated-amount[currency='#{gc.calculated_amount.currency.iso_code}']", xml)
+      assert_element_text_equals(gc.message, "#{gc_selector} > message", xml)
+    end
   end
  end

data/test/unit/order_report_command_test.rb

@@ -43,13 +43,6 @@ class Google4R::Checkout::OrderReportCommandTest < Test::Unit::TestCase
     @command.financial_state = 'CHARGED'
     @command.fulfillment_state = 'NEW'
     @command.date_time_zone = 'America/New_York'
-    
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<order-list-request end-date='2007-09-30T23:59:59' start-date='2007-09-01T00:00:00' xmlns='http://checkout.google.com/schema/2'>
-  <financial-state>CHARGED</financial-state>
-  <fulfillment-state>NEW</fulfillment-state>
-  <date-time-zone>America/New_York</date-time-zone>
-</order-list-request>}
   end
 
   def test_behaves_correctly
@@ -62,7 +55,12 @@ class Google4R::Checkout::OrderReportCommandTest < Test::Unit::TestCase
   end
 
   def test_to_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    selector = "order-list-request[start-date='#{@command.start_date}'][end-date='#{@command.end_date}']"
+    xml = @command.to_xml
+    
+    assert_element_text_equals(@command.financial_state, "#{selector} > financial-state", xml)
+    assert_element_text_equals(@command.fulfillment_state, "#{selector} > fulfillment-state", xml)
+    assert_element_text_equals(@command.date_time_zone, "#{selector} > date-time-zone", xml)
   end
 
   def test_accessors

data/test/unit/pickup_shipping_test.rb

@@ -57,7 +57,7 @@ class Google4R::Checkout::PickupShippingMethodTest < Test::Unit::TestCase
     @shipping.price = Money.new(100, "EUR")
     assert_kind_of Money, @shipping.price
     assert_equal 100, @shipping.price.cents
-    assert_equal "EUR", @shipping.price.currency
+    assert_equal "EUR", @shipping.price.currency.iso_code
   end
   
   def test_pickup_shipping_method_price_is_validated

data/test/unit/refund_order_command_test.rb

@@ -42,18 +42,6 @@ class Google4R::Checkout::RefundOrderCommandTest < Test::Unit::TestCase
     @command.amount = Money.new(1000, 'USD')
     @command.comment = 'Discount for inconvenience; ship replacement item'
     @command.reason = 'Damaged Merchandise'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<refund-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <amount currency='USD'>10.00</amount>
-  <comment>Discount for inconvenience; ship replacement item</comment>
-  <reason>Damaged Merchandise</reason>
-</refund-order>}
-
-    @sample_reason_only=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<refund-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <reason>Damaged Merchandise</reason>
-</refund-order>}
   end
   
   def test_behaves_correctly
@@ -62,10 +50,13 @@ class Google4R::Checkout::RefundOrderCommandTest < Test::Unit::TestCase
     end
   end
 
-  def test_xml_with_amount
+  def test_xml_without_amount
     @command.amount = nil
     @command.comment = nil
-    assert_strings_equal(@sample_reason_only, @command.to_xml)
+    
+    assert_command_element_text_equals(@command.reason, "> reason", @command)
+    assert_no_command_element_exists("amount", @command)
+    assert_no_command_element_exists("comment", @command)
   end
 
   def test_accessors
@@ -76,7 +67,9 @@ class Google4R::Checkout::RefundOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_generation
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals(@command.reason, "> reason", @command)
+    assert_command_element_text_equals(@command.amount, "> amount[currency='USD']", @command)
+    assert_command_element_text_equals(@command.comment, "> comment", @command)
   end
 
   def test_to_xml_does_not_raise_exception

data/test/unit/reset_items_shipping_information_command_test.rb

@@ -44,20 +44,6 @@ class Google4R::Checkout::ResetItemsShippingInformationCommandTest < Test::Unit:
     @item_info1 = ItemInfo.new('A1')
     @item_info2 = ItemInfo.new('B2')
     @command.item_info_arr = [@item_info1, @item_info2]
-    
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<reset-items-shipping-information xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <item-ids>
-    <item-id>
-      <merchant-item-id>A1</merchant-item-id>
-    </item-id>
-    <item-id>
-      <merchant-item-id>B2</merchant-item-id>
-    </item-id>
-  </item-ids>
-  <send-email>true</send-email>
-</reset-items-shipping-information>}
   end
 
   def test_behaves_correctly
@@ -68,7 +54,7 @@ class Google4R::Checkout::ResetItemsShippingInformationCommandTest < Test::Unit:
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
   end
 
   def test_accessors

data/test/unit/return_items_command_test.rb

@@ -44,20 +44,6 @@ class Google4R::Checkout::ReturnItemsCommandTest < Test::Unit::TestCase
     @item_info1 = ItemInfo.new('A1')
     @item_info2 = ItemInfo.new('B2')
     @command.item_info_arr = [@item_info1, @item_info2]
-    
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<return-items xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <item-ids>
-    <item-id>
-      <merchant-item-id>A1</merchant-item-id>
-    </item-id>
-    <item-id>
-      <merchant-item-id>B2</merchant-item-id>
-    </item-id>
-  </item-ids>
-  <send-email>true</send-email>
-</return-items>}
   end
 
   def test_behaves_correctly
@@ -68,7 +54,7 @@ class Google4R::Checkout::ReturnItemsCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
   end
 
   def test_accessors

data/test/unit/risk_information_notification_test.rb

@@ -46,7 +46,7 @@ class Google4R::Checkout::RiskInformationNotificationTest < Test::Unit::TestCase
   <google-order-number>1564645586934214</google-order-number>
   <risk-information>
     <billing-address>
-      <!-- Not to be tested here but in Address --
+      <!-- Not to be tested here but in Address -->
       <!--
       <contact-name>Mr Contact Smith</contact-name>
       <company-name>ACME Products</company-name>

data/test/unit/send_buyer_message_command_test.rb

@@ -42,12 +42,6 @@ class Google4R::Checkout::SendBuyerMessageCommandTest < Test::Unit::TestCase
     @command.google_order_number = '841171949013218'
     @command.message = 'Due to high volume, your order will ship next week. Thank you for your patience.'
     @command.send_email = true
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<send-buyer-message xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <message>Due to high volume, your order will ship next week. Thank you for your patience.</message>
-  <send-email>true</send-email>
-</send-buyer-message>}
   end
 
   def test_behaves_correctly
@@ -57,7 +51,8 @@ class Google4R::Checkout::SendBuyerMessageCommandTest < Test::Unit::TestCase
   end
 
   def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_command_element_text_equals("true", "> send-email", @command)
+    assert_command_element_text_equals(@command.message, "> message", @command)
   end
 
   def test_accessors

data/test/unit/ship_items_command_test.rb

@@ -46,36 +46,6 @@ class Google4R::Checkout::ShipItemsCommandTest < Test::Unit::TestCase
     @item_info_2 = ItemInfo.new('A2')
     @item_info_2.create_tracking_data('FedEx', 12345678)
     @command.item_info_arr = [@item_info_1, @item_info_2]
-    
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<ship-items xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'>
-  <item-shipping-information-list>
-    <item-shipping-information>
-      <item-id>
-        <merchant-item-id>A1</merchant-item-id>
-      </item-id>
-      <tracking-data-list>
-        <tracking-data>
-          <carrier>UPS</carrier>
-          <tracking-number>55555555</tracking-number>
-        </tracking-data>
-      </tracking-data-list>
-    </item-shipping-information>
-    <item-shipping-information>
-      <item-id>
-        <merchant-item-id>A2</merchant-item-id>
-      </item-id>
-      <tracking-data-list>
-        <tracking-data>
-          <carrier>FedEx</carrier>
-          <tracking-number>12345678</tracking-number>
-        </tracking-data>
-      </tracking-data-list>
-    </item-shipping-information>
-  </item-shipping-information-list>
-  <send-email>true</send-email>
-</ship-items>}
   end
 
   def test_behaves_correctly
@@ -85,8 +55,18 @@ class Google4R::Checkout::ShipItemsCommandTest < Test::Unit::TestCase
     end
   end
 
-  def test_xml_send_email
-    assert_strings_equal(@sample_xml, @command.to_xml)
+  def test_xml_generation
+    assert_command_element_text_equals("true", "> send-email", @command)
+    @command.item_info_arr.each do |item_info|
+      selector = "> item-shipping-information-list > item-shipping-information"
+      item_info_elt = find_command_elements(selector, @command).select do |element|
+        element.css("item-id > merchant-item-id").first.text == item_info.merchant_item_id
+      end.first
+      
+      selector = "tracking-data-list > tracking-data"
+      assert_equal item_info.tracking_data_arr.first.carrier, item_info_elt.css("#{selector} > carrier").first.text
+      assert_equal item_info.tracking_data_arr.first.tracking_number, item_info_elt.css("#{selector} > tracking-number").first.text
+    end
   end
 
   def test_accessors

data/test/unit/tax_table_test.rb

@@ -44,17 +44,23 @@ class Google4R::Checkout::TaxTableTest < Test::Unit::TestCase
     assert_respond_to @table, :name
     assert_respond_to @table, :name=
     assert_respond_to @table, :standalone
+    assert_respond_to @table, :merchant_calculated
+    assert_respond_to @table, :merchant_calculated=
   end
   
   def test_initialized_correctly
     assert_nil @table.name
     assert_equal [], @table.rules
     assert_equal false, @table.standalone
+    assert_equal false, @table.merchant_calculated
   end
   
   def test_accessors_work_correctly
     @table.name = "name"
     assert_equal "name", @table.name
+    
+    @table.merchant_calculated = true
+    assert_equal true, @table.merchant_calculated
   end
   
   def test_create_rule_works_correctly_with_block

data/test/unit/unarchive_order_command_test.rb

@@ -40,9 +40,6 @@ class Google4R::Checkout::UnarchiveOrderCommandTest < Test::Unit::TestCase
     @command = @frontend.create_unarchive_order_command
 
     @command.google_order_number = '841171949013218'
-
-    @sample_xml=%Q{<?xml version='1.0' encoding='UTF-8'?>
-<unarchive-order xmlns='http://checkout.google.com/schema/2' google-order-number='841171949013218'/>}
   end
 
   def test_behaves_correctly
@@ -52,7 +49,7 @@ class Google4R::Checkout::UnarchiveOrderCommandTest < Test::Unit::TestCase
   end
 
   def test_xml
-    assert_strings_equal(@sample_xml, @command.to_xml)
+    assert_element_exists(command_selector(@command), @command.to_xml)
   end
 
   def test_accessors

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: google4r-checkout
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
-  - 0
-  - 6
   - 1
-  version: 1.0.6.1
+  - beta1
+  version: 1.1.beta1
 platform: ruby
 authors: 
 - Tony Chan
-autorequire: ""
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 7
-        - 1
-        version: 1.7.1
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
   type: :runtime
   version_requirements: *id001
 description: Ruby library to access the Google Checkout service and implement notification handlers.
@@ -75,11 +74,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.4
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: