alchemy-solidus 3.0.2 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9458c9b23471af597aa21b0c27fb3ad00e0a829f364f72b2ba9a579e564a6e29
-  data.tar.gz: '09eebf44c01872177527514bdda6a50fc5a3354b122c85d2d5f12794516fd53d'
+  metadata.gz: a1aeb2b6118dc7906b425ece752b0bd1c0b8585440595645543fab8d4959709b
+  data.tar.gz: 3e3dd9fc0474a175c60163c76ebda9d7fe7a64781184a037cc3897c231bdeb5f
 SHA512:
-  metadata.gz: fbbb24e6746d071ebfeb72cdda900b50b30441cc5bcbf8b524d8ffbbbe364dcb641b27f1bf64f11a3e433097cf3ead40ce50b1b3ec0aed23610afeb99d091283
-  data.tar.gz: 2be71ea7f1d13b05cc86b95c625002bf5e1b51c019854006a336083a3092cd0cccf1a4971010caae8f92d29b190de878fcc1e776e117fd76e4b534cff51de23d
+  metadata.gz: 8acda8f35742212abbdd080bcc34a285701f4b01b7e3e569ef014204f3eb35e4ca701a2d2e024e230e26741b21aa706454d8b16bc479cf017a761b569e444750
+  data.tar.gz: 26b5cdc72e70f37688247c89898d9f7e4716183d9e5cf31e5d7dd4746017638e0110ccd7053c085e06bd41b9811acbf414940e581545419d332cb285979b8a43

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/config/initializers/alchemy.rb

@@ -2,7 +2,7 @@ alchemy_module = {
   engine_name: 'spree',
   name: 'solidus',
   navigation: {
-    controller: 'spree/admin/orders',
+    controller: '/spree/admin/orders',
     action: 'index',
     name: 'Store',
     inline_image: '<svg version="1.1" width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle">
@@ -11,22 +11,22 @@ alchemy_module = {
     data: { turbolinks: false },
     sub_navigation: [
       {
-        controller: 'spree/admin/orders',
+        controller: '/spree/admin/orders',
         action: 'index',
         name: 'Orders'
       },
       {
-        controller: 'spree/admin/products',
+        controller: '/spree/admin/products',
         action: 'index',
         name: 'Products'
       },
       {
-        controller: 'spree/admin/promotions',
+        controller: '/spree/admin/promotions',
         action: 'index',
         name: 'Promotions'
       },
       {
-        controller: 'spree/admin/stock_items',
+        controller: '/spree/admin/stock_items',
         action: 'index',
         name: 'Stock'
       }
@@ -37,7 +37,7 @@ alchemy_module = {
 if defined?(Spree::Auth::Engine)
   alchemy_module[:navigation][:sub_navigation].push(
     {
-      controller: 'spree/admin/users',
+      controller: '/spree/admin/users',
       action: 'index',
       name: 'Users'
     }

data/lib/alchemy/solidus/engine.rb

@@ -23,7 +23,7 @@ module Alchemy
           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

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.2"
+    VERSION = "3.2.2"
   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.2
+  version: 3.2.2
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-08-21 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!