alchemy-solidus 5.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62c5d703fd9ef1302e57ebf2ae840d8adf6646600d402e171bc2f4e51fc8bc3
-  data.tar.gz: a6c8ada063c962cc66c59841c98f3c8295973d013bebe5d3551643be41315be8
+  metadata.gz: b5b9e5fe0454546aa34cbead4fed12017664b119a068bda5ba08e7064376f008
+  data.tar.gz: 14c4045f805268897fcb4422bee6b0c87aada111c9fefc6d7a6d5eb6b8dab9ce
 SHA512:
-  metadata.gz: f3708d87a8af2485baa75a73a6e680d40395a8e0bf35a4e236991b9f1366c1c238bfd2ec79e2660bc14bfcbcd47887c08de14b8ca002ff0837eaefea7d873386
-  data.tar.gz: cee5253f162afdce10025ddd8167507f68cb9c296128cb6647cd30c89ac3fcde099e5d635b80fd7aeafc91763b3fd594c7d300d1691f99b527b1433cfaed4e36
+  metadata.gz: 3f46f3e3aa9d9f854dcc662e879b48df43f306307f7b7857eb448d02c3cab0292edd7c7f84b3b4ab641ae8f69b950af95ff0803b1e561d57125602cb28daf1b0
+  data.tar.gz: 6a31f2ee758ff475e13c966f6fec4dbf35b19f3f0be0c4f7f0a6893344b5a5e01df1bf4208538e9ba656502759f48e94b14c1c311dbc8d1fbe716a1dbae2c4b2

data/README.md

@@ -13,7 +13,7 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
 
 ### Solidus
 
-This version runs with Solidus v2.11 and v3.0.
+This version runs with Solidus v3.0 and up.
 
 - For a Solidus < 2.11 compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
 - For a Solidus < 2.6 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
@@ -23,18 +23,20 @@ This version runs with Solidus v2.11 and v3.0.
 
 ### Alchemy
 
-This version runs with Alchemy v5.x and v6.0.
+This version runs with Alchemy v7.0
 
-- For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
-- For a Alchemy 4.0 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
-- For a Alchemy 3.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
+- For a Alchemy 6.x compatible version please use the `5.0-stable` branch or `5.0` gem version.
+- For a Alchemy 5.x compatible version please use the `4.1-stable` branch or `4.1` gem version.
+- For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3` gem version.
+- For a Alchemy 4.0 compatible version please use the `2.3-stable` branch or `2.3` gem version.
+- For a Alchemy 3.x compatible version please use the `1.0-stable` branch or `1.1` gem version.
 
 ## Installation
 
 Add this line to your applications `Gemfile`:
 
 ```ruby
-gem 'alchemy-solidus', '~> 2.4.0'
+gem 'alchemy-solidus', '~> 6.0'
 ```
 
 Install the gem with:

data/Rakefile

@@ -10,16 +10,25 @@ require "rspec/core"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:test_setup, :spec]
+task default: %i[test_setup spec]
 
 require "active_support/core_ext/string"
 
 desc "Setup test app"
 task :test_setup do
-  solidus_version = ENV.fetch("SOLIDUS_VERSION", "3.2")
-  solidus_32_install_options = "--payment-method none --frontend none --no-with-authentication"
-  solidus_33_install_options = "--payment-method none --frontend none --authentication none"
-  solidus_install_options = solidus_version == "3.2" ? solidus_32_install_options : solidus_33_install_options
+  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.0")
+  solidus_32_install_options =
+    "--payment-method none --frontend none --no-with-authentication"
+  solidus_33_install_options =
+    "--payment-method none --frontend none --authentication none"
+  solidus_install_options =
+    (
+      if solidus_version == "3.2"
+        solidus_32_install_options
+      else
+        solidus_33_install_options
+      end
+    )
   Dir.chdir("spec/dummy") do
     system <<-SETUP.strip_heredoc
       bin/rake db:environment:set db:drop && \
@@ -27,8 +36,10 @@ task :test_setup do
       bin/rails g gutentag:migration_versions && \
       bin/rails g solidus:install --force --auto-accept --no-seed --no-sample #{solidus_install_options} && \
       bin/rails g solidus_frontend:install --force --auto-accept && \
-      bin/rails g alchemy:solidus:install --auto-accept --force && \
-      bin/rake db:test:prepare
+      bin/rails javascript:install:esbuild && \
+      bin/rails g alchemy:solidus:install --auto-accept --skip && \
+      bin/rake db:test:prepare && \
+      bin/rails javascript:build
     SETUP
     exit($?.exitstatus) unless $?.success?
   end

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

@@ -1,32 +1,37 @@
 //= require alchemy/solidus/admin/select2_config
 
-$.fn.alchemyProductSelect = function(options) {
+$.fn.alchemyProductSelect = function (options) {
   var config = Alchemy.Solidus.getSelect2Config(options)
 
-  this.select2($.extend(true, config, {
-    ajax: {
-      data: function(term, page) {
+  function formatResultObject(product) {
+    return {
+      id: product.id,
+      text: product.name,
+    }
+  }
+
+  var select2config = Object.assign(config, {
+    ajax: Object.assign(config.ajax, {
+      data: function (term, page) {
         return {
-          q: $.extend({
-            name_cont: term
-          }, options.query_params),
-          page: page
+          q: Object.assign(
+            {
+              name_cont: term,
+            },
+            options.query_params
+          ),
+          page: page,
         }
       },
-      results: function(data, page) {
+      results: function (data, page) {
         return {
-          results: data.products.map(function(product) {
-            return {
-              id: product.id,
-              text: product.name
-            }
-          }),
-          more: page * data.per_page < data.total_count
+          results: data.products.map(
+            options.formatResultObject || formatResultObject
+          ),
+          more: page * data.per_page < data.total_count,
         }
-      }
-    },
-    formatSelection: function(product) {
-      return product.text || product.name
-    }
-  }))
+      },
+    }),
+  })
+  this.select2(select2config)
 }

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

@@ -1,24 +1,26 @@
 Alchemy = window.Alchemy || {}
 Alchemy.Solidus = Alchemy.Solidus || {}
 
-Alchemy.Solidus.getSelect2Config = function(options) {
+Alchemy.Solidus.getSelect2Config = function (options) {
   var headers = {
-    'Authorization': 'Bearer ' + options.apiToken
+    Authorization: "Bearer " + options.apiToken,
   }
 
   return {
     placeholder: options.placeholder,
     minimumInputLength: 3,
-    initSelection: function(_$el, callback) {
-      if (options.initialSelection) {
-        callback(options.initialSelection)
-      }
-    },
+    initSelection:
+      options.initSelection ||
+      function (_$el, callback) {
+        if (options.initialSelection) {
+          callback(options.initialSelection)
+        }
+      },
     ajax: {
       url: options.baseUrl,
-      datatype: 'json',
+      datatype: "json",
       quietMillis: 300,
-      params: { headers: headers }
-    }
+      params: { headers: headers },
+    },
   }
 }

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

@@ -1,3 +1,4 @@
 //= require alchemy/solidus/admin/product_select
 //= require alchemy/solidus/admin/variant_select
 //= require alchemy/solidus/admin/taxon_select
+//= require spree

data/app/components/alchemy/ingredients/spree_product_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeProductView < BaseView
+      delegate :product, to: :ingredient
+
+      def call
+        product.name
+      end
+
+      def render?
+        !!product
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/spree_taxon_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeTaxonView < BaseView
+      delegate :taxon, to: :ingredient
+
+      def call
+        taxon.name
+      end
+
+      def render?
+        !!taxon
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/spree_variant_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeVariantView < BaseView
+      delegate :variant, to: :ingredient
+
+      def call
+        variant.name
+      end
+
+      def render?
+        !!variant
+      end
+    end
+  end
+end

data/app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "#overlay_tabs" -->
+
+<div id="overlay_tab_product_link">
+  <%= render "product_link" %>
+</div>

data/app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface

@@ -0,0 +1,7 @@
+<!-- insert_bottom "#overlay_tabs > ul" -->
+
+<li>
+  <a href="#overlay_tab_product_link">
+    <%= Alchemy.t('link_overlay_tab_label.product') %>
+  </a>
+</li>

data/app/views/alchemy/admin/pages/_product_link.html.erb

@@ -0,0 +1,30 @@
+<%= form_tag do %>
+  <%= render_message do %>
+    <h3><%= Alchemy.t(:choose_product_to_link) %></h3>
+  <% end %>
+  <div class="input select">
+    <label for="product_link" class="control-label">
+      <%= Spree::Product.model_name.human %>
+    </label>
+    <input type="text" id="product_link" class="alchemy_selectbox full_width">
+  </div>
+  <div class="input text">
+    <label for="product_link_title" class="control-label">
+      <%= Alchemy.t(:link_title) %>
+    </label>
+    <%= text_field_tag "product_link_title", '', class: 'link_title' %>
+  </div>
+  <div class="input select">
+    <label for="product_link_target" class="control-label">
+      <%= Alchemy.t("Open Link in") %>
+    </label>
+    <%= select_tag 'product_link_target',
+      options_for_select(Alchemy::Page.link_target_options),
+      class: 'alchemy_selectbox link_target' %>
+  </div>
+  <div class="submit">
+    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'product' } %>
+  </div>
+<% end %>
+
+<%= render "product_link_script" %>

data/app/views/alchemy/admin/pages/_product_link_script.html.erb

@@ -0,0 +1,41 @@
+<script>
+  $("#overlay_tabs").on("SelectLinkTab.Alchemy", function(event, data) {
+    $("#product_link").select2("val", data.link.attr("href"))
+  })
+  $("#product_link").alchemyProductSelect({
+    placeholder: "<%= Alchemy.t(:search_product, scope: "solidus") %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_products_path %>",
+    formatResultObject(product) {
+      return {
+        id: Spree.mountedAt() + "products/"+ product.slug,
+        text: product.name,
+      }
+    },
+    initSelection($element, callback) {
+      var query = $element.val().replace(Spree.mountedAt() + "products/", "")
+      $.ajax({
+        url: "<%= spree.api_products_path %>",
+        data: {
+          q: { slug_eq: query },
+          page: 1,
+          per_page: 1
+        },
+        headers: {
+          Authorization: "Bearer <%= current_alchemy_user.spree_api_key %>"
+        }
+      }).done(function(data) {
+        var product = data.products[0]
+        if (product) {
+          callback({
+            id: Spree.mountedAt() + "products/"+ product.slug,
+            text: product.name
+          })
+          $("#overlay_tabs").tabs("option", "active",
+            $("#overlay_tabs > div").index($("#overlay_tab_product_link"))
+          )
+        }
+      })
+    },
+  })
+</script>

data/app/views/alchemy/ingredients/_spree_product_view.html.erb

@@ -1 +1,4 @@
-<%= spree_product_view.product&.name %>
+<%= render spree_product_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

data/app/views/alchemy/ingredients/_spree_taxon_view.html.erb

@@ -1 +1,4 @@
-<%= spree_taxon_view.taxon&.name %>
+<%= render spree_taxon_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

data/app/views/alchemy/ingredients/_spree_variant_view.html.erb

@@ -1 +1,4 @@
-<%= spree_variant_view.variant&.name %>
+<%= render spree_variant_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

data/config/locales/alchemy_solidus_en.yml

@@ -1,5 +1,8 @@
 en:
   alchemy:
+    choose_product_to_link: Choose a product to link to
+    link_overlay_tab_label:
+      product: Product
     solidus:
       search_variant: Search a variant by name or sku
       search_product: Search a product by name

data/lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb

@@ -1,5 +1,5 @@
 Spree::Admin::BaseController.unauthorized_redirect = -> do
-  if try_spree_current_user
+  if spree_current_user
     flash[:error] = I18n.t('spree.authorization_failure')
     redirect_to spree.root_path
   else

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "5.0.0"
+    VERSION = "6.0.1"
   end
 end

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

@@ -1,17 +1,17 @@
-require 'rails/generators'
-require 'alchemy/version'
+require "rails/generators"
+require "alchemy/version"
 
 if Alchemy.gem_version >= Gem::Version.new("5.0.0.a")
-  require 'generators/alchemy/install/install_generator'
+  require "generators/alchemy/install/install_generator"
 else
-  require 'rails/generators/alchemy/install/install_generator'
+  require "rails/generators/alchemy/install/install_generator"
 end
 
-require 'generators/spree/custom_user/custom_user_generator'
-require 'solidus_support'
+require "generators/spree/custom_user/custom_user_generator"
+require "solidus_support"
 
 begin
-  require 'generators/alchemy/devise/install/install_generator'
+  require "generators/alchemy/devise/install/install_generator"
 rescue LoadError
 end
 
@@ -21,46 +21,81 @@ module Alchemy
       SPREE_MOUNT_REGEXP = /mount\sSpree::Core::Engine.*$/
       desc "Installs Alchemy Solidus into your App."
 
-      class_option :skip_alchemy_installer, default: false, type: :boolean,
-        desc: "Set true if you don't want to run the Alchemy installer"
-      class_option :skip_alchemy_devise_installer, default: false, type: :boolean,
-        desc: "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
-      class_option :skip_spree_custom_user_generator, default: false, type: :boolean,
-        desc: "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
-      class_option :skip_alchemy_user_generator, default: false, type: :boolean,
-        desc: "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
-      class_option :auto_accept, default: false, type: :boolean,
-        desc: 'Set true if run from a automated script (ie. on a CI)'
-
-      source_root File.expand_path('files', __dir__)
+      class_option :skip_alchemy_installer,
+                   default: false,
+                   type: :boolean,
+                   desc:
+                     "Set true if you don't want to run the Alchemy installer"
+      class_option :skip_alchemy_devise_installer,
+                   default: false,
+                   type: :boolean,
+                   desc:
+                     "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
+      class_option :skip_spree_custom_user_generator,
+                   default: false,
+                   type: :boolean,
+                   desc:
+                     "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
+      class_option :skip_alchemy_user_generator,
+                   default: false,
+                   type: :boolean,
+                   desc:
+                     "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
+      class_option :auto_accept,
+                   default: false,
+                   type: :boolean,
+                   desc: "Set true if run from a automated script (ie. on a CI)"
+
+      source_root File.expand_path("files", __dir__)
 
       def run_alchemy_installer
         unless options[:skip_alchemy_installer]
-          arguments = options[:auto_accept] ? ['--skip-demo-files', '--force', '--auto-accept'] : []
+          arguments =
+            (
+              if options[:auto_accept]
+                %w[--skip-demo-files --skip --auto-accept]
+              else
+                []
+              end
+            )
           Alchemy::Generators::InstallGenerator.start(arguments)
-          rake('railties:install:migrations', abort_on_failure: true)
-          rake('db:migrate', abort_on_failure: true)
+          rake("railties:install:migrations", abort_on_failure: true)
+          rake("db:migrate", abort_on_failure: true)
         end
       end
 
       def run_alchemy_devise_installer
         if alchemy_devise_present? && !options[:skip_alchemy_devise_installer]
-          arguments = options[:auto_accept] ? ['--force'] : []
+          arguments = options[:auto_accept] ? ["--force"] : []
           Alchemy::Devise::Generators::InstallGenerator.start(arguments)
         end
       end
 
       def run_spree_custom_user_generator
-        if alchemy_devise_present? && !options[:skip_spree_custom_user_generator]
-          arguments = options[:auto_accept] ? ['Alchemy::User', '--force'] : ['Alchemy::User']
+        if alchemy_devise_present? &&
+             !options[:skip_spree_custom_user_generator]
+          arguments =
+            (
+              if options[:auto_accept]
+                %w[Alchemy::User --force]
+              else
+                ["Alchemy::User"]
+              end
+            )
           Spree::CustomUserGenerator.start(arguments)
-          gsub_file 'lib/spree/authentication_helpers.rb', /main_app\./, 'Alchemy.'
-          rake('db:migrate', abort_on_failure: true)
+          gsub_file "lib/spree/authentication_helpers.rb",
+                    /main_app\./,
+                    "Alchemy."
+          rake("db:migrate", abort_on_failure: true)
         end
       end
 
       def inject_admin_tab
-        inject_into_file 'config/initializers/spree.rb', {after: "Spree::Backend::Config.configure do |config|\n"} do
+        inject_into_file "config/initializers/spree.rb",
+                         {
+                           after:
+                             "Spree::Backend::Config.configure do |config|\n"
+                         } do
           <<~ADMIN_TAB
             \  # AlchemyCMS admin tabs
             \  config.menu_items << config.class::MenuItem.new(
@@ -77,64 +112,74 @@ module Alchemy
       end
 
       def create_admin_user
-        if alchemy_devise_present? && !options[:skip_alchemy_user_generator] && Alchemy::User.count.zero?
-          login = ENV.fetch('ALCHEMY_ADMIN_USER_LOGIN', 'admin')
-          email = ENV.fetch('ALCHEMY_ADMIN_USER_EMAIL', 'admin@example.com')
-          password = ENV.fetch('ALCHEMY_ADMIN_USER_PASSWORD', 'test1234')
+        if alchemy_devise_present? && !options[:skip_alchemy_user_generator] &&
+             Alchemy::User.count.zero?
+          login = ENV.fetch("ALCHEMY_ADMIN_USER_LOGIN", "admin")
+          email = ENV.fetch("ALCHEMY_ADMIN_USER_EMAIL", "admin@example.com")
+          password = ENV.fetch("ALCHEMY_ADMIN_USER_PASSWORD", "test1234")
           unless options[:auto_accept]
-            login = ask("\nEnter the username for the admin user", default: login)
+            login =
+              ask("\nEnter the username for the admin user", default: login)
             email = ask("Enter the email for the admin user", default: email)
-            password = ask("Enter the password for the admin user", default: password)
+            password =
+              ask("Enter the password for the admin user", default: password)
           end
 
           # This is a bit strange, but without the double save this fails with a failed validation.
-          Alchemy::User.create!(
-            login: login,
-            email: email,
-            password: password,
-            password_confirmation: password,
-            alchemy_roles: 'admin'
-          ).tap do |user|
-            user.spree_roles = [Spree::Role.find_or_create_by!(name: 'admin')]
-            user.save!
-          end
+          Alchemy::User
+            .create!(
+              login: login,
+              email: email,
+              password: password,
+              password_confirmation: password,
+              alchemy_roles: "admin"
+            )
+            .tap do |user|
+              user.spree_roles = [Spree::Role.find_or_create_by!(name: "admin")]
+              user.save!
+            end
         end
       end
 
       def inject_routes
-        routes_file_path = Rails.root.join('config', 'routes.rb')
-        mountpoint = '/'
+        routes_file_path = Rails.root.join("config", "routes.rb")
+        mountpoint = "/"
         unless options[:auto_accept]
-          mountpoint = ask("\nAt which path do you want to mount AlchemyCMS at?", default: mountpoint)
+          mountpoint =
+            ask(
+              "\nAt which path do you want to mount AlchemyCMS at?",
+              default: mountpoint
+            )
         end
         if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
           sentinel = SPREE_MOUNT_REGEXP
         else
           sentinel = "Rails.application.routes.draw do\n"
         end
-        inject_into_file routes_file_path, {after: sentinel} do
-          "\n  mount Alchemy::Engine, at: '/#{mountpoint.chomp('/')}'\n"
+        inject_into_file routes_file_path, { after: sentinel } do
+          "\n  mount Alchemy::Engine, at: '/#{mountpoint.chomp("/")}'\n"
         end
       end
 
       def set_root_route
-        routes_file_path = Rails.root.join('config', 'routes.rb')
-        if options[:auto_accept] || yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
+        routes_file_path = Rails.root.join("config", "routes.rb")
+        if options[:auto_accept] ||
+             yes?("\nDo you want Alchemy to handle the root route '/'? (y/n)")
           sentinel = "Rails.application.routes.draw do\n"
-          inject_into_file routes_file_path, {after: sentinel} do
+          inject_into_file routes_file_path, { after: sentinel } do
             <<~ROOT_ROUTE
               \  # Let AlchemyCMS handle the root route
               \  root to: 'alchemy/pages#index'
             ROOT_ROUTE
           end
-          copy_file('db/seeds/alchemy/pages.yml')
-          rake('alchemy:db:seed', abort_on_failure: true)
+          copy_file("db/seeds/alchemy/pages.yml")
+          rake("alchemy:db:seed", abort_on_failure: true)
         end
       end
 
       def append_assets
         append_file "vendor/assets/javascripts/alchemy/admin/all.js",
-          "//= require alchemy/solidus/admin.js"
+                    "//= require alchemy/solidus/admin.js"
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.b
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.b
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,54 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.3
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: A AlchemyCMS and Solidus integration
 email:
 - thomas@vondeyen.com
@@ -211,18 +259,16 @@ files:
 - app/assets/javascripts/alchemy/solidus/admin/select2_config.js
 - app/assets/javascripts/alchemy/solidus/admin/taxon_select.js
 - app/assets/javascripts/alchemy/solidus/admin/variant_select.js
-- app/models/alchemy/essence_spree_product.rb
-- app/models/alchemy/essence_spree_taxon.rb
-- app/models/alchemy/essence_spree_variant.rb
+- 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/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
-- app/views/alchemy/essences/_essence_spree_product_editor.html.erb
-- app/views/alchemy/essences/_essence_spree_product_view.html.erb
-- app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb
-- app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
-- app/views/alchemy/essences/_essence_spree_variant_editor.html.erb
-- app/views/alchemy/essences/_essence_spree_variant_view.html.erb
+- app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface
+- app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
+- app/views/alchemy/admin/pages/_product_link.html.erb
+- app/views/alchemy/admin/pages/_product_link_script.html.erb
 - 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
@@ -268,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible

data/app/models/alchemy/essence_spree_product.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class EssenceSpreeProduct < ActiveRecord::Base
-    PRODUCT_ID = /\A\d+\z/
-
-    belongs_to :product,
-      class_name: "Spree::Product",
-      optional: true,
-      foreign_key: "spree_product_id"
-
-    acts_as_essence(ingredient_column: :product)
-
-    def ingredient=(product_or_id)
-      case product_or_id
-      when PRODUCT_ID, ""
-        self.spree_product_id = product_or_id
-      when Spree::Product
-        self.product = product_or_id
-      else
-        super
-      end
-    end
-
-    def preview_text(_maxlength)
-      return unless product
-      product.name
-    end
-  end
-end

data/app/models/alchemy/essence_spree_taxon.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class EssenceSpreeTaxon < ActiveRecord::Base
-    TAXON_ID = /\A\d+\z/
-
-    belongs_to :taxon,
-      class_name: "Spree::Taxon",
-      optional: true,
-      foreign_key: "taxon_id"
-
-    acts_as_essence(ingredient_column: :taxon)
-
-    def ingredient=(taxon_or_id)
-      case taxon_or_id
-      when TAXON_ID, ""
-        self.taxon_id = taxon_or_id
-      when Spree::Taxon
-        self.taxon = taxon_or_id
-      else
-        super
-      end
-    end
-
-    def preview_text(_maxlength)
-      return unless taxon
-      taxon.name
-    end
-  end
-end

data/app/models/alchemy/essence_spree_variant.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class EssenceSpreeVariant < ActiveRecord::Base
-    VARIANT_ID = /\A\d+\z/
-
-    belongs_to :variant,
-      class_name: "Spree::Variant",
-      optional: true
-
-    acts_as_essence(ingredient_column: :variant)
-
-    def ingredient=(variant_or_id)
-      case variant_or_id
-      when VARIANT_ID, ""
-        self.variant_id = variant_or_id
-      when Spree::Variant
-        self.variant = variant_or_id
-      else
-        super
-      end
-    end
-
-    def preview_text(_maxlength)
-      return unless variant
-      variant.descriptive_name
-    end
-  end
-end

data/app/views/alchemy/essences/_essence_spree_product_editor.html.erb

@@ -1,26 +0,0 @@
-<% content ||= local_assigns[:content] || local_assigns[:essence_spree_product_editor] %>
-
-<div class="content_editor essence_spree_product" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
-  <%= text_field_tag(
-    content.form_field_name,
-    content.essence.spree_product_id,
-    id: content.form_field_id,
-    class: 'alchemy_selectbox full_width'
-  ) %>
-</div>
-
-<script>
-  $('#<%= content.form_field_id %>').alchemyProductSelect({
-    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_products_path %>",
-    query_params: <%== content.settings[:query_params].to_json %>,
-    <% if content.essence.product %>
-    initialSelection: {
-      id: <%= content.essence.spree_product_id %>,
-      text: "<%= content.essence.product.name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb

@@ -1,26 +0,0 @@
-<% content ||= local_assigns[:content] || local_assigns[:essence_spree_taxon_editor] %>
-
-<div class="content_editor essence_spree_taxon" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
-  <%= text_field_tag(
-    content.form_field_name,
-    content.essence.taxon_id,
-    id: content.form_field_id,
-    class: 'alchemy_selectbox full_width'
-  ) %>
-</div>
-
-<script>
-  $('#<%= content.form_field_id %>').alchemyTaxonSelect({
-    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_taxons_path %>",
-    query_params: <%== content.settings[:query_params].to_json %>,
-    <% if content.essence.taxon %>
-    initialSelection: {
-      id: <%= content.essence.taxon_id %>,
-      text: "<%= content.essence.taxon.pretty_name %>"
-    }
-    <% end %>
-  })
-</script>

data/app/views/alchemy/essences/_essence_spree_variant_editor.html.erb

@@ -1,26 +0,0 @@
-<% content ||= local_assigns[:content] || local_assigns[:essence_spree_variant_editor] %>
-
-<div class="content_editor essence_spree_variant" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
-  <%= content_label(content) %>
-  <%= text_field_tag(
-    content.form_field_name,
-    content.essence.variant_id,
-    id: content.form_field_id,
-    class: 'alchemy_selectbox full_width'
-  ) %>
-</div>
-
-<script>
-  $('#<%= content.form_field_id %>').alchemyVariantSelect({
-    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
-    apiToken: "<%= current_alchemy_user.spree_api_key %>",
-    baseUrl: "<%= spree.api_variants_path %>",
-    query_params: <%== content.settings[:query_params].to_json %>,
-    <% if content.essence.variant %>
-    initialSelection: {
-      id: <%= content.essence.variant_id %>,
-      text: "<%= content.essence.variant.name %>"
-    }
-    <% end %>
-  })
-</script>