active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module PaginationHelpers
       def pagination_ajax_link(page_number, url_options, options)
-        link_to page_number, url_options.merge(:page => page_number), options.merge(:class => "as_paginate")
+        link_to page_number, url_options.merge(:page => page_number), options.merge(:class => 'as_paginate')
       end
 
       def pagination_url_options(url_options = nil)
@@ -40,18 +40,18 @@ module ActiveScaffold
         if current_page.pager.infinite?
           offsets.reverse.each do |offset|
             page = current_page.number - offset
-            if page < start_number && page > last_page
-              html << '..' if page > last_page + 1
-              html << pagination_ajax_link(page, url_options, options)
-              last_page = page
-            end
+            next unless page < start_number && page > last_page
+
+            html << '..' if page > last_page + 1
+            html << pagination_ajax_link(page, url_options, options)
+            last_page = page
           end
         end
-        html << ".." if start_number > last_page + 1
+        html << '..' if start_number > last_page + 1
 
         [start_number, last_page + 1].max.upto(end_number) do |num|
           if current_page.number == num
-            html << content_tag(:span, num.to_s, {:class => "as_paginate current"})
+            html << content_tag(:span, num.to_s, :class => 'as_paginate current')
           else
             html << pagination_ajax_link(num, url_options, options)
           end
@@ -62,7 +62,7 @@ module ActiveScaffold
             html << '..' << pagination_ajax_link(current_page.number + offset, url_options, options)
           end
         else
-          html << ".." unless end_number >= current_page.pager.last.number - outer_window - 1
+          html << '..' unless end_number >= current_page.pager.last.number - outer_window - 1
           [end_number + 1, current_page.pager.last.number - outer_window].max.upto(current_page.pager.last.number) do |num|
             html << pagination_ajax_link(num, url_options, options)
           end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -7,19 +7,19 @@ module ActiveScaffold
       def active_scaffold_search_for(column, options = nil)
         options ||= active_scaffold_search_options(column)
         record = options[:object]
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
 
         # first, check if the dev has created an override for this specific field for search
         if (method = override_search_field(column))
           send(method, record, options)
 
         # second, check if the dev has specified a valid search_ui for this column, using specific ui for searches
-        elsif column.search_ui and (method = override_search(column.search_ui))
+        elsif column.search_ui && (method = override_search(column.search_ui))
           send(method, column, options)
 
         # third, check if the dev has specified a valid search_ui for this column, using generic ui for forms
-        elsif column.search_ui and (method = override_input(column.search_ui))
+        elsif column.search_ui && (method = override_input(column.search_ui))
           send(method, column, options)
 
         # fourth, check if the dev has created an override for this specific field
@@ -28,7 +28,7 @@ module ActiveScaffold
 
         # fallback: we get to make the decision
         else
-          if column.association or column.virtual?
+          if column.association || column.virtual?
             active_scaffold_search_text(column, options)
 
           else # regular model attribute column
@@ -47,41 +47,41 @@ module ActiveScaffold
             end
           end
         end
-      rescue Exception => e
+      rescue StandardError => e
         logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
         raise e
       end
 
       # the standard active scaffold options used for class, name and scope
       def active_scaffold_search_options(column)
-        { :name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name] }
+        {:name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name]}
       end
 
       def search_attribute(column, record)
         column_options = active_scaffold_search_options(column).merge(:object => record)
         field = active_scaffold_search_for column, column_options
-        %|<dl><dt>#{label_tag search_label_for(column, column_options), search_column_label(column, record)}</dt><dd>#{field}</dd></dl>|.html_safe
+        %(<dl><dt>#{label_tag search_label_for(column, column_options), search_column_label(column, record)}</dt><dd>#{field}</dd></dl>).html_safe
       end
 
       def search_label_for(column, options)
         options[:id] unless [:range, :integer, :decimal, :float, :string, :date_picker, :datetime_picker, :calendar_date_select].include? column.search_ui
       end
-      
+
       ##
       ## Search input methods
       ##
 
       def active_scaffold_search_multi_select(column, options)
         record = options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         associated = options.delete :value
         associated = [associated].compact unless associated.is_a? Array
         associated.collect!(&:to_i)
-        
+
         if column.association
           method = column.options[:label_method] || :to_label
-          select_options = sorted_association_options_find(column.association, nil, record).collect {|r| [r.send(method), r.id]}
+          select_options = sorted_association_options_find(column.association, nil, record).collect { |r| [r.send(method), r.id] }
         else
           select_options = column.options[:options].collect do |text, value|
             active_scaffold_translated_option(column, text, value)
@@ -94,8 +94,8 @@ module ActiveScaffold
 
       def active_scaffold_search_select(column, html_options, options = {})
         record = html_options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         associated = html_options.delete :value
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
@@ -113,10 +113,10 @@ module ActiveScaffold
         if html_options[:multiple]
           html_options[:name] += '[]'
         else
-          options[:include_blank] ||= as_(:_select_) 
+          options[:include_blank] ||= as_(:_select_)
         end
-        
-        if optgroup = options.delete(:optgroup)
+
+        if (optgroup = options.delete(:optgroup))
           select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
         elsif column.association
           collection_select(:record, method, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
@@ -141,18 +141,18 @@ module ActiveScaffold
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
-      
+
       def active_scaffold_search_null(column, options)
         select_options = []
         select_options << [as_(:_select_), nil]
-        select_options.concat ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp), comp]}
+        select_options.concat ActiveScaffold::Finder::NULL_COMPARATORS.collect { |comp| [as_(comp), comp] }
         select_tag(options[:name], options_for_select(select_options, options[:value]), :id => options[:id])
       end
 
       def field_search_params_range_values(column)
         values = field_search_params[column.name]
         return nil unless values.is_a? Hash
-        return values[:opt], (values[:from].blank? ? nil : values[:from]), (values[:to].blank? ? nil : values[:to])
+        [values[:opt], (values[:from].blank? ? nil : values[:from]), (values[:to].blank? ? nil : values[:to])]
       end
 
       def active_scaffold_search_range_string?(column)
@@ -160,18 +160,18 @@ module ActiveScaffold
       end
 
       def active_scaffold_search_range_comparator_options(column)
-        select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
+        select_options = ActiveScaffold::Finder::NUMERIC_COMPARATORS.collect { |comp| [as_(comp.downcase.to_sym), comp] }
         if active_scaffold_search_range_string?(column)
-          select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]}
+          select_options.unshift *ActiveScaffold::Finder::STRING_COMPARATORS.collect { |title, comp| [as_(title), comp] }
         end
         if include_null_comparators? column
-          select_options += ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp), comp]}
+          select_options += ActiveScaffold::Finder::NULL_COMPARATORS.collect { |comp| [as_(comp), comp] }
         end
         select_options
       end
 
       def include_null_comparators?(column)
-        return column.options[:null_comparators] if column.options.has_key? :null_comparators
+        return column.options[:null_comparators] if column.options.key? :null_comparators
         if column.association
           column.association.macro != :belongs_to || active_scaffold_config.columns[column.association.foreign_key].column.try(:null)
         else
@@ -190,20 +190,22 @@ module ActiveScaffold
           text_field_size = 10
           opt_value ||= '='
         end
-        
+
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, column.options) if from_value.is_a?(Numeric)
         to_value = format_number_value(to_value, column.options) if to_value.is_a?(Numeric)
-        html = select_tag("#{options[:name]}[opt]",
-              options_for_select(select_options, opt_value),
-              :id => "#{options[:id]}_opt",
-              :class => "as_search_range_option")
-        html << content_tag("span", :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NullComparators.include?(opt_value) ? "display: none" : nil) do
+        html = select_tag("#{options[:name]}[opt]", options_for_select(select_options, opt_value),
+                          :id => "#{options[:id]}_opt", :class => 'as_search_range_option')
+        html << content_tag('span', :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NULL_COMPARATORS.include?(opt_value) ? 'display: none' : nil) do
           text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => text_field_size)) <<
-          content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
-              active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => (opt_value == 'BETWEEN') ? nil : "display: none")
+            content_tag(
+              :span, (
+                ' - ' + text_field_tag("#{options[:name]}[to]", to_value,
+                                       active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))
+              ).html_safe,
+              :id => "#{options[:id]}_between", :class => 'as_search_range_between', :style => (opt_value == 'BETWEEN') ? nil : 'display: none'
+            )
         end
         content_tag :span, html, :class => 'search_range'
       end
@@ -215,19 +217,20 @@ module ActiveScaffold
       def field_search_datetime_value(value)
         DateTime.new(value[:year].to_i, value[:month].to_i, value[:day].to_i, value[:hour].to_i, value[:minute].to_i, value[:second].to_i) unless value.nil? || value[:year].blank?
       end
-      
+
       def active_scaffold_search_datetime(column, options)
-        opt_value, from_value, to_value = field_search_params_range_values(column)
+        _, from_value, to_value = field_search_params_range_values(column)
         options = column.options.merge(options)
         helper = "select_#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
-        
-        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) << 
-        ' - '.html_safe << send(helper, field_search_datetime_value(to_value), {:include_blank => true, :prefix => "#{options[:name]}[to]"}.merge(options))
+
+        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) <<
+          ' - '.html_safe << send(helper, field_search_datetime_value(to_value), {:include_blank => true, :prefix => "#{options[:name]}[to]"}.merge(options))
       end
 
       def active_scaffold_search_date(column, options)
         active_scaffold_search_datetime(column, options.merge!(:discard_time => true))
       end
+
       def active_scaffold_search_time(column, options)
         active_scaffold_search_datetime(column, options.merge!(:discard_date => true))
       end
@@ -236,7 +239,7 @@ module ActiveScaffold
       ##
       ## Search column override signatures
       ##
-      
+
       def search_column_label(column, record)
         column.label
       end
@@ -250,9 +253,9 @@ module ActiveScaffold
         method = "active_scaffold_search_#{form_ui}"
         method if respond_to? method
       end
-      
+
       def visibles_and_hiddens(search_config)
-        visibles = [] 
+        visibles = []
         hiddens = []
         search_config.columns.each do |column|
           next unless column.search_sql
@@ -262,9 +265,9 @@ module ActiveScaffold
             visibles << column
           end
         end
-        return visibles, hiddens
+        [visibles, hiddens]
       end
-      
+
       def searched_by?(column)
         value = field_search_params[column.name]
         case value

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -10,10 +10,10 @@ module ActiveScaffold
           # performance of our default formatting. see issue #138.
           send(method, record, column)
         # second, check if the dev has specified a valid list_ui for this column
-        elsif column.list_ui and (method = override_show_column_ui(column.list_ui))
+        elsif column.list_ui && (method = override_show_column_ui(column.list_ui))
           send(method, record, column)
         else
-          if column.column and (method = override_show_column_ui(column.column.type))
+          if column.column && (method = override_show_column_ui(column.column.type))
             send(method, record, column)
           else
             get_column_value(record, column)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -35,12 +35,10 @@ module ActiveScaffold
       ##
 
       def controller_path_for_activerecord(klass)
-        begin
-          controller = active_scaffold_controller_for(klass)
-          controller.controller_path
-        rescue ActiveScaffold::ControllerNotFound
-          controller = nil
-        end
+        controller = active_scaffold_controller_for(klass)
+        controller.controller_path
+      rescue ActiveScaffold::ControllerNotFound
+        nil
       end
 
       # This is the template finder logic, keep it updated with however we find stuff in rails
@@ -52,25 +50,25 @@ module ActiveScaffold
       # Turns [[label, value]] into <option> tags
       # Takes optional parameter of :include_blank
       def option_tags_for(select_options, options = {})
-        select_options.insert(0,[as_(:_select_),nil]) if options[:include_blank]
+        select_options.insert(0, [as_(:_select_), nil]) if options[:include_blank]
         select_options.collect do |option|
           label, value = option[0], option[1]
-          value.nil? ? "<option value="">#{label}</option>" : "<option value=\"#{value}\">#{label}</option>"
+          value.nil? ? '<option value='">#{label}</option>" : "<option value=\"#{value}\">#{label}</option>"
         end
       end
 
       def form_remote_upload_tag(url_for_options = {}, options = {})
         options[:target] = action_iframe_id(url_for_options)
         options[:multipart] ||= true
-        options[:class] = "#{options[:class]} as_remote_upload".strip 
-        output=""
+        options[:class] = "#{options[:class]} as_remote_upload".strip
+        output = ''
         output << form_tag(url_for_options, options)
         (output << "<iframe id='#{action_iframe_id(url_for_options)}' name='#{action_iframe_id(url_for_options)}' style='display:none'></iframe>").html_safe
       end
 
       # a general-use loading indicator (the "stuff is happening, please wait" feedback)
       def loading_indicator_tag(options)
-        image_tag "active_scaffold/indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
+        image_tag 'active_scaffold/indicator.gif', :style => 'visibility:hidden;', :id => loading_indicator_id(options), :alt => 'loading indicator', :class => 'loading-indicator'
       end
 
       # Creates a javascript-based link that toggles the visibility of some element on the page.
@@ -78,7 +76,7 @@ module ActiveScaffold
       # You may also flag whether the other element is visible by default or not, and the initial text will adjust accordingly.
       def link_to_visibility_toggle(id, options = {})
         options[:default_visible] = true if options[:default_visible].nil?
-        options[:hide_label] ||= as_(:hide) 
+        options[:hide_label] ||= as_(:hide)
         options[:show_label] ||= as_(:show_block)
         link_to options[:default_visible] ? options[:hide_label] : options[:show_label], '#', :data => {:show => options[:show_label], :hide => options[:hide_label], :toggable => id}, :style => 'display: none;', :class => 'as-js-button visibility-toggle'
       end
@@ -88,8 +86,7 @@ module ActiveScaffold
       end
 
       def action_link_authorized?(link, *args)
-        security_method = link.security_method_set? || controller.respond_to?(link.security_method, true)
-        authorized = if security_method
+        if link.security_method_set? || controller.respond_to?(link.security_method, true)
           controller.send(link.security_method, *args)
         else
           args.empty? ? true : args.first.authorized_for?(:crud_type => link.crud_type, :action => link.action)
@@ -160,7 +157,7 @@ module ActiveScaffold
           options[:authorized] = false if link.action.nil? || link.controller.nil?
           options.delete :link if link.crud_type == :create
         end
-        if link.action.nil? || (link.type == :member && options.has_key?(:authorized) && !options[:authorized])
+        if link.action.nil? || (link.type == :member && options.key?(:authorized) && !options[:authorized])
           action_link_html(link, nil, {:link => action_link_text(link, options), :class => "disabled #{link.action}#{" #{link.html_options[:class]}" unless link.html_options[:class].blank?}"}, record)
         else
           url = action_link_url(link, record)
@@ -199,7 +196,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        
+
         unless column_link_authorized?(link, link.column, record, associated)
           link.action = nil
           # if action is edit and is not authorized, fallback to show if it's enabled
@@ -212,22 +209,23 @@ module ActiveScaffold
 
       def column_link_authorized?(link, column, record, associated)
         if column.association
-          associated_for_authorized = if column.plural_association? || (associated.respond_to?(:blank?) && associated.blank?)
-            column.association.klass
-          else
-            associated
-          end
+          associated_for_authorized =
+            if column.plural_association? || (associated.respond_to?(:blank?) && associated.blank?)
+              column.association.klass
+            else
+              associated
+            end
           authorized = associated_for_authorized.authorized_for?(:crud_type => link.crud_type)
-          authorized = authorized and record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
+          authorized &&= record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
           authorized
-        else 
+        else
           action_link_authorized?(link, record)
         end
       end
 
       def is_sti_record?(record)
         model = active_scaffold_config.model
-        is_sti_record = record && model.columns_hash.include?(model.inheritance_column) &&
+        record && model.columns_hash.include?(model.inheritance_column) &&
           record[model.inheritance_column].present? && !record.instance_of?(model)
       end
 
@@ -236,9 +234,9 @@ module ActiveScaffold
       end
 
       def cached_action_link_url(link, record)
-        url = (@action_links_urls ||= {})[link.name_to_cache]
-        url ||= begin
-          url_options = action_link_url_options(link, record)
+        @action_links_urls ||= {}
+        @action_links_urls[link.name_to_cache] || begin
+          url_options = cached_action_link_url_options(link, record)
           if cache_action_link_url?(link, record)
             @action_links_urls[link.name_to_cache] = url_for(url_options)
           else
@@ -246,7 +244,7 @@ module ActiveScaffold
           end
         end
       end
-      
+
       def replace_id_params_in_action_link_url(link, record, url)
         url = record ? url.sub('--ID--', record.to_param) : url.clone
         if link.column.try(:singular_association?)
@@ -254,7 +252,7 @@ module ActiveScaffold
           if child_id.present?
             url.sub!('--CHILD_ID--', child_id)
           else
-            url.sub!(/\w+=--CHILD_ID--&?/,'')
+            url.sub!(/\w+=--CHILD_ID--&?/, '')
             url.sub!(/\?$/, '')
           end
         elsif nested?
@@ -262,7 +260,7 @@ module ActiveScaffold
         end
         url
       end
-      
+
       def add_query_string_to_cached_url(link, url)
         query_string, non_nested_query_string = query_string_for_action_links(link)
         nested_params = (!link.nested_link? && non_nested_query_string)
@@ -281,15 +279,14 @@ module ActiveScaffold
       end
 
       def query_string_for_action_links(link)
-        if defined?(@query_string) && link.parameters.none? { |k, v| @query_string_params.include? k }
+        if defined?(@query_string) && link.parameters.none? { |k, _| @query_string_params.include? k }
           return [@query_string, @non_nested_query_string]
         end
         keep = true
         @query_string_params ||= Set.new
-        query_string_for_all = nil
         query_string_options = {}
         non_nested_query_string_options = {}
-        
+
         params_for.except(:controller, :action, :id).each do |key, value|
           @query_string_params << key
           if link.parameters.include? key
@@ -302,7 +299,7 @@ module ActiveScaffold
             query_string_options[key] = value
           end
         end
-        
+
         query_string = query_string_options.to_query if query_string_options.present?
         if non_nested_query_string_options.present?
           non_nested_query_string = "#{'&' if query_string}#{non_nested_query_string_options.to_query}"
@@ -317,11 +314,11 @@ module ActiveScaffold
       def cache_action_link_url_options?(link, record)
         active_scaffold_config.cache_action_link_urls && (link.type == :collection || !link.dynamic_parameters.is_a?(Proc)) && !is_sti_record?(record)
       end
-      
-      def action_link_url_options(link, record)
-        options = (@action_links_url_options ||= {})[link.name_to_cache]
-        options ||= begin
-          options = generate_action_link_url_options(link, record)
+
+      def cached_action_link_url_options(link, record)
+        @action_links_url_options ||= {}
+        @action_links_url_options[link.name_to_cache] || begin
+          options = action_link_url_options(link, record)
           if cache_action_link_url_options?(link, record)
             @action_links_url_options[link.name_to_cache] = options
           end
@@ -329,7 +326,7 @@ module ActiveScaffold
         end
       end
 
-      def generate_action_link_url_options(link, record)
+      def action_link_url_options(link, record)
         url_options = {:action => link.action}
         url_options[:id] = '--ID--' unless record.nil?
         url_options[:controller] = link.controller.to_s if link.controller
@@ -350,16 +347,16 @@ module ActiveScaffold
         url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get
         url_options
       end
-      
+
       def action_link_text(link, options)
         text = image_tag(link.image[:name], :size => link.image[:size], :alt => options[:link] || link.label, :title => options[:link] || link.label) if link.image
         text || options[:link]
       end
-      
+
       def replaced_action_link_url_options(link, record)
-        url = action_link_url_options(link, record)
+        url = cached_action_link_url_options(link, record)
         url[:controller] ||= params[:controller]
-        missing_options, url_options = url.partition{|k,v| v.nil?}
+        missing_options, url_options = url.partition { |_, v| v.nil? }
         replacements = {}
         replacements['--ID--'] = record.id.to_s if record
         if link.column.try(:singular_association?)
@@ -367,26 +364,26 @@ module ActiveScaffold
         elsif nested?
           replacements['--CHILD_ID--'] = params[nested.param_name].to_s
         end
-        url_options.collect! do |k,v|
+        url_options.collect! do |k, v|
           [k.to_s, replacements[v] || v]
         end
         [missing_options, url_options]
       end
-      
+
       def action_link_selected?(link, record)
         missing_options, url_options = replaced_action_link_url_options(link, record)
-        (url_options - params.to_a).blank? && missing_options.all? {|k,v| params[k].nil?}
+        (url_options - params.to_a).blank? && missing_options.all? { |k, _| params[k].nil? }
       end
-      
+
       def action_link_html_options(link, record, options)
         link_id = get_action_link_id(link, record)
         html_options = link.html_options.merge(:class => [link.html_options[:class], link.action.to_s].compact.join(' '))
         html_options[:link] = action_link_text(link, options)
 
-        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
+        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails
         html_options[:method] = link.method if link.method != :get
 
-        html_options[:data] = {}
+        html_options[:data] ||= {}
         html_options[:data][:confirm] = link.confirm(record.try(:to_label)) if link.confirm?
         if link.inline?
           html_options[:class] << ' as_action'
@@ -400,7 +397,7 @@ module ActiveScaffold
           html_options[:class] << ' toggle'
           html_options[:class] << ' active' if action_link_selected?(link, record)
         end
-        
+
         html_options[:target] = '_blank' if link.popup?
         html_options[:id] = link_id
         html_options[:remote] = true unless link.page? || link.popup?
@@ -426,11 +423,11 @@ module ActiveScaffold
             id = "#{column.association.name}-#{record.id}" unless record.nil?
           end
         end
-        id ||= record ? record.id : (nested? ? nested_parent_id : '')
+        id ||= record.try(:id) || (nested? ? nested_parent_id : '')
         action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
         action_link_id(action_id, id)
       end
-      
+
       def action_link_html(link, url, html_options, record)
         label = html_options.delete(:link)
         label ||= link.label
@@ -440,7 +437,7 @@ module ActiveScaffold
           link_to(label, url, html_options)
         end
       end
-      
+
       def url_options_for_nested_link(column, record, link, url_options)
         if column && column.association
           url_options[:parent_scaffold] = controller_path
@@ -457,18 +454,14 @@ module ActiveScaffold
       end
 
       def url_options_for_sti_link(column, record, link, url_options)
-        #need to find out controller of current record type
-        #and set parameters
-        # its quite difficult to detect an sti link
-        # if link.column.nil? we are sure that it is nt an singular association inline autolink
-        # howver that will not work if a sti parent is an singular association inline autolink
-        if link.column.nil?
-          sti_controller_path = controller_path_for_activerecord(record.class)
-          if sti_controller_path
-            url_options[:controller] = sti_controller_path
-            url_options[:parent_sti] = controller_path
-          end
-        end
+        # need to find out controller of current record type and set parameters
+        # it's quite difficult to detect an sti link
+        # if link.column.nil? we are sure that it isn't a singular association inline autolink
+        # however that will not work if a sti parent is a singular association inline autolink
+        return unless link.column.nil?
+        return if (sti_controller_path = controller_path_for_activerecord(record.class)).nil?
+        url_options[:controller] = sti_controller_path
+        url_options[:parent_sti] = controller_path
       end
 
       def list_row_class_method(record)
@@ -498,14 +491,14 @@ module ActiveScaffold
         end
         classes = "#{@_column_classes[column.name]} "
         classes << 'empty ' if column_empty? column_value
-        classes << 'in_place_editor_field ' if inplace_edit?(record, column) or column.list_ui == :marked
+        classes << 'in_place_editor_field ' if inplace_edit?(record, column) || column.list_ui == :marked
         if column.css_class.is_a?(Proc)
           css_class = column.css_class.call(column_value, record)
           classes << css_class unless css_class.nil?
         end
         classes
       end
-      
+
       def column_heading_class(column, sorting)
         classes = "#{column.name}-column_heading "
         classes << "sorted #{sorting.direction_of(column).downcase} " if sorting.sorts_on? column
@@ -515,26 +508,26 @@ module ActiveScaffold
 
       def as_main_div_class
         classes = "active-scaffold active-scaffold-#{controller_id}  #{id_from_controller params[:controller]}-view #{active_scaffold_config.theme}-theme"
-        classes << " as_touch" if touch_device?
+        classes << ' as_touch' if touch_device?
         classes
       end
 
       def column_empty?(column_value)
         empty = column_value.nil?
         empty ||= false != column_value && column_value.blank?
-        empty ||= ['&nbsp;', empty_field_text].include? column_value if String === column_value
-        return empty
+        empty ||= ['&nbsp;', empty_field_text].include? column_value if column_value.is_a? String
+        empty
       end
-      
+
       def empty_field_text
         active_scaffold_config.list.empty_field_text if active_scaffold_config.actions.include?(:list)
       end
 
       def column_calculation(column)
-        unless column.calculate.instance_of? Proc
-          calculate_query.calculate(column.calculate, column.name)
-        else
+        if column.calculate.instance_of? Proc
           column.calculate.call(@records)
+        else
+          calculate_query.calculate(column.calculate, column.name)
         end
       end
 
@@ -548,7 +541,7 @@ module ActiveScaffold
       def format_column_calculation(column, calculation)
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"
       end
- 
+
       def clean_column_name(name)
         name.to_s.gsub('?', '')
       end
@@ -556,7 +549,7 @@ module ActiveScaffold
       def clean_class_name(name)
         name.underscore.gsub('/', '_')
       end
-     
+
       # the naming convention for overriding with helpers
       def override_helper_name(column, suffix, class_prefix = false)
         "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_#{suffix}"
@@ -607,9 +600,11 @@ module ActiveScaffold
         end
 
         objects.compact!
-        count = objects.inject(0) {|sum, object| sum + object.errors.count }
+        count = objects.inject(0) { |sum, object| sum + object.errors.count }
 
-        unless count.zero?
+        if count.zero?
+          ''
+        else
           html = {}
           [:id, :class].each do |key|
             if options.include?(key)
@@ -621,11 +616,12 @@ module ActiveScaffold
           end
           options[:object_name] ||= params.first
 
-          header_message = if options.include?(:header_message)
-            options[:header_message]
-          else
-            as_('errors.template.header', :count => count, :model => options[:object_name].to_s.gsub('_', ' '))
-          end
+          header_message =
+            if options.include?(:header_message)
+              options[:header_message]
+            else
+              as_('errors.template.header', :count => count, :model => options[:object_name].to_s.gsub('_', ' '))
+            end
 
           message = options.include?(:message) ? options[:message] : as_('errors.template.body')
 
@@ -634,11 +630,12 @@ module ActiveScaffold
               options[:list_type] != :br ? content_tag(:li, msg) : msg
             end
           end
-          error_messages = if options[:list_type] == :br
-            error_messages.join('<br/>').html_safe
-          else
-            content_tag(options[:list_type], error_messages.join.html_safe)
-          end
+          error_messages =
+            if options[:list_type] == :br
+              error_messages.join('<br/>').html_safe
+            else
+              content_tag(options[:list_type], error_messages.join.html_safe)
+            end
 
           contents = []
           contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
@@ -646,8 +643,6 @@ module ActiveScaffold
           contents << error_messages
           contents = contents.join.html_safe
           options[:container_tag] ? content_tag(options[:container_tag], contents, html) : contents
-        else
-          ''
         end
       end
     end