alchemy-solidus 6.3.2 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfce794c5eb3858c868d40897476a4f377f444772dd0fc7086c849d09b979561
-  data.tar.gz: ed9c3370efa9b829cd4485a43b4c496f2e49a6835dd91468765558c8efc3c255
+  metadata.gz: d86c94ee49a6cd83833924769726f3fc3031d9d52bf027f625193e834fe07b3f
+  data.tar.gz: 42a8cccc0ab2367ddb06503e3b74b9aaa8f18723417981fca1e8eb7dce97a173
 SHA512:
-  metadata.gz: f7ab0cf771f9214a7585231e179a27cb79f41ece1ad55627f6d54ba9311c01d855de49c3e9983a9dd7edc95609e85a51f520b1d38b303c50f846cdba7e3d4a86
-  data.tar.gz: 90827b677754ee6908381ea7e9cde78a4dc349928a995ef05bd4508f8635d7d4eb44ff2c6e8a2b757f3d0a50093e410f4288c96a088ef83e0308d167226cbc21
+  metadata.gz: 7a4ea1882a360b2cdb1a5f98256ab18e0c4e7b8e5152b143875c935ce82c626fc43c8e651ccf753f1b3de33c95b0f8b57e0f74c61db894b306e4dd3e5850a015
+  data.tar.gz: 6ca23c0dd8267e5cb757bded3707adf8c749a36d3480ca03121f9a8a3e3bb514058d366d21879866487ca739a4f41a9446d6e56feb3939855b3ffa445489efef

data/README.md

@@ -19,8 +19,9 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
 
 ### Solidus
 
-This version runs with Solidus v3.0 and up.
+This version runs with Solidus v4.0 and up.
 
+- For a Solidus 3.x compatible version please use the `6.3-stable` branch or `6.3.1` gem version.
 - For a Solidus < 2.11 compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
 - For a Solidus < 2.6 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
 - For a Solidus 1.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
@@ -29,7 +30,7 @@ This version runs with Solidus v3.0 and up.
 
 ### Alchemy
 
-This version runs with Alchemy v7.0
+This version runs with Alchemy v7.0 and v7.1
 
 - For a Alchemy 6.x compatible version please use the `5.0-stable` branch or `5.0` gem version.
 - For a Alchemy 5.x compatible version please use the `4.1-stable` branch or `4.1` gem version.
@@ -42,7 +43,7 @@ This version runs with Alchemy v7.0
 Add this line to your applications `Gemfile`:
 
 ```ruby
-gem 'alchemy-solidus', '~> 6.0'
+gem 'alchemy-solidus', '~> 7.0'
 ```
 
 Install the gem with:
@@ -269,14 +270,14 @@ Please make yourself familiar with AlchemyCMS by [reading the guidelines](https:
 ```yaml
 # config/alchemy/elements.yml
 - name: product
-  contents:
-  - name: spree_product
-    type: EssenceSpreeProduct
+  ingredients:
+    - role: spree_product
+      type: SpreeProduct
 
 - name: product_category
-  contents:
-  - name: spree_taxon
-    type: EssenceSpreeTaxon
+  ingredients:
+    - role: spree_taxon
+      type: SpreeTaxon
 ```
 
 ### Generate the views
@@ -303,7 +304,7 @@ You can mix Alchemy and Solidus content in the same view.
 <!-- app/views/alchemy/elements/_product_view.html.erb -->
 <% cache element do %>
   <%= element_view_for element do |el| %>
-    <% product = el.ingredient(:spree_product) %>
+    <% product = el.value(:spree_product) %>
     <h1><%= product.name %></h1>
     <p><%= product.description %></p>
     <%= el.render :text %>
@@ -321,7 +322,7 @@ Or for a list of taxon products
     <h2><%= el.render :headline %></h2>
     <%= el.render :description %>
 
-    <% taxon = el.ingredient(:spree_taxon) %>
+    <% taxon = el.value(:spree_taxon) %>
     <% taxon.products.each do |product| %>
       <%= link_to product.name, spree.product_path(product) %>
     <% end %>

data/Rakefile

@@ -12,25 +12,15 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: %i[test_setup spec]
 
-require "active_support/core_ext/string"
-
 desc "Setup test app"
 task :test_setup do
-  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
-  solidus_32_install_options =
-    "--payment-method none --frontend none --no-with-authentication"
-  solidus_33_install_options =
-    "--payment-method none --frontend none --authentication none"
-  solidus_install_options =
-    (
-      if solidus_version == "3.2"
-        solidus_32_install_options
-      else
-        solidus_33_install_options
-      end
-    )
+  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.3")
+  solidus_install_options = "--payment-method=none --frontend=none --authentication=none"
+  if solidus_version >= "4.3"
+    solidus_install_options += " --admin-preview=false"
+  end
   Dir.chdir("spec/dummy") do
-    system <<-SETUP.strip_heredoc
+    system <<~SETUP
       bin/rake db:environment:set db:drop && \
       bin/rake gutentag:install:migrations && \
       bin/rails g gutentag:migration_versions && \

data/app/views/alchemy/admin/pages/_product_link_script.html.erb

@@ -1,5 +1,7 @@
 <script>
-  $("#overlay_tabs").on("SelectLinkTab.Alchemy", function(event, data) {
+  var $tabs = $("#overlay_tabs")
+
+  $tabs.on("SelectLinkTab.Alchemy", function(event, data) {
     $("#product_link").select2("val", data.link.attr("href"))
   })
   $("#product_link").alchemyProductSelect({
@@ -31,9 +33,13 @@
             id: Spree.mountedAt() + "products/"+ product.slug,
             text: product.name
           })
-          $("#overlay_tabs").tabs("option", "active",
-            $("#overlay_tabs > div").index($("#overlay_tab_product_link"))
-          )
+          if (typeof $tabs.tabs === "function") {
+            $tabs.tabs("option", "active",
+              $("#overlay_tabs > div").index($("#overlay_tab_product_link"))
+            )
+          } else {
+            $tabs.get(0).show('overlay_tab_product_link')
+          }
         }
       })
     },

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "6.3.2"
+    VERSION = "7.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.3.2
+  version: 7.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'