alchemy-solidus 4.0.0.pre.b2 → 4.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1e758371bc495c388b64953e658acaec9d9f2708d21eaae8f76c686dc2279356
4
- data.tar.gz: 95926d5d99a70dddbfc27ed4483b7c3176b9a91c89cf25f3a1664c64b5f9ff1c
3
+ metadata.gz: 83174dea5ed68edc46ddb776b57d178ec200c6b63c2d674c177efcee4d8766c7
4
+ data.tar.gz: 579502a6211889f8cc709503c03d80c5542f349af0e856284e10130e01bfc631
5
5
  SHA512:
6
- metadata.gz: aa9b550cd214034f9d5e54154f6ba7cc6750d05c068273e1a0eb488d35b033a32e59242b087401fbcbd218db22256d09cd2019ee61163aaacf194650f7f7079c
7
- data.tar.gz: 9ecfb5cb2985843b5e0c19768729c9f8b92c778860f292a3901339861222d8da9f4ba1b8e6dab3e5a5cd80bda25e68737b0852151c624b663b8da870916cde2d
6
+ metadata.gz: 2c50e7d485496ae38dd9524760cbfb4561f550c9ff735a9ec3fb1bbcf2c8af202409f2e620f2f704be84c2e0025c76bb76ebfc70a2093b98bdcb8108ef09d5ca
7
+ data.tar.gz: d6a22895a674dfdaee445a3b631dc684dc4557985f120bc3743d6e5eb153c4cd85078e06d57bf30bf9c3b76f3b67f7393108b96fb13164a13eb7771855f82b2e
data/README.md CHANGED
@@ -13,15 +13,19 @@ This is a [AlchemyCMS](https://alchemy-cms.com) and [Solidus](https://solidus.io
13
13
 
14
14
  ### Solidus
15
15
 
16
- This version runs with Solidus 2.6 and above.
16
+ This version runs with Solidus v2.11 and v3.0.
17
17
 
18
+ - For a Solidus < 2.11 compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
18
19
  - For a Solidus < 2.6 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
19
20
  - For a Solidus 1.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
20
21
 
22
+ > **NOTE:** If you are using Solidus v3.0 with Alchemy v5.3, make sure to also use Rails v6.0 and the legacy image attachment adapter (paperclip) and not the active storage adapter, since this needs Rails >= 6.1 and Alchemy v5.3 is not Rails 6.1 compatible. You need Alchemy v6.0 for Rails >= 6.1.
23
+
21
24
  ### Alchemy
22
25
 
23
- This version runs with Alchemy 4.1 and above.
26
+ This version runs with Alchemy v5.x and v6.0.
24
27
 
28
+ - For a Alchemy 4.x compatible version please use the `3.1-stable` branch or `3.3.0` gem version.
25
29
  - For a Alchemy 4.0 compatible version please use the `2.3-stable` branch or `2.3.2` gem version.
26
30
  - For a Alchemy 3.x compatible version please use the `1.0-stable` branch or `1.1.0` gem version.
27
31
 
data/Rakefile CHANGED
@@ -20,7 +20,9 @@ task :test_setup do
20
20
  system <<-SETUP.strip_heredoc
21
21
  export RAILS_ENV=test && \
22
22
  bin/rake db:environment:set db:drop && \
23
- bin/rails g spree:install --force --auto-accept --no-seed --no-sample && \
23
+ bin/rake gutentag:install:migrations && \
24
+ bin/rails g gutentag:migration_versions && \
25
+ bin/rails g #{ENV["SOLIDUS_BRANCH"].match?(/^2.+/) ? "spree" : "solidus"}:install --force --auto-accept --no-seed --no-sample && \
24
26
  bin/rails g alchemy:solidus:install --auto-accept --force
25
27
  SETUP
26
28
  exit($?.exitstatus) unless $?.success?
@@ -3,7 +3,7 @@ Alchemy.Solidus = Alchemy.Solidus || {}
3
3
 
4
4
  Alchemy.Solidus.getSelect2Config = function(options) {
5
5
  var headers = {
6
- 'X-Spree-Token': options.apiToken
6
+ 'Authorization': 'Bearer ' + options.apiToken
7
7
  }
8
8
 
9
9
  return {
@@ -5,6 +5,7 @@
5
5
  <%= ingredient_label(spree_product_editor, :product_id) %>
6
6
  <%= f.text_field :product_id,
7
7
  value: spree_product_editor.product&.id,
8
+ id: spree_product_editor.form_field_id(:product_id),
8
9
  class: 'alchemy_selectbox full_width' %>
9
10
  <% end %>
10
11
  <% end %>
@@ -5,6 +5,7 @@
5
5
  <%= ingredient_label(spree_taxon_editor, :taxon_id) %>
6
6
  <%= f.text_field :taxon_id,
7
7
  value: spree_taxon_editor.taxon&.id,
8
+ id: spree_taxon_editor.form_field_id(:taxon_id),
8
9
  class: 'alchemy_selectbox full_width' %>
9
10
  <% end %>
10
11
  <% end %>
@@ -5,6 +5,7 @@
5
5
  <%= ingredient_label(spree_variant_editor, :variant_id) %>
6
6
  <%= f.text_field :variant_id,
7
7
  value: spree_variant_editor.variant&.id,
8
+ id: spree_variant_editor.form_field_id(:variant_id),
8
9
  class: 'alchemy_selectbox full_width' %>
9
10
  <% end %>
10
11
  <% end %>
@@ -24,11 +24,6 @@ module Alchemy
24
24
  require 'alchemy/solidus/spree_admin_unauthorized_redirect'
25
25
  end
26
26
 
27
- if Spree.solidus_gem_version < Gem::Version.new('2.5')
28
- require 'alchemy/solidus/spree_custom_user_generator_fix'
29
- require 'alchemy/solidus/spree_install_generator_fix'
30
- end
31
-
32
27
  if SolidusSupport.frontend_available?
33
28
  # Allows to render Alchemy content within Solidus' controller views
34
29
  require_dependency 'alchemy/solidus/alchemy_in_solidus'
@@ -48,14 +43,6 @@ module Alchemy
48
43
  end
49
44
  end
50
45
 
51
- # In versions of Solidus prior to 2.8, we override the tabs partial
52
- # to pass a match_path value to each tab. (Version 2.8 is already
53
- # passing this option.) This option is used to configure the paths
54
- # for which a given tab is active.
55
- #
56
- if Spree.solidus_gem_version < Gem::Version.new('2.8')
57
- paths['app/views'] << 'lib/views'
58
- end
59
46
  if Alchemy.gem_version >= Gem::Version.new('6.0.0.b1')
60
47
  paths['app/models'] << 'lib/models'
61
48
  end
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
  module Solidus
3
- VERSION = "4.0.0-b2"
3
+ VERSION = "4.0.0"
4
4
  end
5
5
  end
@@ -55,9 +55,6 @@ module Alchemy
55
55
  arguments = options[:auto_accept] ? ['Alchemy::User', '--force'] : ['Alchemy::User']
56
56
  Spree::CustomUserGenerator.start(arguments)
57
57
  gsub_file 'lib/spree/authentication_helpers.rb', /main_app\./, 'Alchemy.'
58
- if Spree.solidus_gem_version < Gem::Version.new('2.5.0')
59
- gsub_file 'config/initializers/spree.rb', /Spree\.user_class.?=.?.+$/, 'Spree.user_class = "Alchemy::User"'
60
- end
61
58
  rake('db:migrate', abort_on_failure: true)
62
59
  end
63
60
  end
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: 4.0.0.pre.b2
4
+ version: 4.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-08 00:00:00.000000000 Z
11
+ date: 2022-04-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: alchemy_cms
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: 2.10.0
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: '3.0'
42
+ version: '4.0'
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: 2.10.0
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: '3.0'
52
+ version: '4.0'
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: solidus_backend
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
59
59
  version: 2.10.0
60
60
  - - "<"
61
61
  - !ruby/object:Gem::Version
62
- version: '3.0'
62
+ version: '4.0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
69
69
  version: 2.10.0
70
70
  - - "<"
71
71
  - !ruby/object:Gem::Version
72
- version: '3.0'
72
+ version: '4.0'
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: solidus_support
75
75
  requirement: !ruby/object:Gem::Requirement
@@ -104,14 +104,14 @@ dependencies:
104
104
  requirements:
105
105
  - - "~>"
106
106
  - !ruby/object:Gem::Version
107
- version: '3.7'
107
+ version: '5.0'
108
108
  type: :development
109
109
  prerelease: false
110
110
  version_requirements: !ruby/object:Gem::Requirement
111
111
  requirements:
112
112
  - - "~>"
113
113
  - !ruby/object:Gem::Version
114
- version: '3.7'
114
+ version: '5.0'
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: shoulda-matchers
117
117
  requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,6 @@ files:
228
228
  - app/views/alchemy/ingredients/_spree_variant_view.html.erb
229
229
  - app/views/spree/admin/shared/_alchemy_sub_menu.html.erb
230
230
  - config/initializers/alchemy.rb
231
- - config/initializers/solidus.rb
232
231
  - config/locales/alchemy_solidus_en.yml
233
232
  - config/locales/alchemy_solidus_it.yml
234
233
  - config/locales/en.yml
@@ -240,8 +239,6 @@ files:
240
239
  - lib/alchemy/solidus/alchemy_user_extension.rb
241
240
  - lib/alchemy/solidus/engine.rb
242
241
  - lib/alchemy/solidus/spree_admin_unauthorized_redirect.rb
243
- - lib/alchemy/solidus/spree_custom_user_generator_fix.rb
244
- - lib/alchemy/solidus/spree_install_generator_fix.rb
245
242
  - lib/alchemy/solidus/spree_user_extension.rb
246
243
  - lib/alchemy/solidus/use_solidus_layout.rb
247
244
  - lib/alchemy/solidus/version.rb
@@ -250,12 +247,11 @@ files:
250
247
  - lib/models/alchemy/ingredients/spree_product.rb
251
248
  - lib/models/alchemy/ingredients/spree_taxon.rb
252
249
  - lib/models/alchemy/ingredients/spree_variant.rb
253
- - lib/views/spree/admin/shared/_tabs.html.erb
254
250
  homepage: https://github.com/AlchemyCMS/alchemy-solidus
255
251
  licenses:
256
252
  - BSD New
257
253
  metadata: {}
258
- post_install_message:
254
+ post_install_message:
259
255
  rdoc_options: []
260
256
  require_paths:
261
257
  - lib
@@ -266,12 +262,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
266
262
  version: '0'
267
263
  required_rubygems_version: !ruby/object:Gem::Requirement
268
264
  requirements:
269
- - - ">"
265
+ - - ">="
270
266
  - !ruby/object:Gem::Version
271
- version: 1.3.1
267
+ version: '0'
272
268
  requirements: []
273
- rubygems_version: 3.1.4
274
- signing_key:
269
+ rubygems_version: 3.1.6
270
+ signing_key:
275
271
  specification_version: 4
276
272
  summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
277
273
  Content Management System!
@@ -1,29 +0,0 @@
1
- # In versions of Solidus prior to 2.8, we override this class to
2
- # add the match_path option to the initializer. (Version 2.8 has
3
- # this option already.) This option is used in the tabs partial
4
- # to configure the paths for which a given tab is active.
5
- #
6
- if Spree.solidus_gem_version < Gem::Version.new('2.8')
7
- Spree::BackendConfiguration::MenuItem.class_eval do
8
- attr_reader :match_path
9
-
10
- def initialize(
11
- sections,
12
- icon,
13
- condition: nil,
14
- label: nil,
15
- partial: nil,
16
- url: nil,
17
- match_path: nil
18
- )
19
-
20
- @condition = condition || -> { true }
21
- @sections = sections
22
- @icon = icon
23
- @label = label || sections.first
24
- @partial = partial
25
- @url = url
26
- @match_path = match_path
27
- end
28
- end
29
- end
@@ -1,9 +0,0 @@
1
- require 'active_record/migration'
2
- require 'generators/spree/custom_user/custom_user_generator'
3
-
4
- Spree::CustomUserGenerator.class_eval do
5
- def self.next_migration_number(dirname)
6
- next_migration_number = current_migration_number(dirname) + 1
7
- ActiveRecord::Migration.next_migration_number(next_migration_number)
8
- end
9
- end
@@ -1,29 +0,0 @@
1
- require 'generators/spree/install/install_generator'
2
-
3
- Spree::InstallGenerator.class_eval do
4
- CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
5
-
6
- def install_routes
7
- routes_file_path = File.join('config', 'routes.rb')
8
- unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
9
- insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
10
- <<-ROUTES
11
- # This line mounts Solidus's routes at the root of your application.
12
- # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
13
- # If you would like to change where this engine is mounted, simply change the :at option to something different.
14
- #
15
- # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
16
- #{CORE_MOUNT_ROUTE}, at: '/'
17
-
18
- ROUTES
19
- end
20
- end
21
-
22
- unless options[:quiet]
23
- puts "*" * 50
24
- puts "We added the following line to your application's config/routes.rb file:"
25
- puts " "
26
- puts " #{CORE_MOUNT_ROUTE}, at: '/'"
27
- end
28
- end
29
- end
@@ -1,15 +0,0 @@
1
- <% Spree::Backend::Config.menu_items.each do |menu_item| %>
2
- <% if instance_exec(&menu_item.condition) %>
3
- <%=
4
- tab(
5
- *menu_item.sections,
6
- icon: menu_item.icon,
7
- label: menu_item.label,
8
- url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url,
9
- match_path: menu_item.match_path
10
- ) do
11
- %>
12
- <%- render partial: menu_item.partial if menu_item.partial %>
13
- <%- end %>
14
- <% end %>
15
- <% end %>