alchemy-solidus 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dab9ec75ac8b7aa765fbb322c9aa192f592c070417b56358d73c0254222f7c
-  data.tar.gz: 12a3f2235d188b6578c20da20ce39662319a6e2013957f927ef4b8f30d927817
+  metadata.gz: a62c5d703fd9ef1302e57ebf2ae840d8adf6646600d402e171bc2f4e51fc8bc3
+  data.tar.gz: a6c8ada063c962cc66c59841c98f3c8295973d013bebe5d3551643be41315be8
 SHA512:
-  metadata.gz: 2d86246afab67fe1cecad36c4ea0d8b9a6054a267b09ec796b1f423e5a1d376169d7cf48b756debdb806b4f0b28702c31db1c42a1d0199886847752cbf8a869c
-  data.tar.gz: 6c7dcd1e6c0710710ed8a57291a018433fe4431fa1cc696bf4d03dd01472971b906b4362f8f7b95dc251d1accdea2bb025dfbbc37eed815be5010d1a62124394
+  metadata.gz: f3708d87a8af2485baa75a73a6e680d40395a8e0bf35a4e236991b9f1366c1c238bfd2ec79e2660bc14bfcbcd47887c08de14b8ca002ff0837eaefea7d873386
+  data.tar.gz: cee5253f162afdce10025ddd8167507f68cb9c296128cb6647cd30c89ac3fcde099e5d635b80fd7aeafc91763b3fd594c7d300d1691f99b527b1433cfaed4e36

data/Rakefile

@@ -1,38 +1,43 @@
 #!/usr/bin/env rake
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task default: [:test_setup, :spec]
 
-require 'active_support/core_ext/string'
+require "active_support/core_ext/string"
 
-desc 'Setup test app'
+desc "Setup test app"
 task :test_setup do
-  Dir.chdir('spec/dummy') 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
+  Dir.chdir("spec/dummy") do
     system <<-SETUP.strip_heredoc
-      export RAILS_ENV=test && \
       bin/rake db:environment:set db:drop && \
       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
+      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
     SETUP
     exit($?.exitstatus) unless $?.success?
   end
 end
 
-require 'github_changelog_generator/task'
-require 'alchemy/solidus/version'
+require "github_changelog_generator/task"
+require "alchemy/solidus/version"
 GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
-  config.user = 'AlchemyCMS'
-  config.project = 'alchemy-solidus'
+  config.user = "AlchemyCMS"
+  config.project = "alchemy-solidus"
   config.future_release = "v#{Alchemy::Solidus::VERSION}"
 end

data/config/initializers/spree.rb

@@ -0,0 +1,3 @@
+if defined?(Alchemy::Devise::Engine)
+  Spree.user_class = "Alchemy::User"
+end

data/lib/alchemy/solidus/current_user_helpers.rb

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

data/lib/alchemy/solidus/engine.rb

@@ -1,50 +1,38 @@
-require 'alchemy_cms'
-require 'alchemy/version'
-require 'solidus_core'
-require 'solidus_backend'
-require 'solidus_support'
+require "alchemy_cms"
+require "alchemy/version"
+require "solidus_core"
+require "solidus_backend"
+require "solidus_support"
 
 module Alchemy
   module Solidus
     class Engine < ::Rails::Engine
-      engine_name 'alchemy_solidus'
+      engine_name "alchemy_solidus"
 
       config.to_prepare do
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
 
-        if Alchemy.user_class_name == '::Spree::User'
-          require 'alchemy/solidus/spree_user_extension'
+        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'
+        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
-          require 'alchemy/solidus/spree_admin_unauthorized_redirect'
+          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'
+          require_dependency "alchemy/solidus/alchemy_in_solidus"
         end
 
         # Allows to use Solidus helpers within Alchemys controller views
-        require_dependency 'alchemy/solidus/use_solidus_layout'
-      end
-
-      # Fix for +belongs_to :bill_address+ in {Spree::UserAddressBook}
-      # Solidus has this set to +false+ in {Spree::Base}, but {Alchemy::User} does not inherit from it.
-      initializer 'alchemy_solidus.belongs_bill_address_fix' do
-        if Alchemy.user_class_name == '::Alchemy::User'
-          ActiveSupport.on_load(:active_record) do
-            Alchemy::User.belongs_to_required_by_default = false
-          end
-        end
-      end
-
-      if Alchemy.gem_version >= Gem::Version.new('6.0.0.b1')
-        paths['app/models'] << 'lib/models'
+        require_dependency "alchemy/solidus/use_solidus_layout"
       end
     end
   end

data/lib/alchemy/solidus/version.rb

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

data/lib/generators/alchemy/solidus/install/files/db/seeds/alchemy/pages.yml

@@ -1,3 +1,2 @@
 - name: Home
   page_layout: index
-  public_on: 1970-01-01

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

@@ -128,7 +128,6 @@ module Alchemy
             ROOT_ROUTE
           end
           copy_file('db/seeds/alchemy/pages.yml')
-          append_file(Rails.root.join('db', 'seeds.rb'), "Alchemy::Seeder.seed!\n")
           rake('alchemy:db:seed', abort_on_failure: true)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -214,6 +214,9 @@ files:
 - app/models/alchemy/essence_spree_product.rb
 - app/models/alchemy/essence_spree_taxon.rb
 - app/models/alchemy/essence_spree_variant.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
@@ -228,6 +231,7 @@ files:
 - 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/spree.rb
 - config/locales/alchemy_solidus_en.yml
 - config/locales/alchemy_solidus_it.yml
 - config/locales/en.yml
@@ -237,6 +241,7 @@ files:
 - 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
@@ -244,9 +249,6 @@ files:
 - 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/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
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible