alchemy-solidus 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20516abea7d38b47f1a022998b93c48dddadff27a75e82bf511b0d4bde77792
-  data.tar.gz: c991f9f52ce9c98a87adc6b8ca880564c8f8bfc2802aff44b17b808e252543b2
+  metadata.gz: 4fe28a958674efc0cd3f8ea1e5861035badeb33508d1128def0ffd1b3d8e6840
+  data.tar.gz: 737b9a7e5d6041d80a965192743d343e4c367de463cdfa88331be1c8bbe299cc
 SHA512:
-  metadata.gz: fb405c8a49ba7ce079fe81a94577447673c1c0f6b22b8161153097dec0f6f9e65af98bfb91be37ba26ca3bf0f71ef1e336e34968b70154a71ae5ac440dea3510
-  data.tar.gz: 959ff15ccbba0ab90a0a170bd9cc5fcffe099b89f388fb2066b220c0e45d9636782fe4c4e4a76cfb92e2a177801b520b499954493de84f31890663cb292acd37
+  metadata.gz: 9adbcc2a6287272a28dc5f1acaecf86f282f4939b9a835bf25f0477ca99f9ace9b2a59da0887393d94eaac7334a4611bafb6ef9bdeaddab6b23fafbde3a10687
+  data.tar.gz: f2cb02073e9a39dce852ed04a27d8c79ce2ab1f68bb682a71e57c1e78f39edea83e7d1c6e573f3394eb62d6500d0436debad04c54d08dc7bc0944b5dd5ebfd82

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/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

@@ -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_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.1.0"
+    VERSION = "3.3.0"
   end
 end

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

@@ -36,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)
@@ -55,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-10-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!