trusty-cms 5.2.0 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef01db17864b39bd25d87227e0d6b78995df3a784e6ef4fc1416919d7effe180
-  data.tar.gz: 6b66fad628f8bac4f030edda68a33d403de8530ea41f86ca3fae78ed6921f785
+  metadata.gz: 47f1958b702fa213e0ed7be3725d9e846c619a966bdc614c3e30cac3e4cd190e
+  data.tar.gz: 9ae273f919dd49d71b3288de4d797578c74684b071648b1ee9ad70abdf89b2a5
 SHA512:
-  metadata.gz: e57ba7b714ba22b4a493a2f6616bcab50658f3c53647aa997e7e6b75c218db5f994a351bc352314ff8f42ddf65c0e148a2a787f6bc540fb9287414e8f2fadc7e
-  data.tar.gz: 98915375ec4787f9ead33fe204a01ec15508d8eac073ebc1ea3ab4d34b3d17142899fa071f6fcd7b73b3fd8f3673072e930b5d0dc600359202ef6378b88919ff
+  metadata.gz: 0acfc01a195112e57d8297268c86c4da2773e781b7bb76f16b07606a78f631fe6213906ed4288aa7a17e1bd09b73d4f2cc77cbd34db1853b096078d22e283e97
+  data.tar.gz: 452fea2947b5fddc0e1c4522d30f67d4bb8ec30c4770e9d5c09aa7837799e91ac9959fe6ff95fd7ae783c418d2b2898ab8afb620046e40c7c7ca221e0fd14f60

data/Gemfile

@@ -21,6 +21,7 @@ group :development, :test do
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
+  gem 'psych', '4.0.3'
   gem 'rails-observers'
   gem 'rspec-rails'
   gem 'simplecov'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.2.0)
+    trusty-cms (5.2.3)
       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.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.7)
-      actionview (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
       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.4.7)
-      actionpack (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activerecord (6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activestorage (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      marcel (~> 1.0.0)
+    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)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.1.5)
       rails (>= 5.2.0)
-    activesupport (6.1.4.7)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -102,7 +102,7 @@ GEM
       activerecord (>= 3.0.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.35.3)
@@ -176,7 +176,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    json (2.6.1)
+    json (2.6.2)
     kraken-io (0.1.3)
       activesupport
       httparty
@@ -186,7 +186,7 @@ GEM
       addressable (~> 2.7)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.15.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -198,6 +198,7 @@ GEM
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     mini_racer (0.6.2)
       libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
@@ -205,9 +206,8 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nio4r (2.5.8)
-    nokogiri (1.13.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -230,20 +230,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.4.7)
-      actioncable (= 6.1.4.7)
-      actionmailbox (= 6.1.4.7)
-      actionmailer (= 6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actiontext (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    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)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.7)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -252,11 +252,11 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
     rdoc (6.4.0)
@@ -265,7 +265,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    roadie (5.0.0)
+    roadie (5.0.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
     roadie-rails (3.0.0)
@@ -279,7 +279,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.1)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -356,6 +356,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
+  psych (= 4.0.3)
   rails-observers
   rspec-rails
   simplecov

data/app/assets/javascripts/admin.js

@@ -15,7 +15,7 @@
 //= require jquery-ui-bundle/jquery-ui
 //= require js-cookie/dist/js.cookie
 //= require 'jquery-validation/dist/jquery.validate.min'
-//= require 'jquery-treetable/jquery.treetable'
+//= require jquery-treetable/jquery.treetable.js
 //= require_tree './admin/validations'
 //= require ckeditor/init
 //= require 'admin/persist.min'

data/app/helpers/application_helper.rb

@@ -145,39 +145,6 @@ module ApplicationHelper
     overrides
   end
 
-  # Returns a Gravatar URL associated with the email parameter.
-  # See: http://douglasfshearer.com/blog/gravatar-for-ruby-and-ruby-on-rails
-  def gravatar_url(email, options = {})
-    # Default to highest rating. Rating can be one of G, PG, R X.
-    options[:rating] ||= 'G'
-
-    # Default size of the image.
-    options[:size] ||= '32px'
-
-    # Default image url to be used when no gravatar is found
-    # or when an image exceeds the rating parameter.
-    local_avatar_url = "/production/assets/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
-    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
-    options[:default] ||= default_avatar_url
-
-    if email.blank?
-      local_avatar_url
-    else
-      # Build the Gravatar url.
-      url = '//gravatar.com/avatar/'
-      url << "#{Digest::MD5.new.update(email)}?"
-      url << "rating=#{options[:rating]}" if options[:rating]
-      url << "&size=#{options[:size]}" if options[:size]
-      url << "&default=#{options[:default]}" if options[:default]
-      # Test the Gravatar url
-      require 'open-uri'
-      begin; open "http:#{url}", proxy: true
-      rescue StandardError; local_avatar_url
-      else; url
-      end
-    end
-  end
-
   # returns the usual set of pagination links.
   # options are passed through to will_paginate
   # and a 'show all' depagination link is added if relevant.

data/app/models/standard_tags.rb

@@ -662,46 +662,6 @@ module StandardTags
     end
   end
 
-  desc %{
-    Renders the Gravatar of the author of the current page or the named user.
-
-    *Usage:*
-
-    <pre><code><r:gravatar /></code></pre>
-
-    or
-
-    <pre><code><r:gravatar [name="User Name"]
-        [rating="G | PG | R | X"]
-        [size="32px"] /></code></pre>
-  }
-  tag 'gravatar' do |tag|
-    page = tag.locals.page
-    name = (tag.attr['name'] || page.created_by.name)
-    rating = (tag.attr['rating'] || 'G')
-    size = (tag.attr['size'] || '32px')
-    user = User.find_by_name(name)
-    email = user ? user.email : nil
-    local_avatar_url = "/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
-    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{local_avatar_url}"
-
-    if email.blank?
-      local_avatar_url
-    else
-      url = '//gravatar.com/avatar/'
-      url << "#{Digest::MD5.new.update(email)}?"
-      url << "rating=#{rating}"
-      url << "&size=#{size.to_i}"
-      url << "&default=#{default_avatar_url}" unless request.host_with_port == 'testhost.tld'
-      # Test the Gravatar url
-      require 'open-uri'
-      begin; open "http:#{sanitize(url)}", proxy: true
-      rescue StandardError; local_avatar_url
-      else; url
-      end
-    end
-  end
-
   desc %{
     Renders the date based on the current page (by default when it was published or created).
     The format attribute uses the same formating codes used by the Ruby @strftime@ function.

data/app/views/admin/configuration/show.html.haml

@@ -3,7 +3,6 @@
     - user.preferences do
       %h3
         = t('personal_preferences')
-      = image_tag(gravatar_url(@user.email, :size=>'64px'), :class=>'avatar', :width=>64, :height=>64, :alt=>'')
       %p.ruled
         %label
           = t('name')

data/app/views/admin/users/_form.html.haml

@@ -1,5 +1,4 @@
 = form_for [:admin, @user], :html => {class: 'user_form'} do |f|
-  = render :partial => 'avatar' unless @user.new_record?
 
   = render_region :form_top, :locals => {:f => f}
 

data/config/locales/en_available_tags.yml

@@ -203,17 +203,7 @@ en:
       *Usage:*
 
       <pre><code><r:find path=\"value_to_find\">...</r:find></code></pre>"
-    gravatar: "Renders the Gravatar of the author of the current page or the named user.
 
-      *Usage:*
-
-      <pre><code><r:gravatar /></code></pre>
-
-      or
-
-      <pre><code><r:gravatar [name=\"User Name\"]
-            [rating=\"G | PG | R | X\"]
-            [size=\"32px\"] /></code></pre>"
     hide: "Nothing inside a set of hide tags is rendered.
 
       *Usage:*

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.2.0'.freeze
+    VERSION = '5.2.3'.freeze
   end
 end

data/spec/dummy/package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": "^3.5.0",
+    "jquery-treetable": "^3.2.0-1",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2"
   }

data/spec/dummy/yarn.lock

@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+jquery-treetable@^3.2.0-1:
+  version "3.2.0-1"
+  resolved "https://registry.yarnpkg.com/jquery-treetable/-/jquery-treetable-3.2.0-1.tgz#2a844f59396f764f71747a5087ee555d360aaed7"
+  integrity sha1-KoRPWTlvdk9xdHpQh+5VXTYKrtc=
+  dependencies:
+    jquery ">=1.6"
+
 jquery-ui-bundle@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
@@ -12,6 +19,11 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
+jquery@>=1.6:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
 jquery@>=1.8.0, jquery@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -779,7 +779,6 @@ files:
 - app/views/admin/snippets/index.html.haml
 - app/views/admin/snippets/new.html.haml
 - app/views/admin/snippets/remove.html.haml
-- app/views/admin/users/_avatar.html.haml
 - app/views/admin/users/_choose_site.html.haml
 - app/views/admin/users/_form.html.haml
 - app/views/admin/users/_password_fields.html.haml

data/app/views/admin/users/_avatar.html.haml

@@ -1,5 +0,0 @@
-#avatar
-  = image_tag(gravatar_url(@user.email, :size=>'96px'), :class=>'avatar', :width=>96, :height=>96, :alt=>'')
-  %p.caption
-    Avatar provided by
-    = link_to 'gravatar.com', 'http://gravatar.com/site/signup/'