active_scaffold 3.5.5 → 3.6.0.pre

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -32,11 +32,11 @@ module ActiveScaffold
           klass = association_klass_scoped(association, klass, record)
           relation = klass.where(conditions)
           column = column_for_association(association, record)
-          if column && column.includes
+          if column&.includes
             include_assoc = column.includes.find { |assoc| assoc.is_a?(Hash) && assoc.include?(association.name) }
             relation = relation.includes(include_assoc[association.name]) if include_assoc
           end
-          if column && column.sort && column.sort[:sql]
+          if column&.sort && column.sort&.dig(:sql)
             relation = relation.order(column.sort[:sql])
           end
           relation = yield(relation) if block_given?
@@ -49,12 +49,12 @@ module ActiveScaffold
       end
 
       def association_klass_scoped(association, klass, record)
-        if nested? && nested.through_association? && nested.child_association.try(:through_reflection) == association
+        if nested? && nested.through_association? && nested.child_association&.through_reflection == association
           # only ActiveRecord associations
           if nested.association.through_reflection.collection?
             nested_parent_record.send(nested.association.through_reflection.name)
           else
-            klass.where(association.association_primary_key => nested_parent_record.send(nested.association.through_reflection.name).try(:id))
+            klass.where(association.association_primary_key => nested_parent_record.send(nested.association.through_reflection.name)&.id)
           end
         else
           klass
@@ -65,7 +65,7 @@ module ActiveScaffold
       def sorted_association_options_find(association, conditions = nil, record = nil)
         options = association_options_find(association, conditions, nil, record)
         column = column_for_association(association, record)
-        unless column && column.try(:sort) && column.sort[:sql]
+        unless column&.sort && column.sort&.dig(:sql)
           method = column.options[:label_method] if column
           options = options.sort_by(&(method || :to_label).to_sym)
         end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -8,13 +8,23 @@ module ActiveScaffold
                           :main_path_to_return, :render_parent_options,
                           :render_parent_action, :nested_singular_association?,
                           :main_form_controller, :build_associated,
-                          :generate_temporary_id, :generated_id
+                          :generate_temporary_id, :generated_id,
+                          :active_scaffold_config_for
           end
         end
       end
 
       include ActiveScaffold::Helpers::IdHelpers
 
+      def active_scaffold_config_for(klass)
+        config = self.class.active_scaffold_config_for(klass)
+        if ActiveScaffold.threadsafe
+          config.user || config.new_user_settings({}, {})
+        else
+          config
+        end
+      end
+
       def generate_temporary_id(record = nil, generated_id = nil)
         (generated_id || (Time.now.to_f * 1000).to_i.to_s).tap do |id|
           (@temporary_ids ||= {})[record.class.name] = id if record

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -66,9 +66,7 @@ module ActiveScaffold
           col_class = col_class.join(' ')
         end
         if readonly && !record.new_record? || !record.authorized_for?(:crud_type => crud_type, :column => column.name)
-          options = active_scaffold_input_options(column, scope).except(:name)
-          options[:class] = "#{options[:class]} #{col_class}" if col_class
-          content_tag :span, get_column_value(record, column), options
+          form_attribute(column, record, scope, true, col_class)
         else
           renders_as = column_renders_as(column)
           html = render_column(column, record, renders_as, scope, false, col_class)
@@ -86,7 +84,7 @@ module ActiveScaffold
 
       # the standard active scaffold options used for textual inputs
       def active_scaffold_input_text_options(options = {})
-        options[:autocomplete] = 'off'
+        options[:autocomplete] ||= 'off'
         options[:class] = "#{options[:class]} text-input".strip
         options
       end
@@ -97,7 +95,7 @@ module ActiveScaffold
         record = options[:object]
 
         # Add some HTML5 attributes for in-browser validation and better user experience
-        if column.required? && (!@disable_required_for_new || scope.nil? || record.try(:persisted?))
+        if column.required? && (!@disable_required_for_new || scope.nil? || record&.persisted?)
           options[:required] = true
         end
         options[:placeholder] = column.placeholder if column.placeholder.present?
@@ -114,18 +112,20 @@ module ActiveScaffold
 
       def current_form_columns(record, scope, subform_controller = nil)
         if scope
-          subform_controller.active_scaffold_config.subform.columns.names
+          subform_controller.active_scaffold_config.subform.columns.visible_columns_names
         elsif %i[new create edit update render_field].include? action_name.to_sym
           # disable update_columns for inplace_edit (GET render_field)
           return if action_name == 'render_field' && request.get?
-          active_scaffold_config.send(record.new_record? ? :create : :update).columns.names
+          active_scaffold_config.send(record.new_record? ? :create : :update).columns.visible_columns_names
         end
       end
 
       def update_columns_options(column, scope, options, force = false)
         record = options[:object]
         subform_controller = controller.class.active_scaffold_controller_for(record.class) if scope
-        form_columns = @main_columns.try(:names) if scope.nil? || subform_controller == controller.class
+        if @main_columns && (scope.nil? || subform_controller == controller.class)
+          form_columns = @main_columns.visible_columns_names
+        end
         form_columns ||= current_form_columns(record, scope, subform_controller)
         if force || (form_columns && column.update_columns && (column.update_columns & form_columns).present?)
           url_params = params_for(:action => 'render_field', :column => column.name, :id => record.to_param)
@@ -134,7 +134,7 @@ module ActiveScaffold
             url_params = url_params.except(:parent_scaffold, :association, nested.param_name)
           end
           if scope
-            url_params[:parent_controller] ||= url_params[:controller].gsub(/^\//, '')
+            url_params[:parent_controller] ||= url_params[:controller].gsub(%r{/^//}, '')
             url_params[:controller] = subform_controller.controller_path
             url_params[:scope] = scope
             url_params[:parent_id] = params[:parent_id] || params[:id]
@@ -189,7 +189,7 @@ module ActiveScaffold
       end
 
       def label_for(column, options)
-        options[:id] unless column.form_ui == :select && column.association.try(:collection?)
+        options[:id] unless column.form_ui == :select && column.association&.collection?
       end
 
       def subform_label(column, hidden)
@@ -205,7 +205,7 @@ module ActiveScaffold
 
       def form_hidden_field(column, record, scope)
         options = active_scaffold_input_options(column, scope)
-        if column.association.try(:collection?)
+        if column.association&.collection?
           associated = record.send(column.name)
           if associated.blank?
             hidden_field_tag options[:name], '', options
@@ -217,7 +217,7 @@ module ActiveScaffold
             safe_join fields, ''
           end
         elsif column.association
-          hidden_field_tag options[:name], record.send(column.name).try(:id), options
+          hidden_field_tag options[:name], record.send(column.name)&.id, options
         else
           hidden_field :record, column.name, options.merge(object: record)
         end
@@ -245,7 +245,7 @@ module ActiveScaffold
       end
 
       def column_show_add_existing(column, record = nil)
-        column.allow_add_existing && options_for_association_count(column.association, record) > 0
+        column.allow_add_existing && options_for_association_count(column.association, record).positive?
       end
 
       def column_show_add_new(column, associated, record)
@@ -263,7 +263,7 @@ module ActiveScaffold
       def active_scaffold_grouped_options(column, select_options, optgroup)
         group_column = active_scaffold_config_for(column.association.klass).columns[optgroup]
         group_label = group_column.options[:label_method] if group_column
-        group_label ||= group_column.try(:association) ? :to_label : :to_s
+        group_label ||= group_column&.association ? :to_label : :to_s
         select_options.group_by(&optgroup.to_sym).collect do |group, options|
           [group.send(group_label), options.collect { |r| [r.send(column.options[:label_method] || :to_label), r.id] }]
         end
@@ -289,7 +289,7 @@ module ActiveScaffold
         select_options.unshift(associated) unless associated.nil? || select_options.include?(associated)
 
         method = column.name
-        options.merge! :selected => associated.try(:id), :include_blank => as_(:_select_), :object => record
+        options.merge! :selected => associated&.id, :include_blank => as_(:_select_), :object => record
 
         html_options.merge!(column.options[:html_options] || {})
         options.merge!(column.options)
@@ -345,7 +345,7 @@ module ActiveScaffold
           link_options['data-update_send_form'] = html_options['data-update_send_form']
           link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
         else
-          scope = html_options[:name].scan(/^record((\[[^\]]*\])*)\[#{column.name}\]/)[0].try(:first) if html_options[:name]
+          scope = html_options[:name].scan(/^record((\[[^\]]*\])*)\[#{column.name}\]/).dig(0, 0) if html_options[:name]
           link_options = update_columns_options(column, scope.presence, link_options, true)
         end
         link_options[:class] = 'refresh-link'
@@ -418,9 +418,9 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_select(column, html_options)
-        if column.association.try :singular?
+        if column.association&.singular?
           active_scaffold_input_singular_association(column, html_options)
-        elsif column.association.try :collection?
+        elsif column.association&.collection?
           active_scaffold_input_plural_association(column, html_options)
         else
           active_scaffold_input_enum(column, html_options)
@@ -430,7 +430,8 @@ module ActiveScaffold
       def active_scaffold_radio_option(option, selected, column, radio_options)
         if column.association
           label_method = column.options[:label_method] || :to_label
-          text, value = [option.send(label_method), option.id]
+          text = option.send(label_method)
+          value = option.id
           checked = {:checked => selected == value}
         else
           text, value = active_scaffold_translated_option(column, *option)
@@ -452,7 +453,7 @@ module ActiveScaffold
             active_scaffold_enum_options(column, record)
           end
 
-        selected = record.send(column.association.name).try(:id) if column.association
+        selected = record.send(column.association.name)&.id if column.association
         radios = options.map do |option|
           active_scaffold_radio_option(option, selected, column, html_options)
         end
@@ -464,7 +465,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_password(column, options)
-        active_scaffold_text_input :password_field, column, options
+        active_scaffold_text_input :password_field, column, options.reverse_merge(autocomplete: 'new-password')
       end
 
       def active_scaffold_input_textarea(column, options)
@@ -519,7 +520,7 @@ module ActiveScaffold
       # A color picker
       def active_scaffold_input_color(column, options)
         options = active_scaffold_input_text_options(options)
-        if column.column.try(:null)
+        if column.column&.null
           no_color = options[:object].send(column.name).nil?
           method = no_color ? :hidden_field : :color_field
           html = content_tag(:label, check_box_tag('disable', '1', no_color, id: nil, name: nil, class: 'no-color') << " #{as_ column.options[:no_color] || :no_color}")
@@ -622,7 +623,7 @@ module ActiveScaffold
       end
 
       def column_scope(column, scope = nil, record = nil)
-        if column.association.try(:collection?)
+        if column.association&.collection?
           "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record)}]"
         else
           "#{scope}[#{column.name}]"
@@ -689,7 +690,7 @@ module ActiveScaffold
               only_odd_valid  = validators.any? { |v| v.options[:odd] }
               only_even_valid = validators.any? { |v| v.options[:even] } unless only_odd_valid
               if !only_integer
-                numerical_constraints[:step] ||= "0.#{'0' * (column.column.scale - 1)}1" if column.column && column.column.scale.to_i > 0
+                numerical_constraints[:step] ||= "0.#{'0' * (column.column.scale - 1)}1" if column.column&.scale.to_i.positive?
               elsif options[:min] && options[:min].respond_to?(:even?) && (only_odd_valid || only_even_valid)
                 numerical_constraints[:step] = 2
                 numerical_constraints[:min] += 1 if only_odd_valid  && options[:min].even?

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -14,8 +14,8 @@ module ActiveScaffold
         nested_parent_record.id
       end
 
-      def nested_id(controller = params[:controller])
-        "#{nested.parent_scaffold.controller_path}-#{nested_parent_id}-#{controller}" if nested?
+      def nested_id(controller = nil)
+        "#{nested.parent_scaffold.controller_path}-#{nested_parent_id}-#{controller || params[:parent_controller] || params[:controller]}" if nested?
       end
 
       def active_scaffold_id

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -11,7 +11,7 @@ module ActiveScaffold
           value = nil
         end
         value = ' '.html_safe if value.nil? || value.blank? # fix for IE 6
-        return value
+        value
       rescue StandardError => e
         logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
         raise e
@@ -249,7 +249,7 @@ module ActiveScaffold
         # we are not using eager loading, cache firsts records in order not to query the database for whole association in a future
         if column.associated_limit.nil?
           logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
-        elsif column.associated_limit > 0
+        elsif column.associated_limit.positive?
           # load at least one record more, is needed to display '...'
           association.target = association.reader.limit(column.associated_limit + 1).select(column.select_associated_columns || "#{association.klass.quoted_table_name}.*").to_a
         elsif @cache_associations
@@ -295,8 +295,10 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         return unless inplace_edit?(active_scaffold_config.model, column) && inplace_edit_cloning?(column)
-        column = column.clone
-        column.options = column.options.clone
+        unless ActiveScaffold.threadsafe
+          column = column.dup
+          column.options = column.options.dup
+        end
         column.form_ui = :select if column.association && column.form_ui.nil?
         options = active_scaffold_input_options(column).merge(:object => column.active_record_class.new)
         options[:class] = "#{options[:class]} inplace_field"
@@ -316,7 +318,7 @@ module ActiveScaffold
         data[:ie_loading_text] = column.options[:loading_text] || as_(:loading)
         data[:ie_save_text] = column.options[:save_text] || as_(:update)
         data[:ie_saving_text] = column.options[:saving_text] || as_(:saving)
-        data[:ie_rows] = column.options[:rows] || 5 if column.column.try(:type) == :text
+        data[:ie_rows] = column.options[:rows] || 5 if column.column&.type == :text
         data[:ie_cols] = column.options[:cols] if column.options[:cols]
         data[:ie_size] = column.options[:size] if column.options[:size]
         data[:ie_use_html] = column.options[:use_html] if column.options[:use_html]
@@ -327,7 +329,7 @@ module ActiveScaffold
           data[:ie_mode] = :clone
         elsif column.inplace_edit == :ajax
           url = url_for(params_for(:controller => params_for[:controller], :action => 'render_field', :id => '__id__', :update_column => column.name))
-          plural = column.association.try(:collection?) && !override_form_field?(column) && %i[select record_select].include?(column.form_ui)
+          plural = column.association&.collection? && !override_form_field?(column) && %i[select record_select].include?(column.form_ui)
           data[:ie_render_url] = url
           data[:ie_mode] = :ajax
           data[:ie_plural] = plural

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -195,9 +195,9 @@ module ActiveScaffold
       def include_null_comparators?(column)
         return column.options[:null_comparators] if column.options.key? :null_comparators
         if column.association
-          !column.association.belongs_to? || active_scaffold_config.columns[column.association.foreign_key].column.try(:null)
+          !column.association.belongs_to? || active_scaffold_config.columns[column.association.foreign_key].column&.null
         else
-          column.column.try(:null)
+          column.column&.null
         end
       end
 
@@ -225,7 +225,7 @@ module ActiveScaffold
             content_tag(
               :span,
               safe_join([' - ', send(input_method, "#{options[:name]}[to]", to_value, to_options)]),
-              :id => "#{options[:id]}_between", :class => 'as_search_range_between', :style => (opt_value == 'BETWEEN') ? nil : 'display: none'
+              :id => "#{options[:id]}_between", :class => 'as_search_range_between', :style => ('display: none' unless opt_value == 'BETWEEN')
             )
         end
         content_tag :span, html, :class => 'search_range'
@@ -292,7 +292,7 @@ module ActiveScaffold
       def visibles_and_hiddens(search_config)
         visibles = []
         hiddens = []
-        search_config.columns.each do |column|
+        search_config.columns.each_column do |column|
           next unless column.search_sql
           if search_config.optional_columns.include?(column.name) && !searched_by?(column)
             hiddens << column

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -17,15 +17,6 @@ module ActiveScaffold
       ## Delegates
       ##
 
-      # access to the configuration variable
-      def active_scaffold_config
-        controller.class.active_scaffold_config
-      end
-
-      def active_scaffold_config_for(*args)
-        controller.class.active_scaffold_config_for(*args)
-      end
-
       def active_scaffold_controller_for(*args)
         controller.class.active_scaffold_controller_for(*args)
       end
@@ -44,7 +35,10 @@ module ActiveScaffold
       # This is the template finder logic, keep it updated with however we find stuff in rails
       # currently this very similar to the logic in ActionBase::Base.render for options file
       def template_exists?(template_name, partial = false)
-        restore_view_paths, lookup_context.view_paths = lookup_context.view_paths, @_view_paths if @_view_paths
+        if @_view_paths
+          restore_view_paths = lookup_context.view_paths
+          lookup_context.view_paths = @_view_paths
+        end
         lookup_context.exists?(template_name, '', partial).tap do
           lookup_context.view_paths = restore_view_paths if @_view_paths
         end
@@ -173,7 +167,7 @@ module ActiveScaffold
 
       def history_state
         if active_scaffold_config.store_user_settings
-          state = {page: @page.try(:number)}
+          state = {page: @page&.number}
           state[:search] = search_params if respond_to?(:search_params) && search_params.present?
           if active_scaffold_config.list.user.user_sorting?
             column, state[:sort_direction] = active_scaffold_config.list.user.sorting.first
@@ -189,12 +183,12 @@ module ActiveScaffold
 
       def display_message(message)
         message = safe_join message, tag(:br) if message.is_a?(Array)
-        if (highlights = active_scaffold_config.highlight_messages)
+        if (highlights = active_scaffold_config.user.highlight_messages)
           message = highlights.inject(message) do |msg, (phrases, highlighter)|
             highlight(msg, phrases, highlighter || {})
           end
         end
-        if (format = active_scaffold_config.timestamped_messages)
+        if (format = active_scaffold_config.user.timestamped_messages)
           format = :short if format == true
           messages = [content_tag(:div, l(Time.current, :format => format), :class => 'timestamp')]
           messages << content_tag(:div, message, :class => 'message-content')

data/lib/active_scaffold/marked_model.rb

@@ -24,11 +24,11 @@ module ActiveScaffold
 
     module ClassMethods
       def marked_records
-        Thread.current[:marked_records] ||= {}
+        ActiveScaffold::Registry.marked_records ||= {}
       end
 
       def marked_records=(marked)
-        Thread.current[:marked_records] = marked
+        ActiveScaffold::Registry.marked_records = marked
       end
 
       def marked_record_ids

data/lib/active_scaffold/orm_checks.rb

@@ -69,11 +69,7 @@ module ActiveScaffold
 
       def type_for_attribute(klass, column_name)
         if active_record? klass
-          if klass.respond_to? :type_for_attribute
-            klass.type_for_attribute column_name.to_s
-          else # Rails.version < 4.2
-            klass.column_types[column_name.to_s]
-          end
+          klass.type_for_attribute column_name.to_s
         elsif mongoid? klass
           klass.fields[column_name.to_s].type
         end

data/lib/active_scaffold/paginator.rb

@@ -19,7 +19,8 @@ class Paginator
   #     (and the number of items to show per page, for
   #     convenience, if the arity is 2)
   def initialize(count, per_page, &select)
-    @count, @per_page = count, per_page
+    @count = count
+    @per_page = per_page
     unless select
       raise MissingSelectError, 'Must provide block to select data for each page'
     end
@@ -28,7 +29,7 @@ class Paginator
 
   # Total number of pages
   def number_of_pages
-    (@count / @per_page).to_i + (@count % @per_page > 0 ? 1 : 0)
+    (@count / @per_page).to_i + ((@count % @per_page).positive? ? 1 : 0)
   end
 
   # First page object
@@ -57,7 +58,7 @@ class Paginator
 
   # Retrieve page object by number
   def page(number)
-    number = (n = number.to_i) > 0 ? n : 1
+    number = [1, number.to_i].max
     Page.new(self, number) do
       offset = (number - 1) * @per_page
       args = [offset]
@@ -80,7 +81,8 @@ class Paginator
     attr_reader :number, :pager
 
     def initialize(pager, number, &select) #:nodoc:
-      @pager, @number = pager, number
+      @pager = pager
+      @number = number
       @offset = (number - 1) * pager.per_page
       @select = select
     end