alchemy-solidus 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0871f7a06ef602fcd95d7c20e3caf64016e226fd6741fb00634a1eadf8d1ee0
-  data.tar.gz: 4f8e1ea07ac7881657577aac59f70542aaf292a52c084a05eb56c736d8489156
+  metadata.gz: 628affa5df0d55f3bf40f0609d3fcb7a13117211fe191ad18a65ff2b9fe8d089
+  data.tar.gz: f887fabd4f2eeeb5f4e9225d0e3cbec5ef4af1ea120dd987c02789bc3c92dca3
 SHA512:
-  metadata.gz: 066107a45e63c075b4fe68ad8588c396d0b60cba2af16e32881078aa29d356e34c72e4338150db683a23bda4489e34f51dc1960f216d74356afeec5e38d758ef
-  data.tar.gz: c92e64257ab9a192086ca5dffbf27f1ce32fb6435c1f82fa6f07994f933489359490002f519d10fe2206de53ff03571d88fb12f62692f0f29b6d718d3941211f
+  metadata.gz: 2d1a2eb2d4e0a8113bc0b46d32f397b1d8e943ce5716a93df7b8b99c92210a3bb52a2128e760d0db840295c4eabb5cfdf96a03d0e2e9ad26ffde56b9ec8f3f9a
+  data.tar.gz: e6db47cc5296f2c5b64d1f03d2601193e072a9f2bac2582e9eea87785ba015edc283013edd31473b85ca9641673eee949f9431cd0d31b55c9e75deeb004ac50d

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", "4.0")
+  solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
   solidus_32_install_options =
     "--payment-method none --frontend none --no-with-authentication"
   solidus_33_install_options =

data/config/initializers/spree.rb

@@ -2,66 +2,69 @@ if defined?(Alchemy::Devise::Engine)
   Spree.user_class = "Alchemy::User"
 end
 
-Spree::Backend::Config.configure do |config|
-  alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
-    config.class::MenuItem.new(
-      label: :cms,
-      icon: "copy",
-      condition: -> { can?(:index, :alchemy_admin_dashboard) },
-      url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
-      children: [
-        config.class::MenuItem.new(
-          label: :pages,
-          condition: -> { can?(:index, :alchemy_admin_pages) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
-          match_path: "/pages"
-        ),
-        config.class::MenuItem.new(
-          label: :languages,
-          condition: -> { can?(:index, :alchemy_admin_sites) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
-          match_path: "/languages"
-        ),
-        (if defined?(Alchemy::Devise::Engine)
-            config.class::MenuItem.new(
-              label: :users,
-              condition: -> { can?(:index, :alchemy_admin_users) },
-              url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
-              match_path: "/users"
-            )
-          end),
-        config.class::MenuItem.new(
-          label: :tags,
-          condition: -> { can?(:index, :alchemy_admin_tags) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
-        ),
-        config.class::MenuItem.new(
-          label: :pictures,
-          condition: -> { can?(:index, :alchemy_admin_pictures) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
-        ),
-        config.class::MenuItem.new(
-          label: :attachments,
-          condition: -> { can?(:index, :alchemy_admin_attachments) },
-          url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
-        )
-      ].compact
-    )
-  else
-    config.class::MenuItem.new(
-      [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
-      "copy",
-      label: :cms,
-      condition: -> { can?(:index, :alchemy_admin_dashboard) },
-      partial: "spree/admin/shared/alchemy_sub_menu",
-      url: "/admin/pages",
-      match_path: "/pages"
-    )
+Rails.application.config.after_initialize do
+  Spree::Backend::Config.configure do |config|
+    alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
+      config.class::MenuItem.new(
+        label: :cms,
+        icon: config.admin_updated_navbar ? "ri-pages-line" : "copy",
+        condition: -> { can?(:index, :alchemy_admin_dashboard) },
+        url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
+        children: [
+          config.class::MenuItem.new(
+            label: :pages,
+            condition: -> { can?(:index, :alchemy_admin_pages) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
+            match_path: "/pages"
+          ),
+          config.class::MenuItem.new(
+            label: :languages,
+            condition: -> { can?(:index, :alchemy_admin_sites) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
+            match_path: "/languages"
+          ),
+          (if defined?(Alchemy::Devise::Engine)
+              config.class::MenuItem.new(
+                label: :users,
+                condition: -> { can?(:index, :alchemy_admin_users) },
+                url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
+                match_path: "/users"
+              )
+            end),
+          config.class::MenuItem.new(
+            label: :tags,
+            condition: -> { can?(:index, :alchemy_admin_tags) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
+          ),
+          config.class::MenuItem.new(
+            label: :pictures,
+            condition: -> { can?(:index, :alchemy_admin_pictures) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
+          ),
+          config.class::MenuItem.new(
+            label: :attachments,
+            condition: -> { can?(:index, :alchemy_admin_attachments) },
+            url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
+          )
+        ].compact
+      )
+    else
+      config.class::MenuItem.new(
+        [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
+        "copy",
+        label: :cms,
+        condition: -> { can?(:index, :alchemy_admin_dashboard) },
+        partial: "spree/admin/shared/alchemy_sub_menu",
+        url: "/admin/pages",
+        match_path: "/pages"
+      )
+    end
+    settings = config.menu_items.detect { |item| item.label == :settings }
+    config.menu_items.index(settings).tap do |index|
+      config.menu_items.insert(index, alchemy_menu_item)
+    end
   end
-  config.menu_items << alchemy_menu_item
-end
 
-Rails.application.config.after_initialize do
   if Spree::Backend::Config.menu_items.many? { |menu_item| menu_item.label == :cms }
     Alchemy::Deprecation.warn("You configured the Alchemy menu items in your app's initializers. We can do that for you now! Please remove the menu item with the label `:cms`.")
   end

data/lib/alchemy/solidus/version.rb

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

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

@@ -1,12 +1,5 @@
 require "rails/generators"
-require "alchemy/version"
-
-if Alchemy.gem_version >= Gem::Version.new("5.0.0.a")
-  require "generators/alchemy/install/install_generator"
-else
-  require "rails/generators/alchemy/install/install_generator"
-end
-
+require "generators/alchemy/install/install_generator"
 require "generators/spree/custom_user/custom_user_generator"
 require "solidus_support"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms