trusty-cms 4.0.2 → 4.1.4

data/app/helpers/admin/layouts_helper.rb

@@ -1,3 +1,2 @@
 module Admin::LayoutsHelper
-
 end

data/app/helpers/admin/node_helper.rb

@@ -1,18 +1,16 @@
 module Admin::NodeHelper
-
   def render_nodes(page, starting_index, parent_index = nil, simple = false)
-    @rendered_html = ""
+    @rendered_html = ''
     render_node page, starting_index, parent_index, simple
     @rendered_html
   end
 
   def render_node(page, index, parent_index = nil, simple = false)
-
     @current_node = prepare_page(page)
 
-    @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) })
+    @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) })
     index
   end
 
@@ -35,14 +33,19 @@ module Admin::NodeHelper
 
   def expanded_rows
     unless @expanded_rows
-      @expanded_rows = case
-      when rows = cookies[:expanded_rows]
-        rows.split(',').map { |x| Integer(x) rescue nil }.compact
-      else
-        []
+      @expanded_rows = if rows = cookies[:expanded_rows]
+                         rows.split(',').map do |x|
+                           begin
+                                                                      Integer(x)
+                           rescue StandardError
+                             nil
+                                                                    end
+                         end .compact
+                       else
+                         []
       end
 
-      if homepage and !@expanded_rows.include?(homepage.id)
+      if homepage && !@expanded_rows.include?(homepage.id)
         @expanded_rows << homepage.id
       end
     end
@@ -54,37 +57,37 @@ module Admin::NodeHelper
   end
 
   def expander(level)
-    unless @current_node.children.empty? or level == 0
-      image((expanded ? "collapse" : "expand"),
-            :class => "expander", :alt => 'toggle children',
-            :title => '')
+    if @current_node.children.empty? || (level == 0)
+      ''
     else
-      ""
+      image((expanded ? 'collapse' : 'expand'),
+            class: 'expander', alt: 'toggle children',
+            title: '')
     end
   end
 
   def icon
     icon_name = @current_node.virtual? ? 'virtual_page' : 'page'
-    image(icon_name, :class => "icon", :alt => '', :title => '')
+    image(icon_name, class: 'icon', alt: '', title: '')
   end
 
   def node_title
-    %{<span class="title">#{ h(@current_node.title) }</span>}.html_safe
+    %{<span class="title">#{h(@current_node.title)}</span>}.html_safe
   end
 
   def page_type
     display_name = @current_node.class.display_name
     if display_name == 'Page'
-      ""
+      ''
     else
-      %{<span class="info">(#{ h(display_name) })</span>}.html_safe
+      %{<span class="info">(#{h(display_name)})</span>}.html_safe
     end
   end
 
   def spinner
     image('spinner.gif',
-            :class => 'busy', :id => "busy_#{@current_node.id}",
-            :alt => "",  :title => "",
-            :style => 'display: none;')
+          class: 'busy', id: "busy_#{@current_node.id}",
+          alt: '', title: '',
+          style: 'display: none;')
   end
 end

data/app/helpers/admin/pages_helper.rb

@@ -16,10 +16,10 @@ module Admin::PagesHelper
 
   def status_to_display
     @page.status_id = 100 if @page.status_id == 90
-    @display_status = Status.selectable.map{ |s| [I18n.translate(s.name.downcase), s.id] }
+    @display_status = Status.selectable.map { |s| [I18n.translate(s.name.downcase), s.id] }
   end
 
   def clean_page_description(page)
-    page.description.to_s.strip.gsub(/\t/,'').gsub(/\s+/,' ')
+    page.description.to_s.strip.gsub(/\t/, '').gsub(/\s+/, ' ')
   end
 end

data/app/helpers/admin/preferences_helper.rb

@@ -1,3 +1,2 @@
 module Admin::PreferencesHelper
-
 end

data/app/helpers/admin/references_helper.rb

@@ -1,27 +1,26 @@
-require "RedCloth"
+require 'RedCloth'
 
 module Admin::ReferencesHelper
   def tag_reference
     String.new.tap do |output|
       class_of_page.tag_descriptions.sort.each do |tag_name, description|
-        value = t("desc.#{tag_name.gsub(':','-')}").match('desc') ? description : t("desc.#{tag_name.gsub(':','-')}")
-        output << render(:partial => "admin/references/tag_reference.haml",
-            :locals => {:tag_name => tag_name,
-                        :description =>  RedCloth.new(TrustyCms::Taggable::Util.strip_leading_whitespace(value)).to_html
-                       })
+        value = t("desc.#{tag_name.gsub(':', '-')}").match('desc') ? description : t("desc.#{tag_name.gsub(':', '-')}")
+        output << render(partial: 'admin/references/tag_reference.haml',
+                         locals: { tag_name: tag_name,
+                                   description: RedCloth.new(TrustyCms::Taggable::Util.strip_leading_whitespace(value)).to_html })
       end
     end
   end
 
   def filter_reference
-    unless filter.blank?
+    if filter.blank?
+      'There is no filter on the current page part.'
+    else
       if filter.description.blank?
-        "There is no documentation on this filter."
+        'There is no documentation on this filter.'
       else
         filter.description
       end
-    else
-      "There is no filter on the current page part."
     end
   end
 

data/app/helpers/admin/regions_helper.rb

@@ -1,14 +1,14 @@
 module Admin::RegionsHelper
-  def render_region(region, options={}, &block)
+  def render_region(region, options = {}, &block)
     lazy_initialize_region_set
     default_partials = TrustyCms::AdminUI::RegionPartials.new(self)
     if block_given?
       block.call(default_partials)
-      (options[:locals] ||= {}).merge!(:defaults => default_partials)
+      (options[:locals] ||= {}).merge!(defaults: default_partials)
     end
     output = @region_set[region].compact.map do |partial|
       begin
-        render options.merge(:partial => partial)
+        render options.merge(partial: partial)
       rescue ::ActionView::MissingTemplate # couldn't find template
         default_partials[partial]
       rescue ::ActionView::TemplateError => e # error in template

data/app/helpers/application_helper.rb

@@ -22,26 +22,26 @@ module ApplicationHelper
   end
 
   def onsubmit_status(model)
-    model.new_record? ? t('creating_status', :model => t(model.class.name.downcase)) : "#{I18n.t('saving_changes')}…"
+    model.new_record? ? t('creating_status', model: t(model.class.name.downcase)) : "#{I18n.t('saving_changes')}…"
   end
 
   def save_model_button(model, options = {})
     model_name = model.class.name.underscore
     human_model_name = model_name.humanize.titlecase
     options[:label] ||= model.new_record? ?
-      t('buttons.create', :name => t(model_name, :default => human_model_name), :default => 'Create ' + human_model_name) :
-      t('buttons.save_changes', :default => 'Save Changes')
-    options[:class] ||= "button"
+      t('buttons.create', name: t(model_name, default: human_model_name), default: 'Create ' + human_model_name) :
+      t('buttons.save_changes', default: 'Save Changes')
+    options[:class] ||= 'button'
     options[:accesskey] ||= 'S'
     submit_tag options.delete(:label), options
   end
 
-  def save_model_and_continue_editing_button(model)
-    submit_tag t('buttons.save_and_continue'), :name => 'continue', :class => 'button', :accesskey => "s"
+  def save_model_and_continue_editing_button(_model)
+    submit_tag t('buttons.save_and_continue'), name: 'continue', class: 'button', accesskey: 's'
   end
 
   def current_item?(item)
-    if item.tab && item.tab.many? {|i| current_url?(i.relative_url) }
+    if item.tab&.many? { |i| current_url?(i.relative_url) }
       # Accept only stricter URL matches if more than one matches
       current_page?(item.url)
     else
@@ -50,7 +50,7 @@ module ApplicationHelper
   end
 
   def current_tab?(tab)
-    @current_tab ||= tab if tab.any? {|item| current_url?(item.relative_url) }
+    @current_tab ||= tab if tab.any? { |item| current_url?(item.relative_url) }
     @current_tab == tab
   end
 
@@ -70,7 +70,7 @@ module ApplicationHelper
   end
 
   def admin?
-    current_user and current_user.admin?
+    current_user&.admin?
   end
 
   def designer?
@@ -82,11 +82,11 @@ module ApplicationHelper
       updated_by = (model.updated_by || model.created_by)
       name = updated_by ? updated_by.name : nil
       time = (model.updated_at || model.created_at)
-      if name or time
-        html = %{<p class="updated_line">#{t('timestamp.last_updated')} }
+      if name || time
+        html = %{<div class="updated_line">#{t('timestamp.last_updated')} }
         html << %{#{t('timestamp.by')} <strong>#{name}</strong> } if name
         html << %{#{t('timestamp.at')} #{timestamp(time)}} if time
-        html << %{</p>}
+        html << %{</div>}
         html.html_safe
       end
     end
@@ -94,7 +94,7 @@ module ApplicationHelper
 
   def timestamp(time)
     # time.strftime("%I:%M %p on %B %e, %Y").sub("AM", 'am').sub("PM", 'pm')
-    I18n.localize(time, :format => :timestamp)
+    I18n.localize(time, format: :timestamp)
   end
 
   def meta_errors?
@@ -122,11 +122,11 @@ module ApplicationHelper
   end
 
   def translate_with_default(name)
-    t(name.underscore.downcase, :default => name)
+    t(name.underscore.downcase, default: name)
   end
 
   def available_locales_select
-    [[t('select.default'),'']] + TrustyCms::AvailableLocales.locales
+    [[t('select.default'), '']] + TrustyCms::AvailableLocales.locales
   end
 
   def stylesheet_overrides
@@ -147,12 +147,12 @@ module ApplicationHelper
 
   # 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={})
+  def gravatar_url(email, options = {})
     # Default to highest rating. Rating can be one of G, PG, R X.
-    options[:rating] ||= "G"
+    options[:rating] ||= 'G'
 
     # Default size of the image.
-    options[:size] ||= "32px"
+    options[:size] ||= '32px'
 
     # Default image url to be used when no gravatar is found
     # or when an image exceeds the rating parameter.
@@ -160,7 +160,9 @@ module ApplicationHelper
     default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
     options[:default] ||= default_avatar_url
 
-    unless email.blank?
+    if email.blank?
+      local_avatar_url
+    else
       # Build the Gravatar url.
       url = '//gravatar.com/avatar/'
       url << "#{Digest::MD5.new.update(email)}?"
@@ -169,31 +171,29 @@ module ApplicationHelper
       url << "&default=#{options[:default]}" if options[:default]
       # Test the Gravatar url
       require 'open-uri'
-      begin; open "http:#{url}", :proxy => true
-      rescue; local_avatar_url
+      begin; open "http:#{url}", proxy: true
+      rescue StandardError; local_avatar_url
       else; url
       end
-    else
-      local_avatar_url
     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.
-  def pagination_for(list, options={})
+  def pagination_for(list, options = {})
     if list.respond_to? :total_pages
       options = {
-        :max_per_page => @trusty_config['pagination.max_per_page'] || 500,
-        :depaginate => true
+        max_per_page: @trusty_config['pagination.max_per_page'] || 500,
+        depaginate: true,
       }.merge(options.symbolize_keys)
       depaginate = options.delete(:depaginate)                                     # supply :depaginate => false to omit the 'show all' link
       depagination_limit = options.delete(:max_per_page)                           # supply :max_per_page => false to include the 'show all' link no matter how large the collection
       html = will_paginate(list, will_paginate_options.merge(options))
       if depaginate && list.total_pages > 1 && (!depagination_limit.blank? || list.total_entries <= depagination_limit.to_i)
-        html << content_tag(:div, link_to(t('show_all'), :pp => 'all'), :class => 'depaginate')
+        html << content_tag(:div, link_to(t('show_all'), pp: 'all'), class: 'depaginate')
       elsif depaginate && list.total_entries > depagination_limit.to_i
-        html = content_tag(:div, link_to("paginate", :p => 1), :class => 'pagination')
+        html = content_tag(:div, link_to('paginate', p: 1), class: 'pagination')
       end
       html
     end
@@ -201,12 +201,11 @@ module ApplicationHelper
 
   private
 
-    def append_image_extension(name)
-      unless name =~ /\.(.*?)$/
-        name + '.png'
-      else
-        name
+  def append_image_extension(name)
+    if name =~ /\.(.*?)$/
+      name
+    else
+      name + '.png'
       end
-    end
-
+  end
 end

data/app/helpers/rad_social_helper.rb

@@ -1,7 +1,6 @@
 module RadSocialHelper
-
   def rad_test_method
-    "SURPRISE SURPRISE SURPRISE"
+    'SURPRISE SURPRISE SURPRISE'
   end
 
   def rad_share_widget(options)
@@ -9,15 +8,13 @@ module RadSocialHelper
     message = options[:message].nil? ? "Check out #{options[:title]}." : options[:message]
     email_subject = options[:email_subject].nil? ? options[:title] : options[:email_subject]
     email_message = options[:email_message].nil? ? "I thought you might be interested in this: #{url}" : "#{options[:email_message]} #{url}"
-    email_action_url = options[:email_action_url].nil? ? "/rad_social/mail" : options[:email_action_url]
+    email_action_url = options[:email_action_url].nil? ? '/rad_social/mail' : options[:email_action_url]
 
-    render :partial => "widget/horizontal_widget",
-                             :locals => { :url => url,
-                                          :message => message,
-                                          :email_subject => email_subject,
-                                          :email_message => email_message,
-                                          :email_action_url => email_action_url
-                             }
+    render partial: 'widget/horizontal_widget',
+           locals: { url: url,
+                     message: message,
+                     email_subject: email_subject,
+                     email_message: email_message,
+                     email_action_url: email_action_url }
   end
-
 end

data/app/helpers/scoped_helper.rb

@@ -1,9 +1,8 @@
 module ScopedHelper
   def self.included(base)
-
     base.module_eval do
       def title
-        t = current_site.name 
+        t = current_site.name
         t = TrustyCms::Config['admin.title'] || 'TrustyCMS' if t.blank?
         t
       end
@@ -13,7 +12,6 @@ module ScopedHelper
         st = TrustyCms::Config['admin.subtitle'] || 'publishing for small teams' if st.blank?
         st
       end
-
     end
   end
 end

data/app/helpers/sites_helper.rb

@@ -1,10 +1,10 @@
 module SitesHelper
   def order_links(site)
     String.new.tap do |output|
-      output << link_to(image("move_to_top.png", :alt => "Move to top"), move_to_top_admin_site_path(site), :method => :put)
-      output << link_to(image("move_higher.png", :alt => "Move up"), move_higher_admin_site_path(site), :method => :post)
-      output << link_to(image("move_lower.png", :alt => "Move down"), move_lower_admin_site_path(site), :method => :post)
-      output << link_to(image("move_to_bottom.png", :alt => "Move to bottom"), move_to_bottom_admin_site_path(site), :method => :put)
+      output << link_to(image('move_to_top.png', alt: 'Move to top'), move_to_top_admin_site_path(site), method: :put)
+      output << link_to(image('move_higher.png', alt: 'Move up'), move_higher_admin_site_path(site), method: :post)
+      output << link_to(image('move_lower.png', alt: 'Move down'), move_lower_admin_site_path(site), method: :post)
+      output << link_to(image('move_to_bottom.png', alt: 'Move to bottom'), move_to_bottom_admin_site_path(site), method: :put)
     end
   end
 end

data/app/mailers/devise_mailer.rb

@@ -1,8 +1,7 @@
 class DeviseMailer < Devise::Mailer
-
-  def reset_password_instructions(record, token, opts={})
+  def reset_password_instructions(record, token, opts = {})
     mail = super
-    mail.subject = "Reset Password for TrustyCMS"
+    mail.subject = 'Reset Password for TrustyCMS'
     mail
-  end  
+  end
 end

data/app/mailers/rad_social_mailer.rb

@@ -3,7 +3,7 @@ require 'roadie-rails'
 class RadSocialMailer < ApplicationMailer
   include Roadie::Rails::Automatic
 
-  def social_mail options
+  def social_mail(options)
     from_address = Mail::Address.new options[:from] # ex: "john@example.com"
     from_address.display_name = options[:from_name] # ex: "John Doe"
 
@@ -14,12 +14,12 @@ class RadSocialMailer < ApplicationMailer
     @actual_from = from_address if @actual_from.nil?
 
     mail({
-      to: options[:to],
-      from: @actual_from,
-      reply_to: @from_email,
-      subject: options[:subject],
-      text: @message,
-      content_type: "text/html"
-     })
+           to: options[:to],
+           from: @actual_from,
+           reply_to: @from_email,
+           subject: options[:subject],
+           text: @message,
+           content_type: 'text/html',
+         })
   end
 end