google4r-checkout 1.1.0 → 1.1.1

data/CHANGES

@@ -1,5 +1,11 @@
 =google4r-checkout Changelog
 
+== 1.1.1 (2011-12-16)
+
+* Bug fix for subscriptions not being processed, contributed by Larry Salibra
+* Automated testing with Travis
+* Officially support JRuby
+
 == 1.1.0 (2011-06-29)
 
 * Support for newer refund-notification XML format, contributed by Chris Parrish

data/README.md

@@ -1,4 +1,4 @@
-# google4r/checkout
+# google4r/checkout [![Build Status](https://secure.travis-ci.org/nbudin/google4r-checkout.png)](http://travis-ci.org/nbudin/google4r-checkout)
 
 google4r/checkout is a library to access the Google Checkout API.
 

data/lib/google4r/checkout/shared.rb

@@ -328,6 +328,11 @@ module Google4R #:nodoc:
           result.create_digital_content(DigitalContent.create_from_element(digital_content_element))
         end
         
+        subscription_element = element.elements['subscription']
+        if not subscription_element.nil?
+          result.create_subscription(Subscription.create_from_element(subscription_element))
+        end
+        
         return result
       end
 
@@ -479,11 +484,11 @@ module Google4R #:nodoc:
           result.start_date = Time.iso8601(element.attributes['start-date']) rescue nil
           result.type = element.attributes['type'] rescue nil
           
-          element.elements['payments/subscription-payment'].each do |payment_element|
-            result.payments << SubscriptionPayment.create_from_element(subscription, payment_element)
+          element.elements.each('payments/subscription-payment') do |payment_element|
+            result.payments << SubscriptionPayment.create_from_element(result, payment_element)
           end
           
-          element.elements['recurrent-item'].each do |item_element|
+          element.elements.each('recurrent-item') do |item_element|
             result.recurrent_items << Item.create_from_element(item_element)
           end
           
@@ -521,7 +526,7 @@ module Google4R #:nodoc:
           end
           
           def self.create_from_element(subscription, element)
-            result = SubscriptionPayment.new
+            result = SubscriptionPayment.new(subscription)
             result.subscription = subscription
             result.times = element.attributes['times'].to_i rescue nil
             

data/test/unit/command_test.rb

@@ -56,7 +56,15 @@ class Google4R::Checkout::CommandTest < Test::Unit::TestCase
   def test_sending_fails_if_certificate_validation_fails
     OpenSSL::SSL::SSLSocket.any_instance.stubs(:connect).raises(OpenSSL::SSL::SSLError, 'certificate verify failed')
     
-    assert_raises(OpenSSL::SSL::SSLError) { @command.send_to_google_checkout }
+    exc_type = case RUBY_PLATFORM
+    when "java"
+      # jruby-openssl throws an EOFError instead, for some reason
+      EOFError
+    else
+      OpenSSL::SSL::SSLError
+    end
+    
+    assert_raise(exc_type) { @command.send_to_google_checkout }
   end
   
   def test_instantiate_abstract_class

data/test/unit/notification_acknowledgement_test.rb

@@ -52,16 +52,14 @@ class Google4R::Checkout::NotificationAcknowledgementTest < Test::Unit::TestCase
   end
     
   def test_to_xml_works_as_expected
-    ack = NotificationAcknowledgement.new
-    str = %q{<?xml version='1.0' encoding='UTF-8'?><notification-acknowledgment xmlns='http://checkout.google.com/schema/2'/>}
-    assert_equal str, ack.to_xml
+    ack = Nokogiri.parse(NotificationAcknowledgement.new.to_xml).css('notification-acknowledgment').first
+    assert_equal "http://checkout.google.com/schema/2", ack.namespace.href
   end
   
   def test_to_xml_with_serial_number
     root = REXML::Document.new(@example_xml).root
     notification = ChargebackAmountNotification.create_from_element(root, @frontend)
-    ack = NotificationAcknowledgement.new(notification)
-    str = %q{<?xml version='1.0' encoding='UTF-8'?><notification-acknowledgment serial-number='bea6bc1b-e1e2-44fe-80ff-0180e33a2614' xmlns='http://checkout.google.com/schema/2'/>}
-    assert_equal str, ack.to_xml
+    ack = Nokogiri.parse(NotificationAcknowledgement.new(notification).to_xml).css('notification-acknowledgment').first
+    assert_equal "bea6bc1b-e1e2-44fe-80ff-0180e33a2614", ack.attr('serial-number')
   end
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google4r-checkout
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Tony Chan
 - Dan Dukeson
 - Nat Budin
@@ -17,68 +12,67 @@ authors:
 - Daniel Higham
 - Johnathan Niziol
 - Chris Parrish
+- Larry Salibra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: money
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70330930056060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70330930056060
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70330930055680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70330930055680
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: &70330930055080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70330930055080
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70330930054460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: "  google4r-checkout is a lightweight, framework-agnostic Ruby library to access the Google Checkout service and implement \n  notification handlers.  It exposes object-oriented wrappers for all of Google Checkout's API commands and notifications.\n"
+  prerelease: false
+  version_requirements: *70330930054460
+description: ! "  google4r-checkout is a lightweight, framework-agnostic Ruby library
+  to access the Google Checkout service and implement \n  notification handlers.  It
+  exposes object-oriented wrappers for all of Google Checkout's API commands and notifications.\n"
 email: natbudin@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
 - CHANGES
-files: 
+files:
 - lib/google4r/checkout/commands.rb
 - lib/google4r/checkout/frontend.rb
 - lib/google4r/checkout/merchant_calculation.rb
@@ -153,47 +147,34 @@ files:
 - test/unit/us_zip_area_test.rb
 - test/unit/world_area_test.rb
 - test/test_helper.rb
-- test/frontend_configuration_example.rb
 - README.md
 - LICENSE
 - CHANGES
-has_rdoc: true
 homepage: http://github.com/nbudin/google4r-checkout
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 63
-      segments: 
-      - 1
-      - 8
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.4
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Full-featured Google Checkout library for Ruby
-test_files: 
+test_files:
 - test/integration/checkout_command_test.rb
 - test/unit/add_merchant_order_number_command_test.rb
 - test/unit/add_tracking_data_command_test.rb
@@ -259,4 +240,4 @@ test_files:
 - test/unit/us_zip_area_test.rb
 - test/unit/world_area_test.rb
 - test/test_helper.rb
-- test/frontend_configuration_example.rb
+has_rdoc: 

data/test/frontend_configuration_example.rb

@@ -1,13 +0,0 @@
-  # 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 => '', 
-      :merchant_key => '',
-      :use_sandbox => true
-    }