alchemy_cms 7.0.1 → 7.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +11 -0
  3. data/alchemy_cms.gemspec +2 -2
  4. data/app/helpers/alchemy/admin/ingredients_helper.rb +2 -2
  5. data/app/views/alchemy/admin/pages/_table.html.erb +6 -0
  6. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +2 -2
  7. data/app/views/alchemy/ingredients/_picture_editor.html.erb +1 -1
  8. data/lib/alchemy/version.rb +1 -1
  9. data/lib/non_stupid_digest_assets.rb +1 -1
  10. metadata +22 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3f0cc418c39ce5701b162c99be3ffdd6fd0a7ccffa37cae44df6632f282b3387
4
- data.tar.gz: acccc64201262b7caca16131104d5e5edf64ff44a7b11770f210b6aa4037dfb4
3
+ metadata.gz: b01898eaa0c9b209814972d61b137c1ee14f875ce1426db5cb45389ce435a1fe
4
+ data.tar.gz: 9b1edbdb5096b2384187e3282f4c28a854c2139474cf1dbc452e32c177f0f65c
5
5
  SHA512:
6
- metadata.gz: '062183faa7a2519e5727ca492ee2e9cf34763b4c016a1e1eb9790d04a03e81e68bd2f37ca09f738251baf9ad4d07f4ff9ab04c9851139b5313ecb34f3d079886'
7
- data.tar.gz: 7fd8da93df4758470ac57fd457469be08420c2740547b5c64c571fa7c0fae19be7460ba3ff2ba88a225f5c4d7d75a0351039d66962ed091736def00b09450006
6
+ metadata.gz: ccf4b9760d9a8f286a245e36b399534df9b61ce6972567a5ccf4cbfd861ab037802cbcd91f74e0c62e28b7b45e108ce0c969e230430e8508e932a8c09af6751e
7
+ data.tar.gz: bc750d8c231526c3f560c7c09fd45994225e730be031954a1304a52d113bb10ac313e4c1bf699e1ab076245e4caf43a7583f501bae7ef2ae775c045a6fb0b0dd
data/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # Changelog
2
2
 
3
+ ## 7.0.3 (2023-08-29)
4
+
5
+ - [7.0-stable] Merge pull request #2571 from tvdeyen/fix-non-stupid-digest-assets [#2572](https://github.com/AlchemyCMS/alchemy_cms/pull/2572) ([github-actions](https://github.com/apps/github-actions))
6
+ - Increase minimum Rails version to v6.1 [#2541](https://github.com/AlchemyCMS/alchemy_cms/pull/2541) ([sascha-karnatz](https://github.com/sascha-karnatz))
7
+
8
+ ## 7.0.2 (2023-07-31)
9
+
10
+ - [7.0] Fix DOM ids and labels of ingredient editors [#2538](https://github.com/AlchemyCMS/alchemy_cms/pull/2538) ([tvdeyen](https://github.com/tvdeyen))
11
+ - [7.0] Bugfix: Initialize PagePublicationFields on Pages Table [#2537](https://github.com/AlchemyCMS/alchemy_cms/pull/2537) ([tvdeyen](https://github.com/tvdeyen))
12
+ - [v7.0] Use selenium-webdriver instead of webdrivers gem [#2532](https://github.com/AlchemyCMS/alchemy_cms/pull/2532) ([mamhoff](https://github.com/mamhoff))
13
+
3
14
  ## 7.0.1 (2023-07-07)
4
15
 
5
16
  - Fix disconnecting Tinymce intersection observer [#2519](https://github.com/AlchemyCMS/alchemy_cms/pull/2519) ([tvdeyen](https://github.com/tvdeyen))
data/alchemy_cms.gemspec CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
29
29
  activesupport
30
30
  railties
31
31
  ].each do |rails_gem|
32
- gem.add_runtime_dependency rails_gem, [">= 6.0", "< 7.1"]
32
+ gem.add_runtime_dependency rails_gem, [">= 6.1", "< 7.1"]
33
33
  end
34
34
 
35
35
  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
@@ -63,7 +63,7 @@ Gem::Specification.new do |gem|
63
63
  gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
64
64
  gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
65
65
  gem.add_development_dependency "simplecov", ["~> 0.20"]
66
- gem.add_development_dependency "webdrivers", ["~> 5.0"]
66
+ gem.add_development_dependency "selenium-webdriver", ["~> 4.10"]
67
67
  gem.add_development_dependency "webmock", ["~> 3.3"]
68
68
  gem.add_development_dependency "shoulda-matchers", ["~> 5.0"]
69
69
  gem.add_development_dependency "timecop", ["~> 0.9"]
data/app/helpers/alchemy/admin/ingredients_helper.rb CHANGED
@@ -32,8 +32,8 @@ module Alchemy
32
32
  end
33
33
 
34
34
  # Renders the label and hint for a ingredient.
35
- def ingredient_label(ingredient, column = :value)
36
- label_tag ingredient.form_field_id(column) do
35
+ def ingredient_label(ingredient, column = :value, html_options = {})
36
+ label_tag ingredient.form_field_id(column), html_options do
37
37
  [render_ingredient_role(ingredient), render_hint_for(ingredient)].compact.join("&nbsp;").html_safe
38
38
  end
39
39
  end
data/app/views/alchemy/admin/pages/_table.html.erb CHANGED
@@ -25,3 +25,9 @@
25
25
  <%= render partial: "table_row", collection: @pages, as: "page" %>
26
26
  </tbody>
27
27
  </table>
28
+
29
+ <script type="text/javascript">
30
+ $(function() {
31
+ Alchemy.PagePublicationFields();
32
+ });
33
+ </script>
data/app/views/alchemy/ingredients/_boolean_editor.html.erb CHANGED
@@ -2,8 +2,8 @@
2
2
  class: boolean_editor.css_classes,
3
3
  data: boolean_editor.data_attributes do %>
4
4
  <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
5
- <%= f.label :value, style: "display: inline-block" do %>
6
- <%= f.check_box :value, id: boolean_editor.form_field_id %>
5
+ <%= f.label :value, style: "display: inline-block", for: nil do %>
6
+ <%= f.check_box :value, id: nil %>
7
7
  <%= render_ingredient_role(boolean_editor) %>
8
8
  <% end %>
9
9
  <%= render_hint_for(boolean_editor) %>
data/app/views/alchemy/ingredients/_picture_editor.html.erb CHANGED
@@ -4,7 +4,7 @@
4
4
  class: picture_editor.css_classes,
5
5
  data: picture_editor.data_attributes do %>
6
6
  <%= element_form.fields_for(:ingredients, picture_editor.ingredient) do |f| %>
7
- <%= ingredient_label(picture_editor, :picture_id) %>
7
+ <%= ingredient_label(picture_editor, :picture_id, for: nil) %>
8
8
  <%= content_tag :div,
9
9
  data: {
10
10
  target_size: picture_editor.settings[:size] || [
data/lib/alchemy/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Alchemy
4
- VERSION = "7.0.1"
4
+ VERSION = "7.0.3"
5
5
 
6
6
  def self.version
7
7
  VERSION
data/lib/non_stupid_digest_assets.rb CHANGED
@@ -19,7 +19,7 @@ module NonStupidDigestAssets
19
19
  def whitelisted_assets(assets)
20
20
  assets.select do |logical_path, _digest_path|
21
21
  whitelist.any? do |item|
22
- item =~ logical_path
22
+ /#{item}/ =~ logical_path
23
23
  end
24
24
  end
25
25
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.1
4
+ version: 7.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2023-07-07 00:00:00.000000000 Z
16
+ date: 2023-08-29 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: actionmailer
@@ -21,7 +21,7 @@ dependencies:
21
21
  requirements:
22
22
  - - ">="
23
23
  - !ruby/object:Gem::Version
24
- version: '6.0'
24
+ version: '6.1'
25
25
  - - "<"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '7.1'
@@ -31,7 +31,7 @@ dependencies:
31
31
  requirements:
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: '6.0'
34
+ version: '6.1'
35
35
  - - "<"
36
36
  - !ruby/object:Gem::Version
37
37
  version: '7.1'
@@ -41,7 +41,7 @@ dependencies:
41
41
  requirements:
42
42
  - - ">="
43
43
  - !ruby/object:Gem::Version
44
- version: '6.0'
44
+ version: '6.1'
45
45
  - - "<"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '7.1'
@@ -51,7 +51,7 @@ dependencies:
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '6.0'
54
+ version: '6.1'
55
55
  - - "<"
56
56
  - !ruby/object:Gem::Version
57
57
  version: '7.1'
@@ -61,7 +61,7 @@ dependencies:
61
61
  requirements:
62
62
  - - ">="
63
63
  - !ruby/object:Gem::Version
64
- version: '6.0'
64
+ version: '6.1'
65
65
  - - "<"
66
66
  - !ruby/object:Gem::Version
67
67
  version: '7.1'
@@ -71,7 +71,7 @@ dependencies:
71
71
  requirements:
72
72
  - - ">="
73
73
  - !ruby/object:Gem::Version
74
- version: '6.0'
74
+ version: '6.1'
75
75
  - - "<"
76
76
  - !ruby/object:Gem::Version
77
77
  version: '7.1'
@@ -81,7 +81,7 @@ dependencies:
81
81
  requirements:
82
82
  - - ">="
83
83
  - !ruby/object:Gem::Version
84
- version: '6.0'
84
+ version: '6.1'
85
85
  - - "<"
86
86
  - !ruby/object:Gem::Version
87
87
  version: '7.1'
@@ -91,7 +91,7 @@ dependencies:
91
91
  requirements:
92
92
  - - ">="
93
93
  - !ruby/object:Gem::Version
94
- version: '6.0'
94
+ version: '6.1'
95
95
  - - "<"
96
96
  - !ruby/object:Gem::Version
97
97
  version: '7.1'
@@ -101,7 +101,7 @@ dependencies:
101
101
  requirements:
102
102
  - - ">="
103
103
  - !ruby/object:Gem::Version
104
- version: '6.0'
104
+ version: '6.1'
105
105
  - - "<"
106
106
  - !ruby/object:Gem::Version
107
107
  version: '7.1'
@@ -111,7 +111,7 @@ dependencies:
111
111
  requirements:
112
112
  - - ">="
113
113
  - !ruby/object:Gem::Version
114
- version: '6.0'
114
+ version: '6.1'
115
115
  - - "<"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '7.1'
@@ -121,7 +121,7 @@ dependencies:
121
121
  requirements:
122
122
  - - ">="
123
123
  - !ruby/object:Gem::Version
124
- version: '6.0'
124
+ version: '6.1'
125
125
  - - "<"
126
126
  - !ruby/object:Gem::Version
127
127
  version: '7.1'
@@ -131,7 +131,7 @@ dependencies:
131
131
  requirements:
132
132
  - - ">="
133
133
  - !ruby/object:Gem::Version
134
- version: '6.0'
134
+ version: '6.1'
135
135
  - - "<"
136
136
  - !ruby/object:Gem::Version
137
137
  version: '7.1'
@@ -141,7 +141,7 @@ dependencies:
141
141
  requirements:
142
142
  - - ">="
143
143
  - !ruby/object:Gem::Version
144
- version: '6.0'
144
+ version: '6.1'
145
145
  - - "<"
146
146
  - !ruby/object:Gem::Version
147
147
  version: '7.1'
@@ -151,7 +151,7 @@ dependencies:
151
151
  requirements:
152
152
  - - ">="
153
153
  - !ruby/object:Gem::Version
154
- version: '6.0'
154
+ version: '6.1'
155
155
  - - "<"
156
156
  - !ruby/object:Gem::Version
157
157
  version: '7.1'
@@ -161,7 +161,7 @@ dependencies:
161
161
  requirements:
162
162
  - - ">="
163
163
  - !ruby/object:Gem::Version
164
- version: '6.0'
164
+ version: '6.1'
165
165
  - - "<"
166
166
  - !ruby/object:Gem::Version
167
167
  version: '7.1'
@@ -171,7 +171,7 @@ dependencies:
171
171
  requirements:
172
172
  - - ">="
173
173
  - !ruby/object:Gem::Version
174
- version: '6.0'
174
+ version: '6.1'
175
175
  - - "<"
176
176
  - !ruby/object:Gem::Version
177
177
  version: '7.1'
@@ -656,19 +656,19 @@ dependencies:
656
656
  - !ruby/object:Gem::Version
657
657
  version: '0.20'
658
658
  - !ruby/object:Gem::Dependency
659
- name: webdrivers
659
+ name: selenium-webdriver
660
660
  requirement: !ruby/object:Gem::Requirement
661
661
  requirements:
662
662
  - - "~>"
663
663
  - !ruby/object:Gem::Version
664
- version: '5.0'
664
+ version: '4.10'
665
665
  type: :development
666
666
  prerelease: false
667
667
  version_requirements: !ruby/object:Gem::Requirement
668
668
  requirements:
669
669
  - - "~>"
670
670
  - !ruby/object:Gem::Version
671
- version: '5.0'
671
+ version: '4.10'
672
672
  - !ruby/object:Gem::Dependency
673
673
  name: webmock
674
674
  requirement: !ruby/object:Gem::Requirement
@@ -1447,7 +1447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1447
1447
  version: '0'
1448
1448
  requirements:
1449
1449
  - ImageMagick (libmagick), v6.6 or greater.
1450
- rubygems_version: 3.4.15
1450
+ rubygems_version: 3.4.17
1451
1451
  signing_key:
1452
1452
  specification_version: 4
1453
1453
  summary: A powerful, userfriendly and flexible CMS for Rails