alchemy-solidus 6.3.0 → 6.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -1
  3. data/config/initializers/spree.rb +61 -58
  4. data/lib/alchemy/solidus/version.rb +1 -1
  5. data/lib/generators/alchemy/solidus/install/install_generator.rb +1 -8
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d0871f7a06ef602fcd95d7c20e3caf64016e226fd6741fb00634a1eadf8d1ee0
4
- data.tar.gz: 4f8e1ea07ac7881657577aac59f70542aaf292a52c084a05eb56c736d8489156
3
+ metadata.gz: 628affa5df0d55f3bf40f0609d3fcb7a13117211fe191ad18a65ff2b9fe8d089
4
+ data.tar.gz: f887fabd4f2eeeb5f4e9225d0e3cbec5ef4af1ea120dd987c02789bc3c92dca3
5
5
  SHA512:
6
- metadata.gz: 066107a45e63c075b4fe68ad8588c396d0b60cba2af16e32881078aa29d356e34c72e4338150db683a23bda4489e34f51dc1960f216d74356afeec5e38d758ef
7
- data.tar.gz: c92e64257ab9a192086ca5dffbf27f1ce32fb6435c1f82fa6f07994f933489359490002f519d10fe2206de53ff03571d88fb12f62692f0f29b6d718d3941211f
6
+ metadata.gz: 2d1a2eb2d4e0a8113bc0b46d32f397b1d8e943ce5716a93df7b8b99c92210a3bb52a2128e760d0db840295c4eabb5cfdf96a03d0e2e9ad26ffde56b9ec8f3f9a
7
+ data.tar.gz: e6db47cc5296f2c5b64d1f03d2601193e072a9f2bac2582e9eea87785ba015edc283013edd31473b85ca9641673eee949f9431cd0d31b55c9e75deeb004ac50d
data/Rakefile CHANGED
@@ -16,7 +16,7 @@ require "active_support/core_ext/string"
16
16
 
17
17
  desc "Setup test app"
18
18
  task :test_setup do
19
- solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.0")
19
+ solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
20
20
  solidus_32_install_options =
21
21
  "--payment-method none --frontend none --no-with-authentication"
22
22
  solidus_33_install_options =
data/config/initializers/spree.rb CHANGED
@@ -2,66 +2,69 @@ if defined?(Alchemy::Devise::Engine)
2
2
  Spree.user_class = "Alchemy::User"
3
3
  end
4
4
 
5
- Spree::Backend::Config.configure do |config|
6
- alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
7
- config.class::MenuItem.new(
8
- label: :cms,
9
- icon: "copy",
10
- condition: -> { can?(:index, :alchemy_admin_dashboard) },
11
- url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
12
- children: [
13
- config.class::MenuItem.new(
14
- label: :pages,
15
- condition: -> { can?(:index, :alchemy_admin_pages) },
16
- url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
17
- match_path: "/pages"
18
- ),
19
- config.class::MenuItem.new(
20
- label: :languages,
21
- condition: -> { can?(:index, :alchemy_admin_sites) },
22
- url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
23
- match_path: "/languages"
24
- ),
25
- (if defined?(Alchemy::Devise::Engine)
26
- config.class::MenuItem.new(
27
- label: :users,
28
- condition: -> { can?(:index, :alchemy_admin_users) },
29
- url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
30
- match_path: "/users"
31
- )
32
- end),
33
- config.class::MenuItem.new(
34
- label: :tags,
35
- condition: -> { can?(:index, :alchemy_admin_tags) },
36
- url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
37
- ),
38
- config.class::MenuItem.new(
39
- label: :pictures,
40
- condition: -> { can?(:index, :alchemy_admin_pictures) },
41
- url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
42
- ),
43
- config.class::MenuItem.new(
44
- label: :attachments,
45
- condition: -> { can?(:index, :alchemy_admin_attachments) },
46
- url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
47
- )
48
- ].compact
49
- )
50
- else
51
- config.class::MenuItem.new(
52
- [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
53
- "copy",
54
- label: :cms,
55
- condition: -> { can?(:index, :alchemy_admin_dashboard) },
56
- partial: "spree/admin/shared/alchemy_sub_menu",
57
- url: "/admin/pages",
58
- match_path: "/pages"
59
- )
5
+ Rails.application.config.after_initialize do
6
+ Spree::Backend::Config.configure do |config|
7
+ alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
8
+ config.class::MenuItem.new(
9
+ label: :cms,
10
+ icon: config.admin_updated_navbar ? "ri-pages-line" : "copy",
11
+ condition: -> { can?(:index, :alchemy_admin_dashboard) },
12
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
13
+ children: [
14
+ config.class::MenuItem.new(
15
+ label: :pages,
16
+ condition: -> { can?(:index, :alchemy_admin_pages) },
17
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
18
+ match_path: "/pages"
19
+ ),
20
+ config.class::MenuItem.new(
21
+ label: :languages,
22
+ condition: -> { can?(:index, :alchemy_admin_sites) },
23
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
24
+ match_path: "/languages"
25
+ ),
26
+ (if defined?(Alchemy::Devise::Engine)
27
+ config.class::MenuItem.new(
28
+ label: :users,
29
+ condition: -> { can?(:index, :alchemy_admin_users) },
30
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
31
+ match_path: "/users"
32
+ )
33
+ end),
34
+ config.class::MenuItem.new(
35
+ label: :tags,
36
+ condition: -> { can?(:index, :alchemy_admin_tags) },
37
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
38
+ ),
39
+ config.class::MenuItem.new(
40
+ label: :pictures,
41
+ condition: -> { can?(:index, :alchemy_admin_pictures) },
42
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
43
+ ),
44
+ config.class::MenuItem.new(
45
+ label: :attachments,
46
+ condition: -> { can?(:index, :alchemy_admin_attachments) },
47
+ url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
48
+ )
49
+ ].compact
50
+ )
51
+ else
52
+ config.class::MenuItem.new(
53
+ [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
54
+ "copy",
55
+ label: :cms,
56
+ condition: -> { can?(:index, :alchemy_admin_dashboard) },
57
+ partial: "spree/admin/shared/alchemy_sub_menu",
58
+ url: "/admin/pages",
59
+ match_path: "/pages"
60
+ )
61
+ end
62
+ settings = config.menu_items.detect { |item| item.label == :settings }
63
+ config.menu_items.index(settings).tap do |index|
64
+ config.menu_items.insert(index, alchemy_menu_item)
65
+ end
60
66
  end
61
- config.menu_items << alchemy_menu_item
62
- end
63
67
 
64
- Rails.application.config.after_initialize do
65
68
  if Spree::Backend::Config.menu_items.many? { |menu_item| menu_item.label == :cms }
66
69
  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`.")
67
70
  end
data/lib/alchemy/solidus/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
  module Solidus
3
- VERSION = "6.3.0"
3
+ VERSION = "6.3.1"
4
4
  end
5
5
  end
data/lib/generators/alchemy/solidus/install/install_generator.rb CHANGED
@@ -1,12 +1,5 @@
1
1
  require "rails/generators"
2
- require "alchemy/version"
3
-
4
- if Alchemy.gem_version >= Gem::Version.new("5.0.0.a")
5
- require "generators/alchemy/install/install_generator"
6
- else
7
- require "rails/generators/alchemy/install/install_generator"
8
- end
9
-
2
+ require "generators/alchemy/install/install_generator"
10
3
  require "generators/spree/custom_user/custom_user_generator"
11
4
  require "solidus_support"
12
5
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy-solidus
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.3.0
4
+ version: 6.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-10-25 00:00:00.000000000 Z
11
+ date: 2023-11-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: alchemy_cms