trusty-cms 4.1.9 → 4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -1
  3. data/Gemfile.lock +129 -123
  4. data/LICENSE.md +1 -1
  5. data/app/assets/javascripts/admin/custom_file_upload.js +7 -0
  6. data/app/controllers/admin/pages_controller.rb +1 -1
  7. data/app/controllers/admin/preferences_controller.rb +1 -1
  8. data/app/controllers/admin/resource_controller.rb +1 -1
  9. data/app/controllers/admin/users_controller.rb +1 -1
  10. data/app/helpers/admin/node_helper.rb +1 -1
  11. data/app/models/asset.rb +3 -3
  12. data/app/models/page.rb +5 -5
  13. data/app/models/standard_tags.rb +3 -3
  14. data/app/models/user.rb +1 -1
  15. data/app/views/admin/assets/new.html.haml +2 -0
  16. data/config/database.mysql.yml +10 -2
  17. data/db/migrate/20210331134718_create_active_storage_tables.active_storage.rb +36 -0
  18. data/lib/generators/extension/templates/test_helper.rb +6 -8
  19. data/lib/login_system.rb +1 -1
  20. data/lib/trusty_cms.rb +1 -1
  21. data/lib/trusty_cms/setup.rb +1 -1
  22. data/spec/dummy/config/database.yml +6 -2
  23. data/trusty_cms.gemspec +4 -5
  24. data/vendor/extensions/clipped-extension/lib/asset_tags.rb +4 -4
  25. data/yarn.lock +6 -6
  26. metadata +354 -67
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4fb05c8f28c0097f216371ee9b64551430ef41f134939c45db99af078f16a909
4
- data.tar.gz: a774319265c2377af1242e05337c59e5310188f7259330adcf56e138407c9a32
3
+ metadata.gz: ad9371ba3318d81f9d8e099bef26a6f579a7d57d63a9dd9c7adeadc734bf4ffe
4
+ data.tar.gz: 38553db2e1df5a329f43bdf44579460b4f17cc6a2bd52dfb5aacaee55b522a67
5
5
  SHA512:
6
- metadata.gz: b77c5e66a0793e654d506cf7b07fda3e04b90869e515e181e6a96c42659e65876d2dfe0d436f8ef6aa8bd1a14cbfa1136f0a21a92a99912edaefb8d545c76885
7
- data.tar.gz: 0eee0cbdcc348c0ea3a5c9167c7622eba56a88ebf02d3430ba31b92020e780da3889f01179bcc07ff235f8fa2ea6a47d2ffd99189c4a431b779d69866a420de5
6
+ metadata.gz: 554218a5ffd924487b5e3925da8be1ed5c974b26b81a42408f8185cb90caa6160001428b1821af6d5e1d4791a164487ac4e8bbfc35edc13d7395a71f661f392c
7
+ data.tar.gz: 3a86ab5361d2023645cc3638fdd518160a279d2b383664cd1b4139bd3a630a353a0476daea32582adb6d69a77a5dc936c42ef5f3ff3df0c78861e224c66bba7f
data/Gemfile CHANGED
@@ -14,7 +14,8 @@ gemspec
14
14
  group :development, :test do
15
15
  gem 'acts_as_list'
16
16
  gem 'database_cleaner'
17
- gem 'factory_bot_rails', '6.1.0'
17
+ gem 'factory_bot_rails', '6.2.0'
18
+ gem 'kt-paperclip', '~> 7.0.0'
18
19
  gem 'launchy', '~> 2.5.0'
19
20
  gem 'mysql2'
20
21
  gem 'poltergeist', '~> 1.18.1'
data/Gemfile.lock CHANGED
@@ -1,21 +1,20 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (4.1.9)
4
+ trusty-cms (4.3)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (>= 0.9.5, < 1.1.0)
7
- acts_as_tree (>= 2.6.1, < 2.9.0)
7
+ acts_as_tree (~> 2.9.1)
8
8
  ckeditor (>= 4.2.2, < 4.3.0)
9
9
  delocalize (>= 0.2, < 2.0)
10
10
  devise
11
11
  execjs (~> 2.7)
12
- haml (~> 5.0)
13
- haml-rails (~> 1.0.0)
12
+ haml
13
+ haml-rails (~> 2.0)
14
14
  highline (>= 1.7.8, < 2.1.0)
15
15
  kraken-io
16
16
  mini_racer
17
17
  mysql2
18
- paperclip (> 5.2)
19
18
  rack (>= 2.0.1, < 2.3.0)
20
19
  rack-cache (~> 1.7)
21
20
  radius (~> 0.7)
@@ -23,7 +22,7 @@ PATH
23
22
  rake (< 14.0)
24
23
  rdoc (>= 5.1, < 7.0)
25
24
  roadie-rails
26
- sassc-rails
25
+ sass-rails
27
26
  stringex (>= 2.7.1, < 2.9.0)
28
27
  tzinfo (>= 1.2.3, < 2.1.0)
29
28
  uglifier (>= 3.2, < 5.0)
@@ -34,77 +33,81 @@ GEM
34
33
  remote: https://rubygems.org/
35
34
  specs:
36
35
  RedCloth (4.3.2)
37
- actioncable (6.0.3.4)
38
- actionpack (= 6.0.3.4)
36
+ actioncable (6.1.3.2)
37
+ actionpack (= 6.1.3.2)
38
+ activesupport (= 6.1.3.2)
39
39
  nio4r (~> 2.0)
40
40
  websocket-driver (>= 0.6.1)
41
- actionmailbox (6.0.3.4)
42
- actionpack (= 6.0.3.4)
43
- activejob (= 6.0.3.4)
44
- activerecord (= 6.0.3.4)
45
- activestorage (= 6.0.3.4)
46
- activesupport (= 6.0.3.4)
41
+ actionmailbox (6.1.3.2)
42
+ actionpack (= 6.1.3.2)
43
+ activejob (= 6.1.3.2)
44
+ activerecord (= 6.1.3.2)
45
+ activestorage (= 6.1.3.2)
46
+ activesupport (= 6.1.3.2)
47
47
  mail (>= 2.7.1)
48
- actionmailer (6.0.3.4)
49
- actionpack (= 6.0.3.4)
50
- actionview (= 6.0.3.4)
51
- activejob (= 6.0.3.4)
48
+ actionmailer (6.1.3.2)
49
+ actionpack (= 6.1.3.2)
50
+ actionview (= 6.1.3.2)
51
+ activejob (= 6.1.3.2)
52
+ activesupport (= 6.1.3.2)
52
53
  mail (~> 2.5, >= 2.5.4)
53
54
  rails-dom-testing (~> 2.0)
54
- actionpack (6.0.3.4)
55
- actionview (= 6.0.3.4)
56
- activesupport (= 6.0.3.4)
57
- rack (~> 2.0, >= 2.0.8)
55
+ actionpack (6.1.3.2)
56
+ actionview (= 6.1.3.2)
57
+ activesupport (= 6.1.3.2)
58
+ rack (~> 2.0, >= 2.0.9)
58
59
  rack-test (>= 0.6.3)
59
60
  rails-dom-testing (~> 2.0)
60
61
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
61
- actiontext (6.0.3.4)
62
- actionpack (= 6.0.3.4)
63
- activerecord (= 6.0.3.4)
64
- activestorage (= 6.0.3.4)
65
- activesupport (= 6.0.3.4)
62
+ actiontext (6.1.3.2)
63
+ actionpack (= 6.1.3.2)
64
+ activerecord (= 6.1.3.2)
65
+ activestorage (= 6.1.3.2)
66
+ activesupport (= 6.1.3.2)
66
67
  nokogiri (>= 1.8.5)
67
- actionview (6.0.3.4)
68
- activesupport (= 6.0.3.4)
68
+ actionview (6.1.3.2)
69
+ activesupport (= 6.1.3.2)
69
70
  builder (~> 3.1)
70
71
  erubi (~> 1.4)
71
72
  rails-dom-testing (~> 2.0)
72
73
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
73
- activejob (6.0.3.4)
74
- activesupport (= 6.0.3.4)
74
+ activejob (6.1.3.2)
75
+ activesupport (= 6.1.3.2)
75
76
  globalid (>= 0.3.6)
76
- activemodel (6.0.3.4)
77
- activesupport (= 6.0.3.4)
78
- activerecord (6.0.3.4)
79
- activemodel (= 6.0.3.4)
80
- activesupport (= 6.0.3.4)
81
- activestorage (6.0.3.4)
82
- actionpack (= 6.0.3.4)
83
- activejob (= 6.0.3.4)
84
- activerecord (= 6.0.3.4)
85
- marcel (~> 0.3.1)
86
- activesupport (6.0.3.4)
77
+ activemodel (6.1.3.2)
78
+ activesupport (= 6.1.3.2)
79
+ activerecord (6.1.3.2)
80
+ activemodel (= 6.1.3.2)
81
+ activesupport (= 6.1.3.2)
82
+ activestorage (6.1.3.2)
83
+ actionpack (= 6.1.3.2)
84
+ activejob (= 6.1.3.2)
85
+ activerecord (= 6.1.3.2)
86
+ activesupport (= 6.1.3.2)
87
+ marcel (~> 1.0.0)
88
+ mini_mime (~> 1.0.2)
89
+ activesupport (6.1.3.2)
87
90
  concurrent-ruby (~> 1.0, >= 1.0.2)
88
- i18n (>= 0.7, < 2)
89
- minitest (~> 5.1)
90
- tzinfo (~> 1.1)
91
- zeitwerk (~> 2.2, >= 2.2.2)
92
- acts_as_list (1.0.3)
91
+ i18n (>= 1.6, < 2)
92
+ minitest (>= 5.1)
93
+ tzinfo (~> 2.0)
94
+ zeitwerk (~> 2.3)
95
+ acts_as_list (1.0.4)
93
96
  activerecord (>= 4.2)
94
- acts_as_tree (2.8.0)
97
+ acts_as_tree (2.9.1)
95
98
  activerecord (>= 3.0.0)
96
99
  addressable (2.7.0)
97
100
  public_suffix (>= 2.0.2, < 5.0)
98
101
  bcrypt (3.1.16)
99
102
  builder (3.2.4)
100
103
  byebug (11.1.3)
101
- capybara (3.34.0)
104
+ capybara (3.35.3)
102
105
  addressable
103
106
  mini_mime (>= 0.1.3)
104
107
  nokogiri (~> 1.8)
105
108
  rack (>= 1.6.0)
106
109
  rack-test (>= 0.6.3)
107
- regexp_parser (~> 1.5)
110
+ regexp_parser (>= 1.5, < 3.0)
108
111
  xpath (~> 3.2)
109
112
  ckeditor (4.2.4)
110
113
  cocaine
@@ -114,41 +117,46 @@ GEM
114
117
  cocaine (0.6.0)
115
118
  terrapin (= 0.6.0)
116
119
  coderay (1.1.3)
117
- concurrent-ruby (1.1.7)
120
+ concurrent-ruby (1.1.9)
118
121
  crass (1.0.6)
119
- css_parser (1.7.1)
122
+ css_parser (1.9.0)
120
123
  addressable
121
- database_cleaner (1.8.5)
124
+ database_cleaner (2.0.1)
125
+ database_cleaner-active_record (~> 2.0.0)
126
+ database_cleaner-active_record (2.0.1)
127
+ activerecord (>= 5.a)
128
+ database_cleaner-core (~> 2.0.0)
129
+ database_cleaner-core (2.0.1)
122
130
  delocalize (1.2.0)
123
131
  rails (>= 2)
124
- devise (4.7.3)
132
+ devise (4.8.0)
125
133
  bcrypt (~> 3.0)
126
134
  orm_adapter (~> 0.1)
127
135
  railties (>= 4.1.0)
128
136
  responders
129
137
  warden (~> 1.2.3)
130
138
  diff-lcs (1.4.4)
131
- docile (1.3.4)
139
+ docile (1.4.0)
132
140
  erubi (1.10.0)
133
141
  erubis (2.7.0)
134
- execjs (2.7.0)
135
- factory_bot (6.1.0)
142
+ execjs (2.8.1)
143
+ factory_bot (6.2.0)
136
144
  activesupport (>= 5.0.0)
137
- factory_bot_rails (6.1.0)
138
- factory_bot (~> 6.1.0)
145
+ factory_bot_rails (6.2.0)
146
+ factory_bot (~> 6.2.0)
139
147
  railties (>= 5.0.0)
140
- ffi (1.14.2)
148
+ ffi (1.15.1)
141
149
  globalid (0.4.2)
142
150
  activesupport (>= 4.2.0)
143
151
  haml (5.2.1)
144
152
  temple (>= 0.8.0)
145
153
  tilt
146
- haml-rails (1.0.0)
147
- actionpack (>= 4.0.1)
148
- activesupport (>= 4.0.1)
154
+ haml-rails (2.0.1)
155
+ actionpack (>= 5.1)
156
+ activesupport (>= 5.1)
149
157
  haml (>= 4.0.6, < 6.0)
150
158
  html2haml (>= 1.0.1)
151
- railties (>= 4.0.1)
159
+ railties (>= 5.1)
152
160
  highline (2.0.3)
153
161
  html2haml (2.2.0)
154
162
  erubis (~> 2.7.0)
@@ -158,7 +166,7 @@ GEM
158
166
  httparty (0.18.1)
159
167
  mime-types (~> 3.0)
160
168
  multi_xml (>= 0.5.2)
161
- i18n (1.8.7)
169
+ i18n (1.8.10)
162
170
  concurrent-ruby (~> 1.0)
163
171
  json (2.5.1)
164
172
  kraken-io (0.1.3)
@@ -166,40 +174,36 @@ GEM
166
174
  httparty
167
175
  json
168
176
  multipart-post
177
+ kt-paperclip (7.0.0)
178
+ activemodel (>= 4.2.0)
179
+ activesupport (>= 4.2.0)
180
+ marcel (~> 1.0.1)
181
+ mime-types
182
+ terrapin (~> 0.6.0)
169
183
  launchy (2.5.0)
170
184
  addressable (~> 2.7)
171
- libv8 (8.4.255.0)
172
- loofah (2.8.0)
185
+ libv8-node (15.14.0.1-x86_64-darwin-18)
186
+ loofah (2.10.0)
173
187
  crass (~> 1.0.2)
174
188
  nokogiri (>= 1.5.9)
175
189
  mail (2.7.1)
176
190
  mini_mime (>= 0.1.1)
177
- marcel (0.3.3)
178
- mimemagic (~> 0.3.2)
191
+ marcel (1.0.1)
179
192
  method_source (1.0.0)
180
193
  mime-types (3.3.1)
181
194
  mime-types-data (~> 3.2015)
182
- mime-types-data (3.2020.1104)
183
- mimemagic (0.3.5)
184
- mini_mime (1.0.2)
185
- mini_portile2 (2.5.0)
186
- mini_racer (0.3.1)
187
- libv8 (~> 8.4.255)
188
- minitest (5.14.3)
195
+ mime-types-data (3.2021.0225)
196
+ mini_mime (1.0.3)
197
+ mini_racer (0.4.0)
198
+ libv8-node (~> 15.14.0.0)
199
+ minitest (5.14.4)
189
200
  multi_xml (0.6.0)
190
201
  multipart-post (2.1.1)
191
202
  mysql2 (0.5.3)
192
- nio4r (2.5.4)
193
- nokogiri (1.11.1)
194
- mini_portile2 (~> 2.5.0)
203
+ nio4r (2.5.7)
204
+ nokogiri (1.11.7-x86_64-darwin)
195
205
  racc (~> 1.4)
196
206
  orm_adapter (0.5.0)
197
- paperclip (6.1.0)
198
- activemodel (>= 4.2.0)
199
- activesupport (>= 4.2.0)
200
- mime-types
201
- mimemagic (~> 0.3.0)
202
- terrapin (~> 0.6.0)
203
207
  poltergeist (1.18.1)
204
208
  capybara (>= 2.1, < 4)
205
209
  cliver (~> 0.3.1)
@@ -218,20 +222,20 @@ GEM
218
222
  rack-test (1.1.0)
219
223
  rack (>= 1.0, < 3)
220
224
  radius (0.7.5)
221
- rails (6.0.3.4)
222
- actioncable (= 6.0.3.4)
223
- actionmailbox (= 6.0.3.4)
224
- actionmailer (= 6.0.3.4)
225
- actionpack (= 6.0.3.4)
226
- actiontext (= 6.0.3.4)
227
- actionview (= 6.0.3.4)
228
- activejob (= 6.0.3.4)
229
- activemodel (= 6.0.3.4)
230
- activerecord (= 6.0.3.4)
231
- activestorage (= 6.0.3.4)
232
- activesupport (= 6.0.3.4)
233
- bundler (>= 1.3.0)
234
- railties (= 6.0.3.4)
225
+ rails (6.1.3.2)
226
+ actioncable (= 6.1.3.2)
227
+ actionmailbox (= 6.1.3.2)
228
+ actionmailer (= 6.1.3.2)
229
+ actionpack (= 6.1.3.2)
230
+ actiontext (= 6.1.3.2)
231
+ actionview (= 6.1.3.2)
232
+ activejob (= 6.1.3.2)
233
+ activemodel (= 6.1.3.2)
234
+ activerecord (= 6.1.3.2)
235
+ activestorage (= 6.1.3.2)
236
+ activesupport (= 6.1.3.2)
237
+ bundler (>= 1.15.0)
238
+ railties (= 6.1.3.2)
235
239
  sprockets-rails (>= 2.0.0)
236
240
  rails-dom-testing (2.0.3)
237
241
  activesupport (>= 4.2.0)
@@ -240,15 +244,15 @@ GEM
240
244
  loofah (~> 2.3)
241
245
  rails-observers (0.1.5)
242
246
  activemodel (>= 4.0)
243
- railties (6.0.3.4)
244
- actionpack (= 6.0.3.4)
245
- activesupport (= 6.0.3.4)
247
+ railties (6.1.3.2)
248
+ actionpack (= 6.1.3.2)
249
+ activesupport (= 6.1.3.2)
246
250
  method_source
247
251
  rake (>= 0.8.7)
248
- thor (>= 0.20.3, < 2.0)
252
+ thor (~> 1.0)
249
253
  rake (13.0.3)
250
- rdoc (6.3.0)
251
- regexp_parser (1.8.2)
254
+ rdoc (6.3.1)
255
+ regexp_parser (2.1.1)
252
256
  responders (3.0.1)
253
257
  actionpack (>= 5.0)
254
258
  railties (>= 5.0)
@@ -263,20 +267,22 @@ GEM
263
267
  rspec-expectations (3.10.1)
264
268
  diff-lcs (>= 1.2.0, < 2.0)
265
269
  rspec-support (~> 3.10.0)
266
- rspec-mocks (3.10.1)
270
+ rspec-mocks (3.10.2)
267
271
  diff-lcs (>= 1.2.0, < 2.0)
268
272
  rspec-support (~> 3.10.0)
269
- rspec-rails (4.0.2)
270
- actionpack (>= 4.2)
271
- activesupport (>= 4.2)
272
- railties (>= 4.2)
273
+ rspec-rails (5.0.1)
274
+ actionpack (>= 5.2)
275
+ activesupport (>= 5.2)
276
+ railties (>= 5.2)
273
277
  rspec-core (~> 3.10)
274
278
  rspec-expectations (~> 3.10)
275
279
  rspec-mocks (~> 3.10)
276
280
  rspec-support (~> 3.10)
277
- rspec-support (3.10.1)
278
- ruby_parser (3.15.1)
279
- sexp_processor (~> 4.9)
281
+ rspec-support (3.10.2)
282
+ ruby_parser (3.16.0)
283
+ sexp_processor (~> 4.15, >= 4.15.1)
284
+ sass-rails (6.0.0)
285
+ sassc-rails (~> 2.1, >= 2.1.1)
280
286
  sassc (2.4.0)
281
287
  ffi (~> 1.9)
282
288
  sassc-rails (2.1.2)
@@ -285,13 +291,13 @@ GEM
285
291
  sprockets (> 3.0)
286
292
  sprockets-rails
287
293
  tilt
288
- sexp_processor (4.15.2)
294
+ sexp_processor (4.15.3)
289
295
  simplecov (0.21.2)
290
296
  docile (~> 1.1)
291
297
  simplecov-html (~> 0.11)
292
298
  simplecov_json_formatter (~> 0.1)
293
299
  simplecov-html (0.12.3)
294
- simplecov_json_formatter (0.1.2)
300
+ simplecov_json_formatter (0.1.3)
295
301
  sprockets (4.0.2)
296
302
  concurrent-ruby (~> 1.0)
297
303
  rack (> 1, < 3)
@@ -303,19 +309,18 @@ GEM
303
309
  temple (0.8.2)
304
310
  terrapin (0.6.0)
305
311
  climate_control (>= 0.0.3, < 1.0)
306
- thor (1.0.1)
307
- thread_safe (0.3.6)
312
+ thor (1.1.0)
308
313
  tilt (2.0.10)
309
314
  trustygems (0.2.1)
310
315
  rake
311
- tzinfo (1.2.9)
312
- thread_safe (~> 0.1)
316
+ tzinfo (2.0.4)
317
+ concurrent-ruby (~> 1.0)
313
318
  uglifier (4.2.0)
314
319
  execjs (>= 0.3.0, < 3)
315
320
  uuidtools (2.2.0)
316
321
  warden (1.2.9)
317
322
  rack (>= 2.0.9)
318
- websocket-driver (0.7.3)
323
+ websocket-driver (0.7.5)
319
324
  websocket-extensions (>= 0.1.0)
320
325
  websocket-extensions (0.1.5)
321
326
  will_paginate (3.3.0)
@@ -324,12 +329,13 @@ GEM
324
329
  zeitwerk (2.4.2)
325
330
 
326
331
  PLATFORMS
327
- ruby
332
+ x86_64-darwin-18
328
333
 
329
334
  DEPENDENCIES
330
335
  acts_as_list
331
336
  database_cleaner
332
- factory_bot_rails (= 6.1.0)
337
+ factory_bot_rails (= 6.2.0)
338
+ kt-paperclip (~> 7.0.0)
333
339
  launchy (~> 2.5.0)
334
340
  mysql2
335
341
  poltergeist (~> 1.18.1)
@@ -341,4 +347,4 @@ DEPENDENCIES
341
347
  trustygems (~> 0.2.0)
342
348
 
343
349
  BUNDLED WITH
344
- 2.1.4
350
+ 2.2.19