trusty-cms 5.3.5 → 5.3.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2f41c5db88399ed3675b8082e59ed41c9bf5fdfedf929575c4b8fc5100edf54b
4
- data.tar.gz: daef5f8d9dfde5ccb49d4e0c41f547515ce90414809d8e3e053af21318ad823f
3
+ metadata.gz: 142ffda692fc907a04f59cd6a31d30e2e9397d8518161987a072ffa880cbdd98
4
+ data.tar.gz: 54337c586f8569888abcbb0ebf0a3d947eb3401f552eb5e85e583ac4f3f84a03
5
5
  SHA512:
6
- metadata.gz: 7f03979458cf796043da050714854a889eea8c3a846c6ab0358c5ec015a9bebcc742153fabbee0613c73b0b5e4e9e693f4ebe21f58a60cf3c53d248d8532138a
7
- data.tar.gz: 3572d0b7d1cb9b2eb99877960b7fa3ceb8dc82eb4b3197971c43bd3e51a0ca48aceb9abefce3d7b3fd7e1dad21d8b35da6327e7d2e1d8ed3cc5ade8584bc5900
6
+ metadata.gz: d0bd0157187af0c940538b8cac85623e76e50179c37f71a6aaad9cabda20abdd9a310c43a883301880991c1c599a13447a5d6bf2c0d52fac4ee4a7eee4c24554
7
+ data.tar.gz: 93614fe90f4abee174d3495decb4bc671ecc86f422dfc2b0e6b7696ddd955fdbb8086cf2dcc83a71e3eb706e88f24800964135983743dbd349ae7391cbd11a7f
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (5.3.3)
4
+ trusty-cms (5.3.7)
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.10.0)
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)
@@ -185,7 +185,6 @@ GEM
185
185
  launchy (2.5.0)
186
186
  addressable (~> 2.7)
187
187
  libv8-node (16.10.0.0-x86_64-darwin)
188
- libv8-node (16.10.0.0-x86_64-linux)
189
188
  loofah (2.18.0)
190
189
  crass (~> 1.0.2)
191
190
  nokogiri (>= 1.5.9)
@@ -198,11 +197,11 @@ GEM
198
197
  mime-types-data (3.2021.0225)
199
198
  mini_magick (4.11.0)
200
199
  mini_mime (1.1.2)
201
- mini_racer (0.6.2)
200
+ mini_racer (0.6.3)
202
201
  libv8-node (~> 16.10.0.0)
203
202
  minitest (5.15.0)
204
203
  multi_xml (0.6.0)
205
- multipart-post (2.2.2)
204
+ multipart-post (2.2.3)
206
205
  mysql2 (0.5.4)
207
206
  nio4r (2.5.8)
208
207
  nokogiri (1.12.5-x86_64-darwin)
@@ -227,23 +226,23 @@ GEM
227
226
  rack (2.2.4)
228
227
  rack-cache (1.13.0)
229
228
  rack (>= 0.4)
230
- rack-test (1.1.0)
231
- rack (>= 1.0, < 3)
229
+ rack-test (2.0.2)
230
+ rack (>= 1.3)
232
231
  radius (0.7.5)
233
- rails (6.1.6)
234
- actioncable (= 6.1.6)
235
- actionmailbox (= 6.1.6)
236
- actionmailer (= 6.1.6)
237
- actionpack (= 6.1.6)
238
- actiontext (= 6.1.6)
239
- actionview (= 6.1.6)
240
- activejob (= 6.1.6)
241
- activemodel (= 6.1.6)
242
- activerecord (= 6.1.6)
243
- activestorage (= 6.1.6)
244
- activesupport (= 6.1.6)
232
+ rails (6.1.6.1)
233
+ actioncable (= 6.1.6.1)
234
+ actionmailbox (= 6.1.6.1)
235
+ actionmailer (= 6.1.6.1)
236
+ actionpack (= 6.1.6.1)
237
+ actiontext (= 6.1.6.1)
238
+ actionview (= 6.1.6.1)
239
+ activejob (= 6.1.6.1)
240
+ activemodel (= 6.1.6.1)
241
+ activerecord (= 6.1.6.1)
242
+ activestorage (= 6.1.6.1)
243
+ activesupport (= 6.1.6.1)
245
244
  bundler (>= 1.15.0)
246
- railties (= 6.1.6)
245
+ railties (= 6.1.6.1)
247
246
  sprockets-rails (>= 2.0.0)
248
247
  rails-dom-testing (2.0.3)
249
248
  activesupport (>= 4.2.0)
@@ -252,9 +251,9 @@ GEM
252
251
  loofah (~> 2.3)
253
252
  rails-observers (0.1.5)
254
253
  activemodel (>= 4.0)
255
- railties (6.1.6)
256
- actionpack (= 6.1.6)
257
- activesupport (= 6.1.6)
254
+ railties (6.1.6.1)
255
+ actionpack (= 6.1.6.1)
256
+ activesupport (= 6.1.6.1)
258
257
  method_source
259
258
  rake (>= 12.2)
260
259
  thor (~> 1.0)
@@ -309,7 +308,7 @@ GEM
309
308
  simplecov_json_formatter (~> 0.1)
310
309
  simplecov-html (0.12.3)
311
310
  simplecov_json_formatter (0.1.3)
312
- sprockets (4.0.3)
311
+ sprockets (4.1.1)
313
312
  concurrent-ruby (~> 1.0)
314
313
  rack (> 1, < 3)
315
314
  sprockets-rails (3.4.2)
@@ -322,10 +321,10 @@ GEM
322
321
  terrapin (0.6.0)
323
322
  climate_control (>= 0.0.3, < 1.0)
324
323
  thor (1.2.1)
325
- tilt (2.0.10)
324
+ tilt (2.0.11)
326
325
  trustygems (0.2.1)
327
326
  rake
328
- tzinfo (2.0.4)
327
+ tzinfo (2.0.5)
329
328
  concurrent-ruby (~> 1.0)
330
329
  uglifier (4.2.0)
331
330
  execjs (>= 0.3.0, < 3)
@@ -338,7 +337,7 @@ GEM
338
337
  will_paginate (3.3.1)
339
338
  xpath (3.2.0)
340
339
  nokogiri (~> 1.8)
341
- zeitwerk (2.5.4)
340
+ zeitwerk (2.6.0)
342
341
 
343
342
  PLATFORMS
344
343
  x86_64-darwin-18
@@ -13,10 +13,6 @@
13
13
  .rad-email {
14
14
  background-image: url("rad_social/email.png");
15
15
  }
16
-
17
- .rad-gplus {
18
- background-image: url("rad_social/gplus.png");
19
- }
20
16
  }
21
17
 
22
18
  .rad-email-form {
@@ -4,14 +4,6 @@ module DeprecatedTags
4
4
 
5
5
  deprecated_tag 'comment', substitute: 'hide', deadline: '2.0'
6
6
 
7
- deprecated_tag 'meta', deadline: '2.0' do |tag|
8
- if tag.double?
9
- tag.expand
10
- else
11
- tag.render('description', tag.attr) + tag.render('keywords', tag.attr)
12
- end
13
- end
14
-
15
7
  deprecated_tag 'rfc1123_date', deadline: '2.0' do |tag|
16
8
  page = tag.locals.page
17
9
  if date = page.published_at || page.created_at
@@ -915,6 +915,14 @@ module StandardTags
915
915
  TrustyCms::Config['dev.host']
916
916
  end
917
917
 
918
+ tag 'meta' do |tag|
919
+ if tag.double?
920
+ tag.expand
921
+ else
922
+ tag.render('description', tag.attr) + tag.render('keywords', tag.attr)
923
+ end
924
+ end
925
+
918
926
  tag 'meta:description' do |tag|
919
927
  show_tag = tag.attr['tag'] != 'false' || false
920
928
  description = CGI.escapeHTML(tag.locals.page.field(:description).try(:content)) if tag.locals.page.field(:description)
@@ -13,6 +13,4 @@
13
13
  .rad-icon
14
14
  %a{:class => 'rad-popup-window rad-twitter', :href => "https://twitter.com/intent/tweet?text=#{CGI::escape(message + " " + url)}", :target=> '_blank'}
15
15
  .rad-icon
16
- %a{:class => 'rad-popup-window rad-email', :href => rad_social_mail_form_url(:email_subject => email_subject, :email_message => email_message, :email_action_url => email_action_url)}
17
- .rad-icon
18
- %a{:class => 'rad-popup-window rad-gplus', :href => "https://plus.google.com/share?url=#{CGI::escape(url)}", :target=> '_blank'}
16
+ %a{:class => 'rad-popup-window rad-email', :href => rad_social_mail_form_url(:email_subject => email_subject, :email_message => email_message, :email_action_url => email_action_url)}
@@ -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) = IO.read(filename).split(/\n#{basename}:\s*\n/) # Add error checking for failed file read?
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
@@ -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.3.5'.freeze
5
+ VERSION = '5.3.7'.freeze
6
6
  end
7
7
  end
data/trusty_cms.gemspec CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
11
11
  s.authors = ['TrustyCms CMS dev team']
12
12
  s.description = 'TrustyCms is a simple and powerful publishing system designed for small teams.
13
13
  It is built with Rails and is similar to Textpattern or MovableType, but is
14
- a general purpose content managment system--not merely a blogging engine.'
14
+ a general purpose content management system--not merely a blogging engine.'
15
15
  s.email = 'webteam@trustarts.org'
16
16
  s.executables = ['trusty_cms']
17
17
  s.extra_rdoc_files = ['README.md', 'INSTALL.md', 'LICENSE.md']
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.5
4
+ version: 5.3.7
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-07-28 00:00:00.000000000 Z
11
+ date: 2022-09-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator
@@ -465,7 +465,7 @@ dependencies:
465
465
  description: |-
466
466
  TrustyCms is a simple and powerful publishing system designed for small teams.
467
467
  It is built with Rails and is similar to Textpattern or MovableType, but is
468
- a general purpose content managment system--not merely a blogging engine.
468
+ a general purpose content management system--not merely a blogging engine.
469
469
  email: webteam@trustarts.org
470
470
  executables:
471
471
  - trusty_cms
@@ -589,9 +589,6 @@ files:
589
589
  - app/assets/images/rad_social/bg_primary-btn.png
590
590
  - app/assets/images/rad_social/email.png
591
591
  - app/assets/images/rad_social/facebook.png
592
- - app/assets/images/rad_social/flickr.png
593
- - app/assets/images/rad_social/foursquare.png
594
- - app/assets/images/rad_social/googleplus.png
595
592
  - app/assets/images/rad_social/twitter.png
596
593
  - app/assets/images/radiant/radiant-badge-color.png
597
594
  - app/assets/javascripts/admin.js
@@ -1168,52 +1165,52 @@ signing_key:
1168
1165
  specification_version: 4
1169
1166
  summary: A no-fluff content management system designed for small teams.
1170
1167
  test_files:
1171
- - spec/fixtures/users.yml
1172
1168
  - spec/models/layout_spec.rb
1173
- - spec/spec_helper.rb
1174
- - spec/dummy/config.ru
1175
- - spec/dummy/bin/rake
1176
- - spec/dummy/bin/setup
1177
- - spec/dummy/bin/bundle
1178
- - spec/dummy/bin/rails
1169
+ - spec/fixtures/users.yml
1170
+ - spec/factories/user.rb
1171
+ - spec/factories/page_part.rb
1172
+ - spec/factories/page.rb
1173
+ - spec/factories/layout.rb
1174
+ - spec/ci/database.mysql.yml
1179
1175
  - spec/dummy/public/422.html
1180
- - spec/dummy/public/500.html
1181
1176
  - spec/dummy/public/favicon.ico
1182
1177
  - spec/dummy/public/404.html
1183
- - spec/dummy/README.rdoc
1184
- - spec/dummy/yarn.lock
1178
+ - spec/dummy/public/500.html
1179
+ - spec/dummy/bin/bundle
1180
+ - spec/dummy/bin/setup
1181
+ - spec/dummy/bin/rails
1182
+ - spec/dummy/bin/rake
1183
+ - spec/dummy/db/schema.rb
1185
1184
  - spec/dummy/config/secrets.yml
1186
- - spec/dummy/config/locales/en.yml
1187
- - spec/dummy/config/environments/test.rb
1188
- - spec/dummy/config/environments/production.rb
1189
- - spec/dummy/config/environments/development.rb
1190
1185
  - 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
- - spec/dummy/config/initializers/session_store.rb
1196
1186
  - spec/dummy/config/initializers/backtrace_silencers.rb
1187
+ - spec/dummy/config/initializers/assets.rb
1188
+ - spec/dummy/config/initializers/trusty_cms_config.rb
1197
1189
  - spec/dummy/config/initializers/wrap_parameters.rb
1198
1190
  - spec/dummy/config/initializers/mime_types.rb
1199
1191
  - spec/dummy/config/initializers/cookies_serializer.rb
1200
- - spec/dummy/config/initializers/assets.rb
1201
- - spec/dummy/config/initializers/trusty_cms_config.rb
1202
1192
  - spec/dummy/config/initializers/filter_parameter_logging.rb
1193
+ - spec/dummy/config/initializers/inflections.rb
1194
+ - spec/dummy/config/initializers/session_store.rb
1195
+ - spec/dummy/config/boot.rb
1196
+ - spec/dummy/config/locales/en.yml
1197
+ - spec/dummy/config/environment.rb
1198
+ - spec/dummy/config/application.rb
1203
1199
  - spec/dummy/config/routes.rb
1200
+ - spec/dummy/config/environments/development.rb
1201
+ - spec/dummy/config/environments/test.rb
1202
+ - spec/dummy/config/environments/production.rb
1204
1203
  - spec/dummy/app/assets/config/manifest.js
1205
1204
  - spec/dummy/package.json
1206
- - spec/dummy/db/schema.rb
1205
+ - spec/dummy/README.rdoc
1206
+ - spec/dummy/yarn.lock
1207
+ - spec/dummy/config.ru
1207
1208
  - spec/dummy/Rakefile
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
1216
- - spec/controllers/users_controller_spec.rb
1217
1209
  - spec/controllers/application_controller_spec.rb
1218
- - spec/ci/database.mysql.yml
1210
+ - spec/controllers/users_controller_spec.rb
1211
+ - spec/support/custom_actions.rb
1219
1212
  - spec/rails_helper.rb
1213
+ - spec/features/pages_spec.rb
1214
+ - spec/features/layouts_spec.rb
1215
+ - spec/features/config_spec.rb
1216
+ - spec/spec_helper.rb