alchemy-solidus 3.0.1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c8533d634026c82d71f1b59fbfe15df5d4bc532a168e40d41e9dbd9f81ce34
-  data.tar.gz: d25d1f17a7291db7a0000dd9b0e832a9a4d535eeaf36a0ca2e242189878ff0f8
+  metadata.gz: c86cf68ac62c01d35dafa6c74bbb7c9fa02376618204eb8d6ab5ef023be71b29
+  data.tar.gz: ed3eac3c22d0296317ec1065af590b072b9e586ad8ecb7bd4d6aa1d7ee01f6e8
 SHA512:
-  metadata.gz: 7f3517058e5a8643cdde356326063a91d3ed9faec2a2d227d0006fe22e79ec892c3a2600947d2add82581de0f081a94a79315379e456003e40e5d8501f021bf1
-  data.tar.gz: 8145a39a7744b1df5fb29b59e27f3e7285caad70dcfd6fea7bbf762a00fe93b8952b838c8193776362816c98ef0c5ed7e0f4a36882d458e73be56d41aa619fa2
+  metadata.gz: fd97ac8596255e8923c7ff675def96de991f2ea5fbc4ae093e5dc61de2d8d1d5c69cde697662b9823a206ac5584734359d6514c519b3cfa7ebb72eea7c09e00f
+  data.tar.gz: a53608bd0d21ae43e05d1133567d7f4330ffce467878bb3740a8d2d10cfbc51ec468c850deb129545ca9e0b0341078d031538b6b5ec91745c60fa08d7ea2161b

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy-solidus.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy-solidus)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-solidus.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy-solidus)
 [![Gem Version](https://badge.fury.io/rb/alchemy-solidus.svg)](https://badge.fury.io/rb/alchemy-solidus)
 
 # Alchemy-Solidus

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/lib/alchemy/solidus/engine.rb

@@ -12,18 +12,18 @@ 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'
         end
 
-        if SolidusSupport.solidus_gem_version < Gem::Version.new('2.5')
+        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
@@ -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/spree_user_extension.rb

@@ -1,6 +1,10 @@
 module Alchemy
   module Solidus
     module SpreeUserExtension
+      def self.included(klass)
+        klass.has_many :folded_pages, class_name: "Alchemy::FoldedPage"
+      end
+
       def alchemy_roles
         if has_spree_role?(:admin)
           %w(admin)

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "3.0.1"
+    VERSION = "3.2.1"
   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)
@@ -48,7 +55,7 @@ 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 SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.0')
+          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)
@@ -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.1
+  version: 3.2.1
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-08-06 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!