alchemy-solidus 7.1.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302063843d99ebf185eba30cd4adf6842262c5209ed9bfcb28df3245f8613345
-  data.tar.gz: 6738fa959535147c86bb3f5fbc39433f25ba11cc487dde90344b69c3f1b6a651
+  metadata.gz: 7e50bb72fd9136b75ae2b8ea66ca80acb37edf3322f2aa750e0ca1f9bc5e1071
+  data.tar.gz: b6cbccde4616f51672baf1b45df5f06d11ad63edf13fdb0c1a6f100ee0b9e819
 SHA512:
-  metadata.gz: 2f7a580d2cc138a1325879a28107532eb10a54e0eacbf75946e38c213dd3bc06041622de03a87c4fb122448e68cde6786c8fad0a820b1bbfd97001ad7fc20015
-  data.tar.gz: d7630e8bd505c5108163ced9ac740db11dc7e0b228f03ce197c660e8e4a79f66825d7ba4f715061f0aca5cba067e5b2413629dd94960fedf67bec6a732387afd
+  metadata.gz: a8324f5ffbf7fc02fd449f30d6b3bb80378cf188b3b4f6f966bcf95b467437160f0511e37eabf1e19ee6a6ae4bf970fb4491b5f6c99989dff9abf1fdedc59fb1
+  data.tar.gz: 5dd149df193cfe5638e9abd2d73d127d6c334de0d2a7ab7cebc868b98e34249af41796b4ad3518b9b1a35d50796c616f8609da2d1fee924df41c7c8288369365

data/app/assets/javascripts/alchemy/solidus/admin/select2_config.js

@@ -9,6 +9,7 @@ Alchemy.Solidus.getSelect2Config = function (options) {
   return {
     placeholder: options.placeholder,
     minimumInputLength: 3,
+    allowClear: true,
     initSelection:
       options.initSelection ||
       function (_$el, callback) {

data/app/decorators/models/spree/spree_product_decorator.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spree
+  module SpreeProductDecorator
+    def self.prepended(base)
+      base.include AlchemySolidus::TouchAlchemyIngredients
+      base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeProduct", as: :related_object, dependent: :nullify
+    end
+
+    private
+
+    # Overwritten Solidus' default behavior
+    #
+    # The Solidus implementation did not trigger `touch` on taxons, but
+    # updated the `updated_at` timestamp in an `update_all`.
+    #
+    # Since we want to invalidate ingredient spree taxons cache as well
+    # we need to use `touch` here and use the `after_touch` callback of
+    # Spree::Taxon
+    #
+    def touch_taxons
+      taxons.each(&:touch)
+    end
+
+    ::Spree::Product.prepend self
+  end
+end

data/app/decorators/models/spree/spree_taxon_decorator.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Spree
+  module SpreeTaxonDecorator
+    def self.prepended(base)
+      base.include AlchemySolidus::TouchAlchemyIngredients
+      base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeTaxon", as: :related_object, dependent: :nullify
+    end
+
+    ::Spree::Taxon.prepend self
+  end
+end

data/app/decorators/models/spree/spree_variant_decorator.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Spree
+  module SpreeVariantDecorator
+    def self.prepended(base)
+      base.include AlchemySolidus::TouchAlchemyIngredients
+      base.has_many :alchemy_ingredients, class_name: "Alchemy::Ingredients::SpreeVariant", as: :related_object, dependent: :nullify
+    end
+
+    ::Spree::Variant.prepend self
+  end
+end

data/app/models/alchemy_solidus/touch_alchemy_ingredients.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module AlchemySolidus
+  module TouchAlchemyIngredients
+    extend ActiveSupport::Concern
+
+    included do
+      after_update :touch_alchemy_ingredients
+      after_touch :touch_alchemy_ingredients
+    end
+
+    private
+
+    def touch_alchemy_ingredients
+      alchemy_ingredients.each(&:touch)
+    end
+  end
+end

data/lib/alchemy/solidus/engine.rb

@@ -7,6 +7,7 @@ require "solidus_support"
 module Alchemy
   module Solidus
     class Engine < ::Rails::Engine
+      include SolidusSupport::EngineExtensions
       engine_name "alchemy_solidus"
 
       config.to_prepare do

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.1.0"
+    VERSION = "7.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -19,7 +19,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -186,16 +192,16 @@ dependencies:
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -242,9 +248,13 @@ files:
 - app/components/alchemy/ingredients/spree_product_view.rb
 - app/components/alchemy/ingredients/spree_taxon_view.rb
 - app/components/alchemy/ingredients/spree_variant_view.rb
+- app/decorators/models/spree/spree_product_decorator.rb
+- app/decorators/models/spree/spree_taxon_decorator.rb
+- app/decorators/models/spree/spree_variant_decorator.rb
 - app/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
+- app/models/alchemy_solidus/touch_alchemy_ingredients.rb
 - app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface
@@ -280,7 +290,7 @@ files:
 - lib/generators/alchemy/solidus/install/install_generator.rb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
-- BSD New
+- BSD-3-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -297,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible