vizjerai-google-checkout 0.1.0 → 0.1.3

data/Rakefile

@@ -20,15 +20,14 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    s.name = "google-checkout"
+    s.name = "vizjerai-google-checkout"
     s.summary = "An experimental library for sending payment requests to Google Checkout."
-    s.email = "mattlins@gmail.com"
-    s.homepage = "http://github.com/mlins/google-checkout/"
+    s.email = "assarata@gmail.com"
+    s.homepage = "http://github.com/vizjerai/google-checkout/"
     s.description = "An experimental library for sending payment requests to Google Checkout."
-    s.authors = ["Peter Elmore", "Geoffrey Grosenbach", "Matt Lins"]
+    s.authors = ["Peter Elmore", "Geoffrey Grosenbach", "Matt Lins", "Steel Fu", "Andrew Assarattanakul"]
     s.files = FileList["[A-Z]*", "{lib,spec,support,examples}/**/*"]
-    s.add_dependency 'ruby-hmac'
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.3

data/lib/duck_punches/inflector.rb

@@ -0,0 +1,13 @@
+module ActiveSupport
+  module Inflector
+    class << self
+      def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+        if first_letter_in_uppercase
+          lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        else
+          lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+        end
+      end
+    end
+  end
+end

data/lib/google-checkout.rb

@@ -8,16 +8,17 @@ $: << File.dirname(__FILE__)
 $: << File.dirname(__FILE__) + "/vendor/ruby-hmac/lib"
 
 require 'rubygems'
+require 'active_support'
 
-require 'hmac-sha1'
+require 'openssl'
 require 'base64'
 require 'builder/xmlmarkup'
 require 'hpricot'
 require 'money'
 require 'net/https'
-require 'active_support'
 
 require 'duck_punches/hpricot'
+require 'duck_punches/inflector'
 require 'google-checkout/notification'
 require 'google-checkout/merchant_calculation'
 require 'google-checkout/command'

data/lib/google-checkout/cart.rb

@@ -121,6 +121,23 @@ module GoogleCheckout
     # You may fill in some optional values as well:
     # * quantity (defaults to 1)
     # * currency (defaults to 'USD')
+    # 
+    # * subscription
+    # ** type (defaults to 'google')
+    # ** period (defaults to 'MONTHLY')
+    # ** start_date
+    # ** no_charge_after
+    # ** payment_times
+    # ** max_charge
+    # ** name
+    # ** description
+    # ** price
+    # ** quantity
+    # 
+    # * digital_content
+    # ** disposition
+    # ** description
+    
     def add_item(item)
       @xml = nil
       if item.respond_to? :to_google_product
@@ -173,6 +190,65 @@ module GoogleCheckout
                 xml.quantity {
                   xml.text! item[:quantity].to_s
                 }
+                
+                # subscription item
+                if item.key?(:subscription)
+                  sub = item[:subscription]
+                  
+                  sub_opts = {}
+                  sub_opts.merge!(:type => sub[:type].to_s) if sub[:type]
+                  sub_opts.merge!(:period => sub[:period].to_s) if sub[:period]
+                  sub_opts.merge!(:"start-date" => sub[:start_date].to_s) if sub[:start_date] 
+                  sub_opts.merge!(:"no-charge-after" => sub[:no_charge_after].to_s) if sub[:no_charge_after]
+                  
+                  xml.subscription(sub_opts) {
+                    xml.payments {
+                      if sub.key?(:payment_times)
+                        xml.tag!('subscription-payment', :times => sub[:payment_times].to_s) {
+                          xml.tag!('maximum-charge', :currency => (item[:currency] || 'USD')) {
+                            xml.text! sub[:max_charge].to_s
+                          }
+                        }
+                      else
+                        xml.tag!('subscription-payment') {
+                          xml.tag!('maximum-charge', :currency => (item[:currency] || 'USD')) {
+                            xml.text! sub[:max_charge].to_s
+                          }
+                        }
+                      end
+                    }
+                    
+                    xml.tag!('recurrent-item') {
+                      xml.tag!('item-name') {
+                        xml.text! sub[:name].to_s
+                      }
+                      xml.tag!('item-description') {
+                        xml.text! sub[:description].to_s
+                      }
+                      xml.tag!('unit-price', :currency => (item[:currency] || 'USD')) {
+                        xml.text! sub[:price].to_s
+                      }
+                      xml.quantity {
+                        xml.text! sub[:quantity].to_s
+                      }
+                    }
+                  }
+                end
+                
+                # digital delivery
+                if item.key?(:digital_content)
+                  content = item[:digital_content]
+                  
+                  xml.tag!('digital-content') {
+                    xml.tag!('display-disposition') {
+                      xml.text! content[:disposition]
+                    }
+                    xml.description {
+                      xml.text! content[:description].to_s
+                    } if content[:description]
+                  }
+                end
+                
                 xml.tag!('merchant-private-item-data') {
                   xml << item[:merchant_private_item_data]
                 } if item.key?(:merchant_private_item_data)
@@ -227,7 +303,8 @@ module GoogleCheckout
     # Returns the signature for the cart XML.
     def signature
       @xml or to_xml
-      HMAC::SHA1.digest(@merchant_key, @xml)
+      digest = OpenSSL::Digest::Digest.new('sha1')
+      OpenSSL::HMAC.digest(digest, @merchant_key, @xml)
     end
 
     # Returns HTML for a checkout form for buying all the items in the
@@ -290,7 +367,7 @@ module GoogleCheckout
 
       # HACK Sandbox graphics are in the checkout subdirectory
       subdir = ""
-      if GoogleCheckout.sandbox? && bname == "checkout.gif"
+      if GoogleCheckout.sandbox? && (bname == "checkout.gif" || bname == "buy.gif")
         subdir = "checkout/"
       end
 

data/lib/google-checkout/notification.rb

@@ -100,7 +100,8 @@ module GoogleCheckout
       xml = Builder::XmlMarkup.new
       xml.instruct!
       @xml = xml.tag!('notification-acknowledgment', {
-        :xmlns => "http://checkout.google.com/schema/2"
+        :xmlns => "http://checkout.google.com/schema/2",
+        'serial-number' => serial_number
       })
       @xml
     end
@@ -152,7 +153,17 @@ module GoogleCheckout
 
   end
 
-  class ChargebackAmountNotification < Notification; end
+  class ChargebackAmountNotification < Notification
+
+    def latest_chargeback_amount
+      (@doc/"latest-chargeback-amount").to_money
+    end
+
+    def total_chargeback_amount
+      (@doc/"total-chargeback-amount").to_money
+    end
+
+  end
 
   class NewOrderNotification < Notification
 
@@ -325,6 +336,8 @@ module GoogleCheckout
 
   class RiskInformationNotification < Notification; end
 
+  class CancelledSubscriptionNotification < Notification; end
+
   class CheckoutRedirect < Notification
 
     ##
@@ -334,7 +347,7 @@ module GoogleCheckout
       (@doc/"redirect-url").inner_html.gsub(/&amp;/, '&')
     end
 
-  end
+  end    
 
   class Error < Notification
 

data/spec/fixtures/google/checkout-shopping-cart.xml

@@ -8,6 +8,32 @@
         <unit-price currency="USD">159.99</unit-price>
         <quantity>1</quantity>
       </item>
+	  <item>
+	  	<item-name>Bronze-level site hosting membership</item-name>
+		<item-description>30GB of disk space.</item-description>
+		<quantity>1</quantity>
+		<unit-price currency="USD">0</unit-price>
+		<subscription type="google" period="MONTHLY"
+		  start-date="2008-04-01T07:55:55.952-08:00"
+		  no-charge-after="2009-03-31T07:55:55.952-08:00">
+		  <payments>
+		    <subscription-payment times="12">
+		      <maximum-charge currency="USD">12.99</maximum-charge>
+		    </subscription-payment>
+		  </payments>
+		  <recurrent-item>
+			<item-name>Usage of My Awesome Website for One Month</item-name>
+			<item-description>Your flat charge for accessing my website</item-description>
+			<quantity>1</quantity>
+			<unit-price currency="USD">12.00</unit-price>
+			<digital-content>
+			  <display-disposition>OPTIMISTIC</display-disposition>
+			  <url>http://mywebsite.example.com</url>
+			  <description>Head over to the website linked below for pie!</description>
+			</digital-content>
+          </recurrent-item>
+		</subscription>
+	  </item>
     </items>
   </shopping-cart>
   <checkout-flow-support>

data/spec/fixtures/google/notifications/cancelled-subscription-notification.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cancelled-subscription-notification xmlns="http://checkout.google.com/schema/2" serial-number="bea6bc1b-e1e2-44fe-80ff-0180e33a2614">
+  <item-ids />
+  <google-order-number>841171949013218</google-order-number>
+  <reason>Customer request to cancel</reason>
+  <timestamp>2009-10-15T23:51:04.662Z</timestamp>
+</cancelled-subscription-notification>

data/spec/google-checkout/cart_spec.rb

@@ -22,7 +22,7 @@ describe GoogleCheckout, "Cart (generic)" do
   end
 
   it "should generate proper sandbox buy button_url" do
-    @cart.button_url.should match(%r{http://sandbox\.google\.com/buttons/buy\.gif})
+    @cart.button_url.should match(%r{http://sandbox\.google\.com/checkout/buttons/buy\.gif})
   end
 
   it "should generate proper sandbox checkout button_url" do

data/spec/google-checkout/notification_spec.rb

@@ -43,7 +43,7 @@ describe GoogleCheckout, "New Order Notification" do
   it "should create Money object from order total" do
     @notification.order_total.should be_kind_of(Money)
     @notification.order_total.cents.should == 19098
-    @notification.order_total.currency.should == 'USD'
+    @notification.order_total.currency.iso_code.should == 'USD'
   end
 
   it "should throw error when accessing non-existent value" do
@@ -235,6 +235,12 @@ describe GoogleCheckout, "Chargeback Amount Notification" do
     @notification.should be_kind_of(GoogleCheckout::ChargebackAmountNotification)
   end
 
+  it "parses chargeback amounts as money objects" do
+    @notification.latest_chargeback_amount.cents.should == 22606
+    @notification.total_chargeback_amount.cents.should == 22606
+    @notification.latest_chargeback_amount.currency.iso_code.should == 'USD'
+  end
+
 end
 
 describe GoogleCheckout, "Refund Amount Notification" do
@@ -251,3 +257,16 @@ describe GoogleCheckout, "Refund Amount Notification" do
 
 end
 
+describe GoogleCheckout, "Cancelled Order Notification" do
+  
+  before(:each) do
+    @notification = GoogleCheckout::Notification.parse(read_xml_fixture('notifications/cancelled-subscription-notification'))
+  end
+
+  it_should_behave_like "basic notification"
+
+  it "should identify type of notification" do
+    @notification.should be_kind_of(GoogleCheckout::CancelledSubscriptionNotification)
+  end  
+    
+end

metadata

@@ -1,31 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: vizjerai-google-checkout
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 29
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Elmore
 - Geoffrey Grosenbach
 - Matt Lins
+- Steel Fu
+- Andrew Assarattanakul
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2011-02-11 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: An experimental library for sending payment requests to Google Checkout.
-email: mattlins@gmail.com
+email: assarata@gmail.com
 executables: []
 
 extensions: []
@@ -37,9 +36,10 @@ files:
 - MIT-LICENSE.txt
 - README.txt
 - Rakefile
-- VERSION.yml
+- VERSION
 - examples/google_notifications_controller.rb
 - lib/duck_punches/hpricot.rb
+- lib/duck_punches/inflector.rb
 - lib/google-checkout.rb
 - lib/google-checkout/cart.rb
 - lib/google-checkout/command.rb
@@ -73,6 +73,7 @@ files:
 - spec/fixtures/google/commands/unarchive-order.xml
 - spec/fixtures/google/merchant_calculations/shipping.xml
 - spec/fixtures/google/notifications/authorization-amount-notification.xml
+- spec/fixtures/google/notifications/cancelled-subscription-notification.xml
 - spec/fixtures/google/notifications/charge-amount-notification.xml
 - spec/fixtures/google/notifications/chargeback-amount-notification.xml
 - spec/fixtures/google/notifications/new-order-notification.xml
@@ -100,32 +101,41 @@ files:
 - spec/spec_helper.rb
 - support/cacert.pem
 has_rdoc: true
-homepage: http://github.com/mlins/google-checkout/
+homepage: http://github.com/vizjerai/google-checkout/
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.5.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An experimental library for sending payment requests to Google Checkout.
 test_files: 
+- examples/google_notifications_controller.rb
 - spec/google-checkout/cart_spec.rb
 - spec/google-checkout/command_spec.rb
 - spec/google-checkout/geography/postal_spec.rb
@@ -141,4 +151,3 @@ test_files:
 - spec/google-checkout/shipping/pickup_spec.rb
 - spec/google-checkout_spec.rb
 - spec/spec_helper.rb
-- examples/google_notifications_controller.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 0
-:minor: 1
-:patch: 0