trusty-cms 4.0.1 → 4.1.3

data/app/models/deprecated_tags.rb

@@ -2,9 +2,9 @@ require 'trusty_cms/taggable'
 module DeprecatedTags
   include TrustyCms::Taggable
 
-  deprecated_tag "comment", :substitute => "hide", :deadline => '2.0'
+  deprecated_tag 'comment', substitute: 'hide', deadline: '2.0'
 
-  deprecated_tag "meta", :deadline => '2.0' do |tag|
+  deprecated_tag 'meta', deadline: '2.0' do |tag|
     if tag.double?
       tag.expand
     else
@@ -12,11 +12,10 @@ module DeprecatedTags
     end
   end
 
-  deprecated_tag "rfc1123_date", :deadline => '2.0' do |tag|
+  deprecated_tag 'rfc1123_date', deadline: '2.0' do |tag|
     page = tag.locals.page
     if date = page.published_at || page.created_at
       CGI.rfc1123_date(date.to_time)
     end
   end
-
 end

data/app/models/file_not_found_page.rb

@@ -1,5 +1,4 @@
 class FileNotFoundPage < Page
-
   def allowed_children
     []
   end
@@ -13,7 +12,7 @@ class FileNotFoundPage < Page
     page type.
   }
 
-  tag "attempted_url" do |tag|
+  tag 'attempted_url' do |_tag|
     CGI.escapeHTML(request.request_uri) unless request.nil?
   end
 
@@ -28,5 +27,4 @@ class FileNotFoundPage < Page
   def cache?
     false
   end
-
 end

data/app/models/haml_filter.rb

@@ -1,5 +1,5 @@
 class HamlFilter < TextFilter
   def filter(text)
-    Haml::Engine.new(text).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/?\\?)&gt;/m,"<\\1r:\\2\\3>")
+    Haml::Engine.new(text).render.gsub(/&lt;(\/)?r:(.+?)\s*(\/?\\?)&gt;/m, '<\\1r:\\2\\3>')
   end
 end

data/app/models/layout.rb

@@ -1,15 +1,14 @@
 class Layout < ActiveRecord::Base
-
   # Default Order
-  default_scope {order("name")}
+  default_scope { order('name') }
 
   # Associations
   has_many :pages
-  belongs_to :created_by, :class_name => 'User'
-  belongs_to :updated_by, :class_name => 'User'
+  belongs_to :created_by, class_name: 'User'
+  belongs_to :updated_by, class_name: 'User'
 
   # Validations
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :maximum => 100
+  validates_length_of :name, maximum: 100
 end

data/app/models/legacy_user.rb

@@ -1,6 +1,6 @@
 class LegacyUser < ActiveRecord::Base
   self.table_name = 'users'
 
-  # this is a legacy class 
+  # this is a legacy class
   # this table formally held user information for when TrustyCMS had a handwritten authentication system
-end  
+end

data/app/models/menu_renderer.rb

@@ -1,5 +1,4 @@
 module MenuRenderer
-
   def exclude(*type_names)
     @excluded_class_names ||= []
     @excluded_class_names.concat(type_names).uniq!
@@ -26,7 +25,7 @@ module MenuRenderer
   end
 
   def menu_renderer_module_name
-    simple_name = self.class_name.to_s.sub('Page','')
+    simple_name = class_name.to_s.sub('Page', '')
     "#{simple_name}MenuRenderer"
   end
 
@@ -38,19 +37,18 @@ module MenuRenderer
     (allowed_children_cache.to_s.split(',') - Array(excluded_class_names)).map do |name|
       begin
         name.constantize
-      rescue LoadError, NameError => _
+      rescue LoadError, NameError => _e
         nil
       end
     end.compact
   end
 
-
   def default_child_item
     menu_item(default_child)
   end
 
   def separator_item
-    view.content_tag :li, '', :class => 'separator'
+    view.content_tag :li, '', class: 'separator'
   end
 
   def child_items
@@ -64,11 +62,11 @@ module MenuRenderer
   end
 
   def menu_list
-    view.content_tag :ul, menu_items.join.html_safe, :class => 'menu', :id => "allowed_children_#{id}"
+    view.content_tag :ul, menu_items.join.html_safe, class: 'menu', id: "allowed_children_#{id}"
   end
 
   def remove_link
-    view.link_to view.image('minus') + ' ' + I18n.t('remove'), view.remove_admin_page_url(self), :class => "action"
+    view.link_to('<i class="fas fa-minus-circle"></i> '.html_safe + I18n.t('remove'), view.remove_admin_page_url(self), class: 'action')
   end
 
   def remove_option
@@ -80,15 +78,15 @@ module MenuRenderer
   end
 
   def disabled_add_child_link
-    view.content_tag :span, view.image('plus_disabled') + ' Add Child', :class => 'action disabled'
+    view.content_tag :span, view.image('plus_disabled') + ' Add Child', class: 'action disabled'
   end
 
   def add_child_link
-    view.link_to((view.image('plus') + ' Add Child'), view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
+    view.link_to('<i class="fas fa-plus-circle"></i> Add Child'.html_safe, view.new_admin_page_child_path(self, page_class: default_child.name), class: 'action')
   end
 
   def add_child_link_with_menu_hook
-    view.link_to((view.image('plus') + ' Add Child'), "#allowed_children_#{id}", :class => "action dropdown")
+    view.link_to('<i class="fas fa-plus-circle"></i> Add Child'.html_safe, "#allowed_children_#{id}", class: 'action dropdown')
   end
 
   def add_child_menu
@@ -114,7 +112,7 @@ module MenuRenderer
   private
 
   def clean_page_description(page_class)
-    page_class.description.to_s.strip.gsub(/\t/,'').gsub(/\s+/,' ')
+    page_class.description.to_s.strip.gsub(/\t/, '').gsub(/\s+/, ' ')
   end
 
   def menu_item(child_class)
@@ -123,18 +121,18 @@ module MenuRenderer
 
   def menu_link(child_class)
     title = clean_page_description(child_class)
-    path = view.new_admin_page_child_path(self, :page_class => child_class.name)
+    path = view.new_admin_page_child_path(self, page_class: child_class.name)
     text = link_text_for_child_class(child_class.name)
-    view.link_to(text, path, :title => title)
+    view.link_to(text, path, title: title)
   end
 
   def link_text_for_child_class(given_class_name)
     translation_key = if given_class_name == 'Page' || given_class_name.blank?
-      'normal_page'
-    else
-      given_class_name.sub('Page','').underscore
+                        'normal_page'
+                      else
+                        given_class_name.sub('Page', '').underscore
     end
-    fallback = given_class_name == 'Page' ? 'Page' : given_class_name.sub('Page','').titleize
-    I18n.t(translation_key, :default => fallback)
+    fallback = given_class_name == 'Page' ? 'Page' : given_class_name.sub('Page', '').titleize
+    I18n.t(translation_key, default: fallback)
   end
 end

data/app/models/page.rb

@@ -1,5 +1,4 @@
 class Page < ActiveRecord::Base
-
   class MissingRootPageError < StandardError
     def initialize(message = 'Database missing root page'); super end
   end
@@ -8,24 +7,24 @@ class Page < ActiveRecord::Base
   before_save :update_virtual, :update_status, :set_allowed_children_cache
 
   # Associations
-  acts_as_tree :order => 'position ASC'
-  has_many :parts, -> {order(:id)}, :class_name => 'PagePart', :dependent => :destroy
-  accepts_nested_attributes_for :parts, :allow_destroy => true
-  has_many :fields, -> {order(:id)}, :class_name => 'PageField', :dependent => :destroy
-  accepts_nested_attributes_for :fields, :allow_destroy => true
+  acts_as_tree order: 'position ASC'
+  has_many :parts, -> { order(:id) }, class_name: 'PagePart', dependent: :destroy
+  accepts_nested_attributes_for :parts, allow_destroy: true
+  has_many :fields, -> { order(:id) }, class_name: 'PageField', dependent: :destroy
+  accepts_nested_attributes_for :fields, allow_destroy: true
   belongs_to :layout
-  belongs_to :created_by, :class_name => 'User'
-  belongs_to :updated_by, :class_name => 'User'
+  belongs_to :created_by, class_name: 'User'
+  belongs_to :updated_by, class_name: 'User'
 
   # Validations
   validates_presence_of :title, :slug, :breadcrumb, :status_id
 
-  validates_length_of :title, :maximum => 255
-  validates_length_of :slug, :maximum => 100
-  validates_length_of :breadcrumb, :maximum => 160
+  validates_length_of :title, maximum: 255
+  validates_length_of :slug, maximum: 100
+  validates_length_of :breadcrumb, maximum: 160
 
-  validates_format_of :slug, :with => %r{\A([-_.A-Za-z0-9]*|/)\z}
-  validates_uniqueness_of :slug, :scope => :parent_id
+  validates_format_of :slug, with: %r{\A([-_.A-Za-z0-9]*|/)\z}
+  validates_uniqueness_of :slug, scope: :parent_id
 
   validate :valid_class_name
 
@@ -42,10 +41,10 @@ class Page < ActiveRecord::Base
   self.inheritance_column = 'class_name'
 
   def layout_with_inheritance
-    unless layout_without_inheritance
-      parent.layout if parent?
-    else
+    if layout_without_inheritance
       layout_without_inheritance
+    else
+      parent.layout if parent?
     end
   end
 
@@ -53,11 +52,11 @@ class Page < ActiveRecord::Base
   alias_method :layout, :layout_with_inheritance
 
   def description
-    self["description"]
+    self['description']
   end
 
   def description=(value)
-    self["description"] = value
+    self['description'] = value
   end
 
   def cache?
@@ -70,8 +69,8 @@ class Page < ActiveRecord::Base
   alias_method :child_url, :child_path
 
   def part(name)
-    if new_record? or parts.to_a.any?(&:new_record?)
-      parts.to_a.find {|p| p.name == name.to_s }
+    if new_record? || parts.to_a.any?(&:new_record?)
+      parts.to_a.find { |p| p.name == name.to_s }
     else
       parts.find_by_name name.to_s
     end
@@ -86,11 +85,11 @@ class Page < ActiveRecord::Base
   end
 
   def inherits_part?(name)
-    !has_part?(name) && self.ancestors.any? { |page| page.has_part?(name) }
+    !has_part?(name) && ancestors.any? { |page| page.has_part?(name) }
   end
 
   def field(name)
-    if new_record? or fields.any?(&:new_record?)
+    if new_record? || fields.any?(&:new_record?)
       fields.detect { |f| f.name.downcase == name.to_s.downcase }
     else
       fields.find_by_name name.to_s
@@ -106,7 +105,7 @@ class Page < ActiveRecord::Base
   end
 
   def status
-   Status.find(self.status_id)
+    Status.find(status_id)
   end
 
   def status=(value)
@@ -123,7 +122,8 @@ class Page < ActiveRecord::Base
   alias_method :url, :path
 
   def process(request, response)
-    @request, @response = request, response
+    @request = request
+    @response = response
     set_response_headers(@response)
     @response.body = render
     @response.status = response_code
@@ -131,12 +131,12 @@ class Page < ActiveRecord::Base
 
   def headers
     # Return a blank hash that child classes can override or merge
-    { }
+    {}
   end
 
   def set_response_headers(response)
     set_content_type(response)
-    headers.each { |k,v| response.headers[k] = v }
+    headers.each { |k, v| response.headers[k] = v }
   end
 
   def self.save_order(new_position)
@@ -187,11 +187,12 @@ class Page < ActiveRecord::Base
 
   def find_by_path(path, live = true, clean = true)
     return nil if virtual?
+
     path = clean_path(path) if clean
     my_path = self.path
-    if (my_path == path) && (not live or published?)
+    if (my_path == path) && ((not live) || published?)
       return self
-    elsif (path =~ /^#{Regexp.quote(my_path)}([^\/]*)/)
+    elsif path =~ /^#{Regexp.quote(my_path)}([^\/]*)/
       slug_child = children.find_by_slug($1)
       if slug_child
         found = slug_child.find_by_path(path, live, clean)
@@ -202,6 +203,7 @@ class Page < ActiveRecord::Base
         return found if found
       end
     end
+
     unless slug_child
       file_not_found_types = ([FileNotFoundPage] + FileNotFoundPage.descendants)
       file_not_found_names = file_not_found_types.collect { |x| x.name }
@@ -214,11 +216,11 @@ class Page < ActiveRecord::Base
   alias_method :find_by_url, :find_by_path
 
   def update_status
-    self.published_at = Time.zone.now if published? && self.published_at == nil
+    self.published_at = Time.zone.now if published? && published_at == nil
 
-    if self.published_at != nil && (published? || scheduled?)
-      self[:status_id] = Status[:scheduled].id if self.published_at  > Time.zone.now
-      self[:status_id] = Status[:published].id if self.published_at <= Time.zone.now
+    if !published_at.nil? && (published? || scheduled?)
+      self[:status_id] = Status[:scheduled].id if published_at > Time.zone.now
+      self[:status_id] = Status[:published].id if published_at <= Time.zone.now
     end
 
     true
@@ -237,22 +239,23 @@ class Page < ActiveRecord::Base
   end
 
   class << self
-
     def root
       find_by_parent_id(nil)
     end
 
     def find_by_path(path, live = true)
       raise MissingRootPageError unless root
+
       root.find_by_path(path, live)
     end
+
     def find_by_url(*args)
       ActiveSupport::Deprecation.warn("`find_by_url' has been deprecated; use `find_by_path' instead.", caller)
       find_by_path(*args)
     end
 
     def date_column_names
-      self.columns.collect{|c| c.name if c.sql_type =~ /(date|time)/}.compact
+      columns.collect { |c| c.name if c.sql_type =~ /(date|time)/ }.compact
     end
 
     def display_name(string = nil)
@@ -266,7 +269,7 @@ class Page < ActiveRecord::Base
           n.strip
         end
       end
-      @display_name = @display_name + " - not installed" if missing? && @display_name !~ /not installed/
+      @display_name = @display_name + ' - not installed' if missing? && @display_name !~ /not installed/
       @display_name
     end
 
@@ -286,8 +289,8 @@ class Page < ActiveRecord::Base
             begin
               p.constantize
             rescue NameError, LoadError
-              #Rubocop: The use of eval is a serious security risk.
-              #eval(%Q{class #{p} < Page; acts_as_tree; def self.missing?; true end end}, TOPLEVEL_BINDING)
+              # Rubocop: The use of eval is a serious security risk.
+              # eval(%Q{class #{p} < Page; acts_as_tree; def self.missing?; true end end}, TOPLEVEL_BINDING)
               Rails.logger.error NameError
             end
           end
@@ -305,12 +308,13 @@ class Page < ActiveRecord::Base
     end
 
     def is_descendant_class_name?(class_name)
-      (Page.descendants.map(&:to_s) + [nil, "", "Page"]).include?(class_name)
+      (Page.descendants.map(&:to_s) + [nil, '', 'Page']).include?(class_name)
     end
 
     def descendant_class(class_name)
-      raise ArgumentError.new("argument must be a valid descendant of Page") unless is_descendant_class_name?(class_name)
-      if ["", nil, "Page"].include?(class_name)
+      raise ArgumentError.new('argument must be a valid descendant of Page') unless is_descendant_class_name?(class_name)
+
+      if ['', nil, 'Page'].include?(class_name)
         Page
       else
         class_name.constantize
@@ -323,73 +327,72 @@ class Page < ActiveRecord::Base
 
     private
 
-      def default_page_parts(config = TrustyCms::Config)
-        default_parts = config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/)
-        default_parts.map do |name|
-          PagePart.new(:name => name, :filter_id => config['defaults.page.filter'])
-        end
+    def default_page_parts(config = TrustyCms::Config)
+      default_parts = config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/)
+      default_parts.map do |name|
+        PagePart.new(name: name, filter_id: config['defaults.page.filter'])
       end
+    end
 
-      def default_page_fields(config = TrustyCms::Config)
-        default_fields = config['defaults.page.fields'].to_s.strip.split(/\s*,\s*/)
-        default_fields.map do |name|
-          PageField.new(:name => name)
-        end
+    def default_page_fields(config = TrustyCms::Config)
+      default_fields = config['defaults.page.fields'].to_s.strip.split(/\s*,\s*/)
+      default_fields.map do |name|
+        PageField.new(name: name)
       end
+    end
   end
 
   private
 
-    def valid_class_name
-      unless Page.is_descendant_class_name?(class_name)
-        errors.add :class_name, "must be set to a valid descendant of Page"
-      end
-    end
-
-    def update_virtual
-      unless self.class == Page.descendant_class(class_name)
-        self.virtual = Page.descendant_class(class_name).new.virtual?
-      else
-        self.virtual = virtual?
-      end
-      true
+  def valid_class_name
+    unless Page.is_descendant_class_name?(class_name)
+      errors.add :class_name, 'must be set to a valid descendant of Page'
     end
+  end
 
-    def clean_path(path)
-      "/#{ path.to_s.strip }".gsub(%r{//+}, '/')
-    end
-    alias_method :clean_url, :clean_path
+  def update_virtual
+    self.virtual = if self.class == Page.descendant_class(class_name)
+                     virtual?
+                   else
+                     Page.descendant_class(class_name).new.virtual?
+                   end
+    true
+  end
 
-    def parent?
-      !parent.nil?
-    end
+  def clean_path(path)
+    "/#{path.to_s.strip}".gsub(%r{//+}, '/')
+  end
+  alias_method :clean_url, :clean_path
 
-    def database_exists?
-      ActiveRecord::Base.connection
-    rescue ActiveRecord::NoDatabaseError
-      false
-    else
-      true
-    end
+  def parent?
+    !parent.nil?
+  end
 
-    def lazy_initialize_parser_and_context
-      unless @parser and @context
-        @context = PageContext.new(self)
-        @parser = Radius::Parser.new(@context, :tag_prefix => 'r')
-      end
-      @parser
-    end
+  def database_exists?
+    ActiveRecord::Base.connection
+  rescue ActiveRecord::NoDatabaseError
+    false
+  else
+    true
+  end
 
-    def parse(text)
-      text = "" if text.nil?
-      lazy_initialize_parser_and_context.parse(text)
+  def lazy_initialize_parser_and_context
+    unless @parser && @context
+      @context = PageContext.new(self)
+      @parser = Radius::Parser.new(@context, tag_prefix: 'r')
     end
+    @parser
+  end
 
-    def parse_object(object)
-      text = object.content || ''
-      text = parse(text)
-      text = object.filter.filter(text) if object.respond_to? :filter_id
-      text
-    end
+  def parse(text)
+    text = '' if text.nil?
+    lazy_initialize_parser_and_context.parse(text)
+  end
 
+  def parse_object(object)
+    text = object.content || ''
+    text = parse(text)
+    text = object.filter.filter(text) if object.respond_to? :filter_id
+    text
+  end
 end