active_scaffold 3.5.4 → 3.6.0

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
 
           def generate_delete_helpers(klass)
             file_column_fields(klass).each do |field|
-              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
+              klass.send :class_eval, <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
                 attr_reader :delete_#{field}
 
                 def delete_#{field}=(value)
@@ -19,7 +19,7 @@ module ActiveScaffold
                   # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
                   self.#{field} = nil unless self.#{field}_just_uploaded?
                 end
-              EOF
+              CODE
             end
           end
 
@@ -41,7 +41,7 @@ module ActiveScaffold
           versions = options[:magick][:versions]
           raise unless versions.stringify_keys[version]
           true
-        rescue
+        rescue StandardError
           false
         end
 

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -18,9 +18,9 @@ module ActiveScaffold
 
           content_tag(:div) do
             content_tag(:div) do
-              get_column_value(record, column) + " #{custom_hidden_field_tag} | ".html_safe <<
-                content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js) <<
-                content_tag(:div, file_column_field('record', column.name, options), :style => 'display: none')
+              safe_join [get_column_value(record, column), custom_hidden_field_tag, '|',
+                         content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js),
+                         content_tag(:div, 'test', :style => 'display: none')], ' '
             end
           end
         else

data/lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb

@@ -1,14 +1,17 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
+require File.expand_path('../mock_model.rb', __dir__)
+require File.expand_path('../../file_column_helpers.rb', __dir__)
 
-class DeleteFileColumnTest < Test::Unit::TestCase
+class DeleteFileColumnTest < MiniTest::Test
   def setup
-    DeleteFileColumn.generate_delete_helpers(MockModel)
+    MockModel.extend ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
+    ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.generate_delete_helpers(MockModel)
     @model = MockModel.new
     @model.band_image = 'coolio.jpg'
   end
 
   def test__file_column_fields
-    assert_equal(1, @model.file_column_fields.length)
+    assert_equal(1, @model.class.file_column_fields.length)
   end
 
   def test__delete_band_image__boolean__should_delete
@@ -23,17 +26,17 @@ class DeleteFileColumnTest < Test::Unit::TestCase
 
   def test__delete_band_image__boolean_false__shouldnt_delete
     @model.delete_band_image = false
-    assert_not_nil @model.band_image
+    refute_nil @model.band_image
   end
 
   def test__delete_band_image__string_false__shouldnt_delete
     @model.delete_band_image = 'false'
-    assert_not_nil @model.band_image
+    refute_nil @model.band_image
   end
 
   def test__just_uploaded__shouldnt_delete
     @model.band_image_just_uploaded = true
     @model.delete_band_image = 'true'
-    assert_not_nil(@model.band_image)
+    refute_nil(@model.band_image)
   end
 end

data/lib/active_scaffold/bridges/paper_trail.rb

@@ -7,6 +7,6 @@ class ActiveScaffold::Bridges::PaperTrail < ActiveScaffold::DataStructures::Brid
   end
 
   def self.prepare
-    ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
+    ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
   end
 end

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -11,7 +11,9 @@ module ActiveScaffold::Actions
 
     def deleted
       query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
-      query = query.where_object(nested.child_association.foreign_key => nested.parent_id) if nested? && nested.child_association.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
+      if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
+        query = query.where_object(nested.child_association.foreign_key => nested.parent_id)
+      end
       pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
         query.offset(offset).limit(per_page).map(&:reify)
       end

data/lib/active_scaffold/bridges/paperclip/list_ui.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
         return nil unless paperclip.file?
         content =
           if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)
-            image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0)
+            image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0, :alt => nil)
           else
             paperclip.original_filename
           end

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
           update.multipart = true
           create.multipart = true
 
-          model.attachment_definitions.keys.each do |field|
+          model.attachment_definitions.each_key do |field|
             configure_paperclip_field(field.to_sym)
             # define the "delete" helper for use with active scaffold, unless it's already defined
             ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.generate_delete_helper(model, field)

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
+          klass.class_eval <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)
@@ -16,7 +16,7 @@ module ActiveScaffold
               # passing nil to the file column causes the file to be deleted. Don't delete if we just uploaded a file!
               self.#{field} = nil unless self.#{field}.dirty?
             end
-          EOF
+          CODE
         end
       end
     end

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

@@ -1,21 +1,23 @@
+require 'active_support/concern'
+
 class ActiveScaffold::Bridges::RecordSelect
   module Helpers
-    def self.included(base)
-      base.class_eval do
-        include FormColumnHelpers
-        include SearchColumnHelpers
-      end
+    extend ActiveSupport::Concern
+    included do
+      include FormColumnHelpers
+      include SearchColumnHelpers
     end
 
     module FormColumnHelpers
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_record_select(column, options)
         record = options.delete(:object)
-        if column.association.try(:singular?)
-          multiple = false
-          multiple = column.options[:html_options][:multiple] if column.options[:html_options] && column.options[:html_options][:multiple]
-          active_scaffold_record_select(record, column, options, record.send(column.name), multiple)
-        elsif column.association.try(:collection?)
+        if column.association&.singular?
+          multiple = column.options.dig(:html_options, :multiple)
+          html = active_scaffold_record_select(record, column, options, record.send(column.name), multiple)
+          html << active_scaffold_new_record_subform(column, record, options) if column.options[:add_new]
+          html
+        elsif column.association&.collection?
           active_scaffold_record_select(record, column, options, record.send(column.name), true)
         else
           active_scaffold_record_select_autocomplete(record, column, options)
@@ -24,14 +26,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,12 +63,13 @@ 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 => (current_search['opt'] == 'RANGE') ? nil : 'display: none')
+                        :style => ('display: none' unless current_search['opt'] == 'RANGE'))
           end
 
           def column_datetime?(column)
@@ -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} BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
-                else
-                  ["%{search_sql} #{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

@@ -23,7 +23,7 @@ module ActiveScaffold::Bridges
                           options_for_select([])
                         end
 
-        state_options += if priority_states && priority_states.include?(selected)
+        state_options += if priority_states&.include?(selected)
                            options_for_select(USASTATES - priority_states, :selected => selected)
                          else
                            options_for_select(USASTATES, :selected => selected)
@@ -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

@@ -2,6 +2,7 @@ module ActiveScaffold::Config
   class Base
     include ActiveScaffold::Configurable
     extend ActiveScaffold::Configurable
+    NO_FORMATS = [].freeze
 
     def initialize(core_config)
       @core = core_config
@@ -9,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)
@@ -37,8 +44,20 @@ module ActiveScaffold::Config
       @label.nil? ? model : as_(@label, :model => model)
     end
 
+    def model_id
+      (core || self).model_id
+    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.
-    attr_accessor :user
+    def user
+      ActiveScaffold::Registry.user_settings[user_settings_key]
+    end
+
+    def new_user_settings(storage, params)
+      ActiveScaffold::Registry.user_settings[user_settings_key] = self.class::UserSettings.new(self, storage, params)
+    end
 
     # define a default action_group for this action
     # e.g. 'members.crud'
@@ -47,10 +66,39 @@ module ActiveScaffold::Config
     # action_group this action should belong to
     attr_accessor :action_group
 
+    def formats
+      return @formats || NO_FORMATS if frozen?
+      @formats ||= NO_FORMATS.dup
+    end
+    attr_writer :formats
+
     class UserSettings
+      # define setter and getter for names
+      # values will be saved for current request only
+      # getter will return value set with setter, or value from conf
+      def self.user_attr(*names)
+        attr_writer(*names)
+        names.each do |name|
+          define_method(name) do
+            instance_variable_defined?("@#{name}") ? instance_variable_get("@#{name}") : @conf.send(name)
+          end
+        end
+      end
+
+      # define setter and getter for names
+      # values will be saved in session if store_user_settings is enabled,
+      # in other case for current request only
+      # getter will return value set with setter, or value from conf
+      def self.session_attr(*names)
+        names.each do |name|
+          define_method(name) { |value| self[name] = value }
+          define_method(name) { key?(name) ? self[name] : @conf.send(name) }
+        end
+      end
+
       def initialize(conf, storage, params, action = :base)
         # the session hash relevant to this action
-        @session = storage
+        @storage = storage
         # all the request params
         @params = params
         # the configuration object for this action
@@ -58,71 +106,115 @@ module ActiveScaffold::Config
         @action = action.to_s
       end
 
+      def user
+        self
+      end
+
+      def core
+        @conf.core.user
+      end
+
       def [](key)
-        @session[@action][key] if @action && @session[@action]
+        @storage[@action][key.to_s] if @action && @storage[@action]
       end
 
       def []=(key, value)
-        @session[@action] ||= {}
-        if value
-          @session[@action][key] = value
+        @storage[@action] ||= {}
+        if value.present?
+          @storage[@action][key.to_s] = value
         else
-          @session[@action].delete key
-          @session.delete @action if @session[@action].empty?
+          @storage[@action].delete key.to_s
+          @storage.delete @action if @storage[@action].empty?
         end
       end
-    end
 
-    def formats
-      @formats ||= []
+      def key?(key)
+        @storage[@action].key? key.to_s if @action && @storage[@action]
+      end
+
+      def method_missing(name, *args)
+        proxy_to_conf?(name, true) ? @conf.send(name, *args) : super
+      end
+
+      def respond_to_missing?(name, include_all = false)
+        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
-    attr_writer :formats
 
     private
 
     def build_action_columns(val)
-      columns =
-        if val.is_a?(ActiveScaffold::DataStructures::ActionColumns)
-          val.dup
+      @core.build_action_columns self, val
+    end
+
+    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
-          ActiveScaffold::DataStructures::ActionColumns.new(*val)
+          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
-      columns.action = self
-      columns.set_columns(@core.columns)
-      columns
+        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)
-          else
-            instance_variable_set(var, build_action_columns(val))
-          end
-          instance_variable_get(var)
+        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
 
-        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
+        var = "@#{name}"
+        self::UserSettings.class_eval do
+          define_method "#{name}=" do |val|
+            instance_variable_set var, proxy_columns(build_action_columns(val))
+          end
+          define_method name do
+            instance_variable_get(var) ||
+              instance_variable_set(var, proxy_columns(@conf.send(name)))
           end
-          instance_variable_get(var)
         end
       end
     end
 
-    private_class_method :columns_accessor
+    private_class_method :columns_accessor, :columns_reader, :columns_writer
   end
 end