active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/data_structures/set.rb

@@ -9,25 +9,25 @@ module ActiveScaffold::DataStructures
 
     def set_values(*args)
       @set = []
-      self.add *args
+      add *args
     end
 
     # the way to add items to the set.
     def add(*args)
       args.flatten! # allow [] as a param
-      args.each { |arg|
+      args.each do |arg|
         arg = arg.to_sym if arg.is_a? String
         @set << arg unless @set.include? arg # avoid duplicates
-      }
+      end
     end
     alias_method :<<, :add
 
     # the way to remove items from the set.
     def exclude(*args)
       args.flatten! # allow [] as a param
-      args.collect! { |a| a.to_sym } # symbolize the args
+      args.collect!(&:to_sym) # symbolize the args
       # check respond_to? :to_sym, ActionColumns doesn't respond to to_sym
-      @set.reject! { |c| c.respond_to? :to_sym and args.include? c.to_sym } # reject all items specified
+      @set.reject! { |c| c.respond_to?(:to_sym) && args.include?(c.to_sym) } # reject all items specified
     end
     alias_method :remove, :exclude
 
@@ -45,17 +45,16 @@ module ActiveScaffold::DataStructures
     alias_method :[], :find_by_name
 
     def each
-      @set.each {|i| yield i }
+      @set.each { |i| yield i }
     end
 
     # returns the number of items in the set
     def length
       @set.length
     end
-    
+
     def empty?
       @set.empty?
     end
-
   end
 end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -4,43 +4,37 @@ module ActiveScaffold::DataStructures
     include Enumerable
 
     attr_accessor :constraint_columns
-    attr_accessor :sorting_by_primary_key
+    attr_accessor :sorting_by_primary_key # enabled by default for postgres
 
     def initialize(columns)
       @columns = columns
       @clauses = []
       @constraint_columns = []
     end
-    
-    def set_default_sorting(model)
-      model_scope = model.send(:build_default_scope)
-      order_clause = model_scope.order_values.join(",") if model_scope
 
+    def set_default_sorting(model)
       # fallback to setting primary key ordering
-      if model.column_names.include?(model.primary_key)
-        set([model.primary_key, 'ASC'])
-        @primary_key_clause = clause
-        @sorting_by_primary_key = model.connection.try(:adapter_name) == 'PostgreSQL' # mandatory for postgres, so enabled by default
-      end
+      setup_primary_key_order_clause(model)
+      model_scope = model.send(:build_default_scope)
+      order_clause = model_scope.order_values.join(',') if model_scope
+      return unless order_clause
       # If an ORDER BY clause is found set default sorting according to it
-      if order_clause
-        set_sorting_from_order_clause(order_clause, model.table_name)
-        @default_sorting = true
-      end
+      set_sorting_from_order_clause(order_clause, model.table_name)
+      @default_sorting = true
     end
 
     def set_nested_sorting(table_name, order_clause)
       clear
       set_sorting_from_order_clause(order_clause, table_name)
     end
-    
+
     # add a clause to the sorting, assuming the column is sortable
     def add(column_name, direction = nil)
       direction ||= 'ASC'
       direction = direction.to_s.upcase
       column = get_column(column_name)
       raise ArgumentError, "Could not find column #{column_name}" if column.nil?
-      raise ArgumentError, "Sorting direction unknown" unless [:ASC, :DESC].include? direction.to_sym
+      raise ArgumentError, 'Sorting direction unknown' unless [:ASC, :DESC].include? direction.to_sym
       @clauses << [column, direction.untaint] if column.sortable?
       raise ArgumentError, "Can't mix :method- and :sql-based sorting" if mixed_sorting?
     end
@@ -59,7 +53,7 @@ module ActiveScaffold::DataStructures
       clear
       if args.first.is_a?(Enumerable)
         args.each do |h|
-          h.is_a?(Hash) ? h.each { |c,d| add(c,d) } : add(*h)
+          h.is_a?(Hash) ? h.each { |c, d| add(c, d) } : add(*h)
         end
       else
         add(*args)
@@ -83,8 +77,8 @@ module ActiveScaffold::DataStructures
       clause[1]
     end
 
-    SORTING_STAGES = Hash[%w(reset ASC DESC reset).each_cons(2).map{|a|a}].freeze
-    DEFAULT_SORTING_STAGES = Hash[%w(ASC DESC ASC).each_cons(2).map{|a|a}].freeze
+    SORTING_STAGES = Hash[%w(reset ASC DESC reset).each_cons(2).to_a].freeze
+    DEFAULT_SORTING_STAGES = Hash[%w(ASC DESC ASC).each_cons(2).to_a].freeze
     def next_sorting_of(column, sorted_by_default)
       stages = sorted_by_default ? DEFAULT_SORTING_STAGES : SORTING_STAGES
       stages[direction_of(column)] || 'ASC'
@@ -92,11 +86,11 @@ module ActiveScaffold::DataStructures
 
     # checks whether any column is configured to sort by method (using a proc)
     def sorts_by_method?
-      @clauses.any? { |sorting| sorting[0].sort.is_a? Hash and sorting[0].sort.has_key? :method }
+      @clauses.any? { |sorting| sorting[0].sort.is_a?(Hash) && sorting[0].sort.key?(:method) }
     end
 
     def sorts_by_sql?
-      @clauses.any? { |sorting| sorting[0].sort.is_a? Hash and sorting[0].sort.has_key? :sql }
+      @clauses.any? { |sorting| sorting[0].sort.is_a?(Hash) && sorting[0].sort.key?(:sql) }
     end
 
     # iterate over the clauses
@@ -118,12 +112,12 @@ module ActiveScaffold::DataStructures
       each do |sort_column, sort_direction|
         next if constraint_columns.include? sort_column.name
         sql = sort_column.sort[:sql]
-        next if sql.nil? or sql.empty?
+        next if sql.nil? || sql.empty?
 
-        order << Array(sql).map {|column| "#{column} #{sort_direction}"}.join(', ')
+        order << Array(sql).map { |column| "#{column} #{sort_direction}" }.join(', ')
       end
 
-      order << @primary_key_clause if @sorting_by_primary_key
+      order << @primary_key_order_clause if @sorting_by_primary_key
       order unless order.empty?
     end
 
@@ -132,7 +126,7 @@ module ActiveScaffold::DataStructures
     # retrieves the sorting clause for the given column
     def get_clause(column)
       column = get_column(column)
-      @clauses.find{ |clause| clause[0] == column}
+      @clauses.find { |clause| clause[0] == column }
     end
 
     # possibly converts the given argument into a column object from @columns (if it's not already)
@@ -141,13 +135,13 @@ module ActiveScaffold::DataStructures
       return name_or_column if name_or_column.is_a? ActiveScaffold::DataStructures::Column
       # it's a name
       name_or_column = name_or_column.to_s.split('.').last if name_or_column.to_s.include? '.'
-      return @columns[name_or_column]
+      @columns[name_or_column]
     end
 
     def mixed_sorting?
-      sorts_by_method? and sorts_by_sql?
+      sorts_by_method? && sorts_by_sql?
     end
-    
+
     def default_sorting?
       @default_sorting
     end
@@ -161,20 +155,20 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     def extract_order_parts(criterion_parts)
       column_name_part, direction_part = criterion_parts.strip.split(' ')
       column_name_parts = column_name_part.split('.')
       order = {:direction => extract_direction(direction_part),
-        :column_name => remove_quotes(column_name_parts.last)}
+               :column_name => remove_quotes(column_name_parts.last)}
       order[:table_name] = remove_quotes(column_name_parts[-2]) if column_name_parts.length >= 2
       order
     end
-    
+
     def different_table?(model_table_name, order_table_name)
       !order_table_name.nil? && model_table_name != order_table_name
     end
-    
+
     def remove_quotes(sql_name)
       if sql_name.starts_with?('"') || sql_name.starts_with?('`')
         sql_name[1, (sql_name.length - 2)]
@@ -182,7 +176,7 @@ module ActiveScaffold::DataStructures
         sql_name
       end
     end
-    
+
     def extract_direction(direction_part)
       if direction_part.to_s.upcase == 'DESC'
         'DESC'
@@ -190,5 +184,16 @@ module ActiveScaffold::DataStructures
         'ASC'
       end
     end
+
+    def postgres?(model)
+      model.connection.try(:adapter_name) == 'PostgreSQL'
+    end
+
+    def setup_primary_key_order_clause(model)
+      return unless model.column_names.include?(model.primary_key)
+      set([model.primary_key, 'ASC'])
+      @primary_key_order_clause = clause
+      @sorting_by_primary_key = postgres?(model) # mandatory for postgres, so enabled by default
+    end
   end
 end

data/lib/active_scaffold/delayed_setup.rb

@@ -8,17 +8,16 @@ module ActiveScaffold
       self.class.config_active_scaffold_delayed
       super
     end
-    
+
     module ClassMethods
       def active_scaffold(model_id = nil, &block)
-        @active_scaffold_delayed = proc{ super(model_id, &block) }
+        @active_scaffold_delayed = proc { super(model_id, &block) }
       end
 
       def config_active_scaffold_delayed
-        if @active_scaffold_delayed
-          block, @active_scaffold_delayed = @active_scaffold_delayed, nil
-          block.call
-        end
+        return unless @active_scaffold_delayed
+        block, @active_scaffold_delayed = @active_scaffold_delayed, nil
+        block.call
       end
 
       def active_scaffold_config

data/lib/active_scaffold/engine.rb

@@ -1,22 +1,23 @@
 module ActiveScaffold
   class Engine < ::Rails::Engine
-    initializer "active_scaffold.action_controller" do |app|
+    initializer 'active_scaffold.action_controller' do
       ActiveSupport.on_load :action_controller do
         include ActiveScaffold::Core
         include ActiveScaffold::DelayedSetup if ActiveScaffold.delayed_setup
         include ActiveScaffold::RespondsToParent
         include ActiveScaffold::Helpers::ControllerHelpers
         include ActiveScaffold::ActiveRecordPermissions::ModelUserAccess::Controller
+        ActiveScaffold::Bridges.prepare_all
       end
     end
 
-    initializer "active_scaffold.action_view" do |app|
+    initializer 'active_scaffold.action_view' do
       ActiveSupport.on_load :action_view do
         include ActiveScaffold::Helpers::ViewHelpers
       end
     end
 
-    initializer "active_scaffold.active_record" do |app|
+    initializer 'active_scaffold.active_record' do
       ActiveSupport.on_load :active_record do
         include ActiveScaffold::ActiveRecordPermissions::ModelUserAccess::Model
         ActiveRecord::Associations::Association.send :include, ActiveScaffold::Tableless::Association
@@ -24,6 +25,5 @@ module ActiveScaffold
         ActiveRecord::Associations::SingularAssociation.send :include, ActiveScaffold::Tableless::SingularAssociation
       end
     end
-
   end
 end

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -2,12 +2,12 @@
 module ActionController #:nodoc:
   class Base
     def render_with_active_scaffold(*args, &block)
-      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil? and request.xhr?
+      if self.class.uses_active_scaffold? && params[:adapter] && @rendering_adapter.nil? && request.xhr?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
-        opts = args.blank? ? Hash.new : args.first
+        opts = args.blank? ? {} : args.first
         render :partial => params[:adapter][1..-1],
-        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
+               :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
                :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else
@@ -17,4 +17,3 @@ module ActionController #:nodoc:
     alias_method_chain :render, :active_scaffold
   end
 end
-

data/lib/active_scaffold/extensions/action_controller_rescueing.rb

@@ -2,7 +2,7 @@ module ActionController #:nodoc:
   class Base
     # adding to ActionController::Base so it can overrided in ApplicationController
     def deny_access
-      head :unauthorized
+      head :forbidden # better for action or record not allowed, according to RFC 7231
     end
   end
 end

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -1,7 +1,7 @@
 module ActionView
   class LookupContext
     attr_accessor :last_template
-    
+
     def find_template_with_last_template(name, prefixes = [], partial = false, keys = [], options = {})
       self.last_template = find_template_without_last_template(name, prefixes, partial, keys, options)
     end
@@ -35,7 +35,7 @@ module ActionView::Helpers #:nodoc:
     # Defining options[:label] lets you completely customize the list title for the embedded scaffold.
     #
     def render_with_active_scaffold(*args, &block)
-      if args.first.is_a? Hash and args.first[:active_scaffold]
+      if args.first.is_a?(Hash) && args.first[:active_scaffold]
         require 'digest/md5'
         options = args.first
 
@@ -45,7 +45,7 @@ module ActionView::Helpers #:nodoc:
         eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
         eid_info = session["as:#{eid}"] ||= {}
         if constraints
-          eid_info['constraints'] = constraints 
+          eid_info['constraints'] = constraints
         else
           eid_info.delete 'constraints'
         end
@@ -99,7 +99,7 @@ module ActionView::Helpers #:nodoc:
         else
           options[:prefixes] = ['active_scaffold_overrides']
           last_view_path = File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
-          lookup_context.view_paths = view_paths.drop(view_paths.find_index {|path| path.to_s == last_view_path} + 1)
+          lookup_context.view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
         end
         result = render_without_active_scaffold options
         lookup_context.view_paths = @_view_paths if @_view_paths
@@ -121,10 +121,9 @@ module ActionView::Helpers #:nodoc:
       end
     end
     alias_method_chain :render, :active_scaffold
-    
+
     def view_stack
       @_view_stack ||= []
     end
-
   end
 end

data/lib/active_scaffold/extensions/left_outer_joins.rb

@@ -14,7 +14,7 @@ module ActiveScaffold
         relation = clone
 
         args.flatten!
-        relation.joins_values += [''] # HACK for using outer_joins in update_all/delete_all
+        relation.joins_values += [''] # HACK: for using outer_joins in update_all/delete_all
         relation.outer_joins_values += args
 
         relation
@@ -30,12 +30,12 @@ module ActiveScaffold
       end
 
       def outer_joins(*args)
-        check_if_method_has_arguments!("outer_joins", args)
+        check_if_method_has_arguments!('outer_joins', args)
         spawn.outer_joins!(*args.compact.flatten)
       end
 
       def outer_joins!(*args)
-        self.joins_values += [''] # HACK for using outer_joins in update_all/delete_all
+        self.joins_values += [''] # HACK: for using outer_joins in update_all/delete_all
         self.outer_joins_values += args
         self
       end
@@ -43,25 +43,25 @@ module ActiveScaffold
 
     if Rails.version < '4.1'
       def build_arel
-        unless outer_joins_values.empty?
-          relation = self.except(:outer_joins)
+        if outer_joins_values.empty?
+          super
+        else
+          relation = except(:outer_joins)
           join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, outer_joins_values, [])
           join_dependency.join_associations.each do |association|
             relation = association.join_relation(relation)
           end
           relation.build_arel
-        else
-          super
         end
       end
     else
       def build_arel
-        unless outer_joins_values.empty?
-          relation = self.except(:outer_joins)
+        if outer_joins_values.empty?
+          super
+        else
+          relation = except(:outer_joins)
           relation.joins! ActiveRecord::Associations::JoinDependency.new(@klass, outer_joins_values, [])
           relation.build_arel
-        else
-          super
         end
       end
     end

data/lib/active_scaffold/extensions/localize.rb

@@ -4,7 +4,7 @@ class Object
       text = I18n.translate("#{key}", {:scope => [:active_scaffold, *options.delete(:scope)], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)).html_safe
       # text = nil if text.include?('translation missing:')
     end
-    text ||= key 
+    text ||= key
     text
   end
 end

data/lib/active_scaffold/extensions/name_option_for_datetime.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module DateSelectExtension
     def datetime_selector_with_name(options, html_options)
-      options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
+      options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/, '')) if options[:name]
       datetime_selector_without_name(options, html_options)
     end
     def self.included(base)

data/lib/active_scaffold/extensions/paginator_extensions.rb

@@ -1,13 +1,12 @@
 require 'active_scaffold/paginator'
 
 class Paginator
-
   # Total number of pages
   def number_of_pages_with_infinite
     number_of_pages_without_infinite if @count
   end
   alias_method_chain :number_of_pages, :infinite
-  
+
   # Is this an "infinite" paginator
   def infinite?
     @count.nil?
@@ -16,7 +15,7 @@ class Paginator
   def count
     @count || first.items.size
   end
-  
+
   class Page
     # Checks to see if there's a page after this one
     def next_with_infinite?
@@ -33,6 +32,4 @@ class Paginator
       end
     end
   end
-
 end
-