trusty-cms 6.2.2.1 → 6.3

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 (25) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Gemfile.lock +145 -138
  4. data/app/assets/javascripts/ckeditor/config.js +1 -0
  5. data/app/assets/stylesheets/admin/assets.scss +8 -0
  6. data/app/assets/stylesheets/admin/partials/_forms.scss +1 -1
  7. data/app/helpers/admin/regions_helper.rb +2 -1
  8. data/config/application.rb +4 -3
  9. data/lib/active_record_extensions/active_record_extensions.rb +0 -2
  10. data/lib/trusty_cms/admin_ui.rb +1 -1
  11. data/lib/trusty_cms/extension_loader.rb +1 -1
  12. data/lib/trusty_cms/initializer.rb +0 -9
  13. data/lib/trusty_cms/resource_responses.rb +1 -1
  14. data/lib/trusty_cms/version.rb +2 -1
  15. data/lib/trusty_cms.rb +1 -0
  16. data/spec/dummy/config/application.rb +1 -1
  17. data/spec/dummy/config/storage.yml +0 -0
  18. data/trusty_cms.gemspec +4 -5
  19. data/vendor/extensions/layouts-extension/layouts_extension.rb +3 -3
  20. data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_validation.rb +25 -35
  21. data/vendor/extensions/multi-site-extension/multi_site_extension.rb +0 -2
  22. data/vendor/extensions/snippets-extension/snippets_extension.rb +1 -1
  23. data/yarn.lock +13 -13
  24. metadata +13 -11
  25. /data/lib/{open_struct.rb → ostruct.rb} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 71383e72f45672a6cf5bf9fb68301f9c0239a2ad40d7782a2e269724150b1e8a
4
- data.tar.gz: bebc54966f5f3a0a431a1ac6585e4646c80fe0d319b33a8666e65a4781ede6a2
3
+ metadata.gz: 5c4f73e3a3abf514d52886a6eb71386cbb3786ad3a3b0848f9e34ccd931f2425
4
+ data.tar.gz: 4d9e6b0b2b561ed0f95f7efc887647d7fc28562ece114e0acc2efb920d361346
5
5
  SHA512:
6
- metadata.gz: a616c07e4091859c3b62c7a3253862dcf4963bb48bb38552b0259e88e1cd2ae2e13256c6fbecee909c60989a194abfd0b6b2d4e3f715ead86f0764b37adf6e34
7
- data.tar.gz: 33b03b3d3ce65928e841e4033e65bf521596b8b311f0336733b5bd8b0f4d1dad92fce0fd82e79225a3e0ba80cf373a6e5e56291793ea829138244ba1938d13db
6
+ metadata.gz: b482105054e3aa23a9fad042d75a1449d0a27ae91d3109e34ad1b279befb8197e56e4dba3a8d8144b2049652678190b4ad015b9ac1ed78165c3c284075b4ced3
7
+ data.tar.gz: 880494f40cb2ae15cc08b31122e372007aec9f23a81dc0fc2eb950beb05571741e53870a8d8d977b943d0b9701de4d3d44428295676e921d14ca13295a02af6e
data/Gemfile CHANGED
@@ -17,7 +17,7 @@ group :development, :test do
17
17
  gem 'database_cleaner'
18
18
  gem 'factory_bot_rails', '6.4.2'
19
19
  gem 'file_validators'
20
- gem 'launchy', '~> 2.5.0'
20
+ gem 'launchy', '~> 3.0.1'
21
21
  gem 'mysql2'
22
22
  gem 'poltergeist', '~> 1.18.1'
23
23
  gem 'pry-byebug'
data/Gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (6.2.2)
4
+ trusty-cms (6.3)
5
5
  RedCloth (= 4.3.3)
6
6
  activestorage-validator
7
- acts_as_list (>= 0.9.5, < 1.2.0)
7
+ acts_as_list (>= 0.9.5, < 1.3.0)
8
8
  acts_as_tree (~> 2.9.1)
9
9
  ckeditor (>= 4.2.2, < 4.4.0)
10
10
  delocalize (>= 0.2, < 2.0)
@@ -12,7 +12,7 @@ PATH
12
12
  execjs (~> 2.7)
13
13
  haml (>= 5.0, < 6.0)
14
14
  haml-rails
15
- highline (>= 1.7.8, < 3.1.0)
15
+ highline (>= 1.7.8, < 3.2.0)
16
16
  image_processing
17
17
  kraken-io
18
18
  mini_racer
@@ -20,7 +20,7 @@ PATH
20
20
  rack (>= 2.0.1, < 3.1.0)
21
21
  rack-cache (~> 1.7)
22
22
  radius (~> 0.7)
23
- rails
23
+ rails (~> 6.1.7)
24
24
  rake (< 14.0)
25
25
  ransack
26
26
  rdoc (>= 5.1, < 7.0)
@@ -35,125 +35,125 @@ GEM
35
35
  remote: https://rubygems.org/
36
36
  specs:
37
37
  RedCloth (4.3.3)
38
- actioncable (7.0.8.1)
39
- actionpack (= 7.0.8.1)
40
- activesupport (= 7.0.8.1)
38
+ actioncable (6.1.7.8)
39
+ actionpack (= 6.1.7.8)
40
+ activesupport (= 6.1.7.8)
41
41
  nio4r (~> 2.0)
42
42
  websocket-driver (>= 0.6.1)
43
- actionmailbox (7.0.8.1)
44
- actionpack (= 7.0.8.1)
45
- activejob (= 7.0.8.1)
46
- activerecord (= 7.0.8.1)
47
- activestorage (= 7.0.8.1)
48
- activesupport (= 7.0.8.1)
43
+ actionmailbox (6.1.7.8)
44
+ actionpack (= 6.1.7.8)
45
+ activejob (= 6.1.7.8)
46
+ activerecord (= 6.1.7.8)
47
+ activestorage (= 6.1.7.8)
48
+ activesupport (= 6.1.7.8)
49
49
  mail (>= 2.7.1)
50
- net-imap
51
- net-pop
52
- net-smtp
53
- actionmailer (7.0.8.1)
54
- actionpack (= 7.0.8.1)
55
- actionview (= 7.0.8.1)
56
- activejob (= 7.0.8.1)
57
- activesupport (= 7.0.8.1)
50
+ actionmailer (6.1.7.8)
51
+ actionpack (= 6.1.7.8)
52
+ actionview (= 6.1.7.8)
53
+ activejob (= 6.1.7.8)
54
+ activesupport (= 6.1.7.8)
58
55
  mail (~> 2.5, >= 2.5.4)
59
- net-imap
60
- net-pop
61
- net-smtp
62
56
  rails-dom-testing (~> 2.0)
63
- actionpack (7.0.8.1)
64
- actionview (= 7.0.8.1)
65
- activesupport (= 7.0.8.1)
66
- rack (~> 2.0, >= 2.2.4)
57
+ actionpack (6.1.7.8)
58
+ actionview (= 6.1.7.8)
59
+ activesupport (= 6.1.7.8)
60
+ rack (~> 2.0, >= 2.0.9)
67
61
  rack-test (>= 0.6.3)
68
62
  rails-dom-testing (~> 2.0)
69
63
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
70
- actiontext (7.0.8.1)
71
- actionpack (= 7.0.8.1)
72
- activerecord (= 7.0.8.1)
73
- activestorage (= 7.0.8.1)
74
- activesupport (= 7.0.8.1)
75
- globalid (>= 0.6.0)
64
+ actiontext (6.1.7.8)
65
+ actionpack (= 6.1.7.8)
66
+ activerecord (= 6.1.7.8)
67
+ activestorage (= 6.1.7.8)
68
+ activesupport (= 6.1.7.8)
76
69
  nokogiri (>= 1.8.5)
77
- actionview (7.0.8.1)
78
- activesupport (= 7.0.8.1)
70
+ actionview (6.1.7.8)
71
+ activesupport (= 6.1.7.8)
79
72
  builder (~> 3.1)
80
73
  erubi (~> 1.4)
81
74
  rails-dom-testing (~> 2.0)
82
75
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
83
- activejob (7.0.8.1)
84
- activesupport (= 7.0.8.1)
76
+ activejob (6.1.7.8)
77
+ activesupport (= 6.1.7.8)
85
78
  globalid (>= 0.3.6)
86
- activemodel (7.0.8.1)
87
- activesupport (= 7.0.8.1)
88
- activerecord (7.0.8.1)
89
- activemodel (= 7.0.8.1)
90
- activesupport (= 7.0.8.1)
91
- activestorage (7.0.8.1)
92
- actionpack (= 7.0.8.1)
93
- activejob (= 7.0.8.1)
94
- activerecord (= 7.0.8.1)
95
- activesupport (= 7.0.8.1)
79
+ activemodel (6.1.7.8)
80
+ activesupport (= 6.1.7.8)
81
+ activerecord (6.1.7.8)
82
+ activemodel (= 6.1.7.8)
83
+ activesupport (= 6.1.7.8)
84
+ activestorage (6.1.7.8)
85
+ actionpack (= 6.1.7.8)
86
+ activejob (= 6.1.7.8)
87
+ activerecord (= 6.1.7.8)
88
+ activesupport (= 6.1.7.8)
96
89
  marcel (~> 1.0)
97
90
  mini_mime (>= 1.1.0)
98
91
  activestorage-validator (0.4.0)
99
92
  rails (>= 6.1.0)
100
- activesupport (7.0.8.1)
93
+ activesupport (6.1.7.8)
101
94
  concurrent-ruby (~> 1.0, >= 1.0.2)
102
95
  i18n (>= 1.6, < 2)
103
96
  minitest (>= 5.1)
104
97
  tzinfo (~> 2.0)
105
- acts_as_list (1.1.0)
106
- activerecord (>= 4.2)
98
+ zeitwerk (~> 2.3)
99
+ acts_as_list (1.2.2)
100
+ activerecord (>= 6.1)
101
+ activesupport (>= 6.1)
107
102
  acts_as_tree (2.9.1)
108
103
  activerecord (>= 3.0.0)
109
- addressable (2.8.6)
110
- public_suffix (>= 2.0.2, < 6.0)
111
- bcrypt (3.1.19)
112
- builder (3.2.4)
104
+ addressable (2.8.7)
105
+ public_suffix (>= 2.0.2, < 7.0)
106
+ bcrypt (3.1.20)
107
+ builder (3.3.0)
113
108
  byebug (11.1.3)
114
- capybara (3.35.3)
109
+ capybara (3.40.0)
115
110
  addressable
111
+ matrix
116
112
  mini_mime (>= 0.1.3)
117
- nokogiri (~> 1.8)
113
+ nokogiri (~> 1.11)
118
114
  rack (>= 1.6.0)
119
115
  rack-test (>= 0.6.3)
120
116
  regexp_parser (>= 1.5, < 3.0)
121
117
  xpath (~> 3.2)
118
+ childprocess (5.1.0)
119
+ logger (~> 1.5)
122
120
  ckeditor (4.3.0)
123
121
  orm_adapter (~> 0.5.0)
124
122
  terrapin
125
- climate_control (0.2.0)
123
+ climate_control (1.2.0)
126
124
  cliver (0.3.2)
127
125
  coderay (1.1.3)
128
- concurrent-ruby (1.2.3)
126
+ concurrent-ruby (1.3.4)
129
127
  crass (1.0.6)
130
- css_parser (1.16.0)
128
+ css_parser (1.19.0)
131
129
  addressable
130
+ csv (3.3.0)
132
131
  database_cleaner (2.0.2)
133
132
  database_cleaner-active_record (>= 2, < 3)
134
- database_cleaner-active_record (2.1.0)
133
+ database_cleaner-active_record (2.2.0)
135
134
  activerecord (>= 5.a)
136
135
  database_cleaner-core (~> 2.0.0)
137
136
  database_cleaner-core (2.0.1)
138
137
  date (3.3.4)
139
138
  delocalize (1.2.0)
140
139
  rails (>= 2)
141
- devise (4.9.3)
140
+ devise (4.9.4)
142
141
  bcrypt (~> 3.0)
143
142
  orm_adapter (~> 0.1)
144
143
  railties (>= 4.1.0)
145
144
  responders
146
145
  warden (~> 1.2.3)
147
146
  diff-lcs (1.5.1)
148
- docile (1.4.0)
149
- erubi (1.12.0)
147
+ docile (1.4.1)
148
+ erubi (1.13.0)
150
149
  execjs (2.9.1)
151
- factory_bot (6.4.2)
150
+ factory_bot (6.5.0)
152
151
  activesupport (>= 5.0.0)
153
152
  factory_bot_rails (6.4.2)
154
153
  factory_bot (~> 6.4)
155
154
  railties (>= 5.0.0)
156
- ffi (1.15.5)
155
+ ffi (1.17.0-x86_64-darwin)
156
+ ffi (1.17.0-x86_64-linux-gnu)
157
157
  file_validators (3.0.0)
158
158
  activemodel (>= 3.2)
159
159
  mime-types (>= 1.0)
@@ -167,25 +167,30 @@ GEM
167
167
  activesupport (>= 5.1)
168
168
  haml (>= 4.0.6)
169
169
  railties (>= 5.1)
170
- highline (3.0.1)
171
- httparty (0.21.0)
170
+ highline (3.1.1)
171
+ reline
172
+ httparty (0.22.0)
173
+ csv
172
174
  mini_mime (>= 1.0.0)
173
175
  multi_xml (>= 0.5.2)
174
- i18n (1.14.1)
176
+ i18n (1.14.6)
175
177
  concurrent-ruby (~> 1.0)
176
- image_processing (1.12.2)
178
+ image_processing (1.13.0)
177
179
  mini_magick (>= 4.9.5, < 5)
178
180
  ruby-vips (>= 2.0.17, < 3)
179
- json (2.6.3)
181
+ io-console (0.7.2)
182
+ json (2.7.2)
180
183
  kraken-io (0.1.3)
181
184
  activesupport
182
185
  httparty
183
186
  json
184
187
  multipart-post
185
- launchy (2.5.2)
188
+ launchy (3.0.1)
186
189
  addressable (~> 2.8)
187
- libv8-node (18.16.0.0-x86_64-darwin)
188
- libv8-node (18.16.0.0-x86_64-linux)
190
+ childprocess (~> 5.0)
191
+ libv8-node (18.19.0.0-x86_64-darwin)
192
+ libv8-node (18.19.0.0-x86_64-linux)
193
+ logger (1.6.1)
189
194
  loofah (2.22.0)
190
195
  crass (~> 1.0.2)
191
196
  nokogiri (>= 1.12.0)
@@ -195,31 +200,32 @@ GEM
195
200
  net-pop
196
201
  net-smtp
197
202
  marcel (1.0.4)
198
- method_source (1.0.0)
199
- mime-types (3.4.1)
203
+ matrix (0.4.2)
204
+ method_source (1.1.0)
205
+ mime-types (3.5.2)
200
206
  mime-types-data (~> 3.2015)
201
- mime-types-data (3.2022.0105)
202
- mini_magick (4.12.0)
207
+ mime-types-data (3.2024.0903)
208
+ mini_magick (4.13.2)
203
209
  mini_mime (1.1.5)
204
- mini_racer (0.8.0)
205
- libv8-node (~> 18.16.0.0)
206
- minitest (5.22.2)
210
+ mini_racer (0.16.0)
211
+ libv8-node (~> 18.19.0.0)
212
+ minitest (5.25.1)
207
213
  multi_xml (0.6.0)
208
- multipart-post (2.2.3)
214
+ multipart-post (2.4.1)
209
215
  mysql2 (0.5.6)
210
- net-imap (0.4.10)
216
+ net-imap (0.4.16)
211
217
  date
212
218
  net-protocol
213
219
  net-pop (0.1.2)
214
220
  net-protocol
215
221
  net-protocol (0.2.2)
216
222
  timeout
217
- net-smtp (0.4.0.1)
223
+ net-smtp (0.5.0)
218
224
  net-protocol
219
- nio4r (2.7.0)
220
- nokogiri (1.16.2-x86_64-darwin)
225
+ nio4r (2.7.3)
226
+ nokogiri (1.16.7-x86_64-darwin)
221
227
  racc (~> 1.4)
222
- nokogiri (1.16.2-x86_64-linux)
228
+ nokogiri (1.16.7-x86_64-linux)
223
229
  racc (~> 1.4)
224
230
  orm_adapter (0.5.0)
225
231
  poltergeist (1.18.1)
@@ -234,28 +240,29 @@ GEM
234
240
  pry (>= 0.13, < 0.15)
235
241
  psych (5.1.1.1)
236
242
  stringio
237
- public_suffix (5.0.4)
238
- racc (1.7.3)
239
- rack (2.2.8.1)
240
- rack-cache (1.14.0)
243
+ public_suffix (6.0.1)
244
+ racc (1.8.1)
245
+ rack (2.2.9)
246
+ rack-cache (1.17.0)
241
247
  rack (>= 0.4)
242
248
  rack-test (2.1.0)
243
249
  rack (>= 1.3)
244
250
  radius (0.7.5)
245
- rails (7.0.8.1)
246
- actioncable (= 7.0.8.1)
247
- actionmailbox (= 7.0.8.1)
248
- actionmailer (= 7.0.8.1)
249
- actionpack (= 7.0.8.1)
250
- actiontext (= 7.0.8.1)
251
- actionview (= 7.0.8.1)
252
- activejob (= 7.0.8.1)
253
- activemodel (= 7.0.8.1)
254
- activerecord (= 7.0.8.1)
255
- activestorage (= 7.0.8.1)
256
- activesupport (= 7.0.8.1)
251
+ rails (6.1.7.8)
252
+ actioncable (= 6.1.7.8)
253
+ actionmailbox (= 6.1.7.8)
254
+ actionmailer (= 6.1.7.8)
255
+ actionpack (= 6.1.7.8)
256
+ actiontext (= 6.1.7.8)
257
+ actionview (= 6.1.7.8)
258
+ activejob (= 6.1.7.8)
259
+ activemodel (= 6.1.7.8)
260
+ activerecord (= 6.1.7.8)
261
+ activestorage (= 6.1.7.8)
262
+ activesupport (= 6.1.7.8)
257
263
  bundler (>= 1.15.0)
258
- railties (= 7.0.8.1)
264
+ railties (= 6.1.7.8)
265
+ sprockets-rails (>= 2.0.0)
259
266
  rails-dom-testing (2.2.0)
260
267
  activesupport (>= 5.0.0)
261
268
  minitest
@@ -265,49 +272,51 @@ GEM
265
272
  nokogiri (~> 1.14)
266
273
  rails-observers (0.1.5)
267
274
  activemodel (>= 4.0)
268
- railties (7.0.8.1)
269
- actionpack (= 7.0.8.1)
270
- activesupport (= 7.0.8.1)
275
+ railties (6.1.7.8)
276
+ actionpack (= 6.1.7.8)
277
+ activesupport (= 6.1.7.8)
271
278
  method_source
272
279
  rake (>= 12.2)
273
280
  thor (~> 1.0)
274
- zeitwerk (~> 2.5)
275
- rake (13.1.0)
276
- ransack (4.1.1)
281
+ rake (13.2.1)
282
+ ransack (4.2.1)
277
283
  activerecord (>= 6.1.5)
278
284
  activesupport (>= 6.1.5)
279
285
  i18n
280
- rdoc (6.6.2)
286
+ rdoc (6.7.0)
281
287
  psych (>= 4.0.0)
282
- regexp_parser (2.1.1)
288
+ regexp_parser (2.9.2)
289
+ reline (0.5.10)
290
+ io-console (~> 0.5)
283
291
  responders (3.1.1)
284
292
  actionpack (>= 5.2)
285
293
  railties (>= 5.2)
286
294
  roadie (5.2.1)
287
295
  css_parser (~> 1.4)
288
296
  nokogiri (~> 1.15)
289
- roadie-rails (3.1.0)
297
+ roadie-rails (3.2.0)
290
298
  railties (>= 5.1, < 8.0)
291
299
  roadie (~> 5.0)
292
- rspec-core (3.13.0)
300
+ rspec-core (3.13.1)
293
301
  rspec-support (~> 3.13.0)
294
- rspec-expectations (3.13.0)
302
+ rspec-expectations (3.13.3)
295
303
  diff-lcs (>= 1.2.0, < 2.0)
296
304
  rspec-support (~> 3.13.0)
297
- rspec-mocks (3.13.0)
305
+ rspec-mocks (3.13.1)
298
306
  diff-lcs (>= 1.2.0, < 2.0)
299
307
  rspec-support (~> 3.13.0)
300
- rspec-rails (6.1.1)
308
+ rspec-rails (6.1.5)
301
309
  actionpack (>= 6.1)
302
310
  activesupport (>= 6.1)
303
311
  railties (>= 6.1)
304
- rspec-core (~> 3.12)
305
- rspec-expectations (~> 3.12)
306
- rspec-mocks (~> 3.12)
307
- rspec-support (~> 3.12)
312
+ rspec-core (~> 3.13)
313
+ rspec-expectations (~> 3.13)
314
+ rspec-mocks (~> 3.13)
315
+ rspec-support (~> 3.13)
308
316
  rspec-support (3.13.1)
309
- ruby-vips (2.1.4)
317
+ ruby-vips (2.2.2)
310
318
  ffi (~> 1.12)
319
+ logger
311
320
  sass-rails (6.0.0)
312
321
  sassc-rails (~> 2.1, >= 2.1.1)
313
322
  sassc (2.4.0)
@@ -322,22 +331,22 @@ GEM
322
331
  docile (~> 1.1)
323
332
  simplecov-html (~> 0.11)
324
333
  simplecov_json_formatter (~> 0.1)
325
- simplecov-html (0.12.3)
334
+ simplecov-html (0.13.1)
326
335
  simplecov_json_formatter (0.1.4)
327
336
  sprockets (4.2.1)
328
337
  concurrent-ruby (~> 1.0)
329
338
  rack (>= 2.2.4, < 4)
330
- sprockets-rails (3.4.2)
331
- actionpack (>= 5.2)
332
- activesupport (>= 5.2)
339
+ sprockets-rails (3.5.2)
340
+ actionpack (>= 6.1)
341
+ activesupport (>= 6.1)
333
342
  sprockets (>= 3.0.0)
334
343
  stringex (2.8.6)
335
- stringio (3.1.0)
336
- temple (0.10.0)
337
- terrapin (0.6.0)
338
- climate_control (>= 0.0.3, < 1.0)
339
- thor (1.3.1)
340
- tilt (2.1.0)
344
+ stringio (3.1.1)
345
+ temple (0.10.3)
346
+ terrapin (1.0.1)
347
+ climate_control
348
+ thor (1.3.2)
349
+ tilt (2.4.0)
341
350
  timeout (0.4.1)
342
351
  trustygems (0.2.1)
343
352
  rake
@@ -350,16 +359,14 @@ GEM
350
359
  websocket-driver (0.7.6)
351
360
  websocket-extensions (>= 0.1.0)
352
361
  websocket-extensions (0.1.5)
353
- will_paginate (4.0.0)
362
+ will_paginate (4.0.1)
354
363
  xpath (3.2.0)
355
364
  nokogiri (~> 1.8)
356
- zeitwerk (2.6.13)
365
+ zeitwerk (2.6.18)
357
366
 
358
367
  PLATFORMS
359
- x86_64-darwin-18
360
- x86_64-darwin-20
361
368
  x86_64-darwin-21
362
- x86_64-darwin-22
369
+ x86_64-darwin-23
363
370
  x86_64-linux
364
371
 
365
372
  DEPENDENCIES
@@ -368,7 +375,7 @@ DEPENDENCIES
368
375
  database_cleaner
369
376
  factory_bot_rails (= 6.4.2)
370
377
  file_validators
371
- launchy (~> 2.5.0)
378
+ launchy (~> 3.0.1)
372
379
  mysql2
373
380
  poltergeist (~> 1.18.1)
374
381
  pry-byebug
data/app/assets/javascripts/ckeditor/config.js CHANGED
@@ -1,6 +1,7 @@
1
1
  CKEDITOR.editorConfig = function (config) {
2
2
  config.allowedContent = true;
3
3
  config.removeFormatTags = "";
4
+ config.fillEmptyBlocks = false;
4
5
  config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
5
6
  config.protectedSource.push(/<r:[^>/]*\/>/g);
6
7
  //let paste from word be available
data/app/assets/stylesheets/admin/assets.scss CHANGED
@@ -45,6 +45,14 @@
45
45
  #assets_table.assets {
46
46
  overflow: auto;
47
47
  }
48
+
49
+ .toolbar {
50
+ .asset_search {
51
+ #filesearchforminput {
52
+ width: 55%;
53
+ }
54
+ }
55
+ }
48
56
  }
49
57
 
50
58
  #upload_holders {
data/app/assets/stylesheets/admin/partials/_forms.scss CHANGED
@@ -40,8 +40,8 @@ input[type="submit"], input[type="button"] {
40
40
  input[type="text"], input[type="search"], input[type="password"], input[type="email"] {
41
41
  border: 0.5px solid $gray;
42
42
  margin: 0.5em;
43
- max-width: 75%;
44
43
  padding: 0.25em;
44
+ width: 75%;
45
45
  }
46
46
 
47
47
  select {
data/app/helpers/admin/regions_helper.rb CHANGED
@@ -15,7 +15,8 @@ module Admin::RegionsHelper
15
15
  raise e
16
16
  end
17
17
  end.join.html_safe
18
- Rails.logger.error(output)
18
+ # comment out all the html logging
19
+ # Rails.logger.error(output)
19
20
  block_given? ? concat(output) : output
20
21
  end
21
22
 
data/config/application.rb CHANGED
@@ -76,9 +76,10 @@ module TrustyCms
76
76
  html
77
77
  end
78
78
  end
79
- config.after_initialize do
80
- # extension_loader.load_extensions
81
- # extension_loader.load_extension_initializers
79
+ config.to_prepare do
80
+ extension_loader.deactivate_extensions
81
+ extension_loader.load_extensions
82
+ extension_loader.load_extension_initializers
82
83
 
83
84
  extension_loader.activate_extensions # also calls initialize_views
84
85
  # config.add_controller_paths(extension_loader.paths(:controller))
data/lib/active_record_extensions/active_record_extensions.rb CHANGED
@@ -1,5 +1,3 @@
1
- require 'active_record'
2
-
3
1
  class ActiveRecord::Base
4
2
  def self.validates_path(*args)
5
3
  configuration = args.extract_options!
data/lib/trusty_cms/admin_ui.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'simpleton'
2
- require 'open_struct'
2
+ require 'ostruct'
3
3
 
4
4
  module TrustyCms
5
5
  class AdminUI
data/lib/trusty_cms/extension_loader.rb CHANGED
@@ -65,7 +65,7 @@ module TrustyCms
65
65
  #
66
66
  def load_extensions
67
67
  configuration = TrustyCms::Application.config
68
- @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
68
+ # @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
69
69
  self.extensions = configuration.enabled_extensions.map { |ext| load_extension(ext) }.compact
70
70
  end
71
71
 
data/lib/trusty_cms/initializer.rb CHANGED
@@ -9,15 +9,6 @@ require 'trusty_cms/extension_loader'
9
9
  require 'string_extensions/string_extensions'
10
10
  require 'trusty_cms/engine'
11
11
 
12
- # This is a wild and probably terrible hack built to initialize extension engines.
13
- # I have no idea what the repercussions will be. Revisit later.
14
- Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), _found|
15
- if gemname =~ /trusty-.*-extension$/
16
- ep = TrustyCms::ExtensionLoader.record_path(gemspec.full_gem_path, gemname)
17
- require "#{ep.name}/engine"
18
- end
19
- end
20
-
21
12
  module TrustyCms
22
13
  module Initializer
23
14
  # Rails::Initializer is essentially a list of startup steps and we extend it here by:
data/lib/trusty_cms/resource_responses.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'open_struct'
1
+ require 'ostruct'
2
2
  module TrustyCms
3
3
  module ResourceResponses
4
4
  def self.extended(base)
data/lib/trusty_cms/version.rb CHANGED
@@ -1,3 +1,4 @@
1
1
  module TrustyCms
2
- VERSION = '6.2.2.1'.freeze
2
+ VERSION = '6.3'.freeze
3
3
  end
4
+
data/lib/trusty_cms.rb CHANGED
@@ -5,3 +5,4 @@ module TrustyCms
5
5
  end
6
6
 
7
7
  TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
8
+
data/spec/dummy/config/application.rb CHANGED
@@ -139,4 +139,4 @@ module TrustyCms
139
139
 
140
140
  end
141
141
  end
142
- end
142
+ end
data/spec/dummy/config/storage.yml ADDED
File without changes
data/trusty_cms.gemspec CHANGED
@@ -1,8 +1,7 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  # frozen_string_literal: true
3
3
 
4
- $:.push File.expand_path('lib', __dir__)
5
- require_relative 'lib/trusty_cms/version'
4
+ require File.expand_path(__FILE__ + '/../lib/trusty_cms/version.rb')
6
5
  Gem::Specification.new do |s|
7
6
  s.required_ruby_version = '>= 3.0.5'
8
7
  s.name = 'trusty-cms'
@@ -27,7 +26,7 @@ a general purpose content management system--not merely a blogging engine.'
27
26
  s.license = 'MIT'
28
27
  s.test_files = Dir['spec/**/*']
29
28
  s.add_dependency 'activestorage-validator'
30
- s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.2.0'
29
+ s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.3.0'
31
30
  s.add_dependency 'acts_as_tree', '~> 2.9.1'
32
31
  s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
33
32
  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
@@ -35,7 +34,7 @@ a general purpose content management system--not merely a blogging engine.'
35
34
  s.add_dependency 'execjs', '~> 2.7'
36
35
  s.add_dependency 'haml', '>= 5.0', '< 6.0'
37
36
  s.add_dependency 'haml-rails'
38
- s.add_dependency 'highline', '>= 1.7.8', '< 3.1.0'
37
+ s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
39
38
  s.add_dependency 'image_processing'
40
39
  s.add_dependency 'kraken-io'
41
40
  s.add_dependency 'mini_racer'
@@ -43,7 +42,7 @@ a general purpose content management system--not merely a blogging engine.'
43
42
  s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
44
43
  s.add_dependency 'rack-cache', '~> 1.7'
45
44
  s.add_dependency 'radius', '~> 0.7'
46
- s.add_dependency 'rails'
45
+ s.add_dependency 'rails', '~> 6.1.7'
47
46
  s.add_dependency 'rake', '< 14.0'
48
47
  s.add_dependency 'ransack'
49
48
  s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
data/vendor/extensions/layouts-extension/layouts_extension.rb CHANGED
@@ -8,11 +8,11 @@ class LayoutsExtension < TrustyCms::Extension
8
8
  ActionView::Base.send :include, ShareLayouts::Helpers::ActionView
9
9
 
10
10
  # Nested Layouts
11
- Page.send :include, NestedLayouts::Tags::Core
11
+ Page.send :include, NestedLayouts::Tags::Core
12
12
 
13
13
  # HAML Layouts
14
- Layout.send :include, HamlLayouts::Models::Layout
15
- Page.send :include, HamlLayouts::Models::Page
14
+ Layout.send :include, HamlLayouts::Models::Layout
15
+ Page.send :include, HamlLayouts::Models::Page
16
16
  HamlFilter
17
17
  end
18
18
 
data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_validation.rb CHANGED
@@ -1,43 +1,33 @@
1
1
  module MultiSite::ScopedValidation
2
+ # scoping validations to the site should be very simple
3
+ # all you would normally need is something like this:
4
+ #
5
+ # validates_uniqueness_of :email, :scope => :site_id
6
+ #
7
+ # but if you want to scope core trusty classes, you have a problem:
8
+ # their uniqueness validations have already been declared
9
+ # The only answer is to reach right back and change the validates_uniqueness_of method
10
+ # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
11
+ # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
2
12
 
3
- def self.included(base)
4
-
5
- base.class_eval do
6
- # scoping validations to the site should be very simple
7
- # all you would normally need is something like this:
8
- #
9
- # validates_uniqueness_of :email, :scope => :site_id
10
- #
11
- # but if you want to scope core trusty classes, you have a problem:
12
- # their uniqueness validations have already been declared
13
- # The only answer is to reach right back and change the validates_uniqueness_of method
14
- # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
15
- # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
16
-
17
- def validates_uniqueness_of_with_site(*attr)
18
- if database_exists?
19
- if table_exists? && column_names.include?('site_id')
20
- configuration = attr.extract_options!
21
- configuration[:scope] ||= :site_id
22
- attr.push(configuration)
23
- end
24
- validates_uniqueness_of_without_site(*attr)
25
- end
26
- end
27
-
28
- alias_method :validates_uniqueness_of_without_site, :validates_uniqueness_of
29
- alias_method :validates_uniqueness_of, :validates_uniqueness_of_with_site
30
-
31
- def database_exists?
32
- ActiveRecord::Base.connection
33
- rescue ActiveRecord::NoDatabaseError
34
- false
35
- else
36
- true
13
+ def validates_uniqueness_of(*attr)
14
+ if database_exists?
15
+ if table_exists? && column_names.include?('site_id')
16
+ configuration = attr.extract_options!
17
+ configuration[:scope] ||= :site_id
18
+ attr.push(configuration)
37
19
  end
20
+ super(*attr)
38
21
  end
22
+ end
39
23
 
24
+ def database_exists?
25
+ ActiveRecord::Base.connection
26
+ rescue ActiveRecord::NoDatabaseError
27
+ false
28
+ else
29
+ true
40
30
  end
41
31
  end
42
32
 
43
- ActiveRecord::Validations::ClassMethods.send :include, MultiSite::ScopedValidation
33
+ ActiveRecord::Validations::ClassMethods.prepend MultiSite::ScopedValidation
data/vendor/extensions/multi-site-extension/multi_site_extension.rb CHANGED
@@ -6,7 +6,6 @@ class MultiSiteExtension < TrustyCms::Extension
6
6
  url "http://trustarts.org/"
7
7
 
8
8
  def activate
9
-
10
9
  # Model extensions
11
10
  ActiveRecord::Base.send :include, MultiSite::ScopedModel
12
11
  Page.send :include, MultiSite::PageExtensions
@@ -19,7 +18,6 @@ class MultiSiteExtension < TrustyCms::Extension
19
18
  # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
20
19
  SiteController.send :include, MultiSite::SiteControllerExtensions
21
20
  Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
22
- Admin::PagesController.send :include, MultiSite::ResourceControllerExtensions
23
21
  Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
24
22
  Admin::ResourceController.send :helper, MultiSite::SiteChooserHelper
25
23
  Admin::PagesController.send :helper, MultiSite::SiteChooserHelper
data/vendor/extensions/snippets-extension/snippets_extension.rb CHANGED
@@ -34,7 +34,7 @@ class SnippetsExtension < TrustyCms::Extension
34
34
  end
35
35
  end
36
36
 
37
- admin.snippet ||= TrustyCms::AdminUI.load_default_snippet_regions
37
+ admin.snippet ||= TrustyCms::AdminUI.load_default_snippet_regions
38
38
 
39
39
  tab 'Design' do
40
40
  add_item "Snippets", "/admin/snippets"
data/yarn.lock CHANGED
@@ -427,12 +427,12 @@ brace-expansion@^1.1.7:
427
427
  balanced-match "^1.0.0"
428
428
  concat-map "0.0.1"
429
429
 
430
- braces@^3.0.2:
431
- version "3.0.2"
432
- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
433
- integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
430
+ braces@^3.0.3:
431
+ version "3.0.3"
432
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
433
+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
434
434
  dependencies:
435
- fill-range "^7.0.1"
435
+ fill-range "^7.1.1"
436
436
 
437
437
  browserslist@^4.12.0, browserslist@^4.21.9:
438
438
  version "4.21.10"
@@ -701,10 +701,10 @@ file-entry-cache@^6.0.1:
701
701
  dependencies:
702
702
  flat-cache "^3.0.4"
703
703
 
704
- fill-range@^7.0.1:
705
- version "7.0.1"
706
- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
707
- integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
704
+ fill-range@^7.1.1:
705
+ version "7.1.1"
706
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
707
+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
708
708
  dependencies:
709
709
  to-regex-range "^5.0.1"
710
710
 
@@ -1225,11 +1225,11 @@ micromark@~2.11.0:
1225
1225
  parse-entities "^2.0.0"
1226
1226
 
1227
1227
  micromatch@^4.0.4:
1228
- version "4.0.5"
1229
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
1230
- integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
1228
+ version "4.0.8"
1229
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
1230
+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
1231
1231
  dependencies:
1232
- braces "^3.0.2"
1232
+ braces "^3.0.3"
1233
1233
  picomatch "^2.3.1"
1234
1234
 
1235
1235
  min-indent@^1.0.0:
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.2.2.1
4
+ version: '6.3'
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-03-07 00:00:00.000000000 Z
11
+ date: 2024-10-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -33,7 +33,7 @@ dependencies:
33
33
  version: 0.9.5
34
34
  - - "<"
35
35
  - !ruby/object:Gem::Version
36
- version: 1.2.0
36
+ version: 1.3.0
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: 0.9.5
44
44
  - - "<"
45
45
  - !ruby/object:Gem::Version
46
- version: 1.2.0
46
+ version: 1.3.0
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: acts_as_tree
49
49
  requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
169
169
  version: 1.7.8
170
170
  - - "<"
171
171
  - !ruby/object:Gem::Version
172
- version: 3.1.0
172
+ version: 3.2.0
173
173
  type: :runtime
174
174
  prerelease: false
175
175
  version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
179
179
  version: 1.7.8
180
180
  - - "<"
181
181
  - !ruby/object:Gem::Version
182
- version: 3.1.0
182
+ version: 3.2.0
183
183
  - !ruby/object:Gem::Dependency
184
184
  name: image_processing
185
185
  requirement: !ruby/object:Gem::Requirement
@@ -288,16 +288,16 @@ dependencies:
288
288
  name: rails
289
289
  requirement: !ruby/object:Gem::Requirement
290
290
  requirements:
291
- - - ">="
291
+ - - "~>"
292
292
  - !ruby/object:Gem::Version
293
- version: '0'
293
+ version: 6.1.7
294
294
  type: :runtime
295
295
  prerelease: false
296
296
  version_requirements: !ruby/object:Gem::Requirement
297
297
  requirements:
298
- - - ">="
298
+ - - "~>"
299
299
  - !ruby/object:Gem::Version
300
- version: '0'
300
+ version: 6.1.7
301
301
  - !ruby/object:Gem::Dependency
302
302
  name: rake
303
303
  requirement: !ruby/object:Gem::Requirement
@@ -954,7 +954,7 @@ files:
954
954
  - lib/inheritable_class_attributes.rb
955
955
  - lib/login_system.rb
956
956
  - lib/method_observer.rb
957
- - lib/open_struct.rb
957
+ - lib/ostruct.rb
958
958
  - lib/simpleton.rb
959
959
  - lib/string_extensions/string_extensions.rb
960
960
  - lib/symbol_extensions/symbol_extensions.rb
@@ -1030,6 +1030,7 @@ files:
1030
1030
  - spec/dummy/config/locales/en.yml
1031
1031
  - spec/dummy/config/routes.rb
1032
1032
  - spec/dummy/config/secrets.yml
1033
+ - spec/dummy/config/storage.yml
1033
1034
  - spec/dummy/db/schema.rb
1034
1035
  - spec/dummy/package.json
1035
1036
  - spec/dummy/public/404.html
@@ -1179,6 +1180,7 @@ test_files:
1179
1180
  - spec/dummy/config/locales/en.yml
1180
1181
  - spec/dummy/config/routes.rb
1181
1182
  - spec/dummy/config/secrets.yml
1183
+ - spec/dummy/config/storage.yml
1182
1184
  - spec/dummy/config.ru
1183
1185
  - spec/dummy/db/schema.rb
1184
1186
  - spec/dummy/package.json
/data/lib/{open_struct.rb → ostruct.rb} RENAMED
File without changes