trusty-cms 4.1.1 → 4.1.6

data/app/controllers/admin/references_controller.rb

@@ -2,7 +2,7 @@ class Admin::ReferencesController < ApplicationController
   def show
     respond_to do |format|
       render_allowed_type(params[:type])
-      format.any { render :action => @type, :content_type => "text/html", :layout => false }
+      format.any { render action: @type, content_type: 'text/html', layout: false }
     end
   end
 

data/app/controllers/admin/resource_controller.rb

@@ -5,10 +5,10 @@ class Admin::ResourceController < ApplicationController
   helper_method :model, :current_object, :models, :current_objects, :model_symbol, :plural_model_symbol, :model_class, :model_name, :plural_model_name
   before_action :populate_format
   before_action :never_cache
-  before_action :load_models, :only => :index
-  before_action :load_model, :only => [:new, :create, :edit, :update, :remove, :destroy]
-  before_action :set_owner_or_editor, :only => [:new, :create, :update]
-  after_action :clear_model_cache, :only => [:create, :update, :destroy]
+  before_action :load_models, only: :index
+  before_action :load_model, only: %i[new create edit update remove destroy]
+  before_action :set_owner_or_editor, only: %i[new create update]
+  after_action :clear_model_cache, only: %i[create update destroy]
 
   cattr_reader :paginated
   cattr_accessor :default_per_page, :will_paginate_options
@@ -23,18 +23,18 @@ class Admin::ResourceController < ApplicationController
     r.plural.publish(:xml, :json) { render format_symbol => models }
 
     r.singular.publish(:xml, :json) { render format_symbol => model }
-    r.singular.default { redirect_to edit_model_path if action_name == "show" }
+    r.singular.default { redirect_to edit_model_path if action_name == 'show' }
 
     r.not_found.publish(:xml, :json) { head :not_found }
-    r.not_found.default { announce_not_found; redirect_to :action => "index" }
+    r.not_found.default { announce_not_found; redirect_to action: 'index' }
 
     r.invalid.publish(:xml, :json) { render format_symbol => model.errors, :status => :unprocessable_entity }
-    r.invalid.default { announce_validation_errors; render :action => template_name }
+    r.invalid.default { announce_validation_errors; render action: template_name }
 
     r.stale.publish(:xml, :json) { head :conflict }
-    r.stale.default { announce_update_conflict; render :action => template_name }
+    r.stale.default { announce_update_conflict; render action: template_name }
 
-    r.create.publish(:xml, :json) { render format_symbol => model, :status => :created, :location => url_for(:format => format_symbol, :id => model) }
+    r.create.publish(:xml, :json) { render format_symbol => model, :status => :created, :location => url_for(format: format_symbol, id: model) }
     r.create.default { redirect_to continue_url(params) }
 
     r.update.publish(:xml, :json) { head :ok }
@@ -48,7 +48,7 @@ class Admin::ResourceController < ApplicationController
     response_for :plural
   end
 
-  [:show, :new, :edit, :remove].each do |action|
+  %i[show new edit remove].each do |action|
     class_eval %{
       def #{action}                # def show
         response_for :singular     #   response_for :singular
@@ -56,7 +56,7 @@ class Admin::ResourceController < ApplicationController
     }, __FILE__, __LINE__
   end
 
-  [:create, :update].each do |action|
+  %i[create update].each do |action|
     class_eval %{
       def #{action}                                       # def create
         model.update_attributes!(permitted_params[model_symbol])    #   model.update_attributes!(params[model_symbol])
@@ -71,7 +71,7 @@ class Admin::ResourceController < ApplicationController
   end
 
   def self.model_class(model_class = nil)
-    @model_class ||= (model_class || self.controller_name).to_s.singularize.camelize.constantize
+    @model_class ||= (model_class || controller_name).to_s.singularize.camelize.constantize
   end
 
   # call paginate_models to declare that will_paginate should be used in the index view
@@ -81,9 +81,9 @@ class Admin::ResourceController < ApplicationController
   # Class MyController < Admin::ResourceController
   #   paginate_models :per_page => 100
 
-  def self.paginate_models(options={})
+  def self.paginate_models(options = {})
     @@paginated = true
-    @@will_paginate_options = options.slice(:class, :previous_label, :next_label, :inner_window, :outer_window, :separator, :container).merge(:param_name => :p)
+    @@will_paginate_options = options.slice(:class, :previous_label, :next_label, :inner_window, :outer_window, :separator, :container).merge(param_name: :p)
     @@default_per_page = options[:per_page]
   end
 
@@ -111,151 +111,153 @@ class Admin::ResourceController < ApplicationController
     pp = params[:pp] || TrustyCms.config['admin.pagination.per_page']
     pp = (self.class.default_per_page || 50) if pp.blank?
     {
-      :page => (params[:p] || 1).to_i,
-      :per_page => pp.to_i
+      page: (params[:p] || 1).to_i,
+      per_page: pp.to_i,
     }
   end
 
   protected
 
-    def rescue_action(exception)
-      case exception
-      when ActiveRecord::RecordInvalid
-        response_for :invalid
-      when ActiveRecord::StaleObjectError
-        response_for :stale
-      when ActiveRecord::RecordNotFound
-        response_for :not_found
-      else
-        super
-      end
+  def rescue_action(exception)
+    case exception
+    when ActiveRecord::RecordInvalid
+      response_for :invalid
+    when ActiveRecord::StaleObjectError
+      response_for :stale
+    when ActiveRecord::RecordNotFound
+      response_for :not_found
+    else
+      super
     end
+  end
 
-    def model_class
-      self.class.model_class
-    end
+  def model_class
+    self.class.model_class
+  end
 
-    def set_owner_or_editor
-      if self.model.has_attribute? :created_by_id
-        self.model.created_by_id = current_user.id if self.model.id == nil
-        self.model.updated_by_id = current_user.id
-      end
+  def set_owner_or_editor
+    if model.has_attribute? :created_by_id
+      model.created_by_id = current_user.id if model.id == nil
+      model.updated_by_id = current_user.id
     end
+  end
 
-    def model
-      instance_variable_get("@#{model_symbol}") || load_model
-    end
-    alias :current_object :model
-    def model=(object)
-      instance_variable_set("@#{model_symbol}", object)
-    end
-    def load_model
-      self.model = if params[:id]
-        model_class.find(params[:id])
-      else
-        model_class.new()
-      end
-    end
+  def model
+    instance_variable_get("@#{model_symbol}") || load_model
+  end
+  alias :current_object :model
+  def model=(object)
+    instance_variable_set("@#{model_symbol}", object)
+  end
 
-    def models
-      instance_variable_get("@#{plural_model_symbol}") || load_models
-    end
-    alias :current_objects :models
-    def models=(objects)
-      instance_variable_set("@#{plural_model_symbol}", objects)
-    end
-    def load_models
-      self.models = paginated? ? model_class.paginate(pagination_parameters) : model_class.all
+  def load_model
+    self.model = if params[:id]
+                   model_class.find(params[:id])
+                 else
+                   model_class.new
     end
+  end
 
-    def model_name
-      model_class.name
-    end
-    def plural_model_name
-      model_name.pluralize
-    end
-    alias :models_name :plural_model_name
+  def models
+    instance_variable_get("@#{plural_model_symbol}") || load_models
+  end
+  alias :current_objects :models
+  def models=(objects)
+    instance_variable_set("@#{plural_model_symbol}", objects)
+  end
 
-    def model_symbol
-      model_name.underscore.intern
-    end
-    def plural_model_symbol
-      model_name.pluralize.underscore.intern
-    end
-    alias :models_symbol :plural_model_symbol
+  def load_models
+    self.models = paginated? ? model_class.paginate(pagination_parameters) : model_class.all
+  end
 
-    def humanized_model_name
-      t(model_name.underscore.downcase)
-    end
+  def model_name
+    model_class.name
+  end
 
-    def continue_url(options)
-      options[:redirect_to] || (params[:continue] ? {:action => 'edit', :id => model.id} : index_page_for_model)
-    end
+  def plural_model_name
+    model_name.pluralize
+  end
+  alias :models_name :plural_model_name
 
-    def index_page_for_model
-      parts = {:action => "index"}
-      if paginated? && model && i = model_class.all.index(model)
-        p = (i / pagination_parameters[:per_page].to_i) + 1
-        parts[:p] = p if p && p > 1
-      end
-      parts
-    end
+  def model_symbol
+    model_name.underscore.intern
+  end
 
-    def edit_model_path
-      method = "edit_admin_#{model_name.underscore}_path"
-      send method.to_sym, params[:id]
-    end
+  def plural_model_symbol
+    model_name.pluralize.underscore.intern
+  end
+  alias :models_symbol :plural_model_symbol
 
-    def announce_validation_errors
-      flash.now[:error] = t("resource_controller.validation_errors")
-    end
+  def humanized_model_name
+    t(model_name.underscore.downcase)
+  end
 
-    def announce_removed
-      ActiveSupport::Deprecation.warn("announce_removed is no longer encouraged in TrustyCms 0.9.x.", caller)
-      flash[:notice] = t("resource_controller.removed", :humanized_model_name => humanized_model_name)
-    end
+  def continue_url(options)
+    options[:redirect_to] || (params[:continue] ? { action: 'edit', id: model.id } : index_page_for_model)
+  end
 
-    def announce_not_found
-      flash[:notice] = t("resource_controller.not_found", :humanized_model_name => humanized_model_name)
+  def index_page_for_model
+    parts = { action: 'index' }
+    if paginated? && model && i = model_class.all.index(model)
+      p = (i / pagination_parameters[:per_page].to_i) + 1
+      parts[:p] = p if p && p > 1
     end
+    parts
+  end
 
-    def announce_update_conflict
-      flash.now[:error] =  t("resource_controller.update_conflict", :humanized_model_name => humanized_model_name)
-    end
+  def edit_model_path
+    method = "edit_admin_#{model_name.underscore}_path"
+    send method.to_sym, params[:id]
+  end
 
-    def clear_model_cache
-      Rails.cache.clear
-    end
+  def announce_validation_errors
+    flash.now[:error] = t('resource_controller.validation_errors')
+  end
 
-    def format_symbol
-      format.to_sym
-    end
+  def announce_removed
+    ActiveSupport::Deprecation.warn('announce_removed is no longer encouraged in TrustyCms 0.9.x.', caller)
+    flash[:notice] = t('resource_controller.removed', humanized_model_name: humanized_model_name)
+  end
 
-    def format
-      params[:format] || 'html'
-    end
+  def announce_not_found
+    flash[:notice] = t('resource_controller.not_found', humanized_model_name: humanized_model_name)
+  end
 
+  def announce_update_conflict
+    flash.now[:error] = t('resource_controller.update_conflict', humanized_model_name: humanized_model_name)
+  end
 
-    # I would like to set this to expires_in(1.minute, :private => true) to allow for more fluid navigation
-    # but the annoyance for concurrent authors would be too great.
-    def never_cache
-      expires_now
-    end
+  def clear_model_cache
+    Rails.cache.clear
+  end
 
-    # Assist with user agents that cause improper content-negotiation
-    # warn "Remove default HTML format, Accept header no longer used. (#{__FILE__}: #{__LINE__})" if Rails.version !~ /^2\.1/
-    def populate_format
-      params[:format] ||= 'html' unless request.xhr?
-    end
+  def format_symbol
+    format.to_sym
+  end
 
-    def permitted_params
-      model_symbols = ActiveRecord::Base.descendants.map{|a| a.name.underscore.to_sym}
-      keys = params.keys.map{|k| k.underscore.to_sym}
-      valid_symbols = model_symbols & keys
-      valid_symbols.each do |symbol|
-        params[symbol].permit!
-      end
-      params
-    end
+  def format
+    params[:format] || 'html'
+  end
 
+  # I would like to set this to expires_in(1.minute, :private => true) to allow for more fluid navigation
+  # but the annoyance for concurrent authors would be too great.
+  def never_cache
+    expires_now
+  end
+
+  # Assist with user agents that cause improper content-negotiation
+  # warn "Remove default HTML format, Accept header no longer used. (#{__FILE__}: #{__LINE__})" if Rails.version !~ /^2\.1/
+  def populate_format
+    params[:format] ||= 'html' unless request.xhr?
+  end
+
+  def permitted_params
+    model_symbols = ActiveRecord::Base.descendants.map { |a| a.name.underscore.to_sym }
+    keys = params.keys.map { |k| k.underscore.to_sym }
+    valid_symbols = model_symbols & keys
+    valid_symbols.each do |symbol|
+      params[symbol].permit!
+    end
+    params
+  end
 end

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