trusty-cms 5.5.8 → 5.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +103 -104
  3. data/app/models/asset_type.rb +0 -4
  4. data/lib/trusty_cms.rb +1 -1
  5. data/trusty_cms.gemspec +2 -2
  6. data/yarn.lock +840 -908
  7. metadata +57 -45
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2f153cb16e77134be24802048d7ba184050c14a3d71e9d76ccc1499e1ee3d9ff
4
- data.tar.gz: e2cf2d5ebd9a4f0a5b09298e2d07e90711167fa4f193855e7d00acd87627ef4b
3
+ metadata.gz: 5f8b0bd8937e1904cbd99f07ebd6cb049c116427158203f3690049ac4dcc7808
4
+ data.tar.gz: 0460de350d9c1a6f9a13ed21e0c8e729804912b96dd970675787c075cb17f69e
5
5
  SHA512:
6
- metadata.gz: a678af78e72cdcc397b26d946800ed3c23063d65a5aae6fbf02003b1a4014c1947fedd2b503dcceb466dd003bca27e42fe0203d4bbcfece95c4ac74f376eff2e
7
- data.tar.gz: 3081cee243cc7c6cd1cb17fea14b5540b9236d873f31353a8d9ca7225d7296e79e129355abdb77027f667623da3f04eff0ffcef3f85eeb51aa759b5f9165de51
6
+ metadata.gz: afe7f5c07904b684ffbc6c1865ace738b25c8fcd3c7aa7a7337b79541bb4fdb0108d6c5d81792afbe07c17c66811215f496235965cdb89884ee6d6721e5c6c44
7
+ data.tar.gz: b64ae5a35689107f12b7fe785660183d049e3aac4d34f6a7b66ee19fec49294a03ff3689e1ac7f37a21b4d3dced22f0ada6bf5866b600199826af295f04a1099
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (5.5.8)
4
+ trusty-cms (5.6.0)
5
5
  RedCloth (= 4.3.2)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.2.0)
@@ -10,7 +10,7 @@ PATH
10
10
  delocalize (>= 0.2, < 2.0)
11
11
  devise
12
12
  execjs (~> 2.7)
13
- haml
13
+ haml (>= 5.0, < 6.0)
14
14
  haml-rails
15
15
  highline (>= 1.7.8, < 2.2.0)
16
16
  image_processing
@@ -29,68 +29,68 @@ PATH
29
29
  tzinfo (>= 1.2.3, < 2.1.0)
30
30
  uglifier (>= 3.2, < 5.0)
31
31
  uuidtools (>= 2.1.5, < 2.3.0)
32
- will_paginate (~> 3.0)
32
+ will_paginate (>= 3, < 5)
33
33
 
34
34
  GEM
35
35
  remote: https://rubygems.org/
36
36
  specs:
37
37
  RedCloth (4.3.2)
38
- actioncable (6.1.7.3)
39
- actionpack (= 6.1.7.3)
40
- activesupport (= 6.1.7.3)
38
+ actioncable (6.1.7.6)
39
+ actionpack (= 6.1.7.6)
40
+ activesupport (= 6.1.7.6)
41
41
  nio4r (~> 2.0)
42
42
  websocket-driver (>= 0.6.1)
43
- actionmailbox (6.1.7.3)
44
- actionpack (= 6.1.7.3)
45
- activejob (= 6.1.7.3)
46
- activerecord (= 6.1.7.3)
47
- activestorage (= 6.1.7.3)
48
- activesupport (= 6.1.7.3)
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)
49
49
  mail (>= 2.7.1)
50
- actionmailer (6.1.7.3)
51
- actionpack (= 6.1.7.3)
52
- actionview (= 6.1.7.3)
53
- activejob (= 6.1.7.3)
54
- activesupport (= 6.1.7.3)
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)
55
55
  mail (~> 2.5, >= 2.5.4)
56
56
  rails-dom-testing (~> 2.0)
57
- actionpack (6.1.7.3)
58
- actionview (= 6.1.7.3)
59
- activesupport (= 6.1.7.3)
57
+ actionpack (6.1.7.6)
58
+ actionview (= 6.1.7.6)
59
+ activesupport (= 6.1.7.6)
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.3)
65
- actionpack (= 6.1.7.3)
66
- activerecord (= 6.1.7.3)
67
- activestorage (= 6.1.7.3)
68
- activesupport (= 6.1.7.3)
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)
69
69
  nokogiri (>= 1.8.5)
70
- actionview (6.1.7.3)
71
- activesupport (= 6.1.7.3)
70
+ actionview (6.1.7.6)
71
+ activesupport (= 6.1.7.6)
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.3)
77
- activesupport (= 6.1.7.3)
76
+ activejob (6.1.7.6)
77
+ activesupport (= 6.1.7.6)
78
78
  globalid (>= 0.3.6)
79
- activemodel (6.1.7.3)
80
- activesupport (= 6.1.7.3)
81
- activerecord (6.1.7.3)
82
- activemodel (= 6.1.7.3)
83
- activesupport (= 6.1.7.3)
84
- activestorage (6.1.7.3)
85
- actionpack (= 6.1.7.3)
86
- activejob (= 6.1.7.3)
87
- activerecord (= 6.1.7.3)
88
- activesupport (= 6.1.7.3)
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)
89
89
  marcel (~> 1.0)
90
90
  mini_mime (>= 1.1.0)
91
- activestorage-validator (0.2.2)
92
- rails (>= 6.0.4.1)
93
- activesupport (6.1.7.3)
91
+ activestorage-validator (0.3.0)
92
+ rails (>= 6.1.0)
93
+ activesupport (6.1.7.6)
94
94
  concurrent-ruby (~> 1.0, >= 1.0.2)
95
95
  i18n (>= 1.6, < 2)
96
96
  minitest (>= 5.1)
@@ -123,22 +123,22 @@ GEM
123
123
  crass (1.0.6)
124
124
  css_parser (1.12.0)
125
125
  addressable
126
- database_cleaner (2.0.1)
127
- database_cleaner-active_record (~> 2.0.0)
128
- database_cleaner-active_record (2.0.1)
126
+ database_cleaner (2.0.2)
127
+ database_cleaner-active_record (>= 2, < 3)
128
+ database_cleaner-active_record (2.1.0)
129
129
  activerecord (>= 5.a)
130
130
  database_cleaner-core (~> 2.0.0)
131
131
  database_cleaner-core (2.0.1)
132
+ date (3.3.3)
132
133
  delocalize (1.2.0)
133
134
  rails (>= 2)
134
- devise (4.9.0)
135
+ devise (4.9.2)
135
136
  bcrypt (~> 3.0)
136
137
  orm_adapter (~> 0.1)
137
138
  railties (>= 4.1.0)
138
139
  responders
139
140
  warden (~> 1.2.3)
140
141
  diff-lcs (1.5.0)
141
- digest (3.1.1)
142
142
  docile (1.4.0)
143
143
  erubi (1.12.0)
144
144
  execjs (2.8.1)
@@ -151,11 +151,10 @@ GEM
151
151
  file_validators (3.0.0)
152
152
  activemodel (>= 3.2)
153
153
  mime-types (>= 1.0)
154
- globalid (1.1.0)
155
- activesupport (>= 5.0)
156
- haml (6.1.1)
157
- temple (>= 0.8.2)
158
- thor
154
+ globalid (1.2.1)
155
+ activesupport (>= 6.1)
156
+ haml (5.2.2)
157
+ temple (>= 0.8.0)
159
158
  tilt
160
159
  haml-rails (2.1.0)
161
160
  actionpack (>= 5.1)
@@ -166,7 +165,7 @@ GEM
166
165
  httparty (0.21.0)
167
166
  mini_mime (>= 1.0.0)
168
167
  multi_xml (>= 0.5.2)
169
- i18n (1.12.0)
168
+ i18n (1.14.1)
170
169
  concurrent-ruby (~> 1.0)
171
170
  image_processing (1.12.2)
172
171
  mini_magick (>= 4.9.5, < 5)
@@ -181,9 +180,9 @@ GEM
181
180
  addressable (~> 2.8)
182
181
  libv8-node (16.10.0.0-x86_64-darwin)
183
182
  libv8-node (16.10.0.0-x86_64-linux)
184
- loofah (2.19.1)
183
+ loofah (2.21.3)
185
184
  crass (~> 1.0.2)
186
- nokogiri (>= 1.5.9)
185
+ nokogiri (>= 1.12.0)
187
186
  mail (2.8.1)
188
187
  mini_mime (>= 0.1.1)
189
188
  net-imap
@@ -195,27 +194,26 @@ GEM
195
194
  mime-types-data (~> 3.2015)
196
195
  mime-types-data (3.2022.0105)
197
196
  mini_magick (4.12.0)
198
- mini_mime (1.1.2)
197
+ mini_mime (1.1.5)
199
198
  mini_racer (0.6.3)
200
199
  libv8-node (~> 16.10.0.0)
201
- minitest (5.18.0)
200
+ minitest (5.20.0)
202
201
  multi_xml (0.6.0)
203
202
  multipart-post (2.2.3)
204
203
  mysql2 (0.5.5)
205
- net-imap (0.2.3)
206
- digest
204
+ net-imap (0.3.7)
205
+ date
207
206
  net-protocol
208
- strscan
209
207
  net-pop (0.1.2)
210
208
  net-protocol
211
- net-protocol (0.1.3)
209
+ net-protocol (0.2.1)
212
210
  timeout
213
211
  net-smtp (0.3.3)
214
212
  net-protocol
215
- nio4r (2.5.8)
216
- nokogiri (1.14.2-x86_64-darwin)
213
+ nio4r (2.5.9)
214
+ nokogiri (1.15.4-x86_64-darwin)
217
215
  racc (~> 1.4)
218
- nokogiri (1.14.2-x86_64-linux)
216
+ nokogiri (1.15.4-x86_64-linux)
219
217
  racc (~> 1.4)
220
218
  orm_adapter (0.5.0)
221
219
  poltergeist (1.18.1)
@@ -231,38 +229,40 @@ GEM
231
229
  psych (5.1.0)
232
230
  stringio
233
231
  public_suffix (4.0.7)
234
- racc (1.6.2)
235
- rack (2.2.6.4)
236
- rack-cache (1.13.0)
232
+ racc (1.7.1)
233
+ rack (2.2.8)
234
+ rack-cache (1.14.0)
237
235
  rack (>= 0.4)
238
236
  rack-test (2.1.0)
239
237
  rack (>= 1.3)
240
238
  radius (0.7.5)
241
- rails (6.1.7.3)
242
- actioncable (= 6.1.7.3)
243
- actionmailbox (= 6.1.7.3)
244
- actionmailer (= 6.1.7.3)
245
- actionpack (= 6.1.7.3)
246
- actiontext (= 6.1.7.3)
247
- actionview (= 6.1.7.3)
248
- activejob (= 6.1.7.3)
249
- activemodel (= 6.1.7.3)
250
- activerecord (= 6.1.7.3)
251
- activestorage (= 6.1.7.3)
252
- activesupport (= 6.1.7.3)
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)
253
251
  bundler (>= 1.15.0)
254
- railties (= 6.1.7.3)
252
+ railties (= 6.1.7.6)
255
253
  sprockets-rails (>= 2.0.0)
256
- rails-dom-testing (2.0.3)
257
- activesupport (>= 4.2.0)
254
+ rails-dom-testing (2.2.0)
255
+ activesupport (>= 5.0.0)
256
+ minitest
258
257
  nokogiri (>= 1.6)
259
- rails-html-sanitizer (1.5.0)
260
- loofah (~> 2.19, >= 2.19.1)
258
+ rails-html-sanitizer (1.6.0)
259
+ loofah (~> 2.21)
260
+ nokogiri (~> 1.14)
261
261
  rails-observers (0.1.5)
262
262
  activemodel (>= 4.0)
263
- railties (6.1.7.3)
264
- actionpack (= 6.1.7.3)
265
- activesupport (= 6.1.7.3)
263
+ railties (6.1.7.6)
264
+ actionpack (= 6.1.7.6)
265
+ activesupport (= 6.1.7.6)
266
266
  method_source
267
267
  rake (>= 12.2)
268
268
  thor (~> 1.0)
@@ -279,22 +279,22 @@ GEM
279
279
  roadie-rails (2.3.0)
280
280
  railties (>= 5.1, < 7.1)
281
281
  roadie (>= 3.1, < 5.0)
282
- rspec-core (3.12.0)
282
+ rspec-core (3.12.2)
283
283
  rspec-support (~> 3.12.0)
284
- rspec-expectations (3.12.2)
284
+ rspec-expectations (3.12.3)
285
285
  diff-lcs (>= 1.2.0, < 2.0)
286
286
  rspec-support (~> 3.12.0)
287
- rspec-mocks (3.12.1)
287
+ rspec-mocks (3.12.5)
288
288
  diff-lcs (>= 1.2.0, < 2.0)
289
289
  rspec-support (~> 3.12.0)
290
- rspec-rails (6.0.1)
290
+ rspec-rails (6.0.3)
291
291
  actionpack (>= 6.1)
292
292
  activesupport (>= 6.1)
293
293
  railties (>= 6.1)
294
- rspec-core (~> 3.11)
295
- rspec-expectations (~> 3.11)
296
- rspec-mocks (~> 3.11)
297
- rspec-support (~> 3.11)
294
+ rspec-core (~> 3.12)
295
+ rspec-expectations (~> 3.12)
296
+ rspec-mocks (~> 3.12)
297
+ rspec-support (~> 3.12)
298
298
  rspec-support (3.12.0)
299
299
  ruby-vips (2.1.4)
300
300
  ffi (~> 1.12)
@@ -314,22 +314,21 @@ GEM
314
314
  simplecov_json_formatter (~> 0.1)
315
315
  simplecov-html (0.12.3)
316
316
  simplecov_json_formatter (0.1.4)
317
- sprockets (4.2.0)
317
+ sprockets (4.2.1)
318
318
  concurrent-ruby (~> 1.0)
319
319
  rack (>= 2.2.4, < 4)
320
320
  sprockets-rails (3.4.2)
321
321
  actionpack (>= 5.2)
322
322
  activesupport (>= 5.2)
323
323
  sprockets (>= 3.0.0)
324
- stringex (2.8.5)
324
+ stringex (2.8.6)
325
325
  stringio (3.0.5)
326
- strscan (3.0.6)
327
326
  temple (0.10.0)
328
327
  terrapin (0.6.0)
329
328
  climate_control (>= 0.0.3, < 1.0)
330
- thor (1.2.1)
329
+ thor (1.2.2)
331
330
  tilt (2.1.0)
332
- timeout (0.3.2)
331
+ timeout (0.4.0)
333
332
  trustygems (0.2.1)
334
333
  rake
335
334
  tzinfo (2.0.6)
@@ -339,13 +338,13 @@ GEM
339
338
  uuidtools (2.2.0)
340
339
  warden (1.2.9)
341
340
  rack (>= 2.0.9)
342
- websocket-driver (0.7.5)
341
+ websocket-driver (0.7.6)
343
342
  websocket-extensions (>= 0.1.0)
344
343
  websocket-extensions (0.1.5)
345
- will_paginate (3.3.1)
344
+ will_paginate (4.0.0)
346
345
  xpath (3.2.0)
347
346
  nokogiri (~> 1.8)
348
- zeitwerk (2.6.7)
347
+ zeitwerk (2.6.11)
349
348
 
350
349
  PLATFORMS
351
350
  x86_64-darwin-18
@@ -372,4 +371,4 @@ DEPENDENCIES
372
371
  trustygems (~> 0.2.0)
373
372
 
374
373
  BUNDLED WITH
375
- 2.4.4
374
+ 2.4.20
data/app/models/asset_type.rb CHANGED
@@ -152,10 +152,6 @@ class AssetType
152
152
  end
153
153
  end
154
154
 
155
- def legacy_styles
156
- TrustyCms::config['assets.additional_thumbnails'].to_s.gsub(' ', '').split(',').collect { |s| s.split('=') }.inject({}) { |ha, (k, v)| ha[k.to_sym] = v; ha }
157
- end
158
-
159
155
  def style_dimensions(style_name)
160
156
  if style = paperclip_styles[style_name.to_sym]
161
157
  style[:size]
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '5.5.8'.freeze
5
+ VERSION = '5.6.0'.freeze
6
6
  end
7
7
  end
data/trusty_cms.gemspec CHANGED
@@ -31,7 +31,7 @@ a general purpose content management system--not merely a blogging engine.'
31
31
  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
32
32
  s.add_dependency 'devise'
33
33
  s.add_dependency 'execjs', '~> 2.7'
34
- s.add_dependency 'haml'
34
+ s.add_dependency 'haml', '>= 5.0', '< 6.0'
35
35
  s.add_dependency 'haml-rails'
36
36
  s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
37
37
  s.add_dependency 'image_processing'
@@ -51,5 +51,5 @@ a general purpose content management system--not merely a blogging engine.'
51
51
  s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
52
52
  s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
53
53
  s.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
54
- s.add_dependency 'will_paginate', '~> 3.0'
54
+ s.add_dependency 'will_paginate', '>= 3', '< 5'
55
55
  end