trusty-cms 4.1.2 → 4.1.3

data/app/controllers/admin/sites_controller.rb

@@ -1,10 +1,10 @@
 class Admin::SitesController < Admin::ResourceController
   helper :sites
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
-    :when => :admin,
-    :denied_url => { :controller => 'pages', :action => 'index' },
-    :denied_message => 'You must have administrative privileges to perform this action.'
-  
+                       when: :admin,
+                       denied_url: { controller: 'pages', action: 'index' },
+                       denied_message: 'You must have administrative privileges to perform this action.'
+
   %w(move_higher move_lower move_to_top move_to_bottom).each do |action|
     define_method action do
       model.send(action)

data/app/controllers/admin/snippets_controller.rb

@@ -1,8 +1,7 @@
 class Admin::SnippetsController < Admin::ResourceController
   paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
-    :when => [:designer, :admin],
-    :denied_url => { :controller => 'admin/pages', :action => 'index' },
-    :denied_message => 'You must have designer privileges to perform this action.'
-  
+                       when: %i[designer admin],
+                       denied_url: { controller: 'admin/pages', action: 'index' },
+                       denied_message: 'You must have designer privileges to perform this action.'
 end

data/app/controllers/admin/users_controller.rb

@@ -1,11 +1,11 @@
 class Admin::UsersController < Admin::ResourceController
   paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
-    :when => :admin,
-    :denied_url => { :controller => 'pages', :action => 'index' },
-    :denied_message => 'You must have administrative privileges to perform this action.'
+                       when: :admin,
+                       denied_url: { controller: 'pages', action: 'index' },
+                       denied_message: 'You must have administrative privileges to perform this action.'
 
-  before_action :ensure_deletable, :only => [:remove, :destroy]
+  before_action :ensure_deletable, only: %i[remove destroy]
 
   def show
     redirect_to edit_admin_user_path(params[:id])
@@ -20,7 +20,7 @@ class Admin::UsersController < Admin::ResourceController
       flash[:error] = 'There was an error saving the user. Please try again.'
       render :new
     end
-  end 
+  end
 
   def update
     user_params = params[model_symbol].permit!
@@ -34,7 +34,7 @@ class Admin::UsersController < Admin::ResourceController
     else
       flash[:error] = 'There was an error saving the user. Please try again.'
       render :edit
-    end    
+    end
   end
 
   def ensure_deletable
@@ -46,16 +46,16 @@ class Admin::UsersController < Admin::ResourceController
 
   private
 
-    def user_params
-      params.require(:user).permit(:first_name, :last_name, :admin, :designer, 
-        :password, :password_confirmation, :email, :site_id, :notes)
-    end
+  def user_params
+    params.require(:user).permit(:first_name, :last_name, :admin, :designer,
+                                 :password, :password_confirmation, :email, :site_id, :notes)
+  end
 
-    def announce_cannot_delete_self
-      flash[:error] = t('users_controller.cannot_delete_self')
-    end
+  def announce_cannot_delete_self
+    flash[:error] = t('users_controller.cannot_delete_self')
+  end
 
-    def announce_cannot_remove_self_from_admin_role
-      flash[:error] = 'You cannot remove yourself from the admin role.'
-    end
+  def announce_cannot_remove_self_from_admin_role
+    flash[:error] = 'You cannot remove yourself from the admin role.'
+  end
 end

data/app/controllers/application_controller.rb

@@ -1,17 +1,17 @@
-#require_dependency 'trusty_cms'
+# require_dependency 'trusty_cms'
 require 'login_system'
 
 class ApplicationController < ActionController::Base
   include LoginSystem
   prepend_view_path("#{TRUSTY_CMS_ROOT}/app/views")
-  
+
   protect_from_forgery with: :exception
   before_action :authenticate_user!
   before_action :set_timezone
   before_action :set_user_locale
   before_action :set_javascripts_and_stylesheets
   before_action :force_utf8_params if RUBY_VERSION =~ /1\.9/
-  before_action :set_standard_body_style, :only => [:new, :edit, :update, :create]
+  before_action :set_standard_body_style, only: %i[new edit update create]
   before_action :set_mailer
 
   attr_accessor :trusty_config, :cache
@@ -23,15 +23,15 @@ class ApplicationController < ActionController::Base
     @trusty_config = TrustyCms::Config
   end
 
-  def after_sign_in_path_for(resource)
+  def after_sign_in_path_for(_resource)
     admin_pages_path
   end
 
   def template_name
-    case self.action_name
+    case action_name
     when 'index'
       'index'
-    when 'new','create'
+    when 'new', 'create'
       'new'
     when 'show'
       'show'
@@ -40,58 +40,57 @@ class ApplicationController < ActionController::Base
     when 'remove', 'destroy'
       'remove'
     else
-      self.action_name
+      action_name
     end
   end
 
   private
 
-    def set_mailer
-      ActionMailer::Base.default_url_options[:host] = request.host_with_port
-    end
+  def set_mailer
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port
+  end
 
-    def set_user_locale
-      I18n.locale = current_user && !current_user.locale.blank? ? current_user.locale : TrustyCms::Config['default_locale']
-    end
+  def set_user_locale
+    I18n.locale = current_user && !current_user.locale.blank? ? current_user.locale : TrustyCms::Config['default_locale']
+  end
 
-    def set_timezone
-      Time.zone = TrustyCms::Config['local.timezone'] != nil && TrustyCms::Config['local.timezone'].empty? ? Time.zone_default : TrustyCms::Config['local.timezone']
-    end
+  def set_timezone
+    Time.zone = !TrustyCms::Config['local.timezone'].nil? && TrustyCms::Config['local.timezone'].empty? ? Time.zone_default : TrustyCms::Config['local.timezone']
+  end
 
-    def set_javascripts_and_stylesheets
-      @stylesheets ||= []
-      @stylesheets.concat %w(admin/main)
-      @javascripts ||= []
-    end
+  def set_javascripts_and_stylesheets
+    @stylesheets ||= []
+    @stylesheets.concat %w(admin/main)
+    @javascripts ||= []
+  end
 
-    def set_standard_body_style
-      @body_classes ||= []
-      @body_classes.concat(%w(reversed))
-    end
+  def set_standard_body_style
+    @body_classes ||= []
+    @body_classes.concat(%w(reversed))
+  end
 
-    # When using TrustyCms with Ruby 1.9, the strings that come in from forms are ASCII-8BIT encoded.
-    # That causes problems, especially when using special chars and with certain DBs, like DB2
-    # That's why we force the encoding of the params to UTF-8
-    # That's what's happening in Rails 3, too: https://github.com/rails/rails/commit/25215d7285db10e2c04d903f251b791342e4dd6a
-    #
-    # See http://stackoverflow.com/questions/8268778/rails-2-3-9-encoding-of-query-parameters
-    # See https://rails.lighthouseapp.com/projects/8994/tickets/4807
-    # See http://jasoncodes.com/posts/ruby19-rails2-encodings (thanks for the following code, Jason!)
-    def force_utf8_params
-      traverse = lambda do |object, block|
-        if object.kind_of?(Hash)
-          object.each_value { |o| traverse.call(o, block) }
-        elsif object.kind_of?(Array)
-          object.each { |o| traverse.call(o, block) }
-        else
-          block.call(object)
-        end
-        object
-      end
-      force_encoding = lambda do |o|
-        o.force_encoding(Encoding::UTF_8) if o.respond_to?(:force_encoding)
+  # When using TrustyCms with Ruby 1.9, the strings that come in from forms are ASCII-8BIT encoded.
+  # That causes problems, especially when using special chars and with certain DBs, like DB2
+  # That's why we force the encoding of the params to UTF-8
+  # That's what's happening in Rails 3, too: https://github.com/rails/rails/commit/25215d7285db10e2c04d903f251b791342e4dd6a
+  #
+  # See http://stackoverflow.com/questions/8268778/rails-2-3-9-encoding-of-query-parameters
+  # See https://rails.lighthouseapp.com/projects/8994/tickets/4807
+  # See http://jasoncodes.com/posts/ruby19-rails2-encodings (thanks for the following code, Jason!)
+  def force_utf8_params
+    traverse = lambda do |object, block|
+      if object.is_a?(Hash)
+        object.each_value { |o| traverse.call(o, block) }
+      elsif object.is_a?(Array)
+        object.each { |o| traverse.call(o, block) }
+      else
+        block.call(object)
       end
-      traverse.call(params, force_encoding)
+      object
     end
-
+    force_encoding = lambda do |o|
+      o.force_encoding(Encoding::UTF_8) if o.respond_to?(:force_encoding)
+    end
+    traverse.call(params, force_encoding)
+  end
 end

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,33 @@
 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.'
+      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