alchemy-solidus 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe28a958674efc0cd3f8ea1e5861035badeb33508d1128def0ffd1b3d8e6840
-  data.tar.gz: 737b9a7e5d6041d80a965192743d343e4c367de463cdfa88331be1c8bbe299cc
+  metadata.gz: 83174dea5ed68edc46ddb776b57d178ec200c6b63c2d674c177efcee4d8766c7
+  data.tar.gz: 579502a6211889f8cc709503c03d80c5542f349af0e856284e10130e01bfc631
 SHA512:
-  metadata.gz: 9adbcc2a6287272a28dc5f1acaecf86f282f4939b9a835bf25f0477ca99f9ace9b2a59da0887393d94eaac7334a4611bafb6ef9bdeaddab6b23fafbde3a10687
-  data.tar.gz: f2cb02073e9a39dce852ed04a27d8c79ce2ab1f68bb682a71e57c1e78f39edea83e7d1c6e573f3394eb62d6500d0436debad04c54d08dc7bc0944b5dd5ebfd82
+  metadata.gz: 2c50e7d485496ae38dd9524760cbfb4561f550c9ff735a9ec3fb1bbcf2c8af202409f2e620f2f704be84c2e0025c76bb76ebfc70a2093b98bdcb8108ef09d5ca
+  data.tar.gz: d6a22895a674dfdaee445a3b631dc684dc4557985f120bc3743d6e5eb153c4cd85078e06d57bf30bf9c3b76f3b67f7393108b96fb13164a13eb7771855f82b2e

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-solidus.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy-solidus)
+[![CI](https://github.com/AlchemyCMS/alchemy-solidus/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy-solidus/actions?query=workflow%3ACI+branch%3Amain)
 [![Gem Version](https://badge.fury.io/rb/alchemy-solidus.svg)](https://badge.fury.io/rb/alchemy-solidus)
 
 # Alchemy-Solidus
@@ -13,15 +13,19 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
 
 ### Solidus
 
-This version runs with Solidus 2.6 and above.
+This version runs with Solidus v2.11 and v3.0.
 
+- 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.
 - For a Solidus 1.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
 
+> **NOTE:** If you are using Solidus v3.0 with Alchemy v5.3, make sure to also use Rails v6.0 and the legacy image attachment adapter (paperclip) and not the active storage adapter, since this needs Rails >= 6.1 and Alchemy v5.3 is not Rails 6.1 compatible. You need Alchemy v6.0 for Rails >= 6.1.
+
 ### Alchemy
 
-This version runs with Alchemy 4.1 and above.
+This version runs with Alchemy v5.x and v6.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.
 

data/Rakefile

@@ -20,7 +20,9 @@ task :test_setup do
     system <<-SETUP.strip_heredoc
       export RAILS_ENV=test && \
       bin/rake db:environment:set db:drop && \
-      bin/rails g spree:install --force --auto-accept --no-seed --no-sample && \
+      bin/rake gutentag:install:migrations && \
+      bin/rails g gutentag:migration_versions && \
+      bin/rails g #{ENV["SOLIDUS_BRANCH"].match?(/^2.+/) ? "spree" : "solidus"}:install --force --auto-accept --no-seed --no-sample && \
       bin/rails g alchemy:solidus:install --auto-accept --force
     SETUP
     exit($?.exitstatus) unless $?.success?

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

@@ -3,7 +3,7 @@ Alchemy.Solidus = Alchemy.Solidus || {}
 
 Alchemy.Solidus.getSelect2Config = function(options) {
   var headers = {
-    'X-Spree-Token': options.apiToken
+    'Authorization': 'Bearer ' + options.apiToken
   }
 
   return {

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

@@ -18,7 +18,7 @@ $.fn.alchemyTaxonSelect = function(options) {
           results: data.taxons.map(function(taxon) {
             return {
               id: taxon.id,
-              text: taxon.name
+              text: taxon.pretty_name
             }
           }),
           more: page * data.per_page < data.total_count

data/app/models/alchemy/essence_spree_product.rb

@@ -4,14 +4,16 @@ 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'
+    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
+      when PRODUCT_ID, ""
         self.spree_product_id = product_or_id
       when Spree::Product
         self.product = product_or_id

data/app/models/alchemy/essence_spree_taxon.rb

@@ -4,14 +4,16 @@ module Alchemy
   class EssenceSpreeTaxon < ActiveRecord::Base
     TAXON_ID = /\A\d+\z/
 
-    belongs_to :taxon, class_name: 'Spree::Taxon',
-      optional: true, foreign_key: 'taxon_id'
+    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
+      when TAXON_ID, ""
         self.taxon_id = taxon_or_id
       when Spree::Taxon
         self.taxon = taxon_or_id

data/app/models/alchemy/essence_spree_variant.rb

@@ -4,13 +4,15 @@ module Alchemy
   class EssenceSpreeVariant < ActiveRecord::Base
     VARIANT_ID = /\A\d+\z/
 
-    belongs_to :variant, class_name: 'Spree::Variant', optional: true
+    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
+      when VARIANT_ID, ""
         self.variant_id = variant_or_id
       when Spree::Variant
         self.variant = variant_or_id

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

@@ -19,7 +19,7 @@
     <% if content.essence.taxon %>
     initialSelection: {
       id: <%= content.essence.taxon_id %>,
-      text: "<%= content.essence.taxon.name %>"
+      text: "<%= content.essence.taxon.pretty_name %>"
     }
     <% end %>
   })

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

@@ -0,0 +1,26 @@
+<%= content_tag :div,
+  class: spree_product_editor.css_classes,
+  data: spree_product_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_product_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_product_editor, :product_id) %>
+    <%= f.text_field :product_id,
+      value: spree_product_editor.product&.id,
+      id: spree_product_editor.form_field_id(:product_id),
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_product_editor.form_field_id(:product_id) %>').alchemyProductSelect({
+    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_products_path %>",
+    query_params: <%== spree_product_editor.settings[:query_params].to_json %>,
+    <% if spree_product_editor.product %>
+    initialSelection: {
+      id: <%= spree_product_editor.product.id %>,
+      text: "<%= spree_product_editor.product.name %>"
+    }
+    <% end %>
+  })
+</script>

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

@@ -0,0 +1 @@
+<%= spree_product_view.product&.name %>

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

@@ -0,0 +1,26 @@
+<%= content_tag :div,
+  class: spree_taxon_editor.css_classes,
+  data: spree_taxon_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_taxon_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_taxon_editor, :taxon_id) %>
+    <%= f.text_field :taxon_id,
+      value: spree_taxon_editor.taxon&.id,
+      id: spree_taxon_editor.form_field_id(:taxon_id),
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_taxon_editor.form_field_id(:taxon_id) %>').alchemyTaxonSelect({
+    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_taxons_path %>",
+    query_params: <%== spree_taxon_editor.settings[:query_params].to_json %>,
+    <% if spree_taxon_editor.taxon %>
+    initialSelection: {
+      id: <%= spree_taxon_editor.taxon.id %>,
+      text: "<%= spree_taxon_editor.taxon.pretty_name %>"
+    }
+    <% end %>
+  })
+</script>

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

@@ -0,0 +1 @@
+<%= spree_taxon_view.taxon&.name %>

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

@@ -0,0 +1,26 @@
+<%= content_tag :div,
+  class: spree_variant_editor.css_classes,
+  data: spree_variant_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_variant_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_variant_editor, :variant_id) %>
+    <%= f.text_field :variant_id,
+      value: spree_variant_editor.variant&.id,
+      id: spree_variant_editor.form_field_id(:variant_id),
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_variant_editor.form_field_id(:variant_id) %>').alchemyVariantSelect({
+    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_variants_path %>",
+    query_params: <%== spree_variant_editor.settings[:query_params].to_json %>,
+    <% if spree_variant_editor.variant %>
+    initialSelection: {
+      id: <%= spree_variant_editor.variant.id %>,
+      text: "<%= spree_variant_editor.variant.name %>"
+    }
+    <% end %>
+  })
+</script>

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

@@ -0,0 +1 @@
+<%= spree_variant_view.variant&.name %>

data/config/initializers/alchemy.rb

@@ -52,4 +52,6 @@ if defined?(Spree::Auth::Engine)
   end
 end
 
-Alchemy::Modules.register_module(alchemy_module)
+Rails.application.config.after_initialize do
+  Alchemy::Modules.register_module(alchemy_module)
+end

data/lib/alchemy/solidus/engine.rb

@@ -1,4 +1,5 @@
 require 'alchemy_cms'
+require 'alchemy/version'
 require 'solidus_core'
 require 'solidus_backend'
 require 'solidus_support'
@@ -23,11 +24,6 @@ module Alchemy
           require 'alchemy/solidus/spree_admin_unauthorized_redirect'
         end
 
-        if Spree.solidus_gem_version < Gem::Version.new('2.5')
-          require 'alchemy/solidus/spree_custom_user_generator_fix'
-          require 'alchemy/solidus/spree_install_generator_fix'
-        end
-
         if SolidusSupport.frontend_available?
           # Allows to render Alchemy content within Solidus' controller views
           require_dependency 'alchemy/solidus/alchemy_in_solidus'
@@ -47,13 +43,8 @@ module Alchemy
         end
       end
 
-      # In versions of Solidus prior to 2.8, we override the tabs partial
-      # to pass a match_path value to each tab. (Version 2.8 is already
-      # passing this option.) This option is used to configure the paths
-      # for which a given tab is active.
-      #
-      if Spree.solidus_gem_version < Gem::Version.new('2.8')
-        paths['app/views'] << 'lib/views'
+      if Alchemy.gem_version >= Gem::Version.new('6.0.0.b1')
+        paths['app/models'] << 'lib/models'
       end
     end
   end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "3.3.0"
+    VERSION = "4.0.0"
   end
 end

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

@@ -55,9 +55,6 @@ module Alchemy
           arguments = options[:auto_accept] ? ['Alchemy::User', '--force'] : ['Alchemy::User']
           Spree::CustomUserGenerator.start(arguments)
           gsub_file 'lib/spree/authentication_helpers.rb', /main_app\./, 'Alchemy.'
-          if Spree.solidus_gem_version < Gem::Version.new('2.5.0')
-            gsub_file 'config/initializers/spree.rb', /Spree\.user_class.?=.?.+$/, 'Spree.user_class = "Alchemy::User"'
-          end
           rake('db:migrate', abort_on_failure: true)
         end
       end

data/lib/models/alchemy/ingredients/spree_product.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeProduct < Alchemy::Ingredient
+      related_object_alias :product, class_name: "Spree::Product"
+
+      def preview_text(maxlength)
+        return unless product
+
+        product.name[0..maxlength - 1]
+      end
+    end
+  end
+end

data/lib/models/alchemy/ingredients/spree_taxon.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeTaxon < Alchemy::Ingredient
+      related_object_alias :taxon, class_name: "Spree::Taxon"
+
+      def preview_text(maxlength)
+        return unless taxon
+
+        taxon.name[0..maxlength - 1]
+      end
+    end
+  end
+end

data/lib/models/alchemy/ingredients/spree_variant.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeVariant < Alchemy::Ingredient
+      related_object_alias :variant, class_name: "Spree::Variant"
+
+      def preview_text(maxlength)
+        return unless variant
+
+        variant.descriptive_name[0..maxlength - 1]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,14 @@ files:
 - 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/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
+- app/views/alchemy/ingredients/_spree_taxon_view.html.erb
+- app/views/alchemy/ingredients/_spree_variant_editor.html.erb
+- app/views/alchemy/ingredients/_spree_variant_view.html.erb
 - app/views/spree/admin/shared/_alchemy_sub_menu.html.erb
 - config/initializers/alchemy.rb
-- config/initializers/solidus.rb
 - config/locales/alchemy_solidus_en.yml
 - config/locales/alchemy_solidus_it.yml
 - config/locales/en.yml
@@ -234,14 +239,14 @@ files:
 - lib/alchemy/solidus/alchemy_user_extension.rb
 - lib/alchemy/solidus/engine.rb
 - lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb
-- lib/alchemy/solidus/spree_custom_user_generator_fix.rb
-- lib/alchemy/solidus/spree_install_generator_fix.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/views/spree/admin/shared/_tabs.html.erb
+- lib/models/alchemy/ingredients/spree_product.rb
+- lib/models/alchemy/ingredients/spree_taxon.rb
+- lib/models/alchemy/ingredients/spree_variant.rb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD New
@@ -261,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible

data/config/initializers/solidus.rb

@@ -1,29 +0,0 @@
-# In versions of Solidus prior to 2.8, we override this class to
-# add the match_path option to the initializer. (Version 2.8 has
-# this option already.) This option is used in the tabs partial
-# to configure the paths for which a given tab is active.
-#
-if Spree.solidus_gem_version < Gem::Version.new('2.8')
-  Spree::BackendConfiguration::MenuItem.class_eval do
-    attr_reader :match_path
-
-    def initialize(
-      sections,
-      icon,
-      condition: nil,
-      label: nil,
-      partial: nil,
-      url: nil,
-      match_path: nil
-    )
-
-      @condition = condition || -> { true }
-      @sections = sections
-      @icon = icon
-      @label = label || sections.first
-      @partial = partial
-      @url = url
-      @match_path = match_path
-    end
-  end
-end

data/lib/alchemy/solidus/spree_custom_user_generator_fix.rb

@@ -1,9 +0,0 @@
-require 'active_record/migration'
-require 'generators/spree/custom_user/custom_user_generator'
-
-Spree::CustomUserGenerator.class_eval do
-  def self.next_migration_number(dirname)
-    next_migration_number = current_migration_number(dirname) + 1
-    ActiveRecord::Migration.next_migration_number(next_migration_number)
-  end
-end

data/lib/alchemy/solidus/spree_install_generator_fix.rb

@@ -1,29 +0,0 @@
-require 'generators/spree/install/install_generator'
-
-Spree::InstallGenerator.class_eval do
-  CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
-
-  def install_routes
-    routes_file_path = File.join('config', 'routes.rb')
-    unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
-      insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
-        <<-ROUTES
-  # This line mounts Solidus's routes at the root of your application.
-  # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
-  # If you would like to change where this engine is mounted, simply change the :at option to something different.
-  #
-  # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
-  #{CORE_MOUNT_ROUTE}, at: '/'
-
-ROUTES
-      end
-    end
-
-    unless options[:quiet]
-      puts "*" * 50
-      puts "We added the following line to your application's config/routes.rb file:"
-      puts " "
-      puts "    #{CORE_MOUNT_ROUTE}, at: '/'"
-    end
-  end
-end

data/lib/views/spree/admin/shared/_tabs.html.erb

@@ -1,15 +0,0 @@
-<% Spree::Backend::Config.menu_items.each do |menu_item| %>
-  <% if instance_exec(&menu_item.condition) %>
-    <%=
-      tab(
-          *menu_item.sections,
-          icon: menu_item.icon,
-          label: menu_item.label,
-          url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url,
-          match_path: menu_item.match_path
-      ) do
-    %>
-      <%- render partial: menu_item.partial if menu_item.partial %>
-    <%- end %>
-  <% end %>
-<% end %>