spree_google_merchant_feed 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bd1e391cd46c9881a481dec0598576a49ffe623ff6ad827b5286d1d0408b1b
-  data.tar.gz: 41e80986993067fa780d64529935f3ec18ad82042a436aa68eabcf2c91d2aa8f
+  metadata.gz: 5efb0498b40ed2ac2d6dd0de0b4a1a39cec1c87f19b20f86135c271a9ac880ee
+  data.tar.gz: a5d8a1d76d0278aff9e3c33657fba0ab7e0b8ca3e1d5de7c36b9743dc0ba4090
 SHA512:
-  metadata.gz: 1c27f241cd94a99b23cf84f003ebb2a62953d8a283a6996d6688bf2f90725b9dcea0d6c5dd64f9b4a92c20cdddbd9f4c3b5165b53656b1209904a48c16e9b6c1
-  data.tar.gz: 90be81863d28167c8ff7ac7fd07cbe01c963d39f34359abf82f87fdf14ac21e433d02d96834ee5c691f7c1ee22ec947efc5007256e64d811354d458feabf0326
+  metadata.gz: b2a55cfbbb48f038d50960b7a9968820c02b0641fbfdd69ef3f0bc4b28865e27fdab15dbca6be91114d0030cbdbcd8bb0d6c11bbe6496d52a3dc4de50bfdb130
+  data.tar.gz: 15b4c0046671c511205b980581569f4028e35a44f6c29c4b5a0716959994d9474539275001d3c007dcd1ac1ff9eabe68c663b3a079f00b6a06f932ca1377f74e

data/README.md

@@ -1,4 +1,4 @@
-# SpreeGoogleMerchantFeed
+# Spree Google Merchant Feed
 
 This is a Google Merchant extension for [Spree Commerce](https://spreecommerce.org), an open‑source e-commerce platform built with Ruby on Rails. It adds the ability to provide products listings to Google Merchant Center.
 
@@ -6,7 +6,7 @@ This is a Google Merchant extension for [Spree Commerce](https://spreecommerce.o
 
 ## Installation
 
-1. Add this extension to your Gemfile:
+1. Add this extension to your Gemfile with this line:
 
     ```bash
     bundle add spree_google_merchant_feed
@@ -40,41 +40,28 @@ To use your Google Merchant endpoint as a data source in Google Merchant Center:
 
 ## Developing
 
-1. Create a dummy app:
+1. Create a dummy app
 
     ```bash
     bundle update
     bundle exec rake test_app
     ```
 
-2. Add code.
+2. Add your new code
 
-3. Run tests:
+3. Run tests
 
     ```bash
     bundle exec rspec
     ```
 
-When testing your application's integration you may use its factories:
+When testing your applications integration with this extension you may use it's factories.
+Simply add this require statement to your spec_helper:
 
 ```ruby
 require 'spree_google_merchant_feed/factories'
 ```
 
-## Testing
-
-Generate the test app:
-
-```bash
-bundle exec rake test_app
-```
-
-Then run:
-
-```bash
-bundle exec rspec
-```
-
 ## Releasing a new version
 
 ```bash

data/app/views/spree_google_merchant_feed/products.xml.builder

@@ -15,22 +15,42 @@ xml.rss version: "2.0", "xmlns:g" => "http://base.google.com/ns/1.0" do
           xml.tag! "g:title", product.name.truncate(150)
           xml.tag! "g:description", product.storefront_description&.truncate(5000)
           xml.tag! "g:link", spree_storefront_resource_url(product)
-          if product.default_image.present?
-            xml.tag! "g:image_link", spree_image_url(product.default_image, width: 500, height: 500)
+
+          if product.featured_image.present?
+            xml.tag! "g:image_link", spree_image_url(product.featured_image, width: 500, height: 500)
+          end
+          product.master_images.each do |image|
+            next if product.featured_image == image
+
+            xml.tag! "g:additional_image_link" do
+              xml.cdata! spree_image_url(image, width: 500, height: 500)
+            end
           end
 
           # Price and availability
-          xml.tag! "g:availability", product.in_stock? ? "in_stock" : "out_of_stock"
+          if product.in_stock?
+            xml.tag! "g:availability", "in_stock"
+          elsif product.backorderable?
+            xml.tag! "g:availability", "backorder"
+          elsif !product.in_stock?
+            xml.tag! "g:availability", "out_of_stock"
+          end
+
           xml.tag! "g:availability_date", product.available_on.strftime("%Y-%m-%dT%H:%M%z") if product.available_on?
           xml.tag! "g:expiration_date", product.discontinue_on.strftime("%Y-%m-%dT%H:%M%z") if product.discontinue_on?
-          xml.tag! "g:price", format('%.2f', product.display_amount.to_d) + " " + current_currency
-          xml.tag! "g:unit_pricing_measure", "#{product.weight}#{product.weight_unit}" if product.weight.present?
+
+          if product.on_sale?(current_store.default_currency)
+            xml.tag! "g:price", format('%.2f', product.display_compare_at_price.to_d) + " " + current_currency
+            xml.tag! "g:sale_price", format('%.2f', product.display_price.to_d) + " " + current_currency
+          else
+            xml.tag! "g:price", format('%.2f', product.display_price.to_d) + " " + current_currency
+          end
 
           # Product category
           xml.tag! "g:product_type", product_breadcrumb_taxons(product).map(&:name).join(' > ')
 
           # Product identifiers
-          xml.tag! "g:brand", product.brand.name if product.brand.present?
+          xml.tag! "g:brand", product.brand_taxon.name if product.brand_taxon.present?
 
           # Detailed product description
           xml.tag! "g:product_weight", "#{product.weight} #{product.weight_unit}" if product.weight.present?

data/config/initializers/spree.rb

@@ -1,3 +1,3 @@
 Rails.application.config.after_initialize do
-  Rails.application.config.spree.integrations << Spree::Integrations::GoogleMerchantFeed
+  Spree.integrations << Spree::Integrations::GoogleMerchantFeed
 end

data/lib/spree_google_merchant_feed/engine.rb

@@ -17,8 +17,8 @@ module SpreeGoogleMerchantFeed
       app.config.assets.precompile += %w[spree_google_merchant_feed_manifest]
     end
 
-    initializer 'spree_google_merchant_feed.importmap', after: 'spree.admin.importmap' do |app|
-      app.config.spree_admin.importmap.draw(root.join('config/importmap.rb'))
+    initializer 'spree_google_merchant_feed.importmap', before: 'importmap' do |app|
+      app.config.importmap.paths << root.join('config/importmap.rb')
     end
 
     def self.activate

data/lib/spree_google_merchant_feed/version.rb

@@ -1,5 +1,5 @@
 module SpreeGoogleMerchantFeed
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_google_merchant_feed
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - OlympusOne
@@ -15,42 +15,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: spree_storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: spree_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.8
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -108,10 +108,10 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/olympusone/spree_google_merchant_feed/issues
-  changelog_uri: https://github.com/olympusone/spree_google_merchant_feed/releases/tag/v1.1.2
+  changelog_uri: https://github.com/olympusone/spree_google_merchant_feed/releases/tag/v1.1.3
   documentation_uri: https://github.com/olympusone/spree_google_merchant_feed
   homepage_uri: https://github.com/olympusone/spree_google_merchant_feed
-  source_code_uri: https://github.com/olympusone/spree_google_merchant_feed/tree/v1.1.2
+  source_code_uri: https://github.com/olympusone/spree_google_merchant_feed/tree/v1.1.3
 rdoc_options: []
 require_paths:
 - lib