trusty-cms 6.0.4 → 6.1.1

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 (21) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -1
  3. data/Gemfile.lock +76 -77
  4. data/app/assets/javascripts/admin/assets.js +254 -237
  5. data/app/assets/stylesheets/admin/partials/_forms.scss +1 -1
  6. data/app/controllers/admin/assets_controller.rb +9 -8
  7. data/app/controllers/admin/pages_controller.rb +7 -0
  8. data/app/models/asset.rb +4 -0
  9. data/app/models/file_not_found_page.rb +4 -4
  10. data/app/models/user.rb +4 -0
  11. data/app/views/admin/assets/_search.html.haml +7 -6
  12. data/app/views/admin/assets/index.html.haml +2 -2
  13. data/app/views/admin/layouts/_site_chooser.html.haml +1 -1
  14. data/app/views/admin/pages/_asset_popups.html.haml +1 -1
  15. data/config/initializers/ransack.rb +5 -0
  16. data/lib/trusty_cms/engine.rb +1 -0
  17. data/lib/trusty_cms.rb +1 -1
  18. data/trusty_cms.gemspec +1 -0
  19. data/vendor/extensions/clipped-extension/clipped_extension.rb +10 -10
  20. data/vendor/extensions/clipped-extension/lib/asset_tags.rb +42 -41
  21. metadata +44 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d9a7903adc14b08abf648ccd87795af51fb168a5ea987ead0c98ae2a6103379f
4
- data.tar.gz: bee09d86dddbf8efab14f644b20a480c22d37af51849390b0acbc433409517bd
3
+ metadata.gz: 671322333fab02c719cde7aea5380c77b1cfc2147f4aea0aae7ff9639d1d338e
4
+ data.tar.gz: f869d02b2cdd5d7ed704fce3cfdd07b13441d86f7f7049ec8d66f9d7ca68d711
5
5
  SHA512:
6
- metadata.gz: e3804b9cf359022ec5784276c19fb6dfb2c1e033fe283736635b040372f6424b5c775d64e2987d287955e29f5fcb4e3419d76c4ee41fc0c50bec36168c3f6d63
7
- data.tar.gz: a39c179f2af842278fdd70f84b4da756473fa6f36bd47f6014b5f7191ac46f1972d11127d84f31ef350fb657de6bb9634d876095680248a6ca4dc029909fc839
6
+ metadata.gz: fe78c7df0cc233522d05ccc4de80261567d49635d89aa69a472e1a59a288a7b1790979fb3b76358ef75934763d223472ee9095a84c0220dad682f652d31024b4
7
+ data.tar.gz: d7efa654ff5b117c031b447100a3c599a3090f40549b4b96cf32bf1329ced4f967d5ca7a5be45a3911d3b29d2f071e3534a545a7a4a6595ac05d5417e4fea279
data/Gemfile CHANGED
@@ -21,8 +21,9 @@ group :development, :test do
21
21
  gem 'mysql2'
22
22
  gem 'poltergeist', '~> 1.18.1'
23
23
  gem 'pry-byebug'
24
- gem 'psych', '5.1.0'
24
+ gem 'psych', '5.1.1.1'
25
25
  gem 'rails-observers'
26
+ gem 'ransack'
26
27
  gem 'rspec-rails'
27
28
  gem 'simplecov'
28
29
  end
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (6.0.4)
4
+ trusty-cms (6.1.0)
5
5
  RedCloth (= 4.3.2)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.2.0)
@@ -22,6 +22,7 @@ PATH
22
22
  radius (~> 0.7)
23
23
  rails
24
24
  rake (< 14.0)
25
+ ransack
25
26
  rdoc (>= 5.1, < 7.0)
26
27
  roadie-rails
27
28
  sass-rails
@@ -34,80 +35,74 @@ GEM
34
35
  remote: https://rubygems.org/
35
36
  specs:
36
37
  RedCloth (4.3.2)
37
- actioncable (7.0.8)
38
- actionpack (= 7.0.8)
39
- activesupport (= 7.0.8)
38
+ actioncable (6.1.7.6)
39
+ actionpack (= 6.1.7.6)
40
+ activesupport (= 6.1.7.6)
40
41
  nio4r (~> 2.0)
41
42
  websocket-driver (>= 0.6.1)
42
- actionmailbox (7.0.8)
43
- actionpack (= 7.0.8)
44
- activejob (= 7.0.8)
45
- activerecord (= 7.0.8)
46
- activestorage (= 7.0.8)
47
- activesupport (= 7.0.8)
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)
48
49
  mail (>= 2.7.1)
49
- net-imap
50
- net-pop
51
- net-smtp
52
- actionmailer (7.0.8)
53
- actionpack (= 7.0.8)
54
- actionview (= 7.0.8)
55
- activejob (= 7.0.8)
56
- activesupport (= 7.0.8)
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)
57
55
  mail (~> 2.5, >= 2.5.4)
58
- net-imap
59
- net-pop
60
- net-smtp
61
56
  rails-dom-testing (~> 2.0)
62
- actionpack (7.0.8)
63
- actionview (= 7.0.8)
64
- activesupport (= 7.0.8)
65
- rack (~> 2.0, >= 2.2.4)
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)
66
61
  rack-test (>= 0.6.3)
67
62
  rails-dom-testing (~> 2.0)
68
63
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
69
- actiontext (7.0.8)
70
- actionpack (= 7.0.8)
71
- activerecord (= 7.0.8)
72
- activestorage (= 7.0.8)
73
- activesupport (= 7.0.8)
74
- globalid (>= 0.6.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)
75
69
  nokogiri (>= 1.8.5)
76
- actionview (7.0.8)
77
- activesupport (= 7.0.8)
70
+ actionview (6.1.7.6)
71
+ activesupport (= 6.1.7.6)
78
72
  builder (~> 3.1)
79
73
  erubi (~> 1.4)
80
74
  rails-dom-testing (~> 2.0)
81
75
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
82
- activejob (7.0.8)
83
- activesupport (= 7.0.8)
76
+ activejob (6.1.7.6)
77
+ activesupport (= 6.1.7.6)
84
78
  globalid (>= 0.3.6)
85
- activemodel (7.0.8)
86
- activesupport (= 7.0.8)
87
- activerecord (7.0.8)
88
- activemodel (= 7.0.8)
89
- activesupport (= 7.0.8)
90
- activestorage (7.0.8)
91
- actionpack (= 7.0.8)
92
- activejob (= 7.0.8)
93
- activerecord (= 7.0.8)
94
- activesupport (= 7.0.8)
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)
95
89
  marcel (~> 1.0)
96
90
  mini_mime (>= 1.1.0)
97
91
  activestorage-validator (0.3.0)
98
92
  rails (>= 6.1.0)
99
- activesupport (7.0.8)
93
+ activesupport (6.1.7.6)
100
94
  concurrent-ruby (~> 1.0, >= 1.0.2)
101
95
  i18n (>= 1.6, < 2)
102
96
  minitest (>= 5.1)
103
97
  tzinfo (~> 2.0)
98
+ zeitwerk (~> 2.3)
104
99
  acts_as_list (1.1.0)
105
100
  activerecord (>= 4.2)
106
101
  acts_as_tree (2.9.1)
107
102
  activerecord (>= 3.0.0)
108
103
  addressable (2.8.1)
109
104
  public_suffix (>= 2.0.2, < 6.0)
110
- bcrypt (3.1.18)
105
+ bcrypt (3.1.19)
111
106
  builder (3.2.4)
112
107
  byebug (11.1.3)
113
108
  capybara (3.35.3)
@@ -137,7 +132,7 @@ GEM
137
132
  date (3.3.3)
138
133
  delocalize (1.2.0)
139
134
  rails (>= 2)
140
- devise (4.9.2)
135
+ devise (4.9.3)
141
136
  bcrypt (~> 3.0)
142
137
  orm_adapter (~> 0.1)
143
138
  railties (>= 4.1.0)
@@ -202,7 +197,7 @@ GEM
202
197
  mini_mime (1.1.5)
203
198
  mini_racer (0.6.3)
204
199
  libv8-node (~> 16.10.0.0)
205
- minitest (5.20.0)
200
+ minitest (5.15.0)
206
201
  multi_xml (0.6.0)
207
202
  multipart-post (2.2.3)
208
203
  mysql2 (0.5.5)
@@ -216,9 +211,9 @@ GEM
216
211
  net-smtp (0.4.0)
217
212
  net-protocol
218
213
  nio4r (2.5.9)
219
- nokogiri (1.15.4-x86_64-darwin)
214
+ nokogiri (1.12.5-x86_64-darwin)
220
215
  racc (~> 1.4)
221
- nokogiri (1.15.4-x86_64-linux)
216
+ nokogiri (1.12.5-x86_64-linux)
222
217
  racc (~> 1.4)
223
218
  orm_adapter (0.5.0)
224
219
  poltergeist (1.18.1)
@@ -231,51 +226,54 @@ GEM
231
226
  pry-byebug (3.9.0)
232
227
  byebug (~> 11.0)
233
228
  pry (~> 0.13.0)
234
- psych (5.1.0)
229
+ psych (5.1.1.1)
235
230
  stringio
236
231
  public_suffix (4.0.7)
237
- racc (1.7.1)
232
+ racc (1.7.2)
238
233
  rack (2.2.8)
239
234
  rack-cache (1.14.0)
240
235
  rack (>= 0.4)
241
236
  rack-test (2.1.0)
242
237
  rack (>= 1.3)
243
238
  radius (0.7.5)
244
- rails (7.0.8)
245
- actioncable (= 7.0.8)
246
- actionmailbox (= 7.0.8)
247
- actionmailer (= 7.0.8)
248
- actionpack (= 7.0.8)
249
- actiontext (= 7.0.8)
250
- actionview (= 7.0.8)
251
- activejob (= 7.0.8)
252
- activemodel (= 7.0.8)
253
- activerecord (= 7.0.8)
254
- activestorage (= 7.0.8)
255
- activesupport (= 7.0.8)
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)
256
251
  bundler (>= 1.15.0)
257
- railties (= 7.0.8)
252
+ railties (= 6.1.7.6)
253
+ sprockets-rails (>= 2.0.0)
258
254
  rails-dom-testing (2.2.0)
259
255
  activesupport (>= 5.0.0)
260
256
  minitest
261
257
  nokogiri (>= 1.6)
262
- rails-html-sanitizer (1.6.0)
263
- loofah (~> 2.21)
264
- nokogiri (~> 1.14)
258
+ rails-html-sanitizer (1.5.0)
259
+ loofah (~> 2.19, >= 2.19.1)
265
260
  rails-observers (0.1.5)
266
261
  activemodel (>= 4.0)
267
- railties (7.0.8)
268
- actionpack (= 7.0.8)
269
- activesupport (= 7.0.8)
262
+ railties (6.1.7.6)
263
+ actionpack (= 6.1.7.6)
264
+ activesupport (= 6.1.7.6)
270
265
  method_source
271
266
  rake (>= 12.2)
272
267
  thor (~> 1.0)
273
- zeitwerk (~> 2.5)
274
- rake (13.0.6)
268
+ rake (13.1.0)
269
+ ransack (4.1.1)
270
+ activerecord (>= 6.1.5)
271
+ activesupport (>= 6.1.5)
272
+ i18n
275
273
  rdoc (6.5.0)
276
274
  psych (>= 4.0.0)
277
275
  regexp_parser (2.1.1)
278
- responders (3.1.0)
276
+ responders (3.1.1)
279
277
  actionpack (>= 5.2)
280
278
  railties (>= 5.2)
281
279
  roadie (4.0.0)
@@ -327,7 +325,7 @@ GEM
327
325
  activesupport (>= 5.2)
328
326
  sprockets (>= 3.0.0)
329
327
  stringex (2.8.6)
330
- stringio (3.0.5)
328
+ stringio (3.0.6)
331
329
  temple (0.10.0)
332
330
  terrapin (0.6.0)
333
331
  climate_control (>= 0.0.3, < 1.0)
@@ -367,8 +365,9 @@ DEPENDENCIES
367
365
  mysql2
368
366
  poltergeist (~> 1.18.1)
369
367
  pry-byebug
370
- psych (= 5.1.0)
368
+ psych (= 5.1.1.1)
371
369
  rails-observers
370
+ ransack
372
371
  rspec-rails
373
372
  simplecov
374
373
  trusty-cms!