trusty-cms 6.1.2 → 6.2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +111 -104
  3. data/app/models/page.rb +14 -6
  4. data/app/views/admin/pages/_fields.html.haml +1 -1
  5. data/config/application.rb +8 -6
  6. data/lib/trusty_cms/admin_ui.rb +1 -1
  7. data/lib/trusty_cms/engine.rb +1 -0
  8. data/lib/trusty_cms/resource_responses.rb +2 -1
  9. data/lib/trusty_cms/version.rb +3 -0
  10. data/lib/trusty_cms.rb +4 -5
  11. data/spec/dummy/config/initializers/zeitwerk.rb +8 -0
  12. data/trusty_cms.gemspec +5 -3
  13. data/vendor/extensions/multi-site-extension/multi_site_extension.rb +1 -0
  14. metadata +45 -42
  15. /data/lib/{ostruct.rb → open_struct.rb} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 317a11bc953c6892d860b8c0e13b7d71ca9feffd3e9c6251c52606928fc1ada3
4
- data.tar.gz: aef8f45d869c2b2ec31df22d23002ba14c4b1399e1bf82b06a4a6bc5ca8d707e
3
+ metadata.gz: 71383e72f45672a6cf5bf9fb68301f9c0239a2ad40d7782a2e269724150b1e8a
4
+ data.tar.gz: bebc54966f5f3a0a431a1ac6585e4646c80fe0d319b33a8666e65a4781ede6a2
5
5
  SHA512:
6
- metadata.gz: 7c6011cc75d010d0a669e5105820b8ab4d498c081220a5584e654dd8e9c8002fa748175b06cce6145c8011b3f1ab0823052c231bd2107946b725afcfcc94b5ea
7
- data.tar.gz: 9b9460d709ae5504c298d03a3a5b170db440fc9db7b7998531ac856f7635dfee5f99dfe3d66d25bf4ce54494c4a687523355b84ff73d8f887f81bfef38fc5f25
6
+ metadata.gz: a616c07e4091859c3b62c7a3253862dcf4963bb48bb38552b0259e88e1cd2ae2e13256c6fbecee909c60989a194abfd0b6b2d4e3f715ead86f0764b37adf6e34
7
+ data.tar.gz: 33b03b3d3ce65928e841e4033e65bf521596b8b311f0336733b5bd8b0f4d1dad92fce0fd82e79225a3e0ba80cf373a6e5e56291793ea829138244ba1938d13db
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (6.1.2)
4
+ trusty-cms (6.2.2)
5
5
  RedCloth (= 4.3.3)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.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
@@ -35,72 +35,78 @@ 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 (7.0.8.1)
39
+ actionpack (= 7.0.8.1)
40
+ activesupport (= 7.0.8.1)
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 (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)
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
+ 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)
55
58
  mail (~> 2.5, >= 2.5.4)
59
+ net-imap
60
+ net-pop
61
+ net-smtp
56
62
  rails-dom-testing (~> 2.0)
57
- actionpack (6.1.7.6)
58
- actionview (= 6.1.7.6)
59
- activesupport (= 6.1.7.6)
60
- rack (~> 2.0, >= 2.0.9)
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)
61
67
  rack-test (>= 0.6.3)
62
68
  rails-dom-testing (~> 2.0)
63
69
  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)
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)
69
76
  nokogiri (>= 1.8.5)
70
- actionview (6.1.7.6)
71
- activesupport (= 6.1.7.6)
77
+ actionview (7.0.8.1)
78
+ activesupport (= 7.0.8.1)
72
79
  builder (~> 3.1)
73
80
  erubi (~> 1.4)
74
81
  rails-dom-testing (~> 2.0)
75
82
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
76
- activejob (6.1.7.6)
77
- activesupport (= 6.1.7.6)
83
+ activejob (7.0.8.1)
84
+ activesupport (= 7.0.8.1)
78
85
  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)
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)
89
96
  marcel (~> 1.0)
90
97
  mini_mime (>= 1.1.0)
91
- activestorage-validator (0.3.0)
98
+ activestorage-validator (0.4.0)
92
99
  rails (>= 6.1.0)
93
- activesupport (6.1.7.6)
100
+ activesupport (7.0.8.1)
94
101
  concurrent-ruby (~> 1.0, >= 1.0.2)
95
102
  i18n (>= 1.6, < 2)
96
103
  minitest (>= 5.1)
97
104
  tzinfo (~> 2.0)
98
- zeitwerk (~> 2.3)
99
105
  acts_as_list (1.1.0)
100
106
  activerecord (>= 4.2)
101
107
  acts_as_tree (2.9.1)
102
108
  activerecord (>= 3.0.0)
103
- addressable (2.8.1)
109
+ addressable (2.8.6)
104
110
  public_suffix (>= 2.0.2, < 6.0)
105
111
  bcrypt (3.1.19)
106
112
  builder (3.2.4)
@@ -119,9 +125,9 @@ GEM
119
125
  climate_control (0.2.0)
120
126
  cliver (0.3.2)
121
127
  coderay (1.1.3)
122
- concurrent-ruby (1.2.2)
128
+ concurrent-ruby (1.2.3)
123
129
  crass (1.0.6)
124
- css_parser (1.12.0)
130
+ css_parser (1.16.0)
125
131
  addressable
126
132
  database_cleaner (2.0.2)
127
133
  database_cleaner-active_record (>= 2, < 3)
@@ -129,7 +135,7 @@ GEM
129
135
  activerecord (>= 5.a)
130
136
  database_cleaner-core (~> 2.0.0)
131
137
  database_cleaner-core (2.0.1)
132
- date (3.3.3)
138
+ date (3.3.4)
133
139
  delocalize (1.2.0)
134
140
  rails (>= 2)
135
141
  devise (4.9.3)
@@ -138,7 +144,7 @@ GEM
138
144
  railties (>= 4.1.0)
139
145
  responders
140
146
  warden (~> 1.2.3)
141
- diff-lcs (1.5.0)
147
+ diff-lcs (1.5.1)
142
148
  docile (1.4.0)
143
149
  erubi (1.12.0)
144
150
  execjs (2.9.1)
@@ -161,7 +167,7 @@ GEM
161
167
  activesupport (>= 5.1)
162
168
  haml (>= 4.0.6)
163
169
  railties (>= 5.1)
164
- highline (2.1.0)
170
+ highline (3.0.1)
165
171
  httparty (0.21.0)
166
172
  mini_mime (>= 1.0.0)
167
173
  multi_xml (>= 0.5.2)
@@ -178,8 +184,8 @@ GEM
178
184
  multipart-post
179
185
  launchy (2.5.2)
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
+ libv8-node (18.16.0.0-x86_64-darwin)
188
+ libv8-node (18.16.0.0-x86_64-linux)
183
189
  loofah (2.22.0)
184
190
  crass (~> 1.0.2)
185
191
  nokogiri (>= 1.12.0)
@@ -188,109 +194,110 @@ GEM
188
194
  net-imap
189
195
  net-pop
190
196
  net-smtp
191
- marcel (1.0.2)
197
+ marcel (1.0.4)
192
198
  method_source (1.0.0)
193
199
  mime-types (3.4.1)
194
200
  mime-types-data (~> 3.2015)
195
201
  mime-types-data (3.2022.0105)
196
202
  mini_magick (4.12.0)
197
203
  mini_mime (1.1.5)
198
- mini_racer (0.6.3)
199
- libv8-node (~> 16.10.0.0)
200
- minitest (5.15.0)
204
+ mini_racer (0.8.0)
205
+ libv8-node (~> 18.16.0.0)
206
+ minitest (5.22.2)
201
207
  multi_xml (0.6.0)
202
208
  multipart-post (2.2.3)
203
- mysql2 (0.5.5)
204
- net-imap (0.4.1)
209
+ mysql2 (0.5.6)
210
+ net-imap (0.4.10)
205
211
  date
206
212
  net-protocol
207
213
  net-pop (0.1.2)
208
214
  net-protocol
209
- net-protocol (0.2.1)
215
+ net-protocol (0.2.2)
210
216
  timeout
211
- net-smtp (0.4.0)
217
+ net-smtp (0.4.0.1)
212
218
  net-protocol
213
- nio4r (2.5.9)
214
- nokogiri (1.12.5-x86_64-darwin)
219
+ nio4r (2.7.0)
220
+ nokogiri (1.16.2-x86_64-darwin)
215
221
  racc (~> 1.4)
216
- nokogiri (1.12.5-x86_64-linux)
222
+ nokogiri (1.16.2-x86_64-linux)
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)
237
+ public_suffix (5.0.4)
232
238
  racc (1.7.3)
233
- rack (2.2.8)
239
+ rack (2.2.8.1)
234
240
  rack-cache (1.14.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 (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
257
  bundler (>= 1.15.0)
252
- railties (= 6.1.7.6)
253
- sprockets-rails (>= 2.0.0)
258
+ railties (= 7.0.8.1)
254
259
  rails-dom-testing (2.2.0)
255
260
  activesupport (>= 5.0.0)
256
261
  minitest
257
262
  nokogiri (>= 1.6)
258
- rails-html-sanitizer (1.5.0)
259
- loofah (~> 2.19, >= 2.19.1)
263
+ rails-html-sanitizer (1.6.0)
264
+ loofah (~> 2.21)
265
+ nokogiri (~> 1.14)
260
266
  rails-observers (0.1.5)
261
267
  activemodel (>= 4.0)
262
- railties (6.1.7.6)
263
- actionpack (= 6.1.7.6)
264
- activesupport (= 6.1.7.6)
268
+ railties (7.0.8.1)
269
+ actionpack (= 7.0.8.1)
270
+ activesupport (= 7.0.8.1)
265
271
  method_source
266
272
  rake (>= 12.2)
267
273
  thor (~> 1.0)
274
+ zeitwerk (~> 2.5)
268
275
  rake (13.1.0)
269
276
  ransack (4.1.1)
270
277
  activerecord (>= 6.1.5)
271
278
  activesupport (>= 6.1.5)
272
279
  i18n
273
- rdoc (6.5.0)
280
+ rdoc (6.6.2)
274
281
  psych (>= 4.0.0)
275
282
  regexp_parser (2.1.1)
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.1.0)
290
+ railties (>= 5.1, < 8.0)
291
+ roadie (~> 5.0)
292
+ rspec-core (3.13.0)
293
+ rspec-support (~> 3.13.0)
294
+ rspec-expectations (3.13.0)
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.0)
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.1)
294
301
  actionpack (>= 6.1)
295
302
  activesupport (>= 6.1)
296
303
  railties (>= 6.1)
@@ -298,7 +305,7 @@ GEM
298
305
  rspec-expectations (~> 3.12)
299
306
  rspec-mocks (~> 3.12)
300
307
  rspec-support (~> 3.12)
301
- rspec-support (3.12.1)
308
+ rspec-support (3.13.1)
302
309
  ruby-vips (2.1.4)
303
310
  ffi (~> 1.12)
304
311
  sass-rails (6.0.0)
@@ -325,13 +332,13 @@ GEM
325
332
  activesupport (>= 5.2)
326
333
  sprockets (>= 3.0.0)
327
334
  stringex (2.8.6)
328
- stringio (3.0.6)
335
+ stringio (3.1.0)
329
336
  temple (0.10.0)
330
337
  terrapin (0.6.0)
331
338
  climate_control (>= 0.0.3, < 1.0)
332
- thor (1.2.2)
339
+ thor (1.3.1)
333
340
  tilt (2.1.0)
334
- timeout (0.4.0)
341
+ timeout (0.4.1)
335
342
  trustygems (0.2.1)
336
343
  rake
337
344
  tzinfo (2.0.6)
@@ -346,7 +353,7 @@ GEM
346
353
  will_paginate (4.0.0)
347
354
  xpath (3.2.0)
348
355
  nokogiri (~> 1.8)
349
- zeitwerk (2.6.12)
356
+ zeitwerk (2.6.13)
350
357
 
351
358
  PLATFORMS
352
359
  x86_64-darwin-18
@@ -374,4 +381,4 @@ DEPENDENCIES
374
381
  trustygems (~> 0.2.0)
375
382
 
376
383
  BUNDLED WITH
377
- 2.4.13
384
+ 2.5.6
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/admin_ui.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'simpleton'
2
- require 'ostruct'
2
+ require 'open_struct'
3
3
 
4
4
  module TrustyCms
5
5
  class AdminUI
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
@@ -1,4 +1,4 @@
1
- require 'ostruct'
1
+ require 'open_struct'
2
2
  module TrustyCms
3
3
  module ResourceResponses
4
4
  def self.extended(base)
@@ -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,3 @@
1
+ module TrustyCms
2
+ VERSION = '6.2.2.1'.freeze
3
+ end
data/lib/trusty_cms.rb CHANGED
@@ -1,8 +1,7 @@
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
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,10 @@
1
1
  # -*- encoding: utf-8 -*-
2
+ # frozen_string_literal: true
2
3
 
3
- require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
4
+ $:.push File.expand_path('lib', __dir__)
5
+ require_relative 'lib/trusty_cms/version'
4
6
  Gem::Specification.new do |s|
5
- s.required_ruby_version = '>=2.5.3'
7
+ s.required_ruby_version = '>= 3.0.5'
6
8
  s.name = 'trusty-cms'
7
9
  s.version = TrustyCms::VERSION
8
10
  s.platform = Gem::Platform::RUBY
@@ -33,7 +35,7 @@ a general purpose content management system--not merely a blogging engine.'
33
35
  s.add_dependency 'execjs', '~> 2.7'
34
36
  s.add_dependency 'haml', '>= 5.0', '< 6.0'
35
37
  s.add_dependency 'haml-rails'
36
- s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
38
+ s.add_dependency 'highline', '>= 1.7.8', '< 3.1.0'
37
39
  s.add_dependency 'image_processing'
38
40
  s.add_dependency 'kraken-io'
39
41
  s.add_dependency 'mini_racer'
data/vendor/extensions/multi-site-extension/multi_site_extension.rb CHANGED
@@ -19,6 +19,7 @@ class MultiSiteExtension < TrustyCms::Extension
19
19
  # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
20
20
  SiteController.send :include, MultiSite::SiteControllerExtensions
21
21
  Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
22
+ Admin::PagesController.send :include, MultiSite::ResourceControllerExtensions
22
23
  Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
23
24
  Admin::ResourceController.send :helper, MultiSite::SiteChooserHelper
24
25
  Admin::PagesController.send :helper, MultiSite::SiteChooserHelper
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.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-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -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
@@ -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/ostruct.rb
957
+ - lib/open_struct.rb
958
958
  - lib/simpleton.rb
959
959
  - lib/string_extensions/string_extensions.rb
960
960
  - lib/symbol_extensions/symbol_extensions.rb
@@ -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
/data/lib/{ostruct.rb → open_struct.rb} RENAMED
File without changes