trusty-cms 4.0.2 → 4.1.4

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

data/lib/method_observer.rb

@@ -1,5 +1,4 @@
 class MethodObserver
-
   attr_reader :target
   attr_accessor :result
 
@@ -11,6 +10,7 @@ class MethodObserver
 
   def observe(target)
     raise ObserverCannotObserveTwiceError if @target
+
     @target = target
     make_observable(target)
   end
@@ -26,25 +26,26 @@ class MethodObserver
   end
 
   private
-    def make_observable(target)
-      methods_to_observe.each do |method|
-        target.instance_eval %{
+
+  def make_observable(target)
+    methods_to_observe.each do |method|
+      target.instance_eval %{
           def #{method}(*args, &block)
-            observer = #{self.class}.instances[#{self.object_id}]
+            observer = #{self.class}.instances[#{object_id}]
             observer.send(:before_#{method}, *args, &block) if observer.respond_to? :before_#{method}
             observer.result = super
             observer.send(:after_#{method}, *args, &block) if observer.respond_to? :after_#{method}
             observer.result
           end
         }
-      end
     end
+  end
 
-    def methods_to_observe
-      (methods_for(:before) + methods_for(:after)).uniq
-    end
+  def methods_to_observe
+    (methods_for(:before) + methods_for(:after)).uniq
+  end
 
-    def methods_for(name)
-      methods.grep(/^#{name}_/).map { |n| n.to_s.gsub(/^#{name}_/, '').intern }
-    end
+  def methods_for(name)
+    methods.grep(/^#{name}_/).map { |n| n.to_s.gsub(/^#{name}_/, '').intern }
+  end
 end

data/lib/ostruct.rb

@@ -2,22 +2,19 @@
 # See more here: http://stackoverflow.com/questions/39278864/openstruct-issue-with-ruby-2-3-1/39280374#39280374
 
 class OpenStruct
-
-  def initialize(hash=nil)
+  def initialize(hash = nil)
     @table = {}
-    if hash
-      hash.each_pair do |k, v|
-        k = k.to_sym
-        @table[k] = v
-        new_ostruct_member(k)
-      end
+    hash&.each_pair do |k, v|
+      k = k.to_sym
+      @table[k] = v
+      new_ostruct_member(k)
     end
   end
 
   def modifiable
     begin
       @modifiable = true
-    rescue
+    rescue StandardError
       raise RuntimeError, "can't modify frozen #{self.class}", caller(3)
     end
     @table
@@ -41,6 +38,7 @@ class OpenStruct
       if len != 1
         raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
       end
+
       modifiable[new_ostruct_member(mname)] = args[0]
     elsif len == 0
       @table[mid]
@@ -50,5 +48,4 @@ class OpenStruct
       raise err
     end
   end
-
 end

data/lib/simpleton.rb

@@ -1,11 +1,9 @@
 module Simpleton
-
   def self.included(base)
     base.extend(ClassMethods)
   end
 
   module ClassMethods
-
     def instance(&block)
       @instance ||= new
       block.call(@instance) if block_given?
@@ -15,7 +13,5 @@ module Simpleton
     def method_missing(method, *args, &block)
       instance.respond_to?(method) ? instance.send(method, *args, &block) : super
     end
-
   end
-
 end

data/lib/string_extensions/string_extensions.rb

@@ -2,15 +2,15 @@ require 'stringex'
 
 class String
   def symbolize
-    self.gsub(/[^A-Za-z0-9]+/, "_").gsub(/(^_+|_+$)/, "").underscore.to_sym
+    gsub(/[^A-Za-z0-9]+/, '_').gsub(/(^_+|_+$)/, '').underscore.to_sym
   end
 
   def titlecase
-    self.gsub(/((?:^|\s)[a-z])/) { $1.to_s.upcase }
+    gsub(/((?:^|\s)[a-z])/) { $1.to_s.upcase }
   end
 
   def to_name(last_part = '')
-    self.underscore.gsub('/', ' ').humanize.titlecase.gsub(/\s*#{last_part}$/, '')
+    underscore.gsub('/', ' ').humanize.titlecase.gsub(/\s*#{last_part}$/, '')
   end
 
   unless methods.include?('parameterize')

data/lib/symbol_extensions/symbol_extensions.rb

@@ -1,5 +1,5 @@
 class Symbol
   def symbolize
-    self.to_s.symbolize
+    to_s.symbolize
   end
 end

data/lib/tasks/database.rake

@@ -1,44 +1,44 @@
 namespace :db do
-  desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
-  task :remigrate => :environment do
+  desc 'Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!'
+  task remigrate: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{TRUSTY_CMS_ROOT}/db/migrate/", 0)
 
       # Migrate upward
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
 
       # Dump the schema
-      Rake::Task["db:schema:dump"].invoke
+      Rake::Task['db:schema:dump'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  task :remigrate => :environment do
+  task remigrate: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{TRUSTY_CMS_ROOT}/db/migrate/", 0)
 
       # Migrate upward
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
 
       # Dump the schema
-      Rake::Task["db:schema:dump"].invoke
+      Rake::Task['db:schema:dump'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  task :initialize => :environment do
+  task initialize: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # We need to erase and remove all existing trusty-cms tables, but we don't want to
       # assume that the administrator has access to drop and create the database.
@@ -48,21 +48,21 @@ namespace :db do
       ActiveRecord::Base.connection.tables.each do |table|
         ActiveRecord::Migration[5.2].drop_table table
       end
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  desc "Bootstrap your database for TrustyCms."
-  task :bootstrap => :initialize do
+  desc 'Bootstrap your database for TrustyCms.'
+  task bootstrap: :initialize do
     require 'trusty_cms/setup'
     TrustyCms::Setup.bootstrap(
-      :admin_name => ENV['ADMIN_NAME'],
-      :admin_username => ENV['ADMIN_USERNAME'],
-      :admin_password => ENV['ADMIN_PASSWORD'],
-      :database_template => ENV['DATABASE_TEMPLATE']
+      admin_name: ENV['ADMIN_NAME'],
+      admin_username: ENV['ADMIN_USERNAME'],
+      admin_password: ENV['ADMIN_PASSWORD'],
+      database_template: ENV['DATABASE_TEMPLATE'],
     )
     puts %{
 Your TrustyCms application is ready to use. Run `rails s -e production` to
@@ -78,16 +78,16 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
 }
   end
 
-  desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
-  task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
-    ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+  desc 'Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false.'
+  task migrate: [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
+    ActiveRecord::Migration[5.2].verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
+    Rake::Task['db:schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
   namespace :migrate do
-    desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
-    task :trusty_cms => :environment do
-      ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    desc 'Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply.'
+    task trusty_cms: :environment do
+      ActiveRecord::Migration[5.2].verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
       Rake::Task['db:migrate'].invoke
     end
   end