trusty-cms 4.1.1 → 4.1.6

data/app/controllers/site_controller.rb

@@ -6,32 +6,34 @@ class SiteController < ApplicationController
   skip_before_action :authenticate_user!
 
   def self.cache_timeout=(val)
-    TrustyCms::PageResponseCacheDirector.cache_timeout=(val)
+    TrustyCms::PageResponseCacheDirector.cache_timeout = val
   end
+
   def self.cache_timeout
     TrustyCms::PageResponseCacheDirector.cache_timeout
   end
 
   def show_page
     url = params[:url]
-    if Array === url
-      url = url.join('/')
-    else
-      url = url.to_s
-    end
+    url = if Array === url
+            url.join('/')
+          else
+            url.to_s
+          end
     if @page = find_page(url)
-      batch_page_status_refresh if (url == "/" || url == "")
+      batch_page_status_refresh if url == '/' || url == ''
       # This is a bit of a hack to get Vanity URL pages working in another extension
       # In Rails 2, redirect_to halted execution, so process_page could be aliased and
       # a redirect could be used. This no longer works. There's a better fix for this,
       # but for now, anything that aliases process_page can return false if it's rendering
       # or redirecting on its own.
       return unless process_page(@page)
+
       set_cache_control
       @performed_render ||= true
       render layout: false
     else
-      render :template => 'site/not_found', :status => 404, layout: false
+      render template: 'site/not_found', status: 404, layout: false
     end
   rescue Page::MissingRootPageError
     redirect_to welcome_path
@@ -42,7 +44,7 @@ class SiteController < ApplicationController
   end
   # hide_action :cacheable_request?
 
-  def set_expiry(time, options={})
+  def set_expiry(time, options = {})
     expires_in time, options
   end
   # hide_action :set_expiry
@@ -53,52 +55,53 @@ class SiteController < ApplicationController
   # hide_action :set_expiry
 
   private
-    def batch_page_status_refresh
-      @changed_pages = []
-      @pages = Page.where({:status_id => Status[:scheduled].id})
-      @pages.each do |page|
-        if page.published_at <= Time.now
-           page.status_id = Status[:published].id
-           page.save
-           @changed_pages << page.id
-        end
-      end
 
-      expires_in nil, :private=>true, "no-cache" => true if @changed_pages.length > 0
+  def batch_page_status_refresh
+    @changed_pages = []
+    @pages = Page.where({ status_id: Status[:scheduled].id })
+    @pages.each do |page|
+      if page.published_at <= Time.now
+        page.status_id = Status[:published].id
+        page.save
+        @changed_pages << page.id
+      end
     end
 
-    def set_cache_control
-      response_cache_director(@page).set_cache_control
-    end
+    expires_in nil, :private => true, 'no-cache' => true if @changed_pages.length > 0
+  end
 
-    def response_cache_director(page)
-      klass_name = "TrustyCms::#{page.class}ResponseCacheDirector"
-      begin
-        klass = klass_name.constantize
-      rescue NameError, LoadError
-        director_klass = "TrustyCms::PageResponseCacheDirector"
-        #Rubocop: The use of eval is a serious security risk.
-        #eval(%Q{class #{klass_name} < #{director_klass}; end}, TOPLEVEL_BINDING)
-        klass = director_klass.constantize
-      end
-      klass.new(page, self)
-    end
+  def set_cache_control
+    response_cache_director(@page).set_cache_control
+  end
 
-    def find_page(url)
-      found = Page.find_by_path(url, live?)
-      found if found and (found.published? or dev?)
+  def response_cache_director(page)
+    klass_name = "TrustyCms::#{page.class}ResponseCacheDirector"
+    begin
+      klass = klass_name.constantize
+    rescue NameError, LoadError
+      director_klass = 'TrustyCms::PageResponseCacheDirector'
+      # Rubocop: The use of eval is a serious security risk.
+      # eval(%Q{class #{klass_name} < #{director_klass}; end}, TOPLEVEL_BINDING)
+      klass = director_klass.constantize
     end
+    klass.new(page, self)
+  end
 
-    def process_page(page)
-      page.pagination_parameters = pagination_parameters
-      page.process(request, response)
-    end
+  def find_page(url)
+    found = Page.find_by_path(url, live?)
+    found if found && (found.published? || dev?)
+  end
 
-    def dev?
-      request.host == @trusty_config['dev.host'] || request.host =~ /^dev\./
-    end
+  def process_page(page)
+    page.pagination_parameters = pagination_parameters
+    page.process(request, response)
+  end
 
-    def live?
-      not dev?
-    end
+  def dev?
+    request.host == @trusty_config['dev.host'] || request.host =~ /^dev\./
+  end
+
+  def live?
+    not dev?
+  end
 end

data/app/controllers/social_mailer_controller.rb

@@ -1,36 +1,26 @@
 class SocialMailerController < ApplicationController
   include ShareLayouts::Controllers::ActionController
-  trusty_layout "default", {:only => :create_social_mail}
+  trusty_layout 'default', { only: :create_social_mail }
   #  no_login_required
   skip_before_action :authenticate_user!
 
   def create_social_mail
-
     mailer_options = {
-      :to => params[:to],
-      :from => params[:from],
-      :from_name => params[:from_name],
-      :message => params[:message],
-      :subject => params[:subject]
+      to: params[:to],
+      from: params[:from],
+      from_name: params[:from_name],
+      message: params[:message],
+      subject: params[:subject],
     }
-
-    if verify_recaptcha(action: 'emailSeats')
-      RadSocialMailer.social_mail(mailer_options).deliver_now
-      head :ok
-    else
-      head :bad_request, :ErrorMsg => 'We have detected suspicious activity and have disabled this feature for your user.'
-    end
-
   end
 
   def social_mail_form
-    render :template => "rad_social_mailer/social_mail_form",
-           :layout => false,
-           :locals => {
-             :email_message => params[:email_message],
-             :email_subject => params[:email_subject],
-             :email_action_url => params[:email_action_url]
+    render template: 'rad_social_mailer/social_mail_form',
+           layout: false,
+           locals: {
+             email_message: params[:email_message],
+             email_subject: params[:email_subject],
+             email_action_url: params[:email_action_url],
            }
   end
-
 end

data/app/helpers/admin/configuration_helper.rb

@@ -6,21 +6,21 @@ module Admin::ConfigurationHelper
   #   show_config("admin.title")
   #   => <label for="admin_title">Admin title<label><span id="admin_title">TrustyCms CMS</span>
   #
-  def show_config(key, options={})
+  def show_config(key, options = {})
     setting = setting_for(key)
     setting.valid?
     domkey = key.gsub(/\W/, '_')
-    html = ""
-    html << content_tag(:label, t("trusty_config.#{key}").titlecase, :for => domkey)
+    html = ''
+    html << content_tag(:label, t("trusty_config.#{key}").titlecase, for: domkey)
     if setting.boolean?
       value = setting.checked? ? t('yes') : t('no')
-      html << content_tag(:span, value, :id => domkey, :class => "#{value} #{options[:class]}")
+      html << content_tag(:span, value, id: domkey, class: "#{value} #{options[:class]}")
     else
       value = setting.selected_value || setting.value
-      html << content_tag(:span, value, :id => domkey, :class => options[:class])
+      html << content_tag(:span, value, id: domkey, class: options[:class])
     end
-    html << content_tag(:span, " #{t("units.#{setting.units}")}", :class => 'units') if setting.units
-    html << content_tag(:span, " #{t('warning')}: #{[setting.errors[:value]].flatten.first}", :class => 'warning') if setting.errors.messages[:value].present?
+    html << content_tag(:span, " #{t("units.#{setting.units}")}", class: 'units') if setting.units
+    html << content_tag(:span, " #{t('warning')}: #{[setting.errors[:value]].flatten.first}", class: 'warning') if setting.errors.messages[:value].present?
     Rails.logger.error(html)
     html.html_safe
   end
@@ -41,34 +41,34 @@ module Admin::ConfigurationHelper
   #   edit_setting("user.allow_password_reset?")
   #   => <label for="user_allow_password_reset_">Admin title<label><input type="checkbox" name="config['user.allow_password_reset?']" id="user_allow_password_reset_" value="1" checked="checked" />
   #
-  def edit_config(key, options={})
+  def edit_config(key, _options = {})
     setting = setting_for(key)
     domkey = key.gsub(/\W/, '_')
     name = "trusty_config[#{key}]"
     title = t("trusty_config.#{key}").titlecase
-    title << content_tag(:span, " (#{t("units.#{setting.units}")})", :class => 'units') if setting.units
+    title << content_tag(:span, " (#{t("units.#{setting.units}")})", class: 'units') if setting.units
     value = params[key.to_sym].nil? ? setting.value : params[key.to_sym]
-    html = ""
+    html = ''
     if setting.boolean?
       html << hidden_field_tag(name, 0)
-      html << check_box_tag(name, 1, value, :class => 'setting', :id => domkey)
-      html << content_tag(:label, title.html_safe, :class => 'checkbox', :for => domkey)
+      html << check_box_tag(name, 1, value, class: 'setting', id: domkey)
+      html << content_tag(:label, title.html_safe, class: 'checkbox', for: domkey)
     elsif setting.selector?
-      html << content_tag(:label, title.html_safe, :for => domkey)
-      html << select_tag(name, options_for_select(setting.definition.selection, value), :class => 'setting', :id => domkey)
+      html << content_tag(:label, title.html_safe, for: domkey)
+      html << select_tag(name, options_for_select(setting.definition.selection, value), class: 'setting', id: domkey)
     else
-      html << content_tag(:label, title.html_safe, :for => domkey)
-      html << text_field_tag(name, value, :class => 'textbox', :id => domkey)
+      html << content_tag(:label, title.html_safe, for: domkey)
+      html << text_field_tag(name, value, class: 'textbox', id: domkey)
     end
     if setting.errors[:value].present?
-      html << content_tag(:span, [setting.errors[:value]].flatten.first, :class => 'error')
-      html = content_tag(:span, html.html_safe, :class => "error-with-field")
+      html << content_tag(:span, [setting.errors[:value]].flatten.first, class: 'error')
+      html = content_tag(:span, html.html_safe, class: 'error-with-field')
     end
     html.html_safe
   end
 
   def setting_for(key)
-    @trusty_config ||= {}    # normally initialized in Admin::ConfigurationController
+    @trusty_config ||= {} # normally initialized in Admin::ConfigurationController
     @trusty_config[key] ||= TrustyCms.config.find_or_initialize_by(key: key)
   end
 
@@ -77,5 +77,4 @@ module Admin::ConfigurationHelper
       setting.definition
     end
   end
-
 end

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