alchemy-solidus 3.2.0 → 4.0.0.pre.b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2d028fabca54565f96594753c68f1750d0db256bd15a659ca55a57e825c9add
-  data.tar.gz: 065b2e46ab184830cbbc973f4feadc4f00130a691d659351bd5bb4077332ee74
+  metadata.gz: 1e758371bc495c388b64953e658acaec9d9f2708d21eaae8f76c686dc2279356
+  data.tar.gz: 95926d5d99a70dddbfc27ed4483b7c3176b9a91c89cf25f3a1664c64b5f9ff1c
 SHA512:
-  metadata.gz: 60cadeaf346108d7d3c4095d462494ac94c0033e52b6a048a7afcc8d1611bdfea575cb2b74b5c681dabe232381af2658ee28ee7d927bf20b121337a746512057
-  data.tar.gz: c9c3f830d7eba6477108160d6f292ea1bb5a5f6ab5d799295cecd9ffb2fb14b04ec236fe3af6b6d6050d83e77b390208356e5293826a6f79a5f82eb43735d896
+  metadata.gz: aa9b550cd214034f9d5e54154f6ba7cc6750d05c068273e1a0eb488d35b033a32e59242b087401fbcbd218db22256d09cd2019ee61163aaacf194650f7f7079c
+  data.tar.gz: 9ecfb5cb2985843b5e0c19768729c9f8b92c778860f292a3901339861222d8da9f4ba1b8e6dab3e5a5cd80bda25e68737b0852151c624b663b8da870916cde2d

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)
+[![CI](https://github.com/AlchemyCMS/alchemy-solidus/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy-solidus/actions?query=workflow%3ACI+branch%3Amain)
 [![Gem Version](https://badge.fury.io/rb/alchemy-solidus.svg)](https://badge.fury.io/rb/alchemy-solidus)
 
 # Alchemy-Solidus

data/app/assets/javascripts/alchemy/solidus/admin/taxon_select.js

@@ -18,7 +18,7 @@ $.fn.alchemyTaxonSelect = function(options) {
           results: data.taxons.map(function(taxon) {
             return {
               id: taxon.id,
-              text: taxon.name
+              text: taxon.pretty_name
             }
           }),
           more: page * data.per_page < data.total_count

data/app/models/alchemy/essence_spree_product.rb

@@ -4,14 +4,16 @@ module Alchemy
   class EssenceSpreeProduct < ActiveRecord::Base
     PRODUCT_ID = /\A\d+\z/
 
-    belongs_to :product, class_name: 'Spree::Product',
-      optional: true, foreign_key: 'spree_product_id'
+    belongs_to :product,
+      class_name: "Spree::Product",
+      optional: true,
+      foreign_key: "spree_product_id"
 
     acts_as_essence(ingredient_column: :product)
 
     def ingredient=(product_or_id)
       case product_or_id
-      when PRODUCT_ID
+      when PRODUCT_ID, ""
         self.spree_product_id = product_or_id
       when Spree::Product
         self.product = product_or_id

data/app/models/alchemy/essence_spree_taxon.rb

@@ -4,14 +4,16 @@ module Alchemy
   class EssenceSpreeTaxon < ActiveRecord::Base
     TAXON_ID = /\A\d+\z/
 
-    belongs_to :taxon, class_name: 'Spree::Taxon',
-      optional: true, foreign_key: 'taxon_id'
+    belongs_to :taxon,
+      class_name: "Spree::Taxon",
+      optional: true,
+      foreign_key: "taxon_id"
 
     acts_as_essence(ingredient_column: :taxon)
 
     def ingredient=(taxon_or_id)
       case taxon_or_id
-      when TAXON_ID
+      when TAXON_ID, ""
         self.taxon_id = taxon_or_id
       when Spree::Taxon
         self.taxon = taxon_or_id

data/app/models/alchemy/essence_spree_variant.rb

@@ -4,13 +4,15 @@ module Alchemy
   class EssenceSpreeVariant < ActiveRecord::Base
     VARIANT_ID = /\A\d+\z/
 
-    belongs_to :variant, class_name: 'Spree::Variant', optional: true
+    belongs_to :variant,
+      class_name: "Spree::Variant",
+      optional: true
 
     acts_as_essence(ingredient_column: :variant)
 
     def ingredient=(variant_or_id)
       case variant_or_id
-      when VARIANT_ID
+      when VARIANT_ID, ""
         self.variant_id = variant_or_id
       when Spree::Variant
         self.variant = variant_or_id

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

@@ -19,7 +19,7 @@
     <% if content.essence.taxon %>
     initialSelection: {
       id: <%= content.essence.taxon_id %>,
-      text: "<%= content.essence.taxon.name %>"
+      text: "<%= content.essence.taxon.pretty_name %>"
     }
     <% end %>
   })

data/app/views/alchemy/ingredients/_spree_product_editor.html.erb

@@ -0,0 +1,25 @@
+<%= content_tag :div,
+  class: spree_product_editor.css_classes,
+  data: spree_product_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_product_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_product_editor, :product_id) %>
+    <%= f.text_field :product_id,
+      value: spree_product_editor.product&.id,
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_product_editor.form_field_id(:product_id) %>').alchemyProductSelect({
+    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_products_path %>",
+    query_params: <%== spree_product_editor.settings[:query_params].to_json %>,
+    <% if spree_product_editor.product %>
+    initialSelection: {
+      id: <%= spree_product_editor.product.id %>,
+      text: "<%= spree_product_editor.product.name %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/ingredients/_spree_product_view.html.erb

@@ -0,0 +1 @@
+<%= spree_product_view.product&.name %>

data/app/views/alchemy/ingredients/_spree_taxon_editor.html.erb

@@ -0,0 +1,25 @@
+<%= content_tag :div,
+  class: spree_taxon_editor.css_classes,
+  data: spree_taxon_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_taxon_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_taxon_editor, :taxon_id) %>
+    <%= f.text_field :taxon_id,
+      value: spree_taxon_editor.taxon&.id,
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_taxon_editor.form_field_id(:taxon_id) %>').alchemyTaxonSelect({
+    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_taxons_path %>",
+    query_params: <%== spree_taxon_editor.settings[:query_params].to_json %>,
+    <% if spree_taxon_editor.taxon %>
+    initialSelection: {
+      id: <%= spree_taxon_editor.taxon.id %>,
+      text: "<%= spree_taxon_editor.taxon.pretty_name %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/ingredients/_spree_taxon_view.html.erb

@@ -0,0 +1 @@
+<%= spree_taxon_view.taxon&.name %>

data/app/views/alchemy/ingredients/_spree_variant_editor.html.erb

@@ -0,0 +1,25 @@
+<%= content_tag :div,
+  class: spree_variant_editor.css_classes,
+  data: spree_variant_editor.data_attributes do %>
+  <%= element_form.fields_for(:ingredients, spree_variant_editor.ingredient) do |f| %>
+    <%= ingredient_label(spree_variant_editor, :variant_id) %>
+    <%= f.text_field :variant_id,
+      value: spree_variant_editor.variant&.id,
+      class: 'alchemy_selectbox full_width' %>
+  <% end %>
+<% end %>
+
+<script>
+  $('#<%= spree_variant_editor.form_field_id(:variant_id) %>').alchemyVariantSelect({
+    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_variants_path %>",
+    query_params: <%== spree_variant_editor.settings[:query_params].to_json %>,
+    <% if spree_variant_editor.variant %>
+    initialSelection: {
+      id: <%= spree_variant_editor.variant.id %>,
+      text: "<%= spree_variant_editor.variant.name %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/ingredients/_spree_variant_view.html.erb

@@ -0,0 +1 @@
+<%= spree_variant_view.variant&.name %>

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'
     }
@@ -52,4 +52,6 @@ if defined?(Spree::Auth::Engine)
   end
 end
 
-Alchemy::Modules.register_module(alchemy_module)
+Rails.application.config.after_initialize do
+  Alchemy::Modules.register_module(alchemy_module)
+end

data/lib/alchemy/solidus/engine.rb

@@ -1,4 +1,5 @@
 require 'alchemy_cms'
+require 'alchemy/version'
 require 'solidus_core'
 require 'solidus_backend'
 require 'solidus_support'
@@ -12,18 +13,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 +41,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
@@ -55,6 +56,9 @@ module Alchemy
       if Spree.solidus_gem_version < Gem::Version.new('2.8')
         paths['app/views'] << 'lib/views'
       end
+      if Alchemy.gem_version >= Gem::Version.new('6.0.0.b1')
+        paths['app/models'] << 'lib/models'
+      end
     end
   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.2.0"
+    VERSION = "4.0.0-b2"
   end
 end

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

@@ -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)

data/lib/models/alchemy/ingredients/spree_product.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeProduct < Alchemy::Ingredient
+      related_object_alias :product, class_name: "Spree::Product"
+
+      def preview_text(maxlength)
+        return unless product
+
+        product.name[0..maxlength - 1]
+      end
+    end
+  end
+end

data/lib/models/alchemy/ingredients/spree_taxon.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeTaxon < Alchemy::Ingredient
+      related_object_alias :taxon, class_name: "Spree::Taxon"
+
+      def preview_text(maxlength)
+        return unless taxon
+
+        taxon.name[0..maxlength - 1]
+      end
+    end
+  end
+end

data/lib/models/alchemy/ingredients/spree_variant.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeVariant < Alchemy::Ingredient
+      related_object_alias :variant, class_name: "Spree::Variant"
+
+      def preview_text(maxlength)
+        return unless variant
+
+        variant.descriptive_name[0..maxlength - 1]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0.pre.b2
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,27 +16,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -220,6 +220,12 @@ files:
 - app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
 - app/views/alchemy/essences/_essence_spree_variant_editor.html.erb
 - app/views/alchemy/essences/_essence_spree_variant_view.html.erb
+- app/views/alchemy/ingredients/_spree_product_editor.html.erb
+- app/views/alchemy/ingredients/_spree_product_view.html.erb
+- app/views/alchemy/ingredients/_spree_taxon_editor.html.erb
+- app/views/alchemy/ingredients/_spree_taxon_view.html.erb
+- app/views/alchemy/ingredients/_spree_variant_editor.html.erb
+- 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/solidus.rb
@@ -241,12 +247,15 @@ 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
 - lib/views/spree/admin/shared/_tabs.html.erb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD New
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -257,12 +266,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!