trusty-cms 6.1.2 → 6.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Gemfile.lock +156 -152
  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/app/models/page.rb +14 -6
  9. data/app/views/admin/pages/_fields.html.haml +1 -1
  10. data/config/application.rb +8 -6
  11. data/lib/trusty_cms/engine.rb +1 -0
  12. data/lib/trusty_cms/resource_responses.rb +1 -0
  13. data/lib/trusty_cms/version.rb +4 -0
  14. data/lib/trusty_cms.rb +5 -5
  15. data/spec/dummy/config/initializers/zeitwerk.rb +8 -0
  16. data/trusty_cms.gemspec +6 -5
  17. metadata +50 -47
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 317a11bc953c6892d860b8c0e13b7d71ca9feffd3e9c6251c52606928fc1ada3
4
- data.tar.gz: aef8f45d869c2b2ec31df22d23002ba14c4b1399e1bf82b06a4a6bc5ca8d707e
3
+ metadata.gz: bc701ab13e1dfe0e97a430d54df2e91ea0b9be912fd22deb10a4c5390508d941
4
+ data.tar.gz: 363c0ca66279a03051923a0fe03d0ae82a37dd472f132e972e2a80cc358c1c8c
5
5
  SHA512:
6
- metadata.gz: 7c6011cc75d010d0a669e5105820b8ab4d498c081220a5584e654dd8e9c8002fa748175b06cce6145c8011b3f1ab0823052c231bd2107946b725afcfcc94b5ea
7
- data.tar.gz: 9b9460d709ae5504c298d03a3a5b170db440fc9db7b7998531ac856f7635dfee5f99dfe3d66d25bf4ce54494c4a687523355b84ff73d8f887f81bfef38fc5f25
6
+ metadata.gz: 5097166a24eddf72936da93b4bc16a508eccc288e18454fac8c07bafebc497330d4e4bdc4d13c260a2b94867d5f05b6da5cdd5b8e1e8f2f4e0a57337ab05f4fb
7
+ data.tar.gz: 362d5fd993f2373e9163250dfe2d03a072f773b1005453b2f3cef1c4a8d3acb90aa39af35645b1b4adfb38ddb783b8d3a01bf712aa6efcf915f7f68876607eef
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.1.2)
4
+ trusty-cms (6.2.1)
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, < 2.2.0)
15
+ highline (>= 1.7.8, < 3.1.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,119 +35,124 @@ GEM
35
35
  remote: https://rubygems.org/
36
36
  specs:
37
37
  RedCloth (4.3.3)
38
- actioncable (6.1.7.6)
39
- actionpack (= 6.1.7.6)
40
- activesupport (= 6.1.7.6)
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 (6.1.7.6)
44
- actionpack (= 6.1.7.6)
45
- activejob (= 6.1.7.6)
46
- activerecord (= 6.1.7.6)
47
- activestorage (= 6.1.7.6)
48
- activesupport (= 6.1.7.6)
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
- actionmailer (6.1.7.6)
51
- actionpack (= 6.1.7.6)
52
- actionview (= 6.1.7.6)
53
- activejob (= 6.1.7.6)
54
- activesupport (= 6.1.7.6)
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)
55
55
  mail (~> 2.5, >= 2.5.4)
56
56
  rails-dom-testing (~> 2.0)
57
- actionpack (6.1.7.6)
58
- actionview (= 6.1.7.6)
59
- activesupport (= 6.1.7.6)
57
+ actionpack (6.1.7.8)
58
+ actionview (= 6.1.7.8)
59
+ activesupport (= 6.1.7.8)
60
60
  rack (~> 2.0, >= 2.0.9)
61
61
  rack-test (>= 0.6.3)
62
62
  rails-dom-testing (~> 2.0)
63
63
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
64
- actiontext (6.1.7.6)
65
- actionpack (= 6.1.7.6)
66
- activerecord (= 6.1.7.6)
67
- activestorage (= 6.1.7.6)
68
- activesupport (= 6.1.7.6)
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)
69
69
  nokogiri (>= 1.8.5)
70
- actionview (6.1.7.6)
71
- activesupport (= 6.1.7.6)
70
+ actionview (6.1.7.8)
71
+ activesupport (= 6.1.7.8)
72
72
  builder (~> 3.1)
73
73
  erubi (~> 1.4)
74
74
  rails-dom-testing (~> 2.0)
75
75
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
76
- activejob (6.1.7.6)
77
- activesupport (= 6.1.7.6)
76
+ activejob (6.1.7.8)
77
+ activesupport (= 6.1.7.8)
78
78
  globalid (>= 0.3.6)
79
- activemodel (6.1.7.6)
80
- activesupport (= 6.1.7.6)
81
- activerecord (6.1.7.6)
82
- activemodel (= 6.1.7.6)
83
- activesupport (= 6.1.7.6)
84
- activestorage (6.1.7.6)
85
- actionpack (= 6.1.7.6)
86
- activejob (= 6.1.7.6)
87
- activerecord (= 6.1.7.6)
88
- activesupport (= 6.1.7.6)
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)
89
89
  marcel (~> 1.0)
90
90
  mini_mime (>= 1.1.0)
91
- activestorage-validator (0.3.0)
91
+ activestorage-validator (0.4.0)
92
92
  rails (>= 6.1.0)
93
- activesupport (6.1.7.6)
93
+ activesupport (6.1.7.8)
94
94
  concurrent-ruby (~> 1.0, >= 1.0.2)
95
95
  i18n (>= 1.6, < 2)
96
96
  minitest (>= 5.1)
97
97
  tzinfo (~> 2.0)
98
98
  zeitwerk (~> 2.3)
99
- acts_as_list (1.1.0)
100
- activerecord (>= 4.2)
99
+ acts_as_list (1.2.2)
100
+ activerecord (>= 6.1)
101
+ activesupport (>= 6.1)
101
102
  acts_as_tree (2.9.1)
102
103
  activerecord (>= 3.0.0)
103
- addressable (2.8.1)
104
- public_suffix (>= 2.0.2, < 6.0)
105
- bcrypt (3.1.19)
106
- 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)
107
108
  byebug (11.1.3)
108
- capybara (3.35.3)
109
+ capybara (3.40.0)
109
110
  addressable
111
+ matrix
110
112
  mini_mime (>= 0.1.3)
111
- nokogiri (~> 1.8)
113
+ nokogiri (~> 1.11)
112
114
  rack (>= 1.6.0)
113
115
  rack-test (>= 0.6.3)
114
116
  regexp_parser (>= 1.5, < 3.0)
115
117
  xpath (~> 3.2)
118
+ childprocess (5.1.0)
119
+ logger (~> 1.5)
116
120
  ckeditor (4.3.0)
117
121
  orm_adapter (~> 0.5.0)
118
122
  terrapin
119
- climate_control (0.2.0)
123
+ climate_control (1.2.0)
120
124
  cliver (0.3.2)
121
125
  coderay (1.1.3)
122
- concurrent-ruby (1.2.2)
126
+ concurrent-ruby (1.3.4)
123
127
  crass (1.0.6)
124
- css_parser (1.12.0)
128
+ css_parser (1.19.0)
125
129
  addressable
130
+ csv (3.3.0)
126
131
  database_cleaner (2.0.2)
127
132
  database_cleaner-active_record (>= 2, < 3)
128
- database_cleaner-active_record (2.1.0)
133
+ database_cleaner-active_record (2.2.0)
129
134
  activerecord (>= 5.a)
130
135
  database_cleaner-core (~> 2.0.0)
131
136
  database_cleaner-core (2.0.1)
132
- date (3.3.3)
137
+ date (3.3.4)
133
138
  delocalize (1.2.0)
134
139
  rails (>= 2)
135
- devise (4.9.3)
140
+ devise (4.9.4)
136
141
  bcrypt (~> 3.0)
137
142
  orm_adapter (~> 0.1)
138
143
  railties (>= 4.1.0)
139
144
  responders
140
145
  warden (~> 1.2.3)
141
- diff-lcs (1.5.0)
142
- docile (1.4.0)
143
- erubi (1.12.0)
146
+ diff-lcs (1.5.1)
147
+ docile (1.4.1)
148
+ erubi (1.13.0)
144
149
  execjs (2.9.1)
145
- factory_bot (6.4.2)
150
+ factory_bot (6.5.0)
146
151
  activesupport (>= 5.0.0)
147
152
  factory_bot_rails (6.4.2)
148
153
  factory_bot (~> 6.4)
149
154
  railties (>= 5.0.0)
150
- ffi (1.15.5)
155
+ ffi (1.17.0-x86_64-darwin)
151
156
  file_validators (3.0.0)
152
157
  activemodel (>= 3.2)
153
158
  mime-types (>= 1.0)
@@ -161,25 +166,27 @@ GEM
161
166
  activesupport (>= 5.1)
162
167
  haml (>= 4.0.6)
163
168
  railties (>= 5.1)
164
- highline (2.1.0)
165
- httparty (0.21.0)
169
+ highline (3.0.1)
170
+ httparty (0.22.0)
171
+ csv
166
172
  mini_mime (>= 1.0.0)
167
173
  multi_xml (>= 0.5.2)
168
- i18n (1.14.1)
174
+ i18n (1.14.6)
169
175
  concurrent-ruby (~> 1.0)
170
- image_processing (1.12.2)
176
+ image_processing (1.13.0)
171
177
  mini_magick (>= 4.9.5, < 5)
172
178
  ruby-vips (>= 2.0.17, < 3)
173
- json (2.6.3)
179
+ json (2.7.2)
174
180
  kraken-io (0.1.3)
175
181
  activesupport
176
182
  httparty
177
183
  json
178
184
  multipart-post
179
- launchy (2.5.2)
185
+ launchy (3.0.1)
180
186
  addressable (~> 2.8)
181
- libv8-node (16.10.0.0-x86_64-darwin)
182
- libv8-node (16.10.0.0-x86_64-linux)
187
+ childprocess (~> 5.0)
188
+ libv8-node (18.19.0.0-x86_64-darwin)
189
+ logger (1.6.1)
183
190
  loofah (2.22.0)
184
191
  crass (~> 1.0.2)
185
192
  nokogiri (>= 1.12.0)
@@ -188,119 +195,120 @@ GEM
188
195
  net-imap
189
196
  net-pop
190
197
  net-smtp
191
- marcel (1.0.2)
192
- method_source (1.0.0)
193
- mime-types (3.4.1)
198
+ marcel (1.0.4)
199
+ matrix (0.4.2)
200
+ method_source (1.1.0)
201
+ mime-types (3.5.2)
194
202
  mime-types-data (~> 3.2015)
195
- mime-types-data (3.2022.0105)
196
- mini_magick (4.12.0)
203
+ mime-types-data (3.2024.0903)
204
+ mini_magick (4.13.2)
197
205
  mini_mime (1.1.5)
198
- mini_racer (0.6.3)
199
- libv8-node (~> 16.10.0.0)
200
- minitest (5.15.0)
206
+ mini_racer (0.16.0)
207
+ libv8-node (~> 18.19.0.0)
208
+ minitest (5.25.1)
201
209
  multi_xml (0.6.0)
202
- multipart-post (2.2.3)
203
- mysql2 (0.5.5)
204
- net-imap (0.4.1)
210
+ multipart-post (2.4.1)
211
+ mysql2 (0.5.6)
212
+ net-imap (0.4.16)
205
213
  date
206
214
  net-protocol
207
215
  net-pop (0.1.2)
208
216
  net-protocol
209
- net-protocol (0.2.1)
217
+ net-protocol (0.2.2)
210
218
  timeout
211
- net-smtp (0.4.0)
219
+ net-smtp (0.5.0)
212
220
  net-protocol
213
- nio4r (2.5.9)
214
- nokogiri (1.12.5-x86_64-darwin)
215
- racc (~> 1.4)
216
- nokogiri (1.12.5-x86_64-linux)
221
+ nio4r (2.7.3)
222
+ nokogiri (1.16.7-x86_64-darwin)
217
223
  racc (~> 1.4)
218
224
  orm_adapter (0.5.0)
219
225
  poltergeist (1.18.1)
220
226
  capybara (>= 2.1, < 4)
221
227
  cliver (~> 0.3.1)
222
228
  websocket-driver (>= 0.2.0)
223
- pry (0.13.1)
229
+ pry (0.14.2)
224
230
  coderay (~> 1.1)
225
231
  method_source (~> 1.0)
226
- pry-byebug (3.9.0)
232
+ pry-byebug (3.10.1)
227
233
  byebug (~> 11.0)
228
- pry (~> 0.13.0)
234
+ pry (>= 0.13, < 0.15)
229
235
  psych (5.1.1.1)
230
236
  stringio
231
- public_suffix (4.0.7)
232
- racc (1.7.3)
233
- rack (2.2.8)
234
- rack-cache (1.14.0)
237
+ public_suffix (6.0.1)
238
+ racc (1.8.1)
239
+ rack (2.2.9)
240
+ rack-cache (1.17.0)
235
241
  rack (>= 0.4)
236
242
  rack-test (2.1.0)
237
243
  rack (>= 1.3)
238
244
  radius (0.7.5)
239
- rails (6.1.7.6)
240
- actioncable (= 6.1.7.6)
241
- actionmailbox (= 6.1.7.6)
242
- actionmailer (= 6.1.7.6)
243
- actionpack (= 6.1.7.6)
244
- actiontext (= 6.1.7.6)
245
- actionview (= 6.1.7.6)
246
- activejob (= 6.1.7.6)
247
- activemodel (= 6.1.7.6)
248
- activerecord (= 6.1.7.6)
249
- activestorage (= 6.1.7.6)
250
- activesupport (= 6.1.7.6)
245
+ rails (6.1.7.8)
246
+ actioncable (= 6.1.7.8)
247
+ actionmailbox (= 6.1.7.8)
248
+ actionmailer (= 6.1.7.8)
249
+ actionpack (= 6.1.7.8)
250
+ actiontext (= 6.1.7.8)
251
+ actionview (= 6.1.7.8)
252
+ activejob (= 6.1.7.8)
253
+ activemodel (= 6.1.7.8)
254
+ activerecord (= 6.1.7.8)
255
+ activestorage (= 6.1.7.8)
256
+ activesupport (= 6.1.7.8)
251
257
  bundler (>= 1.15.0)
252
- railties (= 6.1.7.6)
258
+ railties (= 6.1.7.8)
253
259
  sprockets-rails (>= 2.0.0)
254
260
  rails-dom-testing (2.2.0)
255
261
  activesupport (>= 5.0.0)
256
262
  minitest
257
263
  nokogiri (>= 1.6)
258
- rails-html-sanitizer (1.5.0)
259
- loofah (~> 2.19, >= 2.19.1)
264
+ rails-html-sanitizer (1.6.0)
265
+ loofah (~> 2.21)
266
+ nokogiri (~> 1.14)
260
267
  rails-observers (0.1.5)
261
268
  activemodel (>= 4.0)
262
- railties (6.1.7.6)
263
- actionpack (= 6.1.7.6)
264
- activesupport (= 6.1.7.6)
269
+ railties (6.1.7.8)
270
+ actionpack (= 6.1.7.8)
271
+ activesupport (= 6.1.7.8)
265
272
  method_source
266
273
  rake (>= 12.2)
267
274
  thor (~> 1.0)
268
- rake (13.1.0)
269
- ransack (4.1.1)
275
+ rake (13.2.1)
276
+ ransack (4.2.1)
270
277
  activerecord (>= 6.1.5)
271
278
  activesupport (>= 6.1.5)
272
279
  i18n
273
- rdoc (6.5.0)
280
+ rdoc (6.7.0)
274
281
  psych (>= 4.0.0)
275
- regexp_parser (2.1.1)
282
+ regexp_parser (2.9.2)
276
283
  responders (3.1.1)
277
284
  actionpack (>= 5.2)
278
285
  railties (>= 5.2)
279
- roadie (4.0.0)
286
+ roadie (5.2.1)
280
287
  css_parser (~> 1.4)
281
- nokogiri (~> 1.8)
282
- roadie-rails (2.3.0)
283
- railties (>= 5.1, < 7.1)
284
- roadie (>= 3.1, < 5.0)
285
- rspec-core (3.12.2)
286
- rspec-support (~> 3.12.0)
287
- rspec-expectations (3.12.3)
288
+ nokogiri (~> 1.15)
289
+ roadie-rails (3.2.0)
290
+ railties (>= 5.1, < 8.0)
291
+ roadie (~> 5.0)
292
+ rspec-core (3.13.1)
293
+ rspec-support (~> 3.13.0)
294
+ rspec-expectations (3.13.3)
288
295
  diff-lcs (>= 1.2.0, < 2.0)
289
- rspec-support (~> 3.12.0)
290
- rspec-mocks (3.12.6)
296
+ rspec-support (~> 3.13.0)
297
+ rspec-mocks (3.13.1)
291
298
  diff-lcs (>= 1.2.0, < 2.0)
292
- rspec-support (~> 3.12.0)
293
- rspec-rails (6.1.0)
299
+ rspec-support (~> 3.13.0)
300
+ rspec-rails (6.1.5)
294
301
  actionpack (>= 6.1)
295
302
  activesupport (>= 6.1)
296
303
  railties (>= 6.1)
297
- rspec-core (~> 3.12)
298
- rspec-expectations (~> 3.12)
299
- rspec-mocks (~> 3.12)
300
- rspec-support (~> 3.12)
301
- rspec-support (3.12.1)
302
- ruby-vips (2.1.4)
304
+ rspec-core (~> 3.13)
305
+ rspec-expectations (~> 3.13)
306
+ rspec-mocks (~> 3.13)
307
+ rspec-support (~> 3.13)
308
+ rspec-support (3.13.1)
309
+ ruby-vips (2.2.2)
303
310
  ffi (~> 1.12)
311
+ logger
304
312
  sass-rails (6.0.0)
305
313
  sassc-rails (~> 2.1, >= 2.1.1)
306
314
  sassc (2.4.0)
@@ -315,23 +323,23 @@ GEM
315
323
  docile (~> 1.1)
316
324
  simplecov-html (~> 0.11)
317
325
  simplecov_json_formatter (~> 0.1)
318
- simplecov-html (0.12.3)
326
+ simplecov-html (0.13.1)
319
327
  simplecov_json_formatter (0.1.4)
320
328
  sprockets (4.2.1)
321
329
  concurrent-ruby (~> 1.0)
322
330
  rack (>= 2.2.4, < 4)
323
- sprockets-rails (3.4.2)
324
- actionpack (>= 5.2)
325
- activesupport (>= 5.2)
331
+ sprockets-rails (3.5.2)
332
+ actionpack (>= 6.1)
333
+ activesupport (>= 6.1)
326
334
  sprockets (>= 3.0.0)
327
335
  stringex (2.8.6)
328
- stringio (3.0.6)
329
- temple (0.10.0)
330
- terrapin (0.6.0)
331
- climate_control (>= 0.0.3, < 1.0)
332
- thor (1.2.2)
333
- tilt (2.1.0)
334
- timeout (0.4.0)
336
+ stringio (3.1.1)
337
+ temple (0.10.3)
338
+ terrapin (1.0.1)
339
+ climate_control
340
+ thor (1.3.2)
341
+ tilt (2.4.0)
342
+ timeout (0.4.1)
335
343
  trustygems (0.2.1)
336
344
  rake
337
345
  tzinfo (2.0.6)
@@ -343,17 +351,13 @@ GEM
343
351
  websocket-driver (0.7.6)
344
352
  websocket-extensions (>= 0.1.0)
345
353
  websocket-extensions (0.1.5)
346
- will_paginate (4.0.0)
354
+ will_paginate (4.0.1)
347
355
  xpath (3.2.0)
348
356
  nokogiri (~> 1.8)
349
- zeitwerk (2.6.12)
357
+ zeitwerk (2.6.18)
350
358
 
351
359
  PLATFORMS
352
- x86_64-darwin-18
353
- x86_64-darwin-20
354
360
  x86_64-darwin-21
355
- x86_64-darwin-22
356
- x86_64-linux
357
361
 
358
362
  DEPENDENCIES
359
363
  activestorage-validator
@@ -361,7 +365,7 @@ DEPENDENCIES
361
365
  database_cleaner
362
366
  factory_bot_rails (= 6.4.2)
363
367
  file_validators
364
- launchy (~> 2.5.0)
368
+ launchy (~> 3.0.1)
365
369
  mysql2
366
370
  poltergeist (~> 1.18.1)
367
371
  pry-byebug
@@ -374,4 +378,4 @@ DEPENDENCIES
374
378
  trustygems (~> 0.2.0)
375
379
 
376
380
  BUNDLED WITH
377
- 2.4.13
381
+ 2.5.6
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/app/models/page.rb CHANGED
@@ -1,6 +1,10 @@
1
+ require 'trusty_cms/taggable'
2
+
1
3
  class Page < ActiveRecord::Base
2
4
  class MissingRootPageError < StandardError
3
- def initialize(message = 'Database missing root page'); super end
5
+ def initialize(message = 'Database missing root page')
6
+ ; super
7
+ end
4
8
  end
5
9
 
6
10
  # Callbacks
@@ -65,6 +69,7 @@ class Page < ActiveRecord::Base
65
69
  def child_path(child)
66
70
  clean_path(path + '/' + child.slug)
67
71
  end
72
+
68
73
  alias_method :child_url, :child_path
69
74
 
70
75
  def part(name)
@@ -118,6 +123,7 @@ class Page < ActiveRecord::Base
118
123
  clean_path(slug)
119
124
  end
120
125
  end
126
+
121
127
  alias_method :url, :path
122
128
 
123
129
  def process(request, response)
@@ -157,6 +163,7 @@ class Page < ActiveRecord::Base
157
163
  end
158
164
  end
159
165
  end
166
+
160
167
  private :set_content_type
161
168
 
162
169
  def response_code
@@ -256,11 +263,11 @@ class Page < ActiveRecord::Base
256
263
  @display_name = string
257
264
  else
258
265
  @display_name ||= begin
259
- n = name.to_s
260
- n.sub(/^(.+?)Page$/, '\1')
261
- n.gsub(/([A-Z])/, ' \1')
262
- n.strip
263
- end
266
+ n = name.to_s
267
+ n.sub(/^(.+?)Page$/, '\1')
268
+ n.gsub(/([A-Z])/, ' \1')
269
+ n.strip
270
+ end
264
271
  end
265
272
  @display_name = @display_name + ' - not installed' if missing? && @display_name !~ /not installed/
266
273
  @display_name
@@ -355,6 +362,7 @@ class Page < ActiveRecord::Base
355
362
  def clean_path(path)
356
363
  "/#{path.to_s.strip}".gsub(%r{//+}, '/')
357
364
  end
365
+
358
366
  alias_method :clean_url, :clean_path
359
367
 
360
368
  def parent?
data/app/views/admin/pages/_fields.html.haml CHANGED
@@ -8,7 +8,7 @@
8
8
  - form.edit_title do
9
9
  %p.title
10
10
  %label{:for=>'page_title'}= t('page_title')
11
- = fields.text_field :title, :class => 'textbox', :required => true
11
+ = fields.text_field :title, :class => 'textbox', :required => true, :size => 100
12
12
  - form.edit_extended_metadata do
13
13
  .drawer
14
14
  .drawer_contents#attributes
data/config/application.rb CHANGED
@@ -17,8 +17,7 @@ end
17
17
  module TrustyCms
18
18
  class Application < Rails::Application
19
19
  include TrustyCms::Initializer
20
- config.active_record.whitelist_attributes = true
21
-
20
+ Rails.autoloaders.log!
22
21
  # Enable the asset pipeline
23
22
  config.assets.enabled = true
24
23
 
@@ -26,6 +25,7 @@ module TrustyCms
26
25
  config.assets.version = '1.0'
27
26
 
28
27
  # Initialize extension paths
28
+ config.eager_load_paths << Rails.root.join('vendor', 'extensions')
29
29
  config.initialize_extension_paths
30
30
  extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
31
31
  extension_loader.paths(:load).reverse_each do |path|
@@ -77,16 +77,18 @@ module TrustyCms
77
77
  end
78
78
  end
79
79
  config.after_initialize do
80
- extension_loader.load_extensions
81
- extension_loader.load_extension_initializers
80
+ # extension_loader.load_extensions
81
+ # extension_loader.load_extension_initializers
82
82
 
83
83
  extension_loader.activate_extensions # also calls initialize_views
84
84
  # config.add_controller_paths(extension_loader.paths(:controller))
85
85
  # config.add_eager_load_paths(extension_loader.paths(:eager_load))
86
86
 
87
87
  # Add new inflection rules using the following format:
88
- ActiveSupport::Inflector.inflections do |inflect|
89
- inflect.uncountable 'config'
88
+ Rails.autoloaders.each do |autoloader|
89
+ autoloader.inflector.inflect(
90
+ 'config' => 'Configuration'
91
+ )
90
92
  end
91
93
  end
92
94
  end
data/lib/trusty_cms/engine.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  module TrustyCms
2
2
  class Engine < Rails::Engine
3
+ isolate_namespace TrustyCms
3
4
  paths['app/helpers'] = []
4
5
  initializer 'trusty_cms.assets.precompile' do |app|
5
6
  app.config.assets.paths << Rails.root.join('../trusty-cms/node_modules')
data/lib/trusty_cms/resource_responses.rb CHANGED
@@ -64,6 +64,7 @@ module TrustyCms
64
64
 
65
65
  class Response
66
66
  attr_reader :publish_formats, :publish_block, :blocks, :block_order
67
+
67
68
  def initialize
68
69
  @publish_formats = []
69
70
  @blocks = {}
data/lib/trusty_cms/version.rb ADDED
@@ -0,0 +1,4 @@
1
+ module TrustyCms
2
+ VERSION = '6.2.1'.freeze
3
+ end
4
+
data/lib/trusty_cms.rb CHANGED
@@ -1,8 +1,8 @@
1
- TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
1
+ require 'trusty_cms/version'
2
+ require 'trusty_cms/engine'
2
3
 
3
- unless defined? TrustyCms::VERSION
4
- module TrustyCms
5
- VERSION = '6.1.2'.freeze
6
- end
4
+ module TrustyCms
7
5
  end
8
6
 
7
+ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
8
+
data/spec/dummy/config/initializers/zeitwerk.rb ADDED
@@ -0,0 +1,8 @@
1
+ Rails.autoloaders.each do |autoloader|
2
+ autoloader.inflector.inflect(
3
+ 'clipped_admin_ui' => 'ClippedAdminUI',
4
+ 'admin_ui' => 'AdminUI',
5
+ 'ostruct' => 'OpenStruct',
6
+ # Add more inflections as needed
7
+ )
8
+ end
data/trusty_cms.gemspec CHANGED
@@ -1,8 +1,9 @@
1
1
  # -*- encoding: utf-8 -*-
2
+ # frozen_string_literal: true
2
3
 
3
- require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
4
+ require File.expand_path(__FILE__ + '/../lib/trusty_cms/version.rb')
4
5
  Gem::Specification.new do |s|
5
- s.required_ruby_version = '>=2.5.3'
6
+ s.required_ruby_version = '>= 3.0.5'
6
7
  s.name = 'trusty-cms'
7
8
  s.version = TrustyCms::VERSION
8
9
  s.platform = Gem::Platform::RUBY
@@ -25,7 +26,7 @@ a general purpose content management system--not merely a blogging engine.'
25
26
  s.license = 'MIT'
26
27
  s.test_files = Dir['spec/**/*']
27
28
  s.add_dependency 'activestorage-validator'
28
- 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'
29
30
  s.add_dependency 'acts_as_tree', '~> 2.9.1'
30
31
  s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
31
32
  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
@@ -33,7 +34,7 @@ a general purpose content management system--not merely a blogging engine.'
33
34
  s.add_dependency 'execjs', '~> 2.7'
34
35
  s.add_dependency 'haml', '>= 5.0', '< 6.0'
35
36
  s.add_dependency 'haml-rails'
36
- s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
37
+ s.add_dependency 'highline', '>= 1.7.8', '< 3.1.0'
37
38
  s.add_dependency 'image_processing'
38
39
  s.add_dependency 'kraken-io'
39
40
  s.add_dependency 'mini_racer'
@@ -41,7 +42,7 @@ a general purpose content management system--not merely a blogging engine.'
41
42
  s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
42
43
  s.add_dependency 'rack-cache', '~> 1.7'
43
44
  s.add_dependency 'radius', '~> 0.7'
44
- s.add_dependency 'rails'
45
+ s.add_dependency 'rails', '~> 6.1.7'
45
46
  s.add_dependency 'rake', '< 14.0'
46
47
  s.add_dependency 'ransack'
47
48
  s.add_dependency 'rdoc', '>= 5.1', '< 7.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.1.2
4
+ version: 6.2.1
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: 2023-12-19 00:00:00.000000000 Z
11
+ date: 2024-09-16 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: 2.2.0
172
+ version: 3.1.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: 2.2.0
182
+ version: 3.1.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
@@ -985,6 +985,7 @@ files:
985
985
  - lib/trusty_cms/setup.rb
986
986
  - lib/trusty_cms/taggable.rb
987
987
  - lib/trusty_cms/task_support.rb
988
+ - lib/trusty_cms/version.rb
988
989
  - log/.keep
989
990
  - package.json
990
991
  - public/.htaccess
@@ -1025,6 +1026,7 @@ files:
1025
1026
  - spec/dummy/config/initializers/session_store.rb
1026
1027
  - spec/dummy/config/initializers/trusty_cms_config.rb
1027
1028
  - spec/dummy/config/initializers/wrap_parameters.rb
1029
+ - spec/dummy/config/initializers/zeitwerk.rb
1028
1030
  - spec/dummy/config/locales/en.yml
1029
1031
  - spec/dummy/config/routes.rb
1030
1032
  - spec/dummy/config/secrets.yml
@@ -1135,64 +1137,65 @@ required_ruby_version: !ruby/object:Gem::Requirement
1135
1137
  requirements:
1136
1138
  - - ">="
1137
1139
  - !ruby/object:Gem::Version
1138
- version: 2.5.3
1140
+ version: 3.0.5
1139
1141
  required_rubygems_version: !ruby/object:Gem::Requirement
1140
1142
  requirements:
1141
1143
  - - ">"
1142
1144
  - !ruby/object:Gem::Version
1143
1145
  version: 1.3.1
1144
1146
  requirements: []
1145
- rubygems_version: 3.0.3.1
1147
+ rubygems_version: 3.2.33
1146
1148
  signing_key:
1147
1149
  specification_version: 4
1148
1150
  summary: A no-fluff content management system designed for small teams.
1149
1151
  test_files:
1150
- - spec/fixtures/users.yml
1151
- - spec/features/layouts_spec.rb
1152
- - spec/features/config_spec.rb
1153
- - spec/features/pages_spec.rb
1154
- - spec/controllers/users_controller_spec.rb
1155
- - spec/controllers/application_controller_spec.rb
1156
- - spec/spec_helper.rb
1157
1152
  - spec/ci/database.mysql.yml
1158
- - spec/models/layout_spec.rb
1159
- - spec/dummy/config/environment.rb
1153
+ - spec/controllers/application_controller_spec.rb
1154
+ - spec/controllers/users_controller_spec.rb
1155
+ - spec/dummy/README.rdoc
1156
+ - spec/dummy/Rakefile
1157
+ - spec/dummy/app/assets/config/manifest.js
1158
+ - spec/dummy/bin/bundle
1159
+ - spec/dummy/bin/rails
1160
+ - spec/dummy/bin/rake
1161
+ - spec/dummy/bin/setup
1160
1162
  - spec/dummy/config/application.rb
1161
- - spec/dummy/config/secrets.yml
1162
- - spec/dummy/config/locales/en.yml
1163
- - spec/dummy/config/routes.rb
1163
+ - spec/dummy/config/boot.rb
1164
+ - spec/dummy/config/database.yml
1165
+ - spec/dummy/config/environment.rb
1164
1166
  - spec/dummy/config/environments/development.rb
1165
- - spec/dummy/config/environments/test.rb
1166
1167
  - spec/dummy/config/environments/production.rb
1167
- - spec/dummy/config/initializers/mime_types.rb
1168
+ - spec/dummy/config/environments/test.rb
1169
+ - spec/dummy/config/initializers/assets.rb
1168
1170
  - spec/dummy/config/initializers/backtrace_silencers.rb
1169
- - spec/dummy/config/initializers/session_store.rb
1170
- - spec/dummy/config/initializers/filter_parameter_logging.rb
1171
1171
  - spec/dummy/config/initializers/cookies_serializer.rb
1172
+ - spec/dummy/config/initializers/filter_parameter_logging.rb
1173
+ - spec/dummy/config/initializers/inflections.rb
1174
+ - spec/dummy/config/initializers/mime_types.rb
1175
+ - spec/dummy/config/initializers/session_store.rb
1172
1176
  - spec/dummy/config/initializers/trusty_cms_config.rb
1173
1177
  - spec/dummy/config/initializers/wrap_parameters.rb
1174
- - spec/dummy/config/initializers/assets.rb
1175
- - spec/dummy/config/initializers/inflections.rb
1176
- - spec/dummy/config/database.yml
1177
- - spec/dummy/config/boot.rb
1178
- - spec/dummy/app/assets/config/manifest.js
1179
- - spec/dummy/package.json
1180
- - spec/dummy/README.rdoc
1178
+ - spec/dummy/config/initializers/zeitwerk.rb
1179
+ - spec/dummy/config/locales/en.yml
1180
+ - spec/dummy/config/routes.rb
1181
+ - spec/dummy/config/secrets.yml
1182
+ - spec/dummy/config.ru
1181
1183
  - spec/dummy/db/schema.rb
1182
- - spec/dummy/Rakefile
1183
- - spec/dummy/public/422.html
1184
- - spec/dummy/public/favicon.ico
1184
+ - spec/dummy/package.json
1185
1185
  - spec/dummy/public/404.html
1186
+ - spec/dummy/public/422.html
1186
1187
  - spec/dummy/public/500.html
1188
+ - spec/dummy/public/favicon.ico
1187
1189
  - spec/dummy/yarn.lock
1188
- - spec/dummy/bin/rails
1189
- - spec/dummy/bin/bundle
1190
- - spec/dummy/bin/rake
1191
- - spec/dummy/bin/setup
1192
- - spec/dummy/config.ru
1193
- - spec/support/custom_actions.rb
1194
- - spec/rails_helper.rb
1190
+ - spec/factories/layout.rb
1191
+ - spec/factories/page.rb
1195
1192
  - spec/factories/page_part.rb
1196
1193
  - spec/factories/user.rb
1197
- - spec/factories/page.rb
1198
- - spec/factories/layout.rb
1194
+ - spec/features/config_spec.rb
1195
+ - spec/features/layouts_spec.rb
1196
+ - spec/features/pages_spec.rb
1197
+ - spec/fixtures/users.yml
1198
+ - spec/models/layout_spec.rb
1199
+ - spec/rails_helper.rb
1200
+ - spec/spec_helper.rb
1201
+ - spec/support/custom_actions.rb