trusty-cms 5.3.5 → 5.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f41c5db88399ed3675b8082e59ed41c9bf5fdfedf929575c4b8fc5100edf54b
-  data.tar.gz: daef5f8d9dfde5ccb49d4e0c41f547515ce90414809d8e3e053af21318ad823f
+  metadata.gz: 142ffda692fc907a04f59cd6a31d30e2e9397d8518161987a072ffa880cbdd98
+  data.tar.gz: 54337c586f8569888abcbb0ebf0a3d947eb3401f552eb5e85e583ac4f3f84a03
 SHA512:
-  metadata.gz: 7f03979458cf796043da050714854a889eea8c3a846c6ab0358c5ec015a9bebcc742153fabbee0613c73b0b5e4e9e693f4ebe21f58a60cf3c53d248d8532138a
-  data.tar.gz: 3572d0b7d1cb9b2eb99877960b7fa3ceb8dc82eb4b3197971c43bd3e51a0ca48aceb9abefce3d7b3fd7e1dad21d8b35da6327e7d2e1d8ed3cc5ade8584bc5900
+  metadata.gz: d0bd0157187af0c940538b8cac85623e76e50179c37f71a6aaad9cabda20abdd9a310c43a883301880991c1c599a13447a5d6bf2c0d52fac4ee4a7eee4c24554
+  data.tar.gz: 93614fe90f4abee174d3495decb4bc671ecc86f422dfc2b0e6b7696ddd955fdbb8086cf2dcc83a71e3eb706e88f24800964135983743dbd349ae7391cbd11a7f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.3.3)
+    trusty-cms (5.3.7)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -35,62 +35,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.6)
-      actionpack (= 6.1.6)
-      activesupport (= 6.1.6)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.6)
-      actionpack (= 6.1.6)
-      activejob (= 6.1.6)
-      activerecord (= 6.1.6)
-      activestorage (= 6.1.6)
-      activesupport (= 6.1.6)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.6)
-      actionpack (= 6.1.6)
-      actionview (= 6.1.6)
-      activejob (= 6.1.6)
-      activesupport (= 6.1.6)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.6)
-      actionview (= 6.1.6)
-      activesupport (= 6.1.6)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.6)
-      actionpack (= 6.1.6)
-      activerecord (= 6.1.6)
-      activestorage (= 6.1.6)
-      activesupport (= 6.1.6)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.6)
-      activesupport (= 6.1.6)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.6)
-      activesupport (= 6.1.6)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.6)
-      activesupport (= 6.1.6)
-    activerecord (6.1.6)
-      activemodel (= 6.1.6)
-      activesupport (= 6.1.6)
-    activestorage (6.1.6)
-      actionpack (= 6.1.6)
-      activejob (= 6.1.6)
-      activerecord (= 6.1.6)
-      activesupport (= 6.1.6)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.1.5)
       rails (>= 5.2.0)
-    activesupport (6.1.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -171,7 +171,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -185,7 +185,6 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8-node (16.10.0.0-x86_64-darwin)
-    libv8-node (16.10.0.0-x86_64-linux)
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -198,11 +197,11 @@ GEM
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_racer (0.6.2)
+    mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.2)
+    multipart-post (2.2.3)
     mysql2 (0.5.4)
     nio4r (2.5.8)
     nokogiri (1.12.5-x86_64-darwin)
@@ -227,23 +226,23 @@ GEM
     rack (2.2.4)
     rack-cache (1.13.0)
       rack (>= 0.4)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     radius (0.7.5)
-    rails (6.1.6)
-      actioncable (= 6.1.6)
-      actionmailbox (= 6.1.6)
-      actionmailer (= 6.1.6)
-      actionpack (= 6.1.6)
-      actiontext (= 6.1.6)
-      actionview (= 6.1.6)
-      activejob (= 6.1.6)
-      activemodel (= 6.1.6)
-      activerecord (= 6.1.6)
-      activestorage (= 6.1.6)
-      activesupport (= 6.1.6)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.6)
+      railties (= 6.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -252,9 +251,9 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.6)
-      actionpack (= 6.1.6)
-      activesupport (= 6.1.6)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -309,7 +308,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    sprockets (4.0.3)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -322,10 +321,10 @@ GEM
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (1.2.1)
-    tilt (2.0.10)
+    tilt (2.0.11)
     trustygems (0.2.1)
       rake
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -338,7 +337,7 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   x86_64-darwin-18

data/app/assets/stylesheets/rad_social/rad_screen.scss

@@ -13,10 +13,6 @@
   .rad-email {
     background-image: url("rad_social/email.png");
   }
-
-  .rad-gplus {
-    background-image: url("rad_social/gplus.png");
-  }
 }
 
 .rad-email-form {

data/app/models/deprecated_tags.rb

@@ -4,14 +4,6 @@ module DeprecatedTags
 
   deprecated_tag 'comment', substitute: 'hide', deadline: '2.0'
 
-  deprecated_tag 'meta', deadline: '2.0' do |tag|
-    if tag.double?
-      tag.expand
-    else
-      tag.render('description', tag.attr) + tag.render('keywords', tag.attr)
-    end
-  end
-
   deprecated_tag 'rfc1123_date', deadline: '2.0' do |tag|
     page = tag.locals.page
     if date = page.published_at || page.created_at

data/app/models/standard_tags.rb

@@ -915,6 +915,14 @@ module StandardTags
     TrustyCms::Config['dev.host']
   end
 
+  tag 'meta' do |tag|
+    if tag.double?
+      tag.expand
+    else
+      tag.render('description', tag.attr) + tag.render('keywords', tag.attr)
+    end
+  end
+
   tag 'meta:description' do |tag|
     show_tag = tag.attr['tag'] != 'false' || false
     description = CGI.escapeHTML(tag.locals.page.field(:description).try(:content)) if tag.locals.page.field(:description)

data/app/views/widget/_horizontal_widget.html.haml

@@ -13,6 +13,4 @@
   .rad-icon
     %a{:class => 'rad-popup-window rad-twitter', :href => "https://twitter.com/intent/tweet?text=#{CGI::escape(message + " " + url)}", :target=> '_blank'}
   .rad-icon
-    %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)}
-  .rad-icon
-    %a{:class => 'rad-popup-window rad-gplus', :href => "https://plus.google.com/share?url=#{CGI::escape(url)}", :target=> '_blank'}
+    %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)}

data/lib/translation_support.rb

@@ -8,7 +8,7 @@ class TranslationSupport
 
     # Retrieve comments, translation data in hash form
     def read_file(filename, basename)
-      (comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/) # Add error checking for failed file read?
+      (comments, data) = File.read(filename).split(/\n#{basename}:\s*\n/) # Add error checking for failed file read?
       [comments, create_hash(data, basename)]
     end
 

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '5.3.5'.freeze
+    VERSION = '5.3.7'.freeze
   end
 end

data/trusty_cms.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors = ['TrustyCms CMS dev team']
   s.description = 'TrustyCms is a simple and powerful publishing system designed for small teams.
 It is built with Rails and is similar to Textpattern or MovableType, but is
-a general purpose content managment system--not merely a blogging engine.'
+a general purpose content management system--not merely a blogging engine.'
   s.email = 'webteam@trustarts.org'
   s.executables = ['trusty_cms']
   s.extra_rdoc_files = ['README.md', 'INSTALL.md', 'LICENSE.md']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.3.5
+  version: 5.3.7
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -465,7 +465,7 @@ dependencies:
 description: |-
   TrustyCms is a simple and powerful publishing system designed for small teams.
   It is built with Rails and is similar to Textpattern or MovableType, but is
-  a general purpose content managment system--not merely a blogging engine.
+  a general purpose content management system--not merely a blogging engine.
 email: webteam@trustarts.org
 executables:
 - trusty_cms
@@ -589,9 +589,6 @@ files:
 - app/assets/images/rad_social/bg_primary-btn.png
 - app/assets/images/rad_social/email.png
 - app/assets/images/rad_social/facebook.png
-- app/assets/images/rad_social/flickr.png
-- app/assets/images/rad_social/foursquare.png
-- app/assets/images/rad_social/googleplus.png
 - app/assets/images/rad_social/twitter.png
 - app/assets/images/radiant/radiant-badge-color.png
 - app/assets/javascripts/admin.js
@@ -1168,52 +1165,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/fixtures/users.yml
 - spec/models/layout_spec.rb
-- spec/spec_helper.rb
-- spec/dummy/config.ru
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
+- spec/fixtures/users.yml
+- spec/factories/user.rb
+- spec/factories/page_part.rb
+- spec/factories/page.rb
+- spec/factories/layout.rb
+- spec/ci/database.mysql.yml
 - spec/dummy/public/422.html
-- spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
-- spec/dummy/README.rdoc
-- spec/dummy/yarn.lock
+- spec/dummy/public/500.html
+- spec/dummy/bin/bundle
+- spec/dummy/bin/setup
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/db/schema.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/package.json
-- spec/dummy/db/schema.rb
+- spec/dummy/README.rdoc
+- spec/dummy/yarn.lock
+- spec/dummy/config.ru
 - spec/dummy/Rakefile
-- spec/factories/page.rb
-- spec/factories/layout.rb
-- spec/factories/page_part.rb
-- spec/factories/user.rb
-- spec/features/config_spec.rb
-- spec/features/pages_spec.rb
-- spec/features/layouts_spec.rb
-- spec/support/custom_actions.rb
-- spec/controllers/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/ci/database.mysql.yml
+- spec/controllers/users_controller_spec.rb
+- spec/support/custom_actions.rb
 - spec/rails_helper.rb
+- spec/features/pages_spec.rb
+- spec/features/layouts_spec.rb
+- spec/features/config_spec.rb
+- spec/spec_helper.rb