trusty-cms 4.1.2 → 4.1.3

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 TrustyCms::Application.initialize!

data/config/environments/production.rb

@@ -40,5 +40,4 @@ TrustyCms::Application.configure do
   # config.after_initialize do
   #   SiteController.cache_timeout = 12.hours
   # end
-
 end

data/config/environments/test.rb

@@ -18,13 +18,12 @@ TrustyCms::Application.configure do
   # end
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils    = true
+  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
 
-
   # Raise an ActiveModel::MassAssignmentSecurity::Error any time
   # something is mass-assigned that shouldn't be for ease in debugging.
   # config.active_record.mass_assignment_sanitizer = :strict

data/config/initializers/devise.rb

@@ -20,7 +20,7 @@ Devise.setup do |config|
 
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
-  #config.parent_controller = 'ApplicationController'
+  # config.parent_controller = 'ApplicationController'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/config/initializers/kraken.rb

@@ -2,6 +2,6 @@ require 'rubygems'
 require 'kraken-io'
 
 $kraken = Kraken::API.new(
-    :api_key => ENV['KRAKEN_KEY'],
-    :api_secret => ENV['KRAKEN_SECRET']
+  api_key: ENV['KRAKEN_KEY'],
+  api_secret: ENV['KRAKEN_SECRET'],
 )

data/config/initializers/tmp.rb

@@ -1,2 +1,2 @@
 require 'fileutils'
-FileUtils.mkdir_p(Rails.root.join("tmp", "stylesheets"))
+FileUtils.mkdir_p(Rails.root.join('tmp', 'stylesheets'))

data/config/initializers/trusty_cms_config.rb

@@ -2,47 +2,47 @@ require 'multi_site/engine'
 require 'clipped/engine'
 
 TrustyCms.config do |config|
-  config.define 'admin.title', :default => "TrustyCms CMS"
+  config.define 'admin.title', default: 'TrustyCms CMS'
   config.define 'dev.host'
-  config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
-  config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
-  config.define 'defaults.page.parts', :default => "Body,Extended"
-  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
-  config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  config.define 'local.timezone', allow_change: true, select_from: lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
+  config.define 'defaults.locale', select_from: lambda { TrustyCms::AvailableLocales.locales }, allow_blank: true
+  config.define 'defaults.page.parts', default: 'Body,Extended'
+  config.define 'defaults.page.status', select_from: lambda { Status.selectable_values }, allow_blank: false, default: 'Draft'
+  config.define 'defaults.page.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
   config.define 'defaults.page.fields'
-  config.define 'pagination.param_name', :default => 'page'
-  config.define 'pagination.per_page_param_name', :default => 'per_page'
-  config.define 'admin.pagination.per_page', :type => :integer, :default => 50
-  config.define 'site.title', :default => "Your site title", :allow_blank => false
-  config.define 'site.host', :default => "www.example.com", :allow_blank => false
-  config.define 'user.allow_password_reset?', :default => true
-  config.define 'session_timeout', :default => 2.weeks
+  config.define 'pagination.param_name', default: 'page'
+  config.define 'pagination.per_page_param_name', default: 'per_page'
+  config.define 'admin.pagination.per_page', type: :integer, default: 50
+  config.define 'site.title', default: 'Your site title', allow_blank: false
+  config.define 'site.host', default: 'www.example.com', allow_blank: false
+  config.define 'user.allow_password_reset?', default: true
+  config.define 'session_timeout', default: 2.weeks
   require 'multi_site/scoped_validation'
 end
 
 TrustyCms.config do |config|
   config.namespace 'paperclip' do |pc|
-    pc.define 'url',                      :default => '/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
-    pc.define 'path',                     :default => ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
-    pc.define 'skip_filetype_validation', :default => true, :type => :boolean
-    pc.define 'storage', :default       => 'filesystem',
-                         :select_from   => {
-                           'File System'            => 'filesystem',
-                           'Amazon S3'              => 'fog',
-                           'Google Storage'         => 'fog',
-                           'Rackspace Cloud Files'  => 'fog'
+    pc.define 'url',                      default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+    pc.define 'path',                     default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+    pc.define 'skip_filetype_validation', default: true, type: :boolean
+    pc.define 'storage', default: 'filesystem',
+                         select_from: {
+                           'File System' => 'filesystem',
+                           'Amazon S3' => 'fog',
+                           'Google Storage' => 'fog',
+                           'Rackspace Cloud Files' => 'fog',
                          },
-                         :allow_blank   => false,
-                         :allow_display => false
+                         allow_blank: false,
+                         allow_display: false
 
     pc.namespace 'fog' do |fog|
-      fog.define 'provider', :select_from => {
-                               'Amazon S3'              => 'AWS',
-                               'Google Storage'         => 'Google',
-                               'Rackspace Cloud Files'  => 'Rackspace'
-                             }
+      fog.define 'provider', select_from: {
+        'Amazon S3' => 'AWS',
+        'Google Storage' => 'Google',
+        'Rackspace Cloud Files' => 'Rackspace',
+      }
       fog.define 'directory'
-      fog.define 'public?', :default => true
+      fog.define 'public?', default: true
       fog.define 'host'
     end
 
@@ -59,35 +59,35 @@ TrustyCms.config do |config|
     pc.namespace 's3' do |s3|
       s3.define 'key'
       s3.define 'secret'
-      s3.define 'region', :select_from => {
-                            'Asia North East' => 'ap-northeast-1',
-                            'Asia South East' => 'ap-southeast-1',
-                            'EU West' => 'eu-west-1',
-                            'US East' => 'us-east-1',
-                            'US West' => 'us-west-1'
-                          }
+      s3.define 'region', select_from: {
+        'Asia North East' => 'ap-northeast-1',
+        'Asia South East' => 'ap-southeast-1',
+        'EU West' => 'eu-west-1',
+        'US East' => 'us-east-1',
+        'US West' => 'us-west-1',
+      }
     end
   end
 
-  config.namespace 'assets', :allow_display => false do |assets|
-    assets.define 'create_image_thumbnails?', :default => 'true'
-    assets.define 'create_video_thumbnails?', :default => 'true'
-    assets.define 'create_pdf_thumbnails?', :default => 'true'
+  config.namespace 'assets', allow_display: false do |assets|
+    assets.define 'create_image_thumbnails?', default: 'true'
+    assets.define 'create_video_thumbnails?', default: 'true'
+    assets.define 'create_pdf_thumbnails?', default: 'true'
 
     assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
-      thumbs.define 'image', :default => 'normal:size=640x640>|small:size=320x320>'
-      thumbs.define 'video', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
-      thumbs.define 'pdf', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      thumbs.define 'image', default: 'normal:size=640x640>|small:size=320x320>'
+      thumbs.define 'video', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
     end
 
-    assets.define 'max_asset_size', :default => 5, :type => :integer, :units => 'MB'
-    assets.define 'display_size', :default => 'normal', :allow_blank => true
-    assets.define 'insertion_size', :default => 'normal', :allow_blank => true
+    assets.define 'max_asset_size', default: 5, type: :integer, units: 'MB'
+    assets.define 'display_size', default: 'normal', allow_blank: true
+    assets.define 'insertion_size', default: 'normal', allow_blank: true
   end
 end
 
 if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
-  TrustyCms.config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  TrustyCms.config.define 'defaults.snippet.filter', select_from: lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, allow_blank: true
 end
 
 Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper

data/config/routes.rb

@@ -1,16 +1,16 @@
 TrustyCms::Application.routes.draw do
   root to: 'site#show_page'
-  devise_for :users, module: :devise, :skip => :registration
+  devise_for :users, module: :devise, skip: :registration
   as :user do
     post 'authenticate', to: 'devise/sessions#create', as: :authenticate
   end
   get '/rad_social/mail' => 'social_mailer#social_mail_form', as: :rad_social_mail_form
   post '/rad_social/mail' => 'social_mailer#create_social_mail', as: :rad_create_social_mail
-  TrustyCms::Application.config.enabled_extensions.each { |ext|
-  }
+  TrustyCms::Application.config.enabled_extensions.each do |ext|
+  end
   namespace :admin do
     resources :pages do
-      resources :children, :controller => 'pages'
+      resources :children, controller: 'pages'
       get 'remove', on: :member
     end
     resources :layouts do
@@ -22,7 +22,7 @@ TrustyCms::Application.routes.draw do
     resources :snippets do
       get :remove, on: :member
     end
-    post 'save-table-position' => "pages#save_table_position", as: "save_tables_position"
+    post 'save-table-position' => 'pages#save_table_position', as: 'save_tables_position'
 
     resources :assets do
       get :remove, on: :member
@@ -38,7 +38,7 @@ TrustyCms::Application.routes.draw do
     end
   end
 
-  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => [:post, :put]
+  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => %i[post put]
   get 'admin' => 'admin/pages#index'
 
   namespace :admin do

data/lib/active_record_extensions/active_record_extensions.rb

@@ -1,12 +1,11 @@
 require 'active_record'
 
 class ActiveRecord::Base
-
   def self.validates_path(*args)
     configuration = args.extract_options!
     validates_each(args, configuration) do |record, attr_name, value|
       page = Page.find_by_path(value)
-      record.errors.add(attr_name, :page_not_found, :default => configuration[:message]) if page.nil? || page.is_a?(FileNotFoundPage)
+      record.errors.add(attr_name, :page_not_found, default: configuration[:message]) if page.nil? || page.is_a?(FileNotFoundPage)
     end
   end
 

data/lib/annotatable.rb

@@ -1,5 +1,4 @@
 module Annotatable
-
   def self.included(base)
     base.extend ClassMethods
   end
@@ -14,7 +13,7 @@ module Annotatable
 
     def annotate(*attrs)
       options = {}
-      options = attrs.pop if attrs.last.kind_of?(Hash)
+      options = attrs.pop if attrs.last.is_a?(Hash)
       options.symbolize_keys!
       inherit = options[:inherit]
       if inherit
@@ -42,13 +41,12 @@ module Annotatable
 
     def inherited_with_annotatable(subclass)
       inherited_without_annotatable(subclass)
-      (["inherited_annotations"] + (@inherited_annotations || [])).each do |t|
+      (['inherited_annotations'] + (@inherited_annotations || [])).each do |t|
         ivar = "@#{t}"
         subclass.instance_variable_set(ivar, instance_variable_get(ivar))
       end
     end
   end
-
 end
 
 # We don't necessarily have ActiveSupport loaded yet!
@@ -63,6 +61,6 @@ class Hash
 
   # Destructively convert all keys to symbols.
   def symbolize_keys!
-    self.replace(self.symbolize_keys)
+    replace(symbolize_keys)
   end
 end

data/lib/configuration_extensions/configuration_extensions.rb

@@ -317,4 +317,4 @@ class GemBoot < Boot
   def load_error_message
     "Have you run `bundle install`?'."
   end
-end
+end

data/lib/inheritable_class_attributes.rb

@@ -20,26 +20,26 @@ module InheritableClassAttributes
 
     def cattr_inheritable_reader(*symbols)
       symbols.each do |symbol|
-        self.inheritable_cattr_readers << symbol
-        self.module_eval %{
+        inheritable_cattr_readers << symbol
+        module_eval %{
           def self.#{symbol}
             @#{symbol}
           end
         }
       end
-      self.inheritable_cattr_readers.uniq!
+      inheritable_cattr_readers.uniq!
     end
 
     def cattr_inheritable_writer(*symbols)
       symbols.each do |symbol|
-        self.inheritable_cattr_writers << symbol
-        self.module_eval %{
+        inheritable_cattr_writers << symbol
+        module_eval %{
           def self.#{symbol}=(value)
             @#{symbol} = value
           end
         }
       end
-      self.inheritable_cattr_writers.uniq!
+      inheritable_cattr_writers.uniq!
     end
 
     def cattr_inheritable_accessor(*symbols)
@@ -52,12 +52,16 @@ module InheritableClassAttributes
 
       readers = inheritable_cattr_readers.dup
       writers = inheritable_cattr_writers.dup
-      inheritables = [:inheritable_cattr_readers, :inheritable_cattr_writers]
+      inheritables = %i[inheritable_cattr_readers inheritable_cattr_writers]
 
       (readers + writers + inheritables).uniq.each do |attr|
         var = "@#{attr}"
-        old_value = self.module_eval(var)
-        new_value = (old_value.dup rescue old_value)
+        old_value = module_eval(var)
+        new_value = (begin
+                       old_value.dup
+                     rescue StandardError
+                       old_value
+                     end)
         klass.module_eval("#{var} = new_value")
       end
     end

data/lib/login_system.rb

@@ -2,93 +2,94 @@ module LoginSystem
   def self.included(base)
     base.extend ClassMethods
     base.class_eval do
-      #prepend_before_action :authenticate
-      #prepend_before_action :authorize
-      #helper_method :current_user
+      # prepend_before_action :authenticate
+      # prepend_before_action :authorize
+      # helper_method :current_user
     end
   end
 
   protected
 
-    # def current_user
+  # def current_user
+  # end
+
+  # def current_user=(value=nil)
+  #   if value && value.is_a?(User)
+  #     @current_user = value
+  #     session['user_id'] = value.id
+  #   else
+  #     @current_user = nil
+  #     session['user_id'] = nil
+  #   end
+  #   @current_user
+  # end
+
+  def authenticate
+    # puts _process_action_callbacks.map(&:filter)
+    # if current_user
+    #   session['user_id'] = current_user.id
+    #   true
+    # else
+    #   session[:return_to] = request.original_url
+    #   respond_to do |format|
+    #     format.html { redirect_to login_url }
+    #     format.any(:xml,:json) { request_http_basic_authentication }
+    #   end
+    #   false
     # end
+    true
+  end
 
-    # def current_user=(value=nil)
-    #   if value && value.is_a?(User)
-    #     @current_user = value
-    #     session['user_id'] = value.id
-    #   else
-    #     @current_user = nil
-    #     session['user_id'] = nil
+  def authorize
+    # puts _process_action_callbacks.map(&:filter)
+    # action = action_name.to_s.intern
+    # if user_has_access_to_action?(action)
+    #   true
+    # else
+    #   permissions = self.class.controller_permissions[action]
+    #   flash[:error] = permissions[:denied_message] || 'Access denied.'
+    #   respond_to do |format|
+    #     format.html { redirect_to(permissions[:denied_url] || { :action => :index }) }
+    #     format.any(:xml, :json) { head :forbidden }
     #   end
-    #   @current_user
+    #   false
     # end
+    true
+  end
 
-    def authenticate
-      #puts _process_action_callbacks.map(&:filter)
-      # if current_user
-      #   session['user_id'] = current_user.id
-      #   true
-      # else
-      #   session[:return_to] = request.original_url
-      #   respond_to do |format|
-      #     format.html { redirect_to login_url }
-      #     format.any(:xml,:json) { request_http_basic_authentication }
-      #   end
-      #   false
-      # end
-      true
-    end
-
-    def authorize
-      #puts _process_action_callbacks.map(&:filter)
-      # action = action_name.to_s.intern
-      # if user_has_access_to_action?(action)
-      #   true
-      # else
-      #   permissions = self.class.controller_permissions[action]
-      #   flash[:error] = permissions[:denied_message] || 'Access denied.'
-      #   respond_to do |format|
-      #     format.html { redirect_to(permissions[:denied_url] || { :action => :index }) }
-      #     format.any(:xml, :json) { head :forbidden }
-      #   end
-      #   false
-      # end
-      true
-    end
-
-    def user_has_access_to_action?(action)
-      self.class.user_has_access_to_action?(current_user, action, self)
-    end
+  def user_has_access_to_action?(action)
+    self.class.user_has_access_to_action?(current_user, action, self)
+  end
 
-    def login_from_session
-      User.unscoped.find(session['user_id']) rescue nil
-    end
+  def login_from_session
+    User.unscoped.find(session['user_id'])
+  rescue StandardError
+    nil
+  end
 
-    def login_from_cookie
-      if !cookies[:session_token].blank? && user = User.find_by_session_token(cookies[:session_token]) # don't find by empty value
-        user.remember_me
-        set_session_cookie(user)
-        user
-      end
+  def login_from_cookie
+    if !cookies[:session_token].blank? && user = User.find_by_session_token(cookies[:session_token]) # don't find by empty value
+      user.remember_me
+      set_session_cookie(user)
+      user
     end
+  end
 
-    def login_from_http
-      if [Mime[:xml], Mime[:json]].include?(request.format)
-        authenticate_with_http_basic do |user_name, password|
-          User.authenticate(user_name, password)
-        end
+  def login_from_http
+    if [Mime[:xml], Mime[:json]].include?(request.format)
+      authenticate_with_http_basic do |user_name, password|
+        User.authenticate(user_name, password)
       end
     end
+  end
 
-    def set_session_cookie(user = current_user)
-      cookies[:session_token] = { :value => user.session_token , :expires => (Time.now + ((TrustyCms::Config['session_timeout'].to_i)/86400).days).utc }
-    end
+  def set_session_cookie(user = current_user)
+    cookies[:session_token] = { value: user.session_token, expires: (Time.now + (TrustyCms::Config['session_timeout'].to_i / 86400).days).utc }
+  end
 
   module ClassMethods
-
     def login_required?
-      filter_chain.any? {|f| f.method == :authenticate || f.method == :authorize }
+      filter_chain.any? { |f| f.method == :authenticate || f.method == :authorize }
     end
 
     def login_required
@@ -99,7 +100,7 @@ module LoginSystem
 
     def only_allow_access_to(*args)
       options = {}
-      options = args.pop.dup if args.last.kind_of?(Hash)
+      options = args.pop.dup if args.last.is_a?(Hash)
       options.symbolize_keys!
       actions = args.map { |a| a.to_s.intern }
       actions.each do |action|
@@ -108,16 +109,15 @@ module LoginSystem
     end
 
     def controller_permissions
-      @controller_permissions ||= Hash.new { |h,k| h[k.to_s.intern] = Hash.new }
+      @controller_permissions ||= Hash.new { |h, k| h[k.to_s.intern] = Hash.new }
     end
 
-    def user_has_access_to_action?(user, action, instance=new)
+    def user_has_access_to_action?(user, action, instance = new)
       permissions = controller_permissions[action.to_s.intern]
-      case
-      when allowed_roles = permissions[:when]
+      if allowed_roles = permissions[:when]
         allowed_roles = [allowed_roles].flatten
         user.present? ? allowed_roles.any? { |role| user.has_role?(role) } : false
-      when condition_method = permissions[:if]
+      elsif condition_method = permissions[:if]
         instance.send(condition_method)
       else
         true