vizjerai-google-checkout 0.3.0 → 0.4.0

data/.gitignore

@@ -1,2 +1,3 @@
 .rspec
 Gemfile.lock
+pkg/

data/{History.txt → CHANGELOG.md}

@@ -1,4 +1,17 @@
-== 0.2.0 / 2007-08-14
+## 0.4.0 / 2012-07-27
+
+### New Features
+ - Allow cart contents to be read.
+
+### Bug Fix
+ - Fix not knowing if it was a google error or one caused by the gem.
+
+## 0.3.0 / 2012-07-27
+
+### Bug Fix
+ - Changed Command.post to always return a Notification instead of raising an error.
+
+## 0.2.0 / 2007-08-14
 
 * Significant rewrite!
   * Added rSpec specifications.

data/lib/google-checkout.rb

@@ -4,11 +4,6 @@
 #  https://sandbox.google.com/checkout/cws/v2/Merchant/MERCHANT_ID/merchantCheckout
 #  https://checkout.google.com/cws/v2/Merchant/MERCHANT_ID/merchantCheckout
 
-$: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + "/vendor/ruby-hmac/lib"
-
-require 'google-checkout/version'
-
 require 'active_support'
 
 require 'openssl'

data/lib/google-checkout/cart.rb

@@ -62,15 +62,13 @@ module GoogleCheckout
     # Beware using symbols as values. They may be set as sub-keys instead of values,
     # so use a String or other datatype.
 
-    attr_accessor :merchant_private_data
-
     attr_accessor :edit_cart_url
     attr_accessor :continue_shopping_url
 
     attr_accessor :merchant_calculations_url
-    attr_accessor :parameterized_urls
+    attr_writer :parameterized_urls
 
-    attr_accessor :shipping_methods
+    attr_writer :shipping_methods
 
     # The default options for drawing in the button that are filled in when
     # checkout_button or button_url is called.
@@ -87,14 +85,19 @@ module GoogleCheckout
     # or more items to put inside the cart.
     def initialize(merchant_id, merchant_key, *items)
       super(merchant_id, merchant_key)
-      @contents = []
-      @merchant_private_data = ''
-      @shipping_methods = []
       items.each { |i| add_item i }
     end
 
     def empty?
-      @contents.empty?
+      contents.empty?
+    end
+
+    def contents
+      @contents ||= []
+    end
+
+    def merchant_private_data
+      @merchant_private_data ||= ''
     end
 
     def merchant_private_data=(value)
@@ -109,9 +112,17 @@ module GoogleCheckout
       end
     end
 
+    def parameterized_urls
+      @parameterized_urls ||= []
+    end
+
+    def shipping_methods
+      @shipping_methods ||= []
+    end
+
     # Number of items in the cart.
     def size
-      @contents.size
+      contents.size
     end
 
     def submit_domain
@@ -169,7 +180,7 @@ module GoogleCheckout
         "Required keys missing: #{missing_keys.inspect}"
       end
 
-      @contents << { :quantity => 1, :currency => 'USD' }.merge(item)
+      contents << { :quantity => 1, :currency => 'USD' }.merge(item)
       item
     end
 
@@ -186,7 +197,7 @@ module GoogleCheckout
       @xml = xml.tag!('checkout-shopping-cart', :xmlns => "http://checkout.google.com/schema/2") {
         xml.tag!("shopping-cart") {
           xml.items {
-            @contents.each { |item|
+            contents.each { |item|
               xml.item {
                 if item.key?(:item_id)
                   xml.tag!('merchant-item-id', item[:item_id])
@@ -268,9 +279,9 @@ module GoogleCheckout
               }
             }
           }
-          unless @merchant_private_data.nil? || @merchant_private_data.empty?
+          unless merchant_private_data.empty?
             xml.tag!("merchant-private-data") {
-              xml << @merchant_private_data
+              xml << merchant_private_data
             }
           end
         }
@@ -288,7 +299,7 @@ module GoogleCheckout
             # TODO tax-tables
 
             xml.tag!('parameterized-urls') {
-              @parameterized_urls.each do |param_url|
+              parameterized_urls.each do |param_url|
                 xml.tag!('parameterized-url', :url => param_url[:url]) {
                   next if param_url[:parameters].nil?
                   next if param_url[:parameters].empty?
@@ -299,10 +310,10 @@ module GoogleCheckout
                   }
                 }
               end
-            } unless @parameterized_urls.nil? || @parameterized_urls.empty?
+            } unless parameterized_urls.empty?
 
             xml.tag!('shipping-methods') {
-              @shipping_methods.each do |shipping_method|
+              shipping_methods.each do |shipping_method|
                 xml << shipping_method.to_xml
               end
             }
@@ -368,7 +379,7 @@ module GoogleCheckout
 
     def button_url(opts = {})
       opts = DefaultButtonOpts.merge opts
-      opts[:buy_or_checkout] ||= @contents.size > 1 ? :checkout : :buy_now
+      opts[:buy_or_checkout] ||= contents.size > 1 ? :checkout : :buy_now
       opts.merge! ButtonSizes[opts[:buy_or_checkout]][opts[:size]]
       bname = opts[:buy_or_checkout] == :buy_now ? 'buy.gif' : 'checkout.gif'
       opts.delete :size

data/lib/google-checkout/command.rb

@@ -61,9 +61,9 @@ module GoogleCheckout
       when Net::HTTPSuccess, Net::HTTPClientError
         Notification.parse(response.body)
       when Net::HTTPRedirection, Net::HTTPServerError, Net::HTTPInformation
-        Error.new(nil, :message => "Unexpected response code (#{response.class}): #{response.code} - #{response.message}")
+        ApiError.new("Unexpected response code (#{response.class}): #{response.code} - #{response.message}")
       else
-        Error.new(nil, :message => "Unknown response code: #{response.code} - #{response.message}")
+        ApiError.new("Unknown response code: #{response.code} - #{response.message}")
       end
     end
 

data/lib/google-checkout/notification.rb

@@ -353,18 +353,30 @@ module GoogleCheckout
 
   class Error < Notification
 
-    def initialize(doc, options={})
-      @error_message = options[:message]
-      super(doc)
-    end
+    ##
+    # Alias for +_error_message+
 
-    def error_message
-      @error_message || (doc/'error-message').inner_html
+    def message
+      (doc/'error-message').inner_html
     end
-    alias :message :error_message
 
   end
 
   class RequestReceived < Notification; end
 
+  class ApiError < Notification
+    attr_reader :error_message
+
+    def initialize(message='')
+      @error_message = message
+    end
+
+    def error?
+      true
+    end
+
+    alias :message :error_message
+
+  end
+
 end

data/lib/google-checkout/version.rb

@@ -1,5 +1,3 @@
 module GoogleCheckout
-  unless defined? GoogleCheckout::VERSION
-    VERSION = '0.3.0'
-  end
+  VERSION = '0.4.0'
 end

data/spec/google-checkout/cart_spec.rb

@@ -1,38 +1,96 @@
 require "spec_helper"
 
 describe GoogleCheckout, "Cart (generic)" do
+  let(:item) { {:name => "PeepCode Screencast", :description => "A few screencasts", :price => 9.00} }
 
-  before(:each) do
-    @cart = GoogleCheckout::Cart.new("my_id", "my_key", {
-      :name => "PeepCode Screencast",
-      :description => "A few screencasts",
-      :price => 9.00
-    })
-    GoogleCheckout.use_sandbox
+  before do
+    @cart = GoogleCheckout::Cart.new("my_id", "my_key", item)
   end
 
-  it "should generate proper live buy button_url" do
-    GoogleCheckout.use_production
-    @cart.button_url.should match(%r{http://checkout\.google\.com/buttons/buy\.gif})
-  end
+  context 'when using production' do
+    before do
+      GoogleCheckout.use_production
+    end
 
-  it "should generate proper live checkout button_url" do
-    GoogleCheckout.use_production
-    @cart.button_url(:buy_or_checkout => :checkout).should match(%r{http://checkout\.google\.com/buttons/checkout\.gif})
-  end
+    it "should generate proper live buy button_url" do
+      @cart.button_url.should match(%r{http://checkout\.google\.com/buttons/buy\.gif})
+    end
+
+    it "should generate proper live checkout button_url" do
+      @cart.button_url(:buy_or_checkout => :checkout).should match(%r{http://checkout\.google\.com/buttons/checkout\.gif})
+    end
 
-  it "should generate proper sandbox buy button_url" do
-    @cart.button_url.should match(%r{http://sandbox\.google\.com/checkout/buttons/buy\.gif})
+    it "should generate proper live checkout button url with https" do
+      @cart.button_url(:buy_or_checkout => :checkout, :https => true).should match(%r{https://checkout\.google\.com/buttons/checkout\.gif})
+    end
   end
 
-  it "should generate proper sandbox checkout button_url" do
-    @cart.button_url(:buy_or_checkout => :checkout).should match(%r{http://sandbox\.google\.com/checkout/buttons/checkout\.gif})
+  context 'when using sandbox' do
+    before do
+      GoogleCheckout.use_sandbox
+    end
+
+    it "should generate proper sandbox buy button_url" do
+      @cart.button_url.should match(%r{http://sandbox\.google\.com/checkout/buttons/buy\.gif})
+    end
+
+    it "should generate proper sandbox checkout button_url" do
+      @cart.button_url(:buy_or_checkout => :checkout).should match(%r{http://sandbox\.google\.com/checkout/buttons/checkout\.gif})
+    end
+
+    it "should generate proper sandbox checkout button url with https" do
+      @cart.button_url(:buy_or_checkout => :checkout, :https => true).should match(%r{https://sandbox\.google\.com/checkout/buttons/checkout\.gif})
+    end
   end
 
   it "should generate checkout button" do
     @cart.checkout_button.should match(/buy\.gif/)
   end
 
+  describe '.contents' do
+    subject { @cart.contents }
+    it { should == [{:quantity => 1, :currency => 'USD'}.merge(item)] }
+  end
+
+  describe '.merchant_private_data' do
+    subject { @cart.merchant_private_data }
+    it { should == '' }
+  end
+
+  describe '.parameterized_urls' do
+    subject { @cart.parameterized_urls }
+    it { should == [] }
+
+    context 'with parameterized urls' do
+      let(:param_urls) { [{:url => 'http://checkout.google.com'}] }
+      before { @cart.parameterized_urls = param_urls }
+      it { should == param_urls }
+    end
+  end
+
+  describe '.shipping_methods' do
+    subject { @cart.shipping_methods }
+    it { should == [] }
+
+    context 'with flat rate' do
+      let(:shipping_method) { GoogleCheckout::Shipping::FlatRate.new('FedEx', 1234) }
+      before { @cart.shipping_methods = [shipping_method] }
+      it { should == [shipping_method] }
+    end
+
+    context 'with merchant calculated' do
+      let(:shipping_method) { GoogleCheckout::Shipping::MerchantCalculated.new('FedEx Ground', 1234) }
+      before { @cart.shipping_methods = [shipping_method] }
+      it { should == [shipping_method] }
+    end
+
+    context 'with pickup' do
+      let(:shipping_method) { GoogleCheckout::Shipping::Pickup.new('Pickup', 1234) }
+      before { @cart.shipping_methods = [shipping_method] }
+      it { should == [shipping_method] }
+    end
+  end
+
 end
 
 describe GoogleCheckout, "Cart Post" do

data/spec/google-checkout/command_spec.rb

@@ -114,7 +114,7 @@ describe GoogleCheckout, "Charge Order" do
 
     it "return error" do
       response = @order.post
-      response.should be_kind_of(GoogleCheckout::Error)
+      response.should be_kind_of(GoogleCheckout::ApiError)
       response.should be_error
       response.serial_number.should be_nil
       response.message.should == 'Unexpected response code (Net::HTTPRedirection): 301 - Redirect'
@@ -132,7 +132,7 @@ describe GoogleCheckout, "Charge Order" do
 
     it "return error" do
       response = @order.post
-      response.should be_kind_of(GoogleCheckout::Error)
+      response.should be_kind_of(GoogleCheckout::ApiError)
       response.should be_error
       response.serial_number.should be_nil
       response.message.should == 'Unknown response code: 600 - Unknown Response'

data/spec/google-checkout/notification_spec.rb

@@ -257,9 +257,6 @@ end
 
 describe GoogleCheckout, "Error Notification" do
   let(:notification) { GoogleCheckout::Notification.parse(read_xml_fixture('responses/error')) }
-  before do
-    @notification = notification
-  end
 
   it "should identify type of notication" do
     notification.should be_kind_of GoogleCheckout::Error
@@ -274,3 +271,20 @@ describe GoogleCheckout, "Error Notification" do
   end
 
 end
+
+describe GoogleCheckout, 'Api Error Notification' do
+  let(:notification) { GoogleCheckout::ApiError.new 'Unexpected Error' }
+
+  it "should identify type of notication" do
+    notification.should be_kind_of GoogleCheckout::ApiError
+  end
+
+  it "should have error message" do
+    notification.error_message.should == 'Unexpected Error'
+  end
+
+  it "should have message" do
+    notification.message.should == 'Unexpected Error'
+  end
+
+end

data/spec/support/shared_example_groups/basic_notification.rb

@@ -10,6 +10,7 @@ shared_examples_for "basic notification" do
 
   it "should generate acknowledgment XML" do
     @notification.acknowledgment_xml.should match(/notification-acknowledgment/)
+    @notification.acknowledgment_xml.should match(/serial-number="bea6bc1b-e1e2-44fe-80ff-0180e33a2614"/)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vizjerai-google-checkout
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Peter Elmore
@@ -135,8 +135,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
-- History.txt
 - MIT-LICENSE.txt
 - README.txt
 - Rakefile