alchemy-solidus 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16a15dfe376f96cd10368b80600ecd90db0883f2c49b82d34494d0d7cbd11e2d
-  data.tar.gz: 58eb94228f3a082ca8f7e0b38132c894edccdb4a64e352efe7968516fc43dd99
+  metadata.gz: d1f5bba357c3cd5b1c2ac4d48318c3a065b613119dbf4e943bc898e7a7e19023
+  data.tar.gz: 2dbb9d3332bb54316c30d13d86bfcdff8652af481c268c3c6b410fec0989b57d
 SHA512:
-  metadata.gz: ef6b3b8d01fff1ee7fbfb25fc9813bbffc192af8481e21e4f4b49ba73b9f14509d50de621947a925a06a6a51df5cd1eeb5c3a765942fd4f78ac3d72e17b722f5
-  data.tar.gz: b1fbae3de6f3d2aef1b2cca13e95298e845baac85fb60cf3c4db123b63ff6ee9b41c5f9a2f70619a556d11b38e01fb84ce52c6e698d275f7b8a38345f9f47418
+  metadata.gz: 29b570fd3d5f343ce57fe95667b7a0a5ba12cafd8986ab45cd0c65beab62cc9003bac2c8628c1867a4e1de3cb475fdd39260fa3ef5535c9c887c00b5a2ecff2f
+  data.tar.gz: d7271dbe863c5527090751ef60dcce3043f23e51a8c3d4e4d88e7b8a38145acd17f759839ac01435c47eda9f0830f9eaba1ba8c3937f6633e280a56c40940238

data/README.md

@@ -13,7 +13,7 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
 
 ### Solidus
 
-This version runs with Solidus v2.11 and v3.0.
+This version runs with Solidus v3.0 and up.
 
 - 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.
@@ -23,18 +23,20 @@ This version runs with Solidus v2.11 and v3.0.
 
 ### Alchemy
 
-This version runs with Alchemy v5.x and v6.0.
+This version runs with Alchemy v7.0
 
-- For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
-- For a Alchemy 4.0 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
-- For a Alchemy 3.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
+- 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.
+- For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3` gem version.
+- For a Alchemy 4.0 compatible version please use the `2.3-stable` branch or `2.3` gem version.
+- For a Alchemy 3.x compatible version please use the `1.0-stable` branch or `1.1` gem version.
 
 ## Installation
 
 Add this line to your applications `Gemfile`:
 
 ```ruby
-gem 'alchemy-solidus', '~> 2.4.0'
+gem 'alchemy-solidus', '~> 6.0'
 ```
 
 Install the gem with:

data/Rakefile

@@ -16,7 +16,7 @@ require "active_support/core_ext/string"
 
 desc "Setup test app"
 task :test_setup do
-  solidus_version = ENV.fetch("SOLIDUS_VERSION", "3.2")
+  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.0")
   solidus_32_install_options =
     "--payment-method none --frontend none --no-with-authentication"
   solidus_33_install_options =

data/app/components/alchemy/ingredients/spree_product_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeProductView < BaseView
+      delegate :product, to: :ingredient
+
+      def call
+        product.name
+      end
+
+      def render?
+        !!product
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/spree_taxon_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeTaxonView < BaseView
+      delegate :taxon, to: :ingredient
+
+      def call
+        taxon.name
+      end
+
+      def render?
+        !!taxon
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/spree_variant_view.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SpreeVariantView < BaseView
+      delegate :variant, to: :ingredient
+
+      def call
+        variant.name
+      end
+
+      def render?
+        !!variant
+      end
+    end
+  end
+end

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

@@ -1 +1,4 @@
-<%= spree_product_view.product&.name %>
+<%= render spree_product_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

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

@@ -1 +1,4 @@
-<%= spree_taxon_view.taxon&.name %>
+<%= render spree_taxon_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

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

@@ -1 +1,4 @@
-<%= spree_variant_view.variant&.name %>
+<%= render spree_variant_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

data/lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb

@@ -1,5 +1,5 @@
 Spree::Admin::BaseController.unauthorized_redirect = -> do
-  if try_spree_current_user
+  if spree_current_user
     flash[:error] = I18n.t('spree.authorization_failure')
     redirect_to spree.root_path
   else

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "6.0.0"
+    VERSION = "6.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.a
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.a
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -39,7 +39,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -202,20 +202,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.8.3
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.8.3
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -230,20 +224,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description: A AlchemyCMS and Solidus integration
 email:
 - thomas@vondeyen.com
@@ -259,6 +239,9 @@ files:
 - app/assets/javascripts/alchemy/solidus/admin/select2_config.js
 - app/assets/javascripts/alchemy/solidus/admin/taxon_select.js
 - app/assets/javascripts/alchemy/solidus/admin/variant_select.js
+- app/components/alchemy/ingredients/spree_product_view.rb
+- app/components/alchemy/ingredients/spree_taxon_view.rb
+- app/components/alchemy/ingredients/spree_variant_view.rb
 - app/models/alchemy/ingredients/spree_product.rb
 - app/models/alchemy/ingredients/spree_taxon.rb
 - app/models/alchemy/ingredients/spree_variant.rb
@@ -311,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible