alchemy-solidus 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7702f9a029e49150f896e95ed265edcb1a3008fbe138f180eba53ed3d69f47b2
-  data.tar.gz: 118c3f1109a630ea2dabdd89d480fa4043db9e61ab3211f0bcce9cd27934e18a
+  metadata.gz: b2d028fabca54565f96594753c68f1750d0db256bd15a659ca55a57e825c9add
+  data.tar.gz: 065b2e46ab184830cbbc973f4feadc4f00130a691d659351bd5bb4077332ee74
 SHA512:
-  metadata.gz: a3d80d75fc3bebb74a73fb62ad2d35a407a0a41d7292c3f33edbb36043504e273d67a20fa9edf5f883fa26ee66f82f8d8272ae97bbd75b8eaf2555d1d338359c
-  data.tar.gz: ed3bc37a2c74ebaa376fa1d41928d755e9bc672313019b8515542aa2153e8030d97a78446bb77819c1997f99ed14a7bf9470b82439dadb200b8c4f7fa427df76
+  metadata.gz: 60cadeaf346108d7d3c4095d462494ac94c0033e52b6a048a7afcc8d1611bdfea575cb2b74b5c681dabe232381af2658ee28ee7d927bf20b121337a746512057
+  data.tar.gz: c9c3f830d7eba6477108160d6f292ea1bb5a5f6ab5d799295cecd9ffb2fb14b04ec236fe3af6b6d6050d83e77b390208356e5293826a6f79a5f82eb43735d896

data/Rakefile

@@ -20,7 +20,7 @@ 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 --quiet --auto-accept --no-seed --no-sample && \
+      bin/rails g spree:install --force --auto-accept --no-seed --no-sample && \
       bin/rails g alchemy:solidus:install --auto-accept --force
     SETUP
     exit($?.exitstatus) unless $?.success?

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

@@ -1,3 +1,5 @@
+<% 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(

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

@@ -1,3 +1,5 @@
+<% 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(

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

@@ -1,3 +1,5 @@
+<% 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(

data/config/initializers/alchemy.rb

@@ -44,6 +44,12 @@ if defined?(Spree::Auth::Engine)
   )
   Alchemy.user_class_name = 'Spree::User'
   Alchemy.current_user_method = :spree_current_user
+
+  if Alchemy.respond_to?(:logout_method)
+    Rails.application.config.after_initialize do
+      Alchemy.logout_method = Devise.sign_out_via
+    end
+  end
 end
 
 Alchemy::Modules.register_module(alchemy_module)

data/lib/alchemy/solidus/engine.rb

@@ -12,12 +12,12 @@ module Alchemy
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
 
-        if Alchemy.user_class_name == 'Spree::User'
+        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'
+        if Alchemy.user_class.name == 'Alchemy::User'
           require 'alchemy/solidus/alchemy_user_extension'
           Alchemy::User.include Alchemy::Solidus::AlchemyUserExtension
           require 'alchemy/solidus/spree_admin_unauthorized_redirect'
@@ -40,7 +40,7 @@ module Alchemy
       # 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'
+        if Alchemy.user_class.name == 'Alchemy::User'
           ActiveSupport.on_load(:active_record) do
             Alchemy::User.belongs_to_required_by_default = false
           end

data/lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb

@@ -4,6 +4,6 @@ Spree::Admin::BaseController.unauthorized_redirect = -> do
     redirect_to spree.root_path
   else
     store_location
-    redirect_to alchemy.login_path
+    redirect_to Alchemy.login_path
   end
 end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "3.0.0"
+    VERSION = "3.2.0"
   end
 end

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

@@ -1,5 +1,12 @@
 require 'rails/generators'
-require 'rails/generators/alchemy/install/install_generator'
+require 'alchemy/version'
+
+if Alchemy.gem_version >= Gem::Version.new("5.0.0.a")
+  require 'generators/alchemy/install/install_generator'
+else
+  require 'rails/generators/alchemy/install/install_generator'
+end
+
 require 'generators/spree/custom_user/custom_user_generator'
 require 'solidus_support'
 
@@ -29,7 +36,7 @@ module Alchemy
 
       def run_alchemy_installer
         unless options[:skip_alchemy_installer]
-          arguments = options[:auto_accept] ? ['--skip-demo-files', '--force'] : []
+          arguments = options[:auto_accept] ? ['--skip-demo-files', '--force', '--auto-accept'] : []
           Alchemy::Generators::InstallGenerator.start(arguments)
           rake('railties:install:migrations', abort_on_failure: true)
           rake('db:migrate', abort_on_failure: true)
@@ -83,14 +90,17 @@ module Alchemy
             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',
-            spree_roles: [Spree::Role.find_or_create_by!(name: 'admin')]
-          )
+            alchemy_roles: 'admin'
+          ).tap do |user|
+            user.spree_roles = [Spree::Role.find_or_create_by!(name: 'admin')]
+            user.save!
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -19,7 +19,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD New
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!