alchemy-solidus 8.1.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f430eef503b1316b367b98550bd8dc9154fa4a042695b38f55b14177c245c96
-  data.tar.gz: e872e1bf804dda6d5a9cfc60936818af8409ec5896b9fd7981daa52b9ce6301f
+  metadata.gz: 5910186eafdfbac9b8a44de731612238d859f901d0089341ac05ce33dceba207
+  data.tar.gz: dc717567f6e7976a654dca88fe6c28064aa0483d51b4be509ad61d31ad60b59f
 SHA512:
-  metadata.gz: 381b2949455b301e3b4eb336904becdf86c36dfd1ef12558f8b22465e79b724ec35a2286f3e73de4194c2c504f7758114b6afadabdaadb50de1e2eed98864afd
-  data.tar.gz: 2ba6d5d1aa1c0e520b288c909ad58f66be3dba275c84ffc74a3ad509fda13b6cb40b7c10fd3030858cdc96260d83858cf5516313c0cf643b6cafdf61a72e1b2c
+  metadata.gz: 242f2b28c334a3063733109a9f0f4881578e10e56050b25a6d9acc324136aefba7c06b2798de6616f4858a74f5906824f1a66c8cce79ff5990468e284f437f67
+  data.tar.gz: 7522e15e257a9763e6ab7c89053c7353816929e1674b50c641fe4e69fef373dae1db101fce7e3bff2bc01d540f41acf6a15f1a0e9f319ee6f7eec69abf27850d

data/Rakefile

@@ -14,9 +14,9 @@ task default: %i[test_setup spec]
 
 desc "Setup test app"
 task :test_setup do
-  solidus_branch = ENV.fetch("SOLIDUS_BRANCH", "v4.6")
+  solidus_branch = ENV.fetch("SOLIDUS_BRANCH", "v4.7")
   solidus_install_options = "--payment-method=none --frontend=none --authentication=none"
-  if ["v4.5", "v4.6", "main"].include?(solidus_branch)
+  if ["v4.5", "v4.6", "v4.7", "main"].include?(solidus_branch)
     solidus_install_options += " --admin-preview=false"
   end
   ENV["SKIP_SOLIDUS_BOLT"] = "1" # solidus_frontend defaults to installing solidus_bolt if auto-accept is used

data/app/jobs/alchemy/solidus/invalidate_elements_cache_job.rb

@@ -4,6 +4,11 @@ module Alchemy
       queue_as :default
 
       def perform(model_name, id)
+        Alchemy::Deprecation.warn <<~WARN
+          Alchemy::Solidus::InvalidateElementsCacheJob is deprecated and will be removed in 9.0.
+          Please use Alchemy::InvalidateElementsCacheJob instead.
+        WARN
+
         now = Time.current
 
         element_ids = model(model_name)

data/app/patches/models/alchemy/solidus/spree_product_patch.rb

@@ -4,8 +4,6 @@ module Alchemy
   module Solidus
     module SpreeProductPatch
       def self.prepended(base)
-        # Solidus runs touch callbacks on product after_save
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeProduct", as: :related_object, dependent: :nullify
       end
 
@@ -24,13 +22,9 @@ module Alchemy
         taxons.each(&:touch)
       end
 
-      # Touch all elements that have this product assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeProduct", id)
-      end
-
       ::Spree::Product.prepend self
     end
   end
+
+  ::Spree::Product.include RelatableResource
 end

data/app/patches/models/alchemy/solidus/spree_taxon_patch.rb

@@ -4,20 +4,11 @@ module Alchemy
   module Solidus
     module SpreeTaxonPatch
       def self.prepended(base)
-        base.after_update :touch_alchemy_ingredients
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeTaxon", as: :related_object, dependent: :nullify
       end
 
       ::Spree::Taxon.prepend self
-
-      private
-
-      # Touch all elements that have this taxon assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeTaxon", id)
-      end
     end
   end
+  ::Spree::Taxon.include RelatableResource
 end

data/app/patches/models/alchemy/solidus/spree_variant_patch.rb

@@ -4,20 +4,12 @@ module Alchemy
   module Solidus
     module SpreeVariantPatch
       def self.prepended(base)
-        base.after_update :touch_alchemy_ingredients
-        base.after_touch :touch_alchemy_ingredients
         base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeVariant", as: :related_object, dependent: :nullify
       end
 
       ::Spree::Variant.prepend self
-
-      private
-
-      # Touch all elements that have this variant assigned to one of its ingredients.
-      # This cascades to all parent elements and pages as well.
-      def touch_alchemy_ingredients
-        InvalidateElementsCacheJob.perform_later("SpreeVariant", id)
-      end
     end
   end
+
+  ::Spree::Variant.include RelatableResource
 end

data/lib/alchemy/solidus/test_support/factories/ingredient_factories.rb

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  %w[
+    product
+    taxon
+    variant
+  ].each do |ingredient|
+    factory :"alchemy_ingredient_spree_#{ingredient}", class: "Alchemy::Ingredients::Spree#{ingredient.classify}" do
+      role { ingredient }
+      type { "Alchemy::Ingredients::Spree#{ingredient.classify}" }
+      association :element, name: ingredient, factory: :alchemy_element
+    end
+  end
+end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "8.1.0"
+    VERSION = "8.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.0.a
+        version: 8.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 description: A AlchemyCMS and Solidus integration
 email:
 - thomas@vondeyen.com
@@ -306,6 +306,7 @@ files:
 - config/locales/en.yml
 - lib/alchemy-solidus.rb
 - lib/alchemy/solidus/engine.rb
+- lib/alchemy/solidus/test_support/factories/ingredient_factories.rb
 - lib/alchemy/solidus/version.rb
 - lib/generators/alchemy/solidus/install/files/db/seeds/alchemy/pages.yml
 - lib/generators/alchemy/solidus/install/install_generator.rb
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!