nbudin-google4r-checkout 1.0.10 → 1.0.11

data/Rakefile

@@ -68,8 +68,8 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |spec|
-    spec.name = "google4r-checkout"
-    spec.summary = "Ruby library to access the Google Checkout service and implement notification handlers."
+    spec.name = "nbudin-google4r-checkout"
+    spec.summary = "Nat Budin's branch of the Ruby library to access the Google Checkout service and implement notification handlers."
     spec.description = spec.summary
     spec.authors = ["Tony Chan"]
     
@@ -77,4 +77,4 @@ begin
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+end

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/google4r-checkout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google4r-checkout}
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Chan"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-11-02}
   s.description = %q{Ruby library to access the Google Checkout service and implement notification handlers.}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -98,7 +98,7 @@ Gem::Specification.new do |s|
   ]
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby library to access the Google Checkout service and implement notification handlers.}
   s.test_files = [
     "test/integration/checkout_command_test.rb",

data/lib/google4r/checkout/notifications.rb

@@ -132,6 +132,8 @@ module Google4R #:nodoc:
           ChargebackAmountNotification.create_from_element(root, frontend)
         when 'authorization-amount-notification' then
           AuthorizationAmountNotification.create_from_element(root, frontend)
+        when 'cancelled-subscription-notification' then
+          CancelledSubscriptionNotification.create_from_element(root, frontend)
         else
           raise UnknownNotificationType, "Unknown notification type: #{root.name}"
         end
@@ -487,6 +489,33 @@ module Google4R #:nodoc:
       end
     end
     
+    # CancelledSubscriptionNotification objects contain information about the
+    # cancellation of a subscription, including the item-ids, google order number,
+    # reason, and timestamp.
+    class CancelledSubscriptionNotification < Notification
+      
+      # The reason for the cancellation (String, can be nil.)
+      attr_accessor :reason
+      
+      # The ids of the items being cancelled (Array of Strings)
+      attr_accessor :item_ids
+      
+      # The google order number of the subscription being cancelled
+      attr_accessor :google_order_number
+      
+      def self.create_from_element(element, frontend)
+        csn = CancelledSubscriptionNotification.new(frontend)
+        
+        csn.serial_number = element.attributes['serial-number']
+        csn.timestamp = Time.parse(element.elements['timestamp'].text)
+        csn.reason = element.elements['reason'].text rescue nil
+        csn.item_ids = element.elements['item-ids/item-id/merchant-item-id'].collect {|i| i.text} rescue []
+        csn.google_order_number = element.elements['google-order-number'].text
+        
+        return csn
+      end
+    end
+    
     # Container for the valid financial order states as defined in the 
     # Google Checkout API.
     module FinancialOrderState

data/test/integration/checkout_command_test.rb

@@ -147,6 +147,84 @@ class Google4R::Checkout::CheckoutCommandIntegrationTest < Test::Unit::TestCase
     assert_kind_of CheckoutRedirectResponse, result
   end
   
+  def test_sending_to_google_works_with_google_handled_subscription
+    setup_command(@command)
+    
+    @command.shopping_cart.create_item do |item|
+      item.name = "Test subscription"
+      item.description = "12 month subscription"
+      item.unit_price = Money.us_dollar(0)
+      item.quantity = 1
+      item.private_data = { :id => 123456 }
+      
+      item.create_subscription do |subscription|
+        subscription.type = "google"
+        subscription.period = "MONTHLY"
+        
+        subscription.add_payment do |payment|
+          payment.times = 12
+          payment.maximum_charge = Money.us_dollar(1200)
+        end
+        
+        subscription.add_recurrent_item do |rec_item|
+          rec_item.name = "Usage of My Awesome Website for One Month"
+          rec_item.description = "Your flat charge for accessing my web site"
+          rec_item.quantity = 1
+          rec_item.unit_price = Money.us_dollar(1200)
+          
+          rec_item.create_digital_content do |content|
+            content.display_disposition = "OPTIMISTIC"
+            content.url = "http://mywebsite.example.com"
+            content.description = "Pie is found at this web site!"
+          end
+        end
+        
+        item.create_digital_content do |content|
+          content.display_disposition = "OPTIMISTIC"
+          content.description = "Congratulations!  Your subscription is being set up.  Feel free to log onto" + 
+                                "<a href=\"http://mywebsite.example.com\">My website</a>."
+        end
+      end
+    end
+    
+    result = @command.send_to_google_checkout
+    assert_kind_of CheckoutRedirectResponse, result
+  end
+  
+  def test_sending_to_google_works_with_merchant_handled_subscription
+    setup_command(@command)
+    
+    @command.shopping_cart.create_item do |item|
+      item.name = "Test subscription"
+      item.description = "12 month subscription"
+      item.unit_price = Money.us_dollar(0)
+      item.quantity = 1
+      item.private_data = { :id => 123456 }
+      
+      item.create_subscription do |subscription|
+        subscription.type = "merchant"
+        subscription.period = "MONTHLY"
+        subscription.start_date = Time.new
+        subscription.start_date += (60 * 60 * 24 * 30)
+        subscription.no_charge_after = subscription.start_date + (60 * 60 * 24 * 365)
+        
+        subscription.add_payment do |payment|
+          payment.times = 12
+          payment.maximum_charge = Money.us_dollar(1200)
+        end
+        
+        item.create_digital_content do |content|
+          content.display_disposition = "OPTIMISTIC"
+          content.description = "Congratulations!  Your subscription is being set up.  Feel free to log onto" + 
+                                "<a href=\"http://mywebsite.example.com\">My website</a>."
+        end
+      end
+    end
+    
+    result = @command.send_to_google_checkout
+    assert_kind_of CheckoutRedirectResponse, result
+  end
+  
   def test_using_invalid_credentials_raise_google_checkout_error
     invalid_patches = [ [ :merchant_id, 'invalid' ], [ :merchant_key, 'invalid' ] ]
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nbudin-google4r-checkout
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - Tony Chan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.1
     version: 
-description: Ruby library to access the Google Checkout service and implement notification handlers.
+description: Nat Budin's branch of the Ruby library to access the Google Checkout service and implement notification handlers.
 email: 
 executables: []
 
@@ -111,8 +111,10 @@ files:
 - test/xml/apiv2.xsd
 - test/xml/test_check_persisting_works_expected.xml
 - var/cacert.pem
-has_rdoc: false
+has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -133,10 +135,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Ruby library to access the Google Checkout service and implement notification handlers.
+summary: Nat Budin's branch of the 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