vizjerai-google-checkout 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/google-checkout/cart.rb

@@ -88,7 +88,7 @@ module GoogleCheckout
     def initialize(merchant_id, merchant_key, *items)
       super(merchant_id, merchant_key)
       @contents = []
-      @merchant_private_data = {}
+      @merchant_private_data = ''
       @shipping_methods = []
       items.each { |i| add_item i }
     end
@@ -97,6 +97,18 @@ module GoogleCheckout
       @contents.empty?
     end
 
+    def merchant_private_data=(value)
+      if value.is_a?(Hash)
+        xml = Builder::XmlMarkup.new
+        value.each do |key, value|
+          xml.tag!(key, value)
+        end
+        @merchant_private_data = xml.target!
+      elsif value.is_a?(String)
+        @merchant_private_data = value
+      end
+    end
+
     # Number of items in the cart.
     def size
       @contents.size
@@ -258,9 +270,7 @@ module GoogleCheckout
           }
           unless @merchant_private_data.blank?
             xml.tag!("merchant-private-data") {
-              @merchant_private_data.each do |key, value|
-                xml.tag!(key, value)
-              end
+              xml << @merchant_private_data
             }
           end
         }

data/spec/google-checkout/cart_spec.rb

@@ -69,16 +69,26 @@ describe GoogleCheckout, "Cart Post" do
     response.redirect_url.should == 'https://checkout.google.com/buy?foo=bar&id=8572098456'
   end
 
-  it "should set merchant private data" do
+  it "should set merchant private data with a Hash" do
     @cart.merchant_private_data = { "merchant-order-number" => "1234-5678-9012" }
-    @cart.merchant_private_data["merchant-order-number"].should == "1234-5678-9012"
+    @cart.merchant_private_data.should == "<merchant-order-number>1234-5678-9012</merchant-order-number>"
   end
 
-  it "should include merchant private in the generated xml" do
+  it "should include merchant private data in the generated xml with a Hash" do
     @cart.merchant_private_data = { "merchant-order-number" => "1234-5678-9012" }
     @cart.to_xml.should match(/<merchant-order-number>1234-5678-9012<\/merchant-order-number>/)
   end
 
+  it "should set merchant private data with a String" do
+    @cart.merchant_private_data = "<merchant-order-number>1234-5678-9012</merchant-order-number>"
+    @cart.merchant_private_data.should == "<merchant-order-number>1234-5678-9012</merchant-order-number>"
+  end
+
+  it "should include merchant private data in the generated xml with a String" do
+    @cart.merchant_private_data = "<merchant-order-number>1234-5678-9012</merchant-order-number>"
+    @cart.to_xml.should match(/<merchant-order-number>1234-5678-9012<\/merchant-order-number>/)
+  end
+
   it "should not include merchant private data if none is set" do
     @cart.to_xml.should_not match(/<merchant-private-data>/)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vizjerai-google-checkout
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Peter Elmore
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -06:00
+date: 2011-02-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency