google-content-api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da6672a85eabfb10a9c1b87f32e161c20eecfec7
-  data.tar.gz: 802f067cc36e78b12d508fe0f0ab82f859aad356
+  metadata.gz: 278179a947b6f244964810163fb76c4985ed1fe3
+  data.tar.gz: c352bae8e0dbb96a9179842c66cd4e2d795107b6
 SHA512:
-  metadata.gz: e1a7f059b988ec749a4b9ada5d0fdd4747cdc7e75dd131ea7db74670cc5a0e41c3b7573f88035b7925b19228286bdfc5d7032ce6157fccd50ebcbba26a483f7e
-  data.tar.gz: ef996e0ffac927fca56be8d2a6c193dd50d162ab4cd0dd9faf404d600ea1d0cf0001b447ca5a451d3f98b57a3afe5fef9a8a33167e4731371471c6d1d953ad17
+  metadata.gz: 53a3567008c4d40d0465fe32dc5eed8373e5a08d64e01c09c34a0735683f4efdd01909cf8a279c9abbe460f3dc182c3feb083e36209086857f2f9cea803759b2
+  data.tar.gz: 0f8c585dfdece74743c610d7323e5d3154f76503df62151ff8d7fd76de554db6e0ec70fe5b22959200049fd90cb6a5fe8c476f0620a204de12db67d654610ead

data/lib/google_content_api.rb

@@ -24,6 +24,8 @@ module GoogleContentApi
               if options[:language].nil? || options[:country].nil? || options[:item_id].nil?
 
             "#{base_url}/items/products/generic/online:#{options[:language].downcase}:#{options[:country].upcase}:#{options[:item_id]}?warnings"
+          when "item_to_update"
+             "#{base_url}/items/products/schema/online:#{options[:language].downcase}:#{options[:country].upcase}:#{options[:item_id]}"
           else
             raise "unknown zone"
           end

data/lib/google_content_api/product.rb

@@ -25,6 +25,7 @@ module GoogleContentApi
       def update_products(sub_account_id, products, dry_run = false)
         token            = Authorization.fetch_token
         products_url     = GoogleContentApi.urls("products", sub_account_id, :dry_run => dry_run)
+        @sub_account_id  = sub_account_id
         xml              = update_product_items_batch_xml(products)
         Faraday.headers  = {
           "Content-Type"   => "application/atom+xml",
@@ -66,7 +67,7 @@ module GoogleContentApi
         def create_item_xml(item)
           item[:id] = item_url(item[:id])
 
-          Nokogiri::XML::Builder.new do |xml|
+          NokogiriwXML::Builder.new do |xml|
             xml.entry(
                 'xmlns'     => 'http://www.w3.org/2005/Atom',
                 'xmlns:app' => 'http://www.w3.org/2007/app',
@@ -101,16 +102,16 @@ module GoogleContentApi
           end.to_xml
         end
 
-        def add_mandatory_values(xml, attributes, opts)
-          xml['batch'].id_ attributes[:id]
-          xml['sc'].id_ attributes[:id]
-          xml.title_ attributes[:title]
-          xml.content_ attributes[:description], :type => 'text'
+        def add_mandatory_values(xml, attributes, opts = {})
           if  opts[:type] == 'UPDATE'
-            xml.link_(:rel => 'edit', :type => 'application/atom+xml', :href => attributes[:link])
+            xml.id_ GoogleContentApi.urls("item_to_update", @sub_account_id, :language => attributes[:content_language], :country => attributes[:target_country], :item_id => attributes[:id])
           else
-            xml.link_(:rel => 'alternate', :type => 'text/html', :href => attributes[:link])
+            xml['batch'].id_ attributes[:id]
           end
+          xml['sc'].id_ attributes[:id]
+          xml.title_ attributes[:title]
+          xml.content_ attributes[:description], :type => 'text'
+          xml.link_(:rel => 'alternate', :type => 'text/html', :href => attributes[:link])
           xml['sc'].image_link_ attributes[:image]
           xml['sc'].content_language_ attributes[:content_language]
           xml['sc'].target_country_   attributes[:target_country]
@@ -119,7 +120,7 @@ module GoogleContentApi
           xml['scp'].price_ attributes[:price], :unit => attributes[:currency]
         end
 
-        def add_optional_values(xml, attributes, opts)
+        def add_optional_values(xml, attributes, opts = {})
           if attributes[:expiration_date]
             xml['sc'].expiration_date_  attributes[:expiration_date]
           end

data/lib/google_content_api/version.rb

@@ -1,3 +1,3 @@
 module GoogleContentApi
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/google_content_api/product_spec.rb

@@ -82,8 +82,8 @@ describe GoogleContentApi::Product do
       it "creates an xml with all given product attributes" do
         result_xml = subject.send(:update_product_items_batch_xml, [product_attributes])
         result_xml.should match 'batch:operation type="UPDATE"'
-        result_xml.should match 'link.*rel="edit"'
-        result_xml.should match 'link.*application/atom\+xml'
+        result_xml.should_not match 'batch:id'
+        result_xml.should match 'items/products/schema/online'
         product_attributes.each{ |attribute,value| result_xml.should match /#{value}/ }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-content-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - DaWanda GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler