active_scaffold 3.6.0.pre → 3.6.0.rc1

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -24,14 +24,10 @@ class ActiveScaffold::Bridges::RecordSelect
 
       def active_scaffold_record_select(record, column, options, value, multiple)
         unless column.association
-          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
+          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not). "\
+          'A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user).'
         end
-        klass =
-          if column.association.polymorphic?
-            record.send(column.association.foreign_type).constantize rescue nil
-          else
-            column.association.klass
-          end
+        klass = column.association.klass(record)
         return content_tag :span, '', :class => options[:class] unless klass
 
         remote_controller = active_scaffold_controller_for(klass).controller_path

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -12,7 +12,7 @@ module ActiveScaffold
             tags << active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
             tags << active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
             tags << active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            safe_join tags, '&nbsp;'.html_safe
+            safe_join tags, '&nbsp;'.html_safe # rubocop:disable Rails/OutputSafety
           end
 
           def active_scaffold_search_date_bridge_comparator_options(column)
@@ -21,17 +21,18 @@ module ActiveScaffold
           end
 
           def active_scaffold_search_date_bridge_comparator_tag(column, options, current_search)
-            select_tag("#{options[:name]}[opt]", options_for_select(active_scaffold_search_date_bridge_comparator_options(column), current_search['opt']), :id => "#{options[:id]}_opt", :class => 'as_search_range_option as_search_date_time_option')
+            choices = options_for_select(active_scaffold_search_date_bridge_comparator_options(column), current_search['opt'])
+            select_tag("#{options[:name]}[opt]", choices, :id => "#{options[:id]}_opt", :class => 'as_search_range_option as_search_date_time_option')
           end
 
           def active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
-            numeric_controls =
-              '' <<
-              active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
-              content_tag(:span, (' - ' + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
+            numeric_controls = [
+              active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from'),
+              content_tag(:span, safe_join([' - ', active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')]),
                           :id => "#{options[:id]}_between", :class => 'as_search_range_between',
                           :style => current_search['opt'] == 'BETWEEN' ? nil : 'display: none')
-            content_tag('span', numeric_controls.html_safe,
+            ]
+            content_tag('span', safe_join(numeric_controls),
                         :id => "#{options[:id]}_numeric", :class => 'search-date-numeric',
                         :style => ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(current_search['opt']) ? nil : 'display: none')
           end
@@ -44,12 +45,13 @@ module ActiveScaffold
           end
 
           def active_scaffold_date_bridge_trend_tag(column, options, trend_options)
-            trend_controls =
-              text_field_tag("#{options[:name]}[number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << ' ' <<
+            trend_controls = [
+              text_field_tag("#{options[:name]}[number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off'),
               select_tag("#{options[:name]}[unit]",
                          options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
                          :class => 'text-input')
-            content_tag('span', trend_controls.html_safe,
+            ]
+            content_tag('span', safe_join(trend_controls, ' '),
                         :id => "#{options[:id]}_trend", :class => 'search-date-trend',
                         :style => trend_options[:show] ? nil : 'display: none')
           end
@@ -61,10 +63,11 @@ module ActiveScaffold
           end
 
           def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
+            values = ActiveScaffold::Finder::DATE_RANGES.collect { |range| [as_(range.downcase.to_sym), range] }
             range_controls = select_tag("#{options[:name]}[range]",
-                                        options_for_select(ActiveScaffold::Finder::DATE_RANGES.collect { |range| [as_(range.downcase.to_sym), range] }, current_search['range']),
+                                        options_for_select(values, current_search['range']),
                                         :class => 'text-input', :id => nil)
-            content_tag('span', range_controls.html_safe,
+            content_tag('span', range_controls,
                         :id => "#{options[:id]}_range", :class => 'search-date-range',
                         :style => ('display: none' unless current_search['opt'] == 'RANGE'))
           end
@@ -80,7 +83,7 @@ module ActiveScaffold
             when 'RANGE'
               range_type, range = value['range'].downcase.split('_')
               format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
-              from, to = controller.class.date_bridge_from_to(column, value)
+              from, = controller.class.date_bridge_from_to(column, value)
               "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value['range'].downcase).downcase} (#{I18n.l(from, :format => format)})"
             when 'PAST', 'FUTURE'
               from, to = controller.class.date_bridge_from_to(column, value)
@@ -118,12 +121,10 @@ module ActiveScaffold
 
               if column.search_sql.is_a? Proc
                 column.search_sql.call(from_value, to_value, operator)
+              elsif operator.nil?
+                ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
               else
-                if operator.nil?
-                  ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
-                else
-                  ["%<search_sql>s #{value['opt']} ?", from_value.to_s(:db)] unless from_value.nil?
-                end
+                ["%<search_sql>s #{value['opt']} ?", from_value.to_s(:db)] unless from_value.nil?
               end
             end
 

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -24,7 +24,9 @@ class ActiveScaffold::Bridges::TinyMce
 
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag("tinyMCE.settings = #{settings.to_json}; tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');") if ActiveScaffold.js_framework == :prototype && (request.xhr? || params[:iframe])
+        if ActiveScaffold.js_framework == :prototype && (request.xhr? || params[:iframe])
+          html << javascript_tag("tinyMCE.settings = #{settings.to_json}; tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');")
+        end
         safe_join html
       end
 

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -32,15 +32,32 @@ module ActiveScaffold::Bridges
         state_options
       end
 
-      USASTATES = [%w[Alabama AL], %w[Alaska AK], %w[Arizona AZ], %w[Arkansas AR], %w[California CA], %w[Colorado CO], %w[Connecticut CT], %w[Delaware DE], ['District of Columbia', 'DC'], %w[Florida FL], %w[Georgia GA], %w[Hawaii HI], %w[Idaho ID], %w[Illinois IL], %w[Indiana IN], %w[Iowa IA], %w[Kansas KS], %w[Kentucky KY], %w[Louisiana LA], %w[Maine ME], %w[Maryland MD], %w[Massachusetts MA], %w[Michigan MI], %w[Minnesota MN], %w[Mississippi MS], %w[Missouri MO], %w[Montana MT], %w[Nebraska NE], %w[Nevada NV], ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w[Ohio OH], %w[Oklahoma OK], %w[Oregon OR], %w[Pennsylvania PA], ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], %w[Tennessee TN], %w[Texas TX], %w[Utah UT], %w[Vermont VT], %w[Virginia VA], %w[Washington WA], %w[Wisconsin WI], ['West Virginia', 'WV'], %w[Wyoming WY]].freeze unless const_defined?('USASTATES')
+      unless const_defined?('USASTATES')
+        USASTATES = [
+          %w[Alabama AL], %w[Alaska AK], %w[Arizona AZ], %w[Arkansas AR], %w[California CA], %w[Colorado CO],
+          %w[Connecticut CT], %w[Delaware DE], ['District of Columbia', 'DC'], %w[Florida FL], %w[Georgia GA],
+          %w[Hawaii HI], %w[Idaho ID], %w[Illinois IL], %w[Indiana IN], %w[Iowa IA], %w[Kansas KS], %w[Kentucky KY],
+          %w[Louisiana LA], %w[Maine ME], %w[Maryland MD], %w[Massachusetts MA], %w[Michigan MI], %w[Minnesota MN],
+          %w[Mississippi MS], %w[Missouri MO], %w[Montana MT], %w[Nebraska NE], %w[Nevada NV],
+          ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'],
+          ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w[Ohio OH], %w[Oklahoma OK], %w[Oregon OR],
+          %w[Pennsylvania PA], ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'],
+          %w[Tennessee TN], %w[Texas TX], %w[Utah UT], %w[Vermont VT], %w[Virginia VA], %w[Washington WA],
+          %w[Wisconsin WI], ['West Virginia', 'WV'], %w[Wyoming WY]
+        ].freeze
+      end
     end
 
     module InstanceTagMethods
       def to_usa_state_select_tag(priority_states, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        value = value(object)
-        selected_value = options.key?(:selected) ? options[:selected] : value
+        selected_value =
+          if options.key?(:selected)
+            options[:selected]
+          else
+            method(:value).parameters.any? ? value(object) : value
+          end
         content_tag('select', add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
       end
     end

data/lib/active_scaffold/config/base.rb

@@ -10,7 +10,13 @@ module ActiveScaffold::Config
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone if self.class.respond_to?(:link) && self.class.link
+      setup_user_setting_key
     end
+
+    def setup_user_setting_key
+      @user_settings_key = :"#{model_id}_#{self.class.name.underscore}"
+    end
+
     attr_reader :core
 
     def self.inherited(subclass)
@@ -42,9 +48,7 @@ module ActiveScaffold::Config
       (core || self).model_id
     end
 
-    def user_settings_key
-      :"#{model_id}_#{self.class.name.underscore}"
-    end
+    attr_reader :user_settings_key
 
     # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
     def user
@@ -116,7 +120,7 @@ module ActiveScaffold::Config
 
       def []=(key, value)
         @storage[@action] ||= {}
-        if value
+        if value.present?
           @storage[@action][key.to_s] = value
         else
           @storage[@action].delete key.to_s
@@ -129,11 +133,23 @@ module ActiveScaffold::Config
       end
 
       def method_missing(name, *args)
-        @conf.respond_to?(name, true) ? @conf.send(name, *args) : super
+        proxy_to_conf?(name, true) ? @conf.send(name, *args) : super
       end
 
       def respond_to_missing?(name, include_all = false)
-        @conf.respond_to?(name, include_all) || super
+        proxy_to_conf?(name, include_all) || super
+      end
+
+      def proxy_to_conf?(name, include_all)
+        name !~ /=$/ && @conf.respond_to?(name, include_all)
+      end
+
+      private
+
+      def proxy_columns(columns)
+        proxy = ::CowProxy.wrap(columns)
+        proxy.action = self
+        proxy
       end
     end
 
@@ -145,52 +161,60 @@ module ActiveScaffold::Config
 
     class_attribute :columns_collections
 
+    def self.columns_writer(name)
+      var = "@#{name}"
+      define_method "#{name}=" do |val|
+        if instance_variable_defined?(var)
+          instance_variable_get(var).set_values(*val)
+          instance_variable_get(var)
+        else
+          instance_variable_set(var, build_action_columns(val))
+        end
+      end
+    end
+
+    def self.columns_reader(name, options, &block)
+      var = "@#{name}"
+      define_method name do
+        unless instance_variable_defined?(var) # lazy evaluation
+          action, columns = options[:copy] if options[:copy]
+          if action && @core.actions.include?(action)
+            action_columns = @core.send(action).send(columns || :columns).clone
+            action_columns.action = self
+            instance_variable_set(var, action_columns)
+          else
+            send("#{name}=", @core.columns._inheritable)
+          end
+          instance_exec(&block) if block
+        end
+        instance_variable_get(var)
+      end
+    end
+
     def self.columns_accessor(*names, &block)
       options = names.extract_options!
       self.columns_collections = ((columns_collections || []) + names).uniq
       names.each do |name|
-        var = "@#{name}"
-        define_method "#{name}=" do |val|
-          if instance_variable_defined?(var)
-            instance_variable_get(var).set_values(*val)
-            instance_variable_get(var)
-          else
-            instance_variable_set(var, build_action_columns(val))
-          end
-        end
+        columns_writer name
+        columns_reader name, options, &block unless method_defined? name
 
         if self::UserSettings == ActiveScaffold::Config::Base::UserSettings
           const_set 'UserSettings', Class.new(ActiveScaffold::Config::Base::UserSettings)
         end
 
+        var = "@#{name}"
         self::UserSettings.class_eval do
           define_method "#{name}=" do |val|
-            instance_variable_set var, ::CowProxy.wrap(build_action_columns(val))
+            instance_variable_set var, proxy_columns(build_action_columns(val))
           end
           define_method name do
             instance_variable_get(var) ||
-              instance_variable_set(var, ::CowProxy.wrap(@conf.send(name)))
+              instance_variable_set(var, proxy_columns(@conf.send(name)))
           end
         end
-
-        return if method_defined? name
-        define_method name do
-          unless instance_variable_defined?(var) # lazy evaluation
-            action, columns = options[:copy] if options[:copy]
-            if action && @core.actions.include?(action)
-              action_columns = @core.send(action).send(columns || :columns).clone
-              action_columns.action = self
-              instance_variable_set(var, action_columns)
-            else
-              send("#{name}=", @core.columns._inheritable)
-            end
-            instance_exec(&block) if block
-          end
-          instance_variable_get(var)
-        end
       end
     end
 
-    private_class_method :columns_accessor
+    private_class_method :columns_accessor, :columns_reader, :columns_writer
   end
 end

data/lib/active_scaffold/config/core.rb

@@ -88,6 +88,10 @@ module ActiveScaffold::Config
     cattr_accessor :highlight_messages, instance_accessor: false
     @@highlight_messages = nil
 
+    # method names or procs to be called after all configure blocks
+    cattr_reader :after_config_callbacks, instance_accessor: false
+    @@after_config_callbacks = [:_configure_sti]
+
     def self.freeze
       super
       security.freeze
@@ -160,6 +164,7 @@ module ActiveScaffold::Config
     def initialize(model_id)
       # model_id is the only absolutely required configuration value. it is also not publicly accessible.
       @model_id = model_id
+      setup_user_setting_key
 
       # inherit the actions list directly from the global level
       @actions = self.class.actions.clone
@@ -196,9 +201,6 @@ module ActiveScaffold::Config
     # To be called before freezing
     def _cache_lazy_values
       action_links.each(&:name_to_cache) if cache_action_link_urls
-      # ensure member and collection groups are cached, if no custom link has been added
-      action_links.member
-      action_links.collection
       columns.select(&:sortable?).each(&:sort)
       columns.select(&:searchable?).each(&:search_sql)
       actions.each do |action_name|
@@ -209,6 +211,7 @@ module ActiveScaffold::Config
 
     # To be called after your finished configuration
     def _configure_sti
+      return if sti_children.nil?
       column = model.inheritance_column
       if sti_create_links
         columns[column].form_ui ||= :hidden
@@ -235,7 +238,7 @@ module ActiveScaffold::Config
     end
 
     def respond_to_missing?(name, include_all = false)
-      self.class.config_class?(name) && @actions.include?(action_name.to_s.underscore.to_sym) || super
+      self.class.config_class?(name) && @actions.include?(name.to_sym) || super
     end
 
     def [](action_name)
@@ -243,12 +246,11 @@ module ActiveScaffold::Config
       return unless klass
 
       underscored_name = action_name.to_s.underscore.to_sym
-      if @actions.include? underscored_name
-        @action_configs ||= {}
-        @action_configs[underscored_name] ||= klass.new(self)
-      else
+      unless @actions.include? underscored_name
         raise "#{action_name.to_s.camelcase} is not enabled. Please enable it or remove any references in your configuration (e.g. config.#{underscored_name}.columns = [...])."
       end
+      @action_configs ||= {}
+      @action_configs[underscored_name] ||= klass.new(self)
     end
 
     def []=(action_name, action_config)
@@ -258,8 +260,7 @@ module ActiveScaffold::Config
     private :[]=
 
     def self.method_missing(name, *args)
-      klass = config_class(name) if @@actions.include?(name.to_s.underscore)
-      klass || super
+      config_class(name) || super
     end
 
     def self.config_class(name)
@@ -349,21 +350,39 @@ module ActiveScaffold::Config
       def action_links
         @action_links ||= CowProxy.wrap(@conf.action_links)
       end
+
+      def model
+        @conf.model # for performance, called many times, so we avoid method_missing
+      end
+
+      def actions
+        @conf.actions # for performance, called many times, so we avoid method_missing
+      end
     end
 
     class UserColumns
+      include Enumerable
+
       def initialize(columns)
         @global_columns = columns
         @columns = {}
       end
 
       def [](name)
+        return nil unless @global_columns[name]
         @columns[name.to_sym] ||= CowProxy.wrap @global_columns[name]
       end
 
-      def method_missing(name, *args)
+      def each
+        return enum_for(:each) unless block_given?
+        @global_columns.each do |col|
+          yield self[col.name]
+        end
+      end
+
+      def method_missing(name, *args, &block)
         if @global_columns.respond_to?(name, true)
-          @global_columns.send(name, *args)
+          @global_columns.send(name, *args, &block)
         else
           super
         end

data/lib/active_scaffold/config/delete.rb

@@ -12,7 +12,18 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link, instance_accessor: false
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?, :ignore_method => :delete_ignore?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new(
+      'destroy',
+      :label => :delete,
+      :type => :member,
+      :method => :delete,
+      :crud_type => :delete,
+      :confirm => :are_you_sure_to_delete,
+      :position => false,
+      :parameters => {:destroy_action => true},
+      :security_method => :delete_authorized?,
+      :ignore_method => :delete_ignore?
+    )
 
     # whether we should refresh list after destroy or not
     cattr_accessor :refresh_list, instance_accessor: false

data/lib/active_scaffold/config/list.rb

@@ -186,8 +186,8 @@ module ActiveScaffold::Config
     def search_partial
       if @always_show_search == true
         auto_search_partial
-      else
-        @always_show_search.to_s if @core.actions.include? @always_show_search
+      elsif @core.actions.include? @always_show_search
+        @always_show_search.to_s
       end
     end
 
@@ -219,11 +219,12 @@ module ActiveScaffold::Config
     # order clause will be used for ETag when calculate_etag is disabled, so query for records can be avoided
     attr_accessor :calculate_etag
 
-    UserSettings.class_eval do # defined with columns_accessor
+    # don't inherit, defined with columns_accessor, class_eval would complain about block too long
+    class UserSettings
       user_attr :page_links_inner_window, :page_links_outer_window, :refresh_with_header, :empty_field_text,
                 :association_join_text, :messages_above_header, :wrap_tag, :auto_select_columns, :calculate_etag,
                 :no_entries_message, :filtered_message, :show_search_reset, :always_show_create, :always_show_search,
-                :hide_nested_column
+                :hide_nested_column, :pagination, :auto_pagination
 
       def initialize(conf, storage, params)
         super(conf, storage, params, :list)
@@ -261,12 +262,12 @@ module ActiveScaffold::Config
       attr_reader :nested_default_sorting
 
       def nested_default_sorting=(options)
-        @nested_default_sorting ||= @conf.sorting.dup
+        @nested_default_sorting ||= sorting_dup
         @nested_default_sorting.set_nested_sorting(options[:table_name], options[:default_sorting])
       end
 
       def default_sorting
-        nested_default_sorting.nil? || @sorting.present? ? @conf.sorting.dup : nested_default_sorting
+        nested_default_sorting.nil? || @sorting.present? ? sorting_dup : nested_default_sorting
       end
 
       # TODO: programatically set sorting, for per-request configuration, priority @params, then @sort
@@ -286,7 +287,7 @@ module ActiveScaffold::Config
           self['sort'] = nil if @params['sort_direction'] == 'reset'
 
           if self['sort'] && @conf.core.columns[self['sort'][0]]
-            sorting = @conf.sorting.dup
+            sorting = sorting_dup
             sorting.set(*self['sort'])
             @_sorting = sorting
           else
@@ -303,6 +304,15 @@ module ActiveScaffold::Config
       def count_includes
         @conf.count_includes
       end
+
+      protected
+
+      def sorting_dup
+        sorting = @conf.sorting.dup
+        # access to config instance columns instead of config class columns, in case columns are changed in this request
+        sorting.instance_variable_set :@columns, core.columns
+        sorting
+      end
     end
   end
 end