alchemy-solidus 7.6.0 → 8.0.0.b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15dc076bf68bd7b1c707371eb37043cce0118953337e4cb83a4d3b618986c96f
-  data.tar.gz: b4d750ba90f8e34ca84116c92fe644a286f2d7dbb3ce27e856ecef9b292e3f0d
+  metadata.gz: a67f29fd0f8fbbd29c8834c7fb99430b6d05925e845748f58884e7ced64737a7
+  data.tar.gz: a717544bf570c14692799401c639d4d463b2a55bf408479a0795292070875ec8
 SHA512:
-  metadata.gz: 33b5b8f176dbf5db6047537a149b55048956f5732bd0c63b47e2b67de6a0949240d8d62786288bc76f9ddd69bfad544c7c4509017d176c8891654958480389e1
-  data.tar.gz: 1fe4a15e0c4da77036c0df1e6adbe2c68fa8d6f5e0adcb5d56f4602b0c6156beb870fcfabb9ec1f71a7d3cb19b91b52aa10f6d738fff45ccd43b95831e88d083
+  metadata.gz: a6521ba11a01af44a5fbb9537ac6ce25d83d11fcea801fbc116c9aba5beb9ea67affe781c1623ae238cb000e98d23a2ea4b8a0658c108f96d710945eb97cb0b1
+  data.tar.gz: 8af9b9eaf72104dc1af249c486bbca1c99e2831867e2b9d3df691f57f604c99c3cc1970e638a1120a367d9e8cf650416a5c34aa776b6f2c4c22b63d667345f02

data/README.md

@@ -194,32 +194,6 @@ $ bundle exec rake alchemy:install
 
 and follow the on screen instructions.
 
-### Render Alchemy Content in Solidus Layout
-
-~~If you plan to render the Alchemy site in the Solidus layout add the following
-to your initializer:~~
-
-```ruby
-# config/initializers/alchemy.rb
-require 'alchemy/solidus/use_solidus_layout'
-```
-
-**NOTE:** Since v2.5.2 this is done automatically for you. If you upgraded from an older version you can safely remove this from your initializers.
-
-### Render Alchemy Content in Solidus views
-
-~~If you plan to render Alchemy content in your Solidus views (ie. a global header
-or footer section), you need to include the Alchemy view helpers and language
-store in your Solidus controllers with the following addition to your
-initializer:~~
-
-```ruby
-# config/initializers/alchemy.rb
-require 'alchemy/solidus/alchemy_in_solidus'
-```
-
-**NOTE:** Since v2.5.2 this is done automatically for you. If you upgraded from an older version you can safely remove this from your initializers.
-
 ### Routing
 
 For routing you have a few options.

data/app/assets/config/alchemy_solidus/manifest.js

@@ -1 +1,2 @@
 //= link_tree ../../../javascript .js
+//= link spree.js

data/app/javascript/alchemy_solidus.js

@@ -1,3 +1,4 @@
+import "spree"
 import "alchemy_solidus/components/product_select"
 import "alchemy_solidus/components/taxon_select"
 import "alchemy_solidus/components/variant_select"

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

@@ -0,0 +1,7 @@
+module Alchemy
+  module Solidus
+    class BaseJob < ActiveJob::Base
+      retry_on ActiveRecord::Deadlocked
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Alchemy
+  module Solidus
+    class InvalidateElementsCacheJob < BaseJob
+      queue_as :default
+
+      def perform(model_name, id)
+        now = Time.current
+
+        element_ids = model(model_name)
+          .where(related_object_id: id)
+          .joins(:element)
+          .pluck("alchemy_elements.id")
+        elements = ::Alchemy::Element.where(id: element_ids)
+
+        all_element_ids = get_all_element_ids(elements, element_ids)
+        ::Alchemy::Element.where(id: all_element_ids.uniq).update_all(updated_at: now)
+
+        page_ids = elements.joins(page_version: :page).pluck("alchemy_pages.id")
+        ::Alchemy::Page.where(id: page_ids.uniq).update_all(updated_at: now)
+      end
+
+      private
+
+      def get_all_element_ids(elements, element_ids)
+        parent_element_ids = elements.pluck(:parent_element_id).compact
+        parent_elements = ::Alchemy::Element.distinct.where(id: parent_element_ids)
+
+        if parent_elements.any?
+          element_ids += parent_element_ids
+          get_all_element_ids(parent_elements, element_ids)
+        else
+          element_ids
+        end
+      end
+
+      def model(model_name) = "Alchemy::Ingredients::#{model_name}".constantize
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/alchemy_base_controller_patch.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module AlchemyBaseControllerPatch
+      def self.prepended(base)
+        base.include Spree::Core::ControllerHelpers::Auth
+        base.include Spree::Core::ControllerHelpers::Common
+        base.include Spree::Core::ControllerHelpers::Order
+        base.include Spree::Core::ControllerHelpers::PaymentParameters
+        base.include Spree::Core::ControllerHelpers::Pricing
+        base.include Spree::Core::ControllerHelpers::Search
+        base.include Spree::Core::ControllerHelpers::Store
+        base.include Spree::Core::ControllerHelpers::StrongParameters
+      end
+
+      if defined?(::Alchemy::BaseController)
+        ::Alchemy::BaseController.prepend self
+      end
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/application_controller_patch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module ApplicationControllerPatch
+      def spree_current_user
+        if Alchemy.user_class_name == "::Alchemy::User"
+          current_user
+        else
+          super
+        end
+      end
+
+      if defined?(::ApplicationController)
+        ::ApplicationController.prepend self
+      end
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/spree_user_confirmations_controller_patch.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeUserConfirmationsControllerPatch
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+      end
+
+      if defined?(::Spree::UserConfirmationsController)
+        ::Spree::UserConfirmationsController.prepend self
+      end
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/spree_user_passwords_controller_patch.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeUserPasswordsControllerPatch
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+      end
+
+      if defined?(::Spree::UserPasswordsController)
+        ::Spree::UserPasswordsController.prepend self
+      end
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/spree_user_registrations_controller_patch.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeUserRegistrationsControllerPatch
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+      end
+
+      if defined?(::Spree::UserRegistrationsController)
+        ::Spree::UserRegistrationsController.prepend self
+      end
+    end
+  end
+end

data/app/patches/controllers/alchemy/solidus/spree_user_sessions_controller_patch.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeUserSessionsControllerPatch
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+      end
+
+      if defined?(::Spree::UserSessionsController)
+        ::Spree::UserSessionsController.prepend self
+      end
+    end
+  end
+end

data/app/patches/helpers/alchemy/solidus/alchemy_base_helper_patch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module AlchemyBaseHelperPatch
+      def self.prepended(base)
+        base.include Spree::BaseHelper
+        base.include Spree::CheckoutHelper
+        base.include Spree::ProductsHelper
+        base.include Spree::StoreHelper
+        base.include Spree::TaxonsHelper
+      end
+
+      if defined?(::Alchemy::BaseHelper)
+        ::Alchemy::BaseHelper.prepend self
+      end
+    end
+  end
+end

data/{lib/alchemy/solidus/alchemy_user_extension.rb → app/patches/models/alchemy/solidus/alchemy_user_patch.rb}

@@ -1,7 +1,7 @@
 module Alchemy
   module Solidus
-    module AlchemyUserExtension
-      def self.included(klass)
+    module AlchemyUserPatch
+      def self.prepended(klass)
         klass.include Spree::UserMethods
       end
 
@@ -12,6 +12,10 @@ module Alchemy
           ::Spree::Role.none
         end
       end
+
+      if defined?(::Alchemy::User)
+        ::Alchemy::User.prepend self
+      end
     end
   end
 end

data/app/{decorators/models/alchemy/solidus/spree_product_decorator.rb → patches/models/alchemy/solidus/spree_product_patch.rb}

@@ -2,9 +2,10 @@
 
 module Alchemy
   module Solidus
-    module SpreeProductDecorator
+    module SpreeProductPatch
       def self.prepended(base)
-        base.include Alchemy::Solidus::TouchAlchemyIngredients
+        # 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
 
@@ -23,6 +24,12 @@ 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

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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
+end

data/{lib/alchemy/solidus/spree_user_extension.rb → app/patches/models/alchemy/solidus/spree_user_patch.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Solidus
-    module SpreeUserExtension
-      def self.included(klass)
-        klass.has_many :folded_pages, class_name: "Alchemy::FoldedPage"
+    module SpreeUserPatch
+      def self.prepended(base)
+        base.has_many :folded_pages, class_name: "Alchemy::FoldedPage"
       end
 
       def alchemy_display_name
@@ -16,6 +18,10 @@ module Alchemy
           []
         end
       end
+
+      if defined?(::Spree::User)
+        ::Spree::User.prepend self
+      end
     end
   end
 end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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
+end

data/config/importmap.rb

@@ -1,3 +1,4 @@
 Alchemy.importmap.pin "alchemy_solidus", to: "alchemy_solidus.js", preload: true
 Alchemy.importmap.pin_all_from Alchemy::Solidus::Engine.root.join("app/javascript/alchemy_solidus"),
   under: "alchemy_solidus", preload: true
+Alchemy.importmap.pin "spree", to: "spree.js", preload: true

data/config/initializers/alchemy.rb

@@ -47,5 +47,5 @@ end
 
 Rails.application.config.after_initialize do
   Alchemy::Modules.register_module(alchemy_module)
-  Alchemy.link_dialog_tabs.add(Alchemy::Admin::LinkDialog::ProductTab)
+  Alchemy.config.link_dialog_tabs.add("Alchemy::Admin::LinkDialog::ProductTab")
 end

data/lib/alchemy/solidus/engine.rb

@@ -1,17 +1,25 @@
 require "alchemy_cms"
 require "alchemy/version"
+require "solidus_api"
 require "solidus_core"
 require "solidus_backend"
 require "solidus_support"
 
+begin
+  require "solidus_frontend"
+rescue LoadError
+  # Solidus frontend is not available, but we can still load the engine
+end
+
 module Alchemy
   module Solidus
     class Engine < ::Rails::Engine
       include SolidusSupport::EngineExtensions
+
       engine_name "alchemy_solidus"
 
       initializer "alchemy_solidus.assets", before: "alchemy.importmap" do |app|
-        Alchemy.admin_importmaps.add({
+        Alchemy.config.admin_importmaps.add({
           importmap_path: root.join("config/importmap.rb"),
           source_paths: [
             root.join("app/javascript")
@@ -25,26 +33,21 @@ module Alchemy
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
 
-        if Alchemy.user_class_name == "::Spree::User"
-          require "alchemy/solidus/spree_user_extension"
-          Spree::User.include Alchemy::Solidus::SpreeUserExtension
-        end
-
-        if Alchemy.user_class_name == "::Alchemy::User"
-          require "alchemy/solidus/alchemy_user_extension"
-          require "alchemy/solidus/current_user_helpers"
-          Alchemy::User.include Alchemy::Solidus::AlchemyUserExtension
-          ApplicationController.include Alchemy::Solidus::CurrentUserHelpers
-          require "alchemy/solidus/spree_admin_unauthorized_redirect"
-        end
-
         if SolidusSupport.frontend_available?
           # Allows to render Alchemy content within Solidus' controller views
-          require_dependency "alchemy/solidus/alchemy_in_solidus"
+
+          # Do not prefix element view partials with `spree` namespace.
+          # See https://github.com/AlchemyCMS/alchemy_cms/issues/1626
+          ActionView::Base.prefix_partial_path_with_controller_namespace = false
         end
+      end
 
-        # Allows to use Solidus helpers within Alchemys controller views
-        require_dependency "alchemy/solidus/use_solidus_layout"
+      initializer "alchemy_solidus.patches" do |app|
+        if Alchemy.gem_version < Gem::Version.new("7.4.0") && SolidusSupport.backend_available?
+          app.config.to_prepare do
+            Alchemy::Solidus::SpreeAdminBaseControllerPatch
+          end
+        end
       end
     end
   end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "7.6.0"
+    VERSION = "8.0.0.b"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -149,11 +149,6 @@ module Alchemy
         end
       end
 
-      def append_assets
-        append_file "vendor/assets/javascripts/alchemy/admin/all.js",
-          "//= require alchemy/solidus/admin.js"
-      end
-
       private
 
       def alchemy_devise_present?

data/lib/patches/backend/controllers/alchemy/solidus/spree_admin_base_controller_patch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeAdminBaseControllerPatch
+      def self.prepended(base)
+        if Alchemy.user_class_name == "::Alchemy::User"
+          base.unauthorized_redirect = -> do
+            if spree_current_user
+              flash[:error] = I18n.t("spree.authorization_failure")
+              redirect_to spree.root_path
+            else
+              store_location
+              redirect_to Alchemy.login_path
+            end
+          end
+        end
+      end
+
+      if defined?(::Spree::Admin::BaseController)
+        ::Spree::Admin::BaseController.prepend self
+      end
+    end
+  end
+end

data/lib/patches/frontend/controllers/alchemy/solidus/spree_store_controller_patch.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Solidus
+    module SpreeStoreControllerPatch
+      # Allows to render Alchemy content within Solidus' controller views
+      def self.prepended(base)
+        base.include Alchemy::ControllerActions
+        base.include Alchemy::ConfigurationMethods
+      end
+
+      if defined?(::Spree::StoreController)
+        ::Spree::StoreController.prepend self
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 8.0.0.b
 platform: ruby
 authors:
 - Thomas von Deyen
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -15,20 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0.b
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0.b
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
+- !ruby/object:Gem::Dependency
+  name: solidus_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +95,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -85,7 +105,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -109,14 +129,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'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +260,6 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/alchemy_solidus/manifest.js
-- app/assets/javascripts/alchemy/solidus/admin.js
 - app/components/alchemy/admin/link_dialog/product_tab.rb
 - app/components/alchemy/admin/product_select.rb
 - app/components/alchemy/admin/taxon_select.rb
@@ -248,22 +267,32 @@ 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/alchemy/solidus/spree_product_decorator.rb
-- app/decorators/models/alchemy/solidus/spree_taxon_decorator.rb
-- app/decorators/models/alchemy/solidus/spree_variant_decorator.rb
 - app/javascript/alchemy_solidus.js
 - app/javascript/alchemy_solidus/components/ajax_config.js
 - app/javascript/alchemy_solidus/components/product_select.js
 - app/javascript/alchemy_solidus/components/taxon_select.js
 - app/javascript/alchemy_solidus/components/variant_select.js
+- app/jobs/alchemy/solidus/base_job.rb
+- app/jobs/alchemy/solidus/invalidate_elements_cache_job.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
 - app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
+- app/patches/controllers/alchemy/solidus/alchemy_base_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/application_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_confirmations_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_passwords_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_registrations_controller_patch.rb
+- app/patches/controllers/alchemy/solidus/spree_user_sessions_controller_patch.rb
+- app/patches/helpers/alchemy/solidus/alchemy_base_helper_patch.rb
+- app/patches/models/alchemy/solidus/alchemy_user_patch.rb
+- app/patches/models/alchemy/solidus/spree_product_patch.rb
+- app/patches/models/alchemy/solidus/spree_taxon_patch.rb
+- app/patches/models/alchemy/solidus/spree_user_patch.rb
+- app/patches/models/alchemy/solidus/spree_variant_patch.rb
 - app/views/alchemy/ingredients/_spree_product_editor.html.erb
 - app/views/alchemy/ingredients/_spree_product_view.html.erb
 - app/views/alchemy/ingredients/_spree_taxon_editor.html.erb
@@ -278,20 +307,13 @@ files:
 - config/locales/alchemy_solidus_en.yml
 - config/locales/alchemy_solidus_it.yml
 - config/locales/en.yml
-- db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
-- db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb
-- db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb
 - lib/alchemy-solidus.rb
-- lib/alchemy/solidus/alchemy_in_solidus.rb
-- lib/alchemy/solidus/alchemy_user_extension.rb
-- lib/alchemy/solidus/current_user_helpers.rb
 - lib/alchemy/solidus/engine.rb
-- lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb
-- lib/alchemy/solidus/spree_user_extension.rb
-- lib/alchemy/solidus/use_solidus_layout.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
+- lib/patches/backend/controllers/alchemy/solidus/spree_admin_base_controller_patch.rb
+- lib/patches/frontend/controllers/alchemy/solidus/spree_store_controller_patch.rb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD-3-Clause
@@ -310,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.7.2
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!

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

@@ -1 +0,0 @@
-//= require spree

data/app/decorators/models/alchemy/solidus/spree_taxon_decorator.rb

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

data/app/decorators/models/alchemy/solidus/spree_variant_decorator.rb

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

data/app/models/alchemy/solidus/touch_alchemy_ingredients.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Solidus
-    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
-end

data/db/migrate/20120229160509_create_alchemy_essence_spree_products.rb

@@ -1,8 +0,0 @@
-class CreateAlchemyEssenceSpreeProducts < ActiveRecord::Migration[4.2]
-  def change
-    create_table "alchemy_essence_spree_products" do |t|
-      t.integer :spree_product_id
-    end
-    add_index :alchemy_essence_spree_products, :spree_product_id
-  end
-end

data/db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb

@@ -1,10 +0,0 @@
-class CreateAlchemyEssenceSpreeTaxons < ActiveRecord::Migration[4.2]
-  def change
-    create_table :alchemy_essence_spree_taxons do |t|
-      t.references :taxon
-
-      t.timestamps
-    end
-    add_index :alchemy_essence_spree_taxons, :taxon_id
-  end
-end

data/db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb

@@ -1,9 +0,0 @@
-class CreateAlchemyEssenceSpreeVariants < ActiveRecord::Migration[5.2]
-  def change
-    create_table :alchemy_essence_spree_variants do |t|
-      t.references :variant, null: true, foreign_key: {to_table: Spree::Variant.table_name}
-
-      t.timestamps
-    end
-  end
-end

data/lib/alchemy/solidus/alchemy_in_solidus.rb

@@ -1,17 +0,0 @@
-# Allows to render Alchemy content within Solidus' controller views
-Spree::StoreController.include(
-  Alchemy::ControllerActions,
-  Alchemy::ConfigurationMethods
-)
-
-# Hook into SolidusAuthDevise controllers if present
-if defined? Spree::Auth::Engine
-  Spree::UserPasswordsController.include Alchemy::ControllerActions
-  Spree::UserConfirmationsController.include Alchemy::ControllerActions
-  Spree::UserRegistrationsController.include Alchemy::ControllerActions
-  Spree::UserSessionsController.include Alchemy::ControllerActions
-end
-
-# Do not prefix element view partials with `spree` namespace.
-# See https://github.com/AlchemyCMS/alchemy_cms/issues/1626
-ActionView::Base.prefix_partial_path_with_controller_namespace = false

data/lib/alchemy/solidus/current_user_helpers.rb

@@ -1,9 +0,0 @@
-module Alchemy
-  module Solidus
-    module CurrentUserHelpers
-      def spree_current_user
-        current_user
-      end
-    end
-  end
-end

data/lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb

@@ -1,9 +0,0 @@
-Spree::Admin::BaseController.unauthorized_redirect = -> do
-  if spree_current_user
-    flash[:error] = I18n.t("spree.authorization_failure")
-    redirect_to spree.root_path
-  else
-    store_location
-    redirect_to Alchemy.login_path
-  end
-end

data/lib/alchemy/solidus/use_solidus_layout.rb

@@ -1,19 +0,0 @@
-# Allows to use Solidus helpers within Alchemys controller views
-Alchemy::BaseHelper.include(
-  Spree::BaseHelper,
-  Spree::CheckoutHelper,
-  Spree::ProductsHelper,
-  Spree::StoreHelper,
-  Spree::TaxonsHelper
-)
-
-Alchemy::BaseController.include(
-  Spree::Core::ControllerHelpers::Auth,
-  Spree::Core::ControllerHelpers::Common,
-  Spree::Core::ControllerHelpers::Order,
-  Spree::Core::ControllerHelpers::PaymentParameters,
-  Spree::Core::ControllerHelpers::Pricing,
-  Spree::Core::ControllerHelpers::Search,
-  Spree::Core::ControllerHelpers::Store,
-  Spree::Core::ControllerHelpers::StrongParameters
-)