google4r-checkout 1.1.beta1 → 1.1.beta2

data/CHANGES

@@ -1,5 +1,21 @@
 =google4r-checkout Changelog
 
+== 1.1.beta2 (2010-06-23)
+
+* Make gem compatible with Money 3.x (thanks George Palmer!)
+* Use Bundler for running test suite
+
+== 1.1.beta1 (2010-04-21)
+
+* Full Ruby 1.9.x compatibility
+* Major overhaul of automated test suite
+* Support for merchant-calculated and allow-us-po-box tags
+* Update to Money library version 2.3 (beware - this may break things if you expect the currency to be a string)
+* Verify that we are actually talking to Google's servers when sending checkout commands 
+* Generated XML will no longer include extra whitespace, to help comply with Google's XML schema
+* Use BigDecimal instead of Float for all calculations due to weird rounding errors in Ruby's standard library
+* Fixed deprecation warnings 
+
 == 1.0.6.1 (2010-04-20)
 
 * Fixed issue #14 - will not load on Ruby 1.9.x

data/README.md

@@ -0,0 +1,72 @@
+# google4r/checkout
+
+google4r/checkout is a library to access the Google Checkout API.
+
+### License
+
+google4r itself is distributed under an MIT style license.
+
+However, the library includes the [cacert.pem](http://curl.haxx.se/ca/cacert.pem) file from the Mozilla project. This file is distributed under the [MPL](http://www.mozilla.org/MPL/).
+
+### Installing
+
+Gems are hosted on rubygems.org (aka Gemcutter), so on reasonably recent versions of Rubygems, you should be able to install just like this:
+
+    gem install google4r-checkout
+
+Or, go to [our page on rubygems.org](http://rubygems.org/gems/google4r-checkout).
+
+### Issue Tracking and Wiki
+
+Our issue tracker and wiki can be found [on Google Code](http://code.google.com/p/google-checkout-ruby-sample-code/).  The best way to let us know about bugs or feature requests is to report an issue there.
+
+### Documentation
+
+We've got RDoc documentation for the google4r-checkout library [generated on rdoc.info](http://rdoc.info/projects/nbudin/google4r-checkout).
+
+You can find more information on the Google Checkout API [here](http://code.google.com/apis/checkout/developer/index.html). Note that the API documentation assumes an understanding of the Google Checkout XML API.
+
+## Google Checkout Tests
+
+You have to place a file called 'frontend_configuration.rb' in the directory'test' with the configuration for the Google4R::Checkout::Frontend class to use for running the tests.
+
+The file should contain content similar to:
+
+    # Uncomment the following line if you are using Google Checkout in Great Britain
+    # and adjust it if you want to test google4r-checkout against any other (future)
+    # Google Checkout service.
+    
+    # Money.default_currency = 'GBP'
+    
+    # The test configuration for the Google4R::Checkout::Frontend class.
+    FRONTEND_CONFIGURATION = 
+      { 
+        :merchant_id => '<your merchant id>', 
+        :merchant_key => '<your merchant key>',
+        :use_sandbox => true
+      }
+
+## Dependencies
+
+The unit tests use Mocha so you have to install the gem "mocha" to run the tests. You will also need the money gem library.
+
+## How To: Freeze a google4r version in a Rails project
+
+<code>rake rails:freeze:gems</code> only works for the Rails gems. So, how do you freeze your own gems like google4r? It turns out to be pretty straightforward:
+
+    cd RAILS_ROOT
+    cd vendor
+    gem unpack google4r-checkout
+    ls 
+    # ... google4r-checkout-0.1.1 ...
+
+Then, open RAILS_ROOT/config/environment.rb in your favourite text editor and add the following lines at the top of the file just below <code>require File.join(File.dirname(__FILE__), 'boot')</code>:
+
+    # Freeze non-Rails gem.
+    Dir.glob(File.join(RAILS_ROOT, 'vendor', '*', 'lib')) do |path|
+      $LOAD_PATH << path
+    end
+
+Now you can use the following in your own code:
+
+    require 'google4r/checkout'

data/lib/google4r/checkout/xml_generation.rb

@@ -272,7 +272,7 @@ module Google4R #:nodoc:
         item_element.add_element('item-name').text = item.name
         item_element.add_element('item-description').text = item.description
         
-        item_element.add_element('unit-price', { 'currency' => item.unit_price.currency }).text = item.unit_price.to_s
+        item_element.add_element('unit-price', { 'currency' => item.unit_price.currency.to_s }).text = item.unit_price.to_s
         item_element.add_element('quantity').text = item.quantity.to_i
         
         if not item.id.nil? then
@@ -356,7 +356,7 @@ module Google4R #:nodoc:
         end
         
         if not payment.maximum_charge.nil? then
-          payment_element.add_element('maximum-charge', { 'currency' => payment.maximum_charge.currency }).text = payment.maximum_charge.to_s
+          payment_element.add_element('maximum-charge', { 'currency' => payment.maximum_charge.currency.to_s }).text = payment.maximum_charge.to_s
         end
       end
       
@@ -401,7 +401,7 @@ module Google4R #:nodoc:
       def process_shipping(shipping_type, parent, shipping)
         element = parent.add_element(shipping_type)
         element.add_attribute('name', shipping.name)
-        element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
+        element.add_element('price', { 'currency' => shipping.price.currency.to_s }).text = shipping.price.to_s
         
         if shipping.shipping_restrictions_excluded_areas.length + 
            shipping.shipping_restrictions_allowed_areas.length > 0 then
@@ -465,7 +465,7 @@ module Google4R #:nodoc:
       def process_pickup(parent, shipping)
         element = parent.add_element('pickup')
         element.add_attribute('name', shipping.name)
-        element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
+        element.add_element('price', { 'currency' => shipping.price.currency.to_s }).text = shipping.price.to_s
       end
       
       def process_carrier_calculated_shipping(shipping_type, parent, shipping)
@@ -482,7 +482,7 @@ module Google4R #:nodoc:
       
       def process_carrier_calculated_shipping_option(parent, option)
         element = parent.add_element('carrier-calculated-shipping-option')
-        element.add_element('price', { 'currency' => option.price.currency }).text = option.price.to_s
+        element.add_element('price', { 'currency' => option.price.currency.to_s }).text = option.price.to_s
         element.add_element('shipping-company').text = option.shipping_company
         element.add_element('shipping-type').text = option.shipping_type
         if not option.carrier_pickup.nil?
@@ -490,7 +490,7 @@ module Google4R #:nodoc:
         end
         if not option.additional_fixed_charge.nil?
           element.add_element('additional-fixed-charge', 
-              { 'currency' => option.additional_fixed_charge.currency }).text = 
+              { 'currency' => option.additional_fixed_charge.currency.to_s }).text = 
               option.additional_fixed_charge.to_s
         end
         if not option.additional_variable_charge_percent.nil?
@@ -615,7 +615,7 @@ module Google4R #:nodoc:
       def process_money(parent, money)
         amount_element = parent.add_element('amount')
         amount_element.text = money.to_s
-        amount_element.add_attribute('currency', money.currency)
+        amount_element.add_attribute('currency', money.currency.to_s)
       end
     end
 
@@ -634,7 +634,7 @@ module Google4R #:nodoc:
       def process_money(parent, money)
         amount_element = parent.add_element('amount')
         amount_element.text = money.to_s
-        amount_element.add_attribute('currency', money.currency)
+        amount_element.add_attribute('currency', money.currency.to_s)
       end
       
       # add the comment element to the refund command
@@ -811,12 +811,12 @@ module Google4R #:nodoc:
         element.add_attribute("address-id", merchant_calculation_result.address_id)
         shipping_rate = element.add_element("shipping-rate")
         shipping_rate.text = merchant_calculation_result.shipping_rate.to_s
-        shipping_rate.add_attribute("currency", merchant_calculation_result.shipping_rate.currency)
+        shipping_rate.add_attribute("currency", merchant_calculation_result.shipping_rate.currency.to_s)
         element.add_element("shippable").text = merchant_calculation_result.shippable.to_s
         if (!merchant_calculation_result.total_tax.nil?)
           total_tax = element.add_element("total-tax")
           total_tax.text = merchant_calculation_result.total_tax.to_s
-          total_tax.add_attribute("currency", merchant_calculation_result.total_tax.currency)
+          total_tax.add_attribute("currency", merchant_calculation_result.total_tax.currency.to_s)
         end
         process_code_results(element, merchant_calculation_result.merchant_code_results)
       end
@@ -840,7 +840,7 @@ module Google4R #:nodoc:
         element.add_element("code").text = merchant_code_result.code.to_s
         calculated_amount = element.add_element("calculated-amount")
         calculated_amount.text = merchant_code_result.calculated_amount.to_s
-        calculated_amount.add_attribute("currency", merchant_code_result.calculated_amount.currency)
+        calculated_amount.add_attribute("currency", merchant_code_result.calculated_amount.currency.to_s)
         element.add_element("message").text = merchant_code_result.message
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google4r-checkout
 version: !ruby/object:Gem::Version 
+  hash: -1848230122
   prerelease: true
   segments: 
   - 1
   - 1
-  - beta1
-  version: 1.1.beta1
+  - beta2
+  version: 1.1.beta2
 platform: ruby
 authors: 
 - Tony Chan
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -04:00
+date: 2010-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: money
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
@@ -38,20 +41,80 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 - LICENSE
 - CHANGES
 files: 
-- lib/google4r/checkout.rb
+- lib/google4r/checkout/commands.rb
 - lib/google4r/checkout/frontend.rb
-- lib/google4r/checkout/shared.rb
+- lib/google4r/checkout/merchant_calculation.rb
 - lib/google4r/checkout/notifications.rb
+- lib/google4r/checkout/shared.rb
 - lib/google4r/checkout/utils.rb
 - lib/google4r/checkout/xml_generation.rb
-- lib/google4r/checkout/commands.rb
-- lib/google4r/checkout/merchant_calculation.rb
+- lib/google4r/checkout.rb
 - var/cacert.pem
-- README
+- test/integration/checkout_command_test.rb
+- test/unit/add_merchant_order_number_command_test.rb
+- test/unit/add_tracking_data_command_test.rb
+- test/unit/address_test.rb
+- test/unit/anonymous_address_test.rb
+- test/unit/archive_order_command_test.rb
+- test/unit/area_test.rb
+- test/unit/authorization_amount_notification_test.rb
+- test/unit/authorize_order_command_test.rb
+- test/unit/backorder_items_command_test.rb
+- test/unit/callback_handler_test.rb
+- test/unit/cancel_items_command_test.rb
+- test/unit/cancel_order_command_test.rb
+- test/unit/carrier_calculated_shipping_test.rb
+- test/unit/charge_amount_notification_test.rb
+- test/unit/charge_order_command_test.rb
+- test/unit/chargeback_amount_notification_test.rb
+- test/unit/checkout_command_test.rb
+- test/unit/checkout_command_xml_generator_test.rb
+- test/unit/command_test.rb
+- test/unit/deliver_order_command_test.rb
+- test/unit/delivery_method_test.rb
+- test/unit/digital_content_test.rb
+- test/unit/flat_rate_shipping_test.rb
+- test/unit/frontend_test.rb
+- test/unit/item_info_test.rb
+- test/unit/item_test.rb
+- test/unit/marketing_preferences_test.rb
+- test/unit/merchant_calculated_shipping_test.rb
+- test/unit/merchant_calculation_callback_test.rb
+- test/unit/merchant_calculation_result_test.rb
+- test/unit/merchant_calculation_results_test.rb
+- test/unit/merchant_code_result_test.rb
+- test/unit/merchant_code_test.rb
+- test/unit/new_order_notification_test.rb
+- test/unit/notification_acknowledgement_test.rb
+- test/unit/notification_handler_test.rb
+- test/unit/order_adjustment_test.rb
+- test/unit/order_report_command_test.rb
+- test/unit/order_state_change_notification_test.rb
+- test/unit/pickup_shipping_test.rb
+- test/unit/postal_area_test.rb
+- test/unit/private_data_parser_test.rb
+- test/unit/refund_amount_notification_test.rb
+- test/unit/refund_order_command_test.rb
+- test/unit/reset_items_shipping_information_command_test.rb
+- test/unit/return_items_command_test.rb
+- test/unit/risk_information_notification_test.rb
+- test/unit/send_buyer_message_command_test.rb
+- test/unit/ship_items_command_test.rb
+- test/unit/shipping_adjustment_test.rb
+- test/unit/shopping_cart_test.rb
+- test/unit/tax_rule_test.rb
+- test/unit/tax_table_test.rb
+- test/unit/tracking_data_test.rb
+- test/unit/unarchive_order_command_test.rb
+- test/unit/us_country_area_test.rb
+- test/unit/us_state_area_test.rb
+- test/unit/us_zip_area_test.rb
+- test/unit/world_area_test.rb
+- README.md
 - LICENSE
 - CHANGES
 has_rdoc: true
@@ -64,18 +127,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 63
       segments: 
       - 1
       - 8
       - 4
       version: 1.8.4
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -84,68 +151,68 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby library to access the Google Checkout service and implement notification handlers.
 test_files: 
 - test/integration/checkout_command_test.rb
-- test/unit/order_adjustment_test.rb
-- test/unit/pickup_shipping_test.rb
-- test/unit/merchant_code_test.rb
-- test/unit/chargeback_amount_notification_test.rb
+- test/unit/add_merchant_order_number_command_test.rb
+- test/unit/add_tracking_data_command_test.rb
+- test/unit/address_test.rb
+- test/unit/anonymous_address_test.rb
+- test/unit/archive_order_command_test.rb
+- test/unit/area_test.rb
+- test/unit/authorization_amount_notification_test.rb
 - test/unit/authorize_order_command_test.rb
-- test/unit/merchant_calculation_results_test.rb
-- test/unit/risk_information_notification_test.rb
-- test/unit/ship_items_command_test.rb
-- test/unit/tax_table_test.rb
 - test/unit/backorder_items_command_test.rb
-- test/unit/flat_rate_shipping_test.rb
-- test/unit/refund_order_command_test.rb
-- test/unit/merchant_code_result_test.rb
 - test/unit/callback_handler_test.rb
-- test/unit/charge_order_command_test.rb
-- test/unit/charge_amount_notification_test.rb
+- test/unit/cancel_items_command_test.rb
+- test/unit/cancel_order_command_test.rb
 - test/unit/carrier_calculated_shipping_test.rb
-- test/unit/return_items_command_test.rb
-- test/unit/add_merchant_order_number_command_test.rb
-- test/unit/authorization_amount_notification_test.rb
+- test/unit/charge_amount_notification_test.rb
+- test/unit/charge_order_command_test.rb
+- test/unit/chargeback_amount_notification_test.rb
+- test/unit/checkout_command_test.rb
+- test/unit/checkout_command_xml_generator_test.rb
+- test/unit/command_test.rb
+- test/unit/deliver_order_command_test.rb
+- test/unit/delivery_method_test.rb
+- test/unit/digital_content_test.rb
+- test/unit/flat_rate_shipping_test.rb
 - test/unit/frontend_test.rb
-- test/unit/add_tracking_data_command_test.rb
-- test/unit/address_test.rb
 - test/unit/item_info_test.rb
-- test/unit/order_state_change_notification_test.rb
-- test/unit/us_state_area_test.rb
-- test/unit/notification_handler_test.rb
-- test/unit/us_country_area_test.rb
-- test/unit/shopping_cart_test.rb
-- test/unit/reset_items_shipping_information_command_test.rb
-- test/unit/order_report_command_test.rb
-- test/unit/send_buyer_message_command_test.rb
 - test/unit/item_test.rb
-- test/unit/deliver_order_command_test.rb
-- test/unit/cancel_order_command_test.rb
-- test/unit/archive_order_command_test.rb
-- test/unit/world_area_test.rb
-- test/unit/new_order_notification_test.rb
-- test/unit/private_data_parser_test.rb
+- test/unit/marketing_preferences_test.rb
 - test/unit/merchant_calculated_shipping_test.rb
-- test/unit/cancel_items_command_test.rb
-- test/unit/checkout_command_test.rb
-- test/unit/area_test.rb
+- test/unit/merchant_calculation_callback_test.rb
 - test/unit/merchant_calculation_result_test.rb
-- test/unit/marketing_preferences_test.rb
+- test/unit/merchant_calculation_results_test.rb
+- test/unit/merchant_code_result_test.rb
+- test/unit/merchant_code_test.rb
+- test/unit/new_order_notification_test.rb
 - test/unit/notification_acknowledgement_test.rb
+- test/unit/notification_handler_test.rb
+- test/unit/order_adjustment_test.rb
+- test/unit/order_report_command_test.rb
+- test/unit/order_state_change_notification_test.rb
+- test/unit/pickup_shipping_test.rb
+- test/unit/postal_area_test.rb
+- test/unit/private_data_parser_test.rb
 - test/unit/refund_amount_notification_test.rb
-- test/unit/tax_rule_test.rb
-- test/unit/unarchive_order_command_test.rb
-- test/unit/delivery_method_test.rb
-- test/unit/checkout_command_xml_generator_test.rb
+- test/unit/refund_order_command_test.rb
+- test/unit/reset_items_shipping_information_command_test.rb
+- test/unit/return_items_command_test.rb
+- test/unit/risk_information_notification_test.rb
+- test/unit/send_buyer_message_command_test.rb
+- test/unit/ship_items_command_test.rb
 - test/unit/shipping_adjustment_test.rb
+- test/unit/shopping_cart_test.rb
+- test/unit/tax_rule_test.rb
+- test/unit/tax_table_test.rb
 - test/unit/tracking_data_test.rb
-- test/unit/postal_area_test.rb
-- test/unit/anonymous_address_test.rb
+- test/unit/unarchive_order_command_test.rb
+- test/unit/us_country_area_test.rb
+- test/unit/us_state_area_test.rb
 - test/unit/us_zip_area_test.rb
-- test/unit/digital_content_test.rb
-- test/unit/command_test.rb
-- test/unit/merchant_calculation_callback_test.rb
+- test/unit/world_area_test.rb

data/README

@@ -1,58 +0,0 @@
-= google4r/checkout
-
-google4r/checkout is a library to access the Google Checkout API.
-
-=== License
-
-google4r itself is distributed under an MIT style license.
-
-However, the library includes the cacert.pem:http://curl.haxx.se/ca/cacert.pem file from the Mozilla project. This file is distributed under the MPL:http://www.mozilla.org/MPL/.
-
-== More Information
-
-You can find more information on the Google Checkout API here:http://code.google.com/apis/checkout/developer/index.html. Note that the API documentation assumes an understanding of the Google Checkout XML API.
-
-== Google Checkout Tests
-
-You have to place a file called 'frontend_configuration.rb' in the directory'test' with the configuration for the Google4R::Checkout::Frontend class to use for running the tests.
-
-The file should contain content similar to:
-
-  # Uncomment the following line if you are using Google Checkout in Great Britain
-  # and adjust it if you want to test google4r-checkout against any other (future)
-  # Google Checkout service.
-  
-  # Money.default_currency = 'GBP'
-  
-  # The test configuration for the Google4R::Checkout::Frontend class.
-  FRONTEND_CONFIGURATION = 
-    { 
-      :merchant_id => '<your merchant id>', 
-      :merchant_key => '<your merchant key>',
-      :use_sandbox => true
-    }
-
-== Dependencies
-
-The unit tests use Mocha so you have to install the gem "mocha" to run the tests. You will also need the money gem library.
-
-== How To: Freeze a google4r version in a Rails project
-
-<code>rake rails:freeze:gems</code> only works for the Rails gems. So, how do you freeze your own gems like google4r? It turns out to be pretty straightforward:
-
-  cd RAILS_ROOT
-  cd vendor
-  gem unpack google4r-checkout
-  ls 
-  # ... google4r-checkout-0.1.1 ...
-
-Then, open RAILS_ROOT/config/environment.rb in your favourite text editor and add the following lines at the top of the file just below <code>require File.join(File.dirname(__FILE__), 'boot')</code>:
-
-  # Freeze non-Rails gem.
-  Dir.glob(File.join(RAILS_ROOT, 'vendor', '*', 'lib')) do |path|
-    $LOAD_PATH << path
-  end
-
-Now you can use the following in your own code:
-
-  require 'google4r/checkout'