trusty-cms 5.3.3 → 5.3.6
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +63 -66
- data/app/mailers/rad_social_mailer.rb +1 -1
- data/app/models/standard_tags.rb +3 -3
- data/lib/generators/extension/templates/spec_helper.rb +2 -2
- data/lib/generators/extension/templates/test_helper.rb +2 -2
- data/lib/generators/instance/templates/instance_boot.rb +1 -1
- data/lib/generators/instance/templates/instance_environment.rb +1 -2
- data/lib/generators/language_extension/templates/spec_helper.rb +2 -2
- data/lib/generators/language_extension/templates/test_helper.rb +2 -2
- data/lib/generators/trusty_cms/templates/application.rb.erb +1 -3
- data/lib/tasks/database.rake +4 -4
- data/lib/tasks/framework.rake +1 -1
- data/lib/tasks/radiant_config.rake +4 -4
- data/lib/tasks/upgrade_to_devise.rake +2 -2
- data/lib/translation_support.rb +1 -1
- data/lib/trusty_cms.rb +1 -1
- data/package.json +1 -1
- data/yarn.lock +4 -4
- metadata +37 -37
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2b2ce5997e113553206a9e0f37ca6eb731c4a742e3b5fcf107e604f56393644b
|
|
4
|
+
data.tar.gz: 71e765ff5c6be6ef099ce0e72f11cc14f04715237a1548ce3474d2b4851c9549
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5effa8d623d92be2078e1910c3a6633063a5f82a65d53842ddc0224f8d323da722d22f8888651188c64f05d2bf47ce36501fee9aaa43ffb530bf378f0b59d2a3
|
|
7
|
+
data.tar.gz: 49bd9e83cd4362394dfa32cbfdd9a1bc7b389a3cdee683d62e9ad35675bdc2d7bf4b20357414e8dec31cf21e15ff1b0b439861677c80ebe2b16d344b88b0de4d
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
trusty-cms (5.3.
|
|
4
|
+
trusty-cms (5.3.6)
|
|
5
5
|
RedCloth (= 4.3.2)
|
|
6
6
|
activestorage-validator
|
|
7
7
|
acts_as_list (>= 0.9.5, < 1.1.0)
|
|
@@ -35,62 +35,62 @@ GEM
|
|
|
35
35
|
remote: https://rubygems.org/
|
|
36
36
|
specs:
|
|
37
37
|
RedCloth (4.3.2)
|
|
38
|
-
actioncable (6.1.6)
|
|
39
|
-
actionpack (= 6.1.6)
|
|
40
|
-
activesupport (= 6.1.6)
|
|
38
|
+
actioncable (6.1.6.1)
|
|
39
|
+
actionpack (= 6.1.6.1)
|
|
40
|
+
activesupport (= 6.1.6.1)
|
|
41
41
|
nio4r (~> 2.0)
|
|
42
42
|
websocket-driver (>= 0.6.1)
|
|
43
|
-
actionmailbox (6.1.6)
|
|
44
|
-
actionpack (= 6.1.6)
|
|
45
|
-
activejob (= 6.1.6)
|
|
46
|
-
activerecord (= 6.1.6)
|
|
47
|
-
activestorage (= 6.1.6)
|
|
48
|
-
activesupport (= 6.1.6)
|
|
43
|
+
actionmailbox (6.1.6.1)
|
|
44
|
+
actionpack (= 6.1.6.1)
|
|
45
|
+
activejob (= 6.1.6.1)
|
|
46
|
+
activerecord (= 6.1.6.1)
|
|
47
|
+
activestorage (= 6.1.6.1)
|
|
48
|
+
activesupport (= 6.1.6.1)
|
|
49
49
|
mail (>= 2.7.1)
|
|
50
|
-
actionmailer (6.1.6)
|
|
51
|
-
actionpack (= 6.1.6)
|
|
52
|
-
actionview (= 6.1.6)
|
|
53
|
-
activejob (= 6.1.6)
|
|
54
|
-
activesupport (= 6.1.6)
|
|
50
|
+
actionmailer (6.1.6.1)
|
|
51
|
+
actionpack (= 6.1.6.1)
|
|
52
|
+
actionview (= 6.1.6.1)
|
|
53
|
+
activejob (= 6.1.6.1)
|
|
54
|
+
activesupport (= 6.1.6.1)
|
|
55
55
|
mail (~> 2.5, >= 2.5.4)
|
|
56
56
|
rails-dom-testing (~> 2.0)
|
|
57
|
-
actionpack (6.1.6)
|
|
58
|
-
actionview (= 6.1.6)
|
|
59
|
-
activesupport (= 6.1.6)
|
|
57
|
+
actionpack (6.1.6.1)
|
|
58
|
+
actionview (= 6.1.6.1)
|
|
59
|
+
activesupport (= 6.1.6.1)
|
|
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.6)
|
|
65
|
-
actionpack (= 6.1.6)
|
|
66
|
-
activerecord (= 6.1.6)
|
|
67
|
-
activestorage (= 6.1.6)
|
|
68
|
-
activesupport (= 6.1.6)
|
|
64
|
+
actiontext (6.1.6.1)
|
|
65
|
+
actionpack (= 6.1.6.1)
|
|
66
|
+
activerecord (= 6.1.6.1)
|
|
67
|
+
activestorage (= 6.1.6.1)
|
|
68
|
+
activesupport (= 6.1.6.1)
|
|
69
69
|
nokogiri (>= 1.8.5)
|
|
70
|
-
actionview (6.1.6)
|
|
71
|
-
activesupport (= 6.1.6)
|
|
70
|
+
actionview (6.1.6.1)
|
|
71
|
+
activesupport (= 6.1.6.1)
|
|
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.6)
|
|
77
|
-
activesupport (= 6.1.6)
|
|
76
|
+
activejob (6.1.6.1)
|
|
77
|
+
activesupport (= 6.1.6.1)
|
|
78
78
|
globalid (>= 0.3.6)
|
|
79
|
-
activemodel (6.1.6)
|
|
80
|
-
activesupport (= 6.1.6)
|
|
81
|
-
activerecord (6.1.6)
|
|
82
|
-
activemodel (= 6.1.6)
|
|
83
|
-
activesupport (= 6.1.6)
|
|
84
|
-
activestorage (6.1.6)
|
|
85
|
-
actionpack (= 6.1.6)
|
|
86
|
-
activejob (= 6.1.6)
|
|
87
|
-
activerecord (= 6.1.6)
|
|
88
|
-
activesupport (= 6.1.6)
|
|
79
|
+
activemodel (6.1.6.1)
|
|
80
|
+
activesupport (= 6.1.6.1)
|
|
81
|
+
activerecord (6.1.6.1)
|
|
82
|
+
activemodel (= 6.1.6.1)
|
|
83
|
+
activesupport (= 6.1.6.1)
|
|
84
|
+
activestorage (6.1.6.1)
|
|
85
|
+
actionpack (= 6.1.6.1)
|
|
86
|
+
activejob (= 6.1.6.1)
|
|
87
|
+
activerecord (= 6.1.6.1)
|
|
88
|
+
activesupport (= 6.1.6.1)
|
|
89
89
|
marcel (~> 1.0)
|
|
90
90
|
mini_mime (>= 1.1.0)
|
|
91
91
|
activestorage-validator (0.1.5)
|
|
92
92
|
rails (>= 5.2.0)
|
|
93
|
-
activesupport (6.1.6)
|
|
93
|
+
activesupport (6.1.6.1)
|
|
94
94
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
95
95
|
i18n (>= 1.6, < 2)
|
|
96
96
|
minitest (>= 5.1)
|
|
@@ -171,7 +171,7 @@ GEM
|
|
|
171
171
|
httparty (0.20.0)
|
|
172
172
|
mime-types (~> 3.0)
|
|
173
173
|
multi_xml (>= 0.5.2)
|
|
174
|
-
i18n (1.
|
|
174
|
+
i18n (1.11.0)
|
|
175
175
|
concurrent-ruby (~> 1.0)
|
|
176
176
|
image_processing (1.12.2)
|
|
177
177
|
mini_magick (>= 4.9.5, < 5)
|
|
@@ -202,11 +202,8 @@ GEM
|
|
|
202
202
|
libv8-node (~> 16.10.0.0)
|
|
203
203
|
minitest (5.15.0)
|
|
204
204
|
multi_xml (0.6.0)
|
|
205
|
-
|
|
206
|
-
multipart-post (2.2.2)
|
|
207
|
-
|
|
205
|
+
multipart-post (2.2.3)
|
|
208
206
|
mysql2 (0.5.4)
|
|
209
|
-
|
|
210
207
|
nio4r (2.5.8)
|
|
211
208
|
nokogiri (1.12.5-x86_64-darwin)
|
|
212
209
|
racc (~> 1.4)
|
|
@@ -227,37 +224,37 @@ GEM
|
|
|
227
224
|
stringio
|
|
228
225
|
public_suffix (4.0.6)
|
|
229
226
|
racc (1.6.0)
|
|
230
|
-
rack (2.2.
|
|
227
|
+
rack (2.2.4)
|
|
231
228
|
rack-cache (1.13.0)
|
|
232
229
|
rack (>= 0.4)
|
|
233
|
-
rack-test (
|
|
234
|
-
rack (>= 1.
|
|
230
|
+
rack-test (2.0.2)
|
|
231
|
+
rack (>= 1.3)
|
|
235
232
|
radius (0.7.5)
|
|
236
|
-
rails (6.1.6)
|
|
237
|
-
actioncable (= 6.1.6)
|
|
238
|
-
actionmailbox (= 6.1.6)
|
|
239
|
-
actionmailer (= 6.1.6)
|
|
240
|
-
actionpack (= 6.1.6)
|
|
241
|
-
actiontext (= 6.1.6)
|
|
242
|
-
actionview (= 6.1.6)
|
|
243
|
-
activejob (= 6.1.6)
|
|
244
|
-
activemodel (= 6.1.6)
|
|
245
|
-
activerecord (= 6.1.6)
|
|
246
|
-
activestorage (= 6.1.6)
|
|
247
|
-
activesupport (= 6.1.6)
|
|
233
|
+
rails (6.1.6.1)
|
|
234
|
+
actioncable (= 6.1.6.1)
|
|
235
|
+
actionmailbox (= 6.1.6.1)
|
|
236
|
+
actionmailer (= 6.1.6.1)
|
|
237
|
+
actionpack (= 6.1.6.1)
|
|
238
|
+
actiontext (= 6.1.6.1)
|
|
239
|
+
actionview (= 6.1.6.1)
|
|
240
|
+
activejob (= 6.1.6.1)
|
|
241
|
+
activemodel (= 6.1.6.1)
|
|
242
|
+
activerecord (= 6.1.6.1)
|
|
243
|
+
activestorage (= 6.1.6.1)
|
|
244
|
+
activesupport (= 6.1.6.1)
|
|
248
245
|
bundler (>= 1.15.0)
|
|
249
|
-
railties (= 6.1.6)
|
|
246
|
+
railties (= 6.1.6.1)
|
|
250
247
|
sprockets-rails (>= 2.0.0)
|
|
251
248
|
rails-dom-testing (2.0.3)
|
|
252
249
|
activesupport (>= 4.2.0)
|
|
253
250
|
nokogiri (>= 1.6)
|
|
254
|
-
rails-html-sanitizer (1.4.
|
|
251
|
+
rails-html-sanitizer (1.4.3)
|
|
255
252
|
loofah (~> 2.3)
|
|
256
253
|
rails-observers (0.1.5)
|
|
257
254
|
activemodel (>= 4.0)
|
|
258
|
-
railties (6.1.6)
|
|
259
|
-
actionpack (= 6.1.6)
|
|
260
|
-
activesupport (= 6.1.6)
|
|
255
|
+
railties (6.1.6.1)
|
|
256
|
+
actionpack (= 6.1.6.1)
|
|
257
|
+
activesupport (= 6.1.6.1)
|
|
261
258
|
method_source
|
|
262
259
|
rake (>= 12.2)
|
|
263
260
|
thor (~> 1.0)
|
|
@@ -312,7 +309,7 @@ GEM
|
|
|
312
309
|
simplecov_json_formatter (~> 0.1)
|
|
313
310
|
simplecov-html (0.12.3)
|
|
314
311
|
simplecov_json_formatter (0.1.3)
|
|
315
|
-
sprockets (4.
|
|
312
|
+
sprockets (4.1.1)
|
|
316
313
|
concurrent-ruby (~> 1.0)
|
|
317
314
|
rack (> 1, < 3)
|
|
318
315
|
sprockets-rails (3.4.2)
|
|
@@ -325,7 +322,7 @@ GEM
|
|
|
325
322
|
terrapin (0.6.0)
|
|
326
323
|
climate_control (>= 0.0.3, < 1.0)
|
|
327
324
|
thor (1.2.1)
|
|
328
|
-
tilt (2.0.
|
|
325
|
+
tilt (2.0.11)
|
|
329
326
|
trustygems (0.2.1)
|
|
330
327
|
rake
|
|
331
328
|
tzinfo (2.0.4)
|
|
@@ -341,7 +338,7 @@ GEM
|
|
|
341
338
|
will_paginate (3.3.1)
|
|
342
339
|
xpath (3.2.0)
|
|
343
340
|
nokogiri (~> 1.8)
|
|
344
|
-
zeitwerk (2.
|
|
341
|
+
zeitwerk (2.6.0)
|
|
345
342
|
|
|
346
343
|
PLATFORMS
|
|
347
344
|
x86_64-darwin-18
|
|
@@ -10,7 +10,7 @@ class RadSocialMailer < ApplicationMailer
|
|
|
10
10
|
@from_name = from_address.display_name
|
|
11
11
|
@from_email = from_address
|
|
12
12
|
@message = options[:message]
|
|
13
|
-
@actual_from = ENV
|
|
13
|
+
@actual_from = ENV.fetch('RAD_SOCIAL_FROM_EMAIL')
|
|
14
14
|
@actual_from = from_address if @actual_from.nil?
|
|
15
15
|
|
|
16
16
|
mail({
|
data/app/models/standard_tags.rb
CHANGED
|
@@ -362,7 +362,7 @@ module StandardTags
|
|
|
362
362
|
tag.locals.page = aggregate_page
|
|
363
363
|
aggregates << tag.expand
|
|
364
364
|
end
|
|
365
|
-
aggregates.flatten.join
|
|
365
|
+
aggregates.flatten.join
|
|
366
366
|
end
|
|
367
367
|
|
|
368
368
|
tag 'aggregate:each:children' do |tag|
|
|
@@ -380,7 +380,7 @@ module StandardTags
|
|
|
380
380
|
tag.locals.page = item
|
|
381
381
|
result << tag.expand
|
|
382
382
|
end
|
|
383
|
-
result.flatten.join
|
|
383
|
+
result.flatten.join
|
|
384
384
|
end
|
|
385
385
|
|
|
386
386
|
tag 'aggregate:children' do |tag|
|
|
@@ -976,7 +976,7 @@ module StandardTags
|
|
|
976
976
|
tag.locals.paginated_list = displayed_children
|
|
977
977
|
result << tag.render('pagination', tag.attr.dup)
|
|
978
978
|
end
|
|
979
|
-
result.flatten.join
|
|
979
|
+
result.flatten.join
|
|
980
980
|
end
|
|
981
981
|
|
|
982
982
|
def children_find_options(tag)
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
unless defined? TRUSTY_CMS_ROOT
|
|
2
2
|
ENV["Rails.env"] = "test"
|
|
3
3
|
case
|
|
4
|
-
when ENV
|
|
5
|
-
require ENV
|
|
4
|
+
when ENV.fetch('RADIANT_ENV_FILE')
|
|
5
|
+
require ENV.fetch('RADIANT_ENV_FILE')
|
|
6
6
|
when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
|
|
7
7
|
require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
|
|
8
8
|
else
|
|
@@ -3,8 +3,8 @@ require 'test/unit'
|
|
|
3
3
|
unless defined? TRUSTY_CMS_ROOT
|
|
4
4
|
ENV['Rails.env'] = 'test'
|
|
5
5
|
case
|
|
6
|
-
when ENV
|
|
7
|
-
require ENV
|
|
6
|
+
when ENV.fetch('RADIANT_ENV_FILE')
|
|
7
|
+
require ENV.fetch('RADIANT_ENV_FILE')
|
|
8
8
|
when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
|
|
9
9
|
require "#{File.expand_path(File.dirname(__FILE__) + '/../../../../../../')}/config/environment"
|
|
10
10
|
else
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# Configure your app in config/environment.rb and config/environments/*.rb
|
|
3
3
|
|
|
4
4
|
Rails.root = "#{File.dirname(__FILE__)}/.." unless defined?(Rails.root)
|
|
5
|
-
Rails.env = (
|
|
5
|
+
Rails.env = ENV.fetch('RAILS_ENV', 'development').dup unless defined?(Rails.env)
|
|
6
6
|
|
|
7
7
|
module Rails
|
|
8
8
|
class << self
|
|
@@ -59,8 +59,7 @@ TrustyCms::Initializer.run do |config|
|
|
|
59
59
|
:verbose => false,
|
|
60
60
|
:allow_reload => false,
|
|
61
61
|
:allow_revalidate => false
|
|
62
|
-
|
|
63
|
-
# TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
|
|
62
|
+
|
|
64
63
|
config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
|
|
65
64
|
config.assets.enabled = true
|
|
66
65
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
unless defined? TRUSTY_CMS_ROOT
|
|
2
2
|
ENV["Rails.env"] = "test"
|
|
3
3
|
case
|
|
4
|
-
when ENV
|
|
5
|
-
require ENV
|
|
4
|
+
when ENV.fetch('RADIANT_ENV_FILE')
|
|
5
|
+
require ENV.fetch('RADIANT_ENV_FILE')
|
|
6
6
|
when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
|
|
7
7
|
require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
|
|
8
8
|
else
|
|
@@ -3,8 +3,8 @@ require 'test/unit'
|
|
|
3
3
|
unless defined? TRUSTY_CMS_ROOT
|
|
4
4
|
ENV["Rails.env"] = "test"
|
|
5
5
|
case
|
|
6
|
-
when ENV
|
|
7
|
-
require ENV
|
|
6
|
+
when ENV.fetch('RADIANT_ENV_FILE')
|
|
7
|
+
require ENV.fetch('RADIANT_ENV_FILE')
|
|
8
8
|
when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
|
|
9
9
|
require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
|
|
10
10
|
else
|
|
@@ -86,7 +86,6 @@ module TrustyCms
|
|
|
86
86
|
# radiant: since this will enable manual expiration and acceleration headers.
|
|
87
87
|
|
|
88
88
|
|
|
89
|
-
# TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
|
|
90
89
|
config.middleware.use Rack::Cache,
|
|
91
90
|
:private_headers => ['Authorization'],
|
|
92
91
|
:entitystore => "radiant:tmp/cache/entity",
|
|
@@ -94,8 +93,7 @@ module TrustyCms
|
|
|
94
93
|
:verbose => false,
|
|
95
94
|
:allow_reload => false,
|
|
96
95
|
:allow_revalidate => false
|
|
97
|
-
|
|
98
|
-
# TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
|
|
96
|
+
|
|
99
97
|
config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
|
|
100
98
|
config.assets.enabled = true
|
|
101
99
|
|
data/lib/tasks/database.rake
CHANGED
|
@@ -59,10 +59,10 @@ namespace :db do
|
|
|
59
59
|
task bootstrap: :initialize do
|
|
60
60
|
require 'trusty_cms/setup'
|
|
61
61
|
TrustyCms::Setup.bootstrap(
|
|
62
|
-
admin_name: ENV
|
|
63
|
-
admin_username: ENV
|
|
64
|
-
admin_password: ENV
|
|
65
|
-
database_template: ENV
|
|
62
|
+
admin_name: ENV.fetch('ADMIN_NAME'),
|
|
63
|
+
admin_username: ENV.fetch('ADMIN_USERNAME'),
|
|
64
|
+
admin_password: ENV.fetch('ADMIN_PASSWORD'),
|
|
65
|
+
database_template: ENV.fetch('DATABASE_TEMPLATE'),
|
|
66
66
|
)
|
|
67
67
|
puts %{
|
|
68
68
|
Your TrustyCms application is ready to use. Run `rails s -e production` to
|
data/lib/tasks/framework.rake
CHANGED
|
@@ -7,7 +7,7 @@ unless File.directory? "#{Rails.root}/app"
|
|
|
7
7
|
require 'rubygems'
|
|
8
8
|
require 'rubygems/gem_runner'
|
|
9
9
|
|
|
10
|
-
trusty = (version = ENV
|
|
10
|
+
trusty = (version = ENV.fetch('VERSION')) ?
|
|
11
11
|
Gem.cache.search('trusty-cms', "= #{version}").first :
|
|
12
12
|
Gem.cache.search('trusty-cms').max_by { |g| g.version }
|
|
13
13
|
|
|
@@ -3,15 +3,15 @@ namespace :trusty_cms do
|
|
|
3
3
|
namespace :config do
|
|
4
4
|
desc 'Export TrustyCms::Config to Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml'
|
|
5
5
|
task export: :environment do
|
|
6
|
-
config_path = ENV
|
|
7
|
-
clear = ENV
|
|
6
|
+
config_path = ENV.fetch('TRUSTY_CONFIG_PATH') { "#{Rails.root}/config/trusty_config.yml" }
|
|
7
|
+
clear = ENV.fetch('CLEAR_CONFIG', nil)
|
|
8
8
|
TrustyCms::TaskSupport.config_export(config_path)
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
desc 'Import TrustyCms::Config from Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import'
|
|
12
12
|
task import: :environment do
|
|
13
|
-
config_path = ENV
|
|
14
|
-
clear = ENV
|
|
13
|
+
config_path = ENV('TRUSTY_CONFIG_PATH') { "#{Rails.root}/config/trusty_config.yml" }
|
|
14
|
+
clear = ENV.fetch('CLEAR_CONFIG', nil)
|
|
15
15
|
TrustyCms::TaskSupport.config_import(config_path, clear)
|
|
16
16
|
end
|
|
17
17
|
end
|
|
@@ -10,8 +10,8 @@ namespace :import do
|
|
|
10
10
|
LegacyUser.all.each do |legacy|
|
|
11
11
|
u = User.new(
|
|
12
12
|
email: legacy.email,
|
|
13
|
-
first_name: legacy.name.split
|
|
14
|
-
last_name: legacy.name.split
|
|
13
|
+
first_name: legacy.name.split[0],
|
|
14
|
+
last_name: legacy.name.split[1],
|
|
15
15
|
password: password,
|
|
16
16
|
password_confirmation: password,
|
|
17
17
|
admin: legacy.admin,
|
data/lib/translation_support.rb
CHANGED
|
@@ -8,7 +8,7 @@ class TranslationSupport
|
|
|
8
8
|
|
|
9
9
|
# Retrieve comments, translation data in hash form
|
|
10
10
|
def read_file(filename, basename)
|
|
11
|
-
(comments, data) =
|
|
11
|
+
(comments, data) = File.read(filename).split(/\n#{basename}:\s*\n/) # Add error checking for failed file read?
|
|
12
12
|
[comments, create_hash(data, basename)]
|
|
13
13
|
end
|
|
14
14
|
|
data/lib/trusty_cms.rb
CHANGED
data/package.json
CHANGED
data/yarn.lock
CHANGED
|
@@ -974,10 +974,10 @@ jquery-ujs@^1.2.2:
|
|
|
974
974
|
dependencies:
|
|
975
975
|
jquery ">=1.8.0"
|
|
976
976
|
|
|
977
|
-
jquery-validation@^1.19.
|
|
978
|
-
version "1.19.
|
|
979
|
-
resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.
|
|
980
|
-
integrity sha512-
|
|
977
|
+
jquery-validation@^1.19.5:
|
|
978
|
+
version "1.19.5"
|
|
979
|
+
resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.5.tgz#557495b7cad79716897057c4447ad3cd76fda811"
|
|
980
|
+
integrity sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==
|
|
981
981
|
|
|
982
982
|
jquery@>=1.6:
|
|
983
983
|
version "3.6.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: 5.3.
|
|
4
|
+
version: 5.3.6
|
|
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: 2022-
|
|
11
|
+
date: 2022-07-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activestorage-validator
|
|
@@ -1169,51 +1169,51 @@ specification_version: 4
|
|
|
1169
1169
|
summary: A no-fluff content management system designed for small teams.
|
|
1170
1170
|
test_files:
|
|
1171
1171
|
- spec/fixtures/users.yml
|
|
1172
|
-
- spec/
|
|
1173
|
-
- spec/
|
|
1174
|
-
- spec/dummy/public/404.html
|
|
1175
|
-
- spec/dummy/public/favicon.ico
|
|
1176
|
-
- spec/dummy/app/assets/config/manifest.js
|
|
1177
|
-
- spec/dummy/db/schema.rb
|
|
1172
|
+
- spec/models/layout_spec.rb
|
|
1173
|
+
- spec/spec_helper.rb
|
|
1178
1174
|
- spec/dummy/config.ru
|
|
1179
|
-
- spec/dummy/package.json
|
|
1180
1175
|
- spec/dummy/bin/rake
|
|
1181
|
-
- spec/dummy/bin/rails
|
|
1182
1176
|
- spec/dummy/bin/setup
|
|
1183
1177
|
- spec/dummy/bin/bundle
|
|
1178
|
+
- spec/dummy/bin/rails
|
|
1179
|
+
- spec/dummy/public/422.html
|
|
1180
|
+
- spec/dummy/public/500.html
|
|
1181
|
+
- spec/dummy/public/favicon.ico
|
|
1182
|
+
- spec/dummy/public/404.html
|
|
1184
1183
|
- spec/dummy/README.rdoc
|
|
1185
|
-
- spec/dummy/
|
|
1186
|
-
- spec/dummy/config/
|
|
1187
|
-
- spec/dummy/config/
|
|
1184
|
+
- spec/dummy/yarn.lock
|
|
1185
|
+
- spec/dummy/config/secrets.yml
|
|
1186
|
+
- spec/dummy/config/locales/en.yml
|
|
1188
1187
|
- spec/dummy/config/environments/test.rb
|
|
1189
|
-
- spec/dummy/config/environments/development.rb
|
|
1190
1188
|
- spec/dummy/config/environments/production.rb
|
|
1191
|
-
- spec/dummy/config/
|
|
1192
|
-
- spec/dummy/config/
|
|
1193
|
-
- spec/dummy/config/
|
|
1194
|
-
- spec/dummy/config/
|
|
1189
|
+
- spec/dummy/config/environments/development.rb
|
|
1190
|
+
- spec/dummy/config/database.yml
|
|
1191
|
+
- spec/dummy/config/application.rb
|
|
1192
|
+
- spec/dummy/config/boot.rb
|
|
1193
|
+
- spec/dummy/config/environment.rb
|
|
1194
|
+
- spec/dummy/config/initializers/inflections.rb
|
|
1195
1195
|
- spec/dummy/config/initializers/session_store.rb
|
|
1196
|
-
- spec/dummy/config/initializers/wrap_parameters.rb
|
|
1197
1196
|
- spec/dummy/config/initializers/backtrace_silencers.rb
|
|
1198
|
-
- spec/dummy/config/initializers/
|
|
1197
|
+
- spec/dummy/config/initializers/wrap_parameters.rb
|
|
1198
|
+
- spec/dummy/config/initializers/mime_types.rb
|
|
1199
|
+
- spec/dummy/config/initializers/cookies_serializer.rb
|
|
1200
|
+
- spec/dummy/config/initializers/assets.rb
|
|
1199
1201
|
- spec/dummy/config/initializers/trusty_cms_config.rb
|
|
1200
|
-
- spec/dummy/config/
|
|
1201
|
-
- spec/dummy/config/
|
|
1202
|
-
- spec/dummy/config/
|
|
1203
|
-
- spec/dummy/
|
|
1204
|
-
- spec/dummy/
|
|
1205
|
-
- spec/dummy/
|
|
1206
|
-
- spec/ci/database.mysql.yml
|
|
1207
|
-
- spec/support/custom_actions.rb
|
|
1208
|
-
- spec/rails_helper.rb
|
|
1209
|
-
- spec/factories/user.rb
|
|
1210
|
-
- spec/factories/page_part.rb
|
|
1211
|
-
- spec/factories/layout.rb
|
|
1202
|
+
- spec/dummy/config/initializers/filter_parameter_logging.rb
|
|
1203
|
+
- spec/dummy/config/routes.rb
|
|
1204
|
+
- spec/dummy/app/assets/config/manifest.js
|
|
1205
|
+
- spec/dummy/package.json
|
|
1206
|
+
- spec/dummy/db/schema.rb
|
|
1207
|
+
- spec/dummy/Rakefile
|
|
1212
1208
|
- spec/factories/page.rb
|
|
1209
|
+
- spec/factories/layout.rb
|
|
1210
|
+
- spec/factories/page_part.rb
|
|
1211
|
+
- spec/factories/user.rb
|
|
1212
|
+
- spec/features/config_spec.rb
|
|
1213
|
+
- spec/features/pages_spec.rb
|
|
1214
|
+
- spec/features/layouts_spec.rb
|
|
1215
|
+
- spec/support/custom_actions.rb
|
|
1213
1216
|
- spec/controllers/users_controller_spec.rb
|
|
1214
1217
|
- spec/controllers/application_controller_spec.rb
|
|
1215
|
-
- spec/
|
|
1216
|
-
- spec/
|
|
1217
|
-
- spec/features/pages_spec.rb
|
|
1218
|
-
- spec/features/config_spec.rb
|
|
1219
|
-
- spec/models/layout_spec.rb
|
|
1218
|
+
- spec/ci/database.mysql.yml
|
|
1219
|
+
- spec/rails_helper.rb
|