trusty-cms 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e7e4f174a6b755702f6743fc5c4bed0a9f2384e266e3874b52eeab89df84b8
-  data.tar.gz: 59dfd764929a52eddf268255dba421eaaa4b90227e2cb04b07c66abc547b7bc1
+  metadata.gz: d92ba06bde5529d4765f3383b8724063f42b760909be7630b51d4277fe28e66d
+  data.tar.gz: 0227a9f6118266789d256df74f3d7672333079585b41b7a73a07911b97c2340b
 SHA512:
-  metadata.gz: '083f2fd54a713baf10dc16d0ea3773a9ffe002b3ffdca09771e28c1b81a55511d106bb55bd231165548cacc2dfec9c0bc6157f2db9ecb177af36c0729c0269a2'
-  data.tar.gz: d0707e8e683982348b672b9dd3eaa16802c82c27565ac0c8b709d6828a2b01942c7fe46b4954f1954290e9f282c6b3ae198ab9030686ac44a63e5c3a6e50820b
+  metadata.gz: 626c2a0eb4a13092ab342e039b3a8745307e8f842b6bdb1476d0e93c7f9b11ad9a7100ecb21816332b07dd215d8fddda0603ddc85230389d8d0bc3103113bdf3
+  data.tar.gz: a7f225c262b5c51128eb1438a84fbf37d0ea77562357e4979e0da998a3bdaf15c3f50d366b2fc892345b4c063c0c6c9a1ea18e46beb45fb422247cc3e22eb520

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.2.1)
+    trusty-cms (4.2.2)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -10,12 +10,11 @@ PATH
       devise
       execjs (~> 2.7)
       haml
-      haml-rails
+      haml-rails (~> 2.0)
       highline (>= 1.7.8, < 2.1.0)
       kraken-io
       mini_racer
       mysql2
-      paperclip (> 5.2)
       rack (>= 2.0.1, < 2.3.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
@@ -23,7 +22,7 @@ PATH
       rake (< 14.0)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
-      sassc-rails
+      sass-rails
       stringex (>= 2.7.1, < 2.9.0)
       tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
@@ -34,60 +33,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.1)
-      actionpack (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.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.1)
-      actionpack (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activestorage (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activesupport (= 6.1.1)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.1)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -102,13 +101,13 @@ GEM
     bcrypt (3.1.16)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     ckeditor (4.2.4)
       cocaine
@@ -118,11 +117,16 @@ GEM
     cocaine (0.6.0)
       terrapin (= 0.6.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.9.0)
       addressable
-    database_cleaner (1.8.5)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     delocalize (1.2.0)
       rails (>= 2)
     devise (4.7.3)
@@ -132,7 +136,7 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.3.5)
     erubi (1.10.0)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -141,7 +145,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    ffi (1.14.2)
+    ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.2.1)
@@ -162,7 +166,7 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     kraken-io (0.1.3)
@@ -172,38 +176,28 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (8.4.255.0)
-    loofah (2.8.0)
+    libv8 (8.4.255.0-x86_64-darwin-20)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mime-types-data (3.2021.0225)
+    mini_mime (1.0.3)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
-    minitest (5.14.3)
+    minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
-    nio4r (2.5.4)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.2-x86_64-darwin)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    paperclip (6.1.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      mime-types
-      mimemagic (~> 0.3.0)
-      terrapin (~> 0.6.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -222,20 +216,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.1)
-      actioncable (= 6.1.1)
-      actionmailbox (= 6.1.1)
-      actionmailer (= 6.1.1)
-      actionpack (= 6.1.1)
-      actiontext (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activemodel (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.1)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -244,15 +238,15 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
     rake (13.0.3)
     rdoc (6.3.0)
-    regexp_parser (1.8.2)
+    regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -267,20 +261,22 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -307,7 +303,7 @@ GEM
     temple (0.8.2)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
@@ -327,7 +323,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   acts_as_list
@@ -344,4 +340,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2006-2009, John W. Long and Sean D. Cribbs.
+Copyright (c) 2006-2021, John W. Long and Sean D. Cribbs.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/helpers/admin/node_helper.rb

@@ -10,7 +10,7 @@ module Admin::NodeHelper
 
     @rendered_html += (render partial: 'admin/pages/node',
                               locals: { level: index, index: index, parent_index: parent_index,
-                                        page: page, simple: simple, branch: (page.children.count > 0) })
+                                        page: page, simple: simple, branch: (page.children.count.positive?) })
     index
   end
 

data/app/models/asset.rb

@@ -74,12 +74,12 @@ class Asset < ActiveRecord::Base
 
   def thumbnail(style_name = 'original')
     return asset.url if style_name.to_sym == :original
-    return asset.url(style_name.to_sym) if has_style?(style_name)
+    return asset.url(style_name.to_sym) if style?(style_name)
 
     asset_type.icon(style_name)
   end
 
-  def has_style?(style_name = 'original')
+  def style?(style_name = 'original')
     style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
   end
 
@@ -110,7 +110,7 @@ class Asset < ActiveRecord::Base
   end
 
   def geometry(style_name = 'original')
-    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless has_style?(style_name)
+    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless style?(style_name)
 
     @geometry ||= {}
     begin

data/app/models/page.rb

@@ -76,16 +76,16 @@ class Page < ActiveRecord::Base
     end
   end
 
-  def has_part?(name)
+  def part?(name)
     !part(name).nil?
   end
 
   def has_or_inherits_part?(name)
-    has_part?(name) || inherits_part?(name)
+    part?(name) || inherits_part?(name)
   end
 
   def inherits_part?(name)
-    !has_part?(name) && ancestors.any? { |page| page.has_part?(name) }
+    !part?(name) && ancestors.any? { |page| page.part?(name) }
   end
 
   def field(name)

data/app/models/standard_tags.rb

@@ -312,7 +312,7 @@ module StandardTags
   }
   tag 'if_children' do |tag|
     children = tag.locals.page.children.where(children_find_options(tag)[:conditions]).count
-    tag.expand if children > 0
+    tag.expand if children.positive?
   end
 
   desc %{
@@ -327,7 +327,7 @@ module StandardTags
   }
   tag 'unless_children' do |tag|
     children = tag.locals.page.children.where(children_find_options(tag)[:conditions]).count
-    tag.expand unless children > 0
+    tag.expand unless children.positive?
   end
 
   desc %{
@@ -961,7 +961,7 @@ module StandardTags
       page_path = remove_trailing_slash(path)
       hash[:title] = title
       hash[:path] = path
-      tag.locals.first_child = i == 0
+      tag.locals.first_child = i.zero?
       tag.locals.last_child = i == pairs.length - 1
       result << case page_path
                 when compare_path

data/app/models/user.rb

@@ -19,7 +19,7 @@ class User < ActiveRecord::Base
   belongs_to :created_by, class_name: 'User'
   belongs_to :updated_by, class_name: 'User'
 
-  def has_role?(role)
+  def role?(role)
     case role
     when :admin
       admin?