alchemy-solidus 6.3.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628affa5df0d55f3bf40f0609d3fcb7a13117211fe191ad18a65ff2b9fe8d089
-  data.tar.gz: f887fabd4f2eeeb5f4e9225d0e3cbec5ef4af1ea120dd987c02789bc3c92dca3
+  metadata.gz: a00300118bc15c8ac5bdb72c531f87161dc9b96bf02a12e2e24b2ae96889d2bf
+  data.tar.gz: c88fd8a587782cab3f059fd634f8160bf09b5daacdc4ba2684a4b08ad1edf233
 SHA512:
-  metadata.gz: 2d1a2eb2d4e0a8113bc0b46d32f397b1d8e943ce5716a93df7b8b99c92210a3bb52a2128e760d0db840295c4eabb5cfdf96a03d0e2e9ad26ffde56b9ec8f3f9a
-  data.tar.gz: e6db47cc5296f2c5b64d1f03d2601193e072a9f2bac2582e9eea87785ba015edc283013edd31473b85ca9641673eee949f9431cd0d31b55c9e75deeb004ac50d
+  metadata.gz: e1cef57202eaf15a1b4174c1853d0ca23f981169d01a2e521aab07710ac88a0e6fb193f76d9cef0beb0db93aa3e2dbe7f084b99666031b5a5cc1288d3ecabcf3
+  data.tar.gz: dd070d028b041a37526c786fe0742b56f6dcbafe839aa0292c6e425cdc17ba735f8ece13eb1a32eba68814a781e9069b410ca41f806b0d53bb013e194592a61e

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-14, magic labs*
+Copyright (c) Blish GmbH
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

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.
@@ -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/overrides/alchemy/admin/pages/link/product_link.html.erb.deface

@@ -1,4 +1,4 @@
-<!-- insert_bottom "#overlay_tabs" -->
+<!-- insert_bottom "div#overlay_tabs" -->
 
 <div id="overlay_tab_product_link">
   <%= render "product_link" %>

data/app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "sl-tab-group#overlay_tabs" -->
+
+<sl-tab-panel name="overlay_tab_product_link" id="overlay_tab_product_link">
+  <%= render "product_link" %>
+</sl-tab-panel>

data/app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "sl-tab-group#overlay_tabs" -->
+
+<sl-tab slot="nav" panel="overlay_tab_product_link">
+  <%= Alchemy.t("link_overlay_tab_label.product") %>
+</sl-tab>

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

@@ -1,4 +1,4 @@
-<%= form_tag do %>
+<form data-link-form-type="product">
   <%= render_message do %>
     <h3><%= Alchemy.t(:choose_product_to_link) %></h3>
   <% end %>
@@ -23,8 +23,8 @@
       class: 'alchemy_selectbox link_target' %>
   </div>
   <div class="submit">
-    <%= button_tag Alchemy.t(:apply), class: 'create-link button', data: { link_type: 'product' } %>
+    <%= button_tag Alchemy.t(:apply), class: "create-link button", data: { link_type: "product" } %>
   </div>
-<% end %>
+</form>
 
 <%= render "product_link_script" %>

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "6.3.1"
+    VERSION = "7.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-29 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'
@@ -246,6 +246,8 @@ files:
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
 - app/overrides/alchemy/admin/pages/link/product_link.html.erb.deface
+- app/overrides/alchemy/admin/pages/link/product_link_panel.html.erb.deface
+- app/overrides/alchemy/admin/pages/link/product_link_sl_tab.html.erb.deface
 - app/overrides/alchemy/admin/pages/link/product_link_tab.html.erb.deface
 - app/views/alchemy/admin/pages/_product_link.html.erb
 - app/views/alchemy/admin/pages/_product_link_script.html.erb
@@ -295,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible