Move default option evaluation lower, allow column/filter instance to be passed

Author: tmikoss

lib/datagrid/columns.rb

@@ -369,11 +369,9 @@ def define_column(columns, name, query = nil, **options, &block)
           model.public_send(name)
         end
 
-        options_with_defaults = default_column_options.merge(options)
-
-        position = Datagrid::Utils.extract_position_from_options(columns, options_with_defaults)
+        position = Datagrid::Utils.extract_position_from_options(columns, options)
         column = Datagrid::Columns::Column.new(
-          self, name, query, options_with_defaults, &block
+          self, name, query, options, &block
         )
         columns.insert(position, column)
         column

lib/datagrid/columns/column.rb

@@ -52,7 +52,7 @@ def initialize(grid_class, name, query, options = {}, &block)
         @grid_class = grid_class
         @name = name.to_sym
         @query = query
-        @options = options
+        @options = Datagrid::Utils.callable(grid_class.default_column_options, self).merge(options)
 
         if options[:class]
           Datagrid::Utils.warn_once(
@@ -86,7 +86,7 @@ def label
       # @return [String] column header
       def header
         if (header = options[:header])
-          Datagrid::Utils.callable(header, self)
+          Datagrid::Utils.callable(header)
         else
           Datagrid::Utils.translate_from_namespace(:columns, grid_class, name)
         end

lib/datagrid/filters.rb

@@ -221,10 +221,8 @@ def filter(name, type = :default, **options, &block)
         klass = type.is_a?(Class) ? type : FILTER_TYPES[type]
         raise ConfigurationError, "filter class #{type.inspect} not found" unless klass
 
-        options_with_defaults = default_filter_options.merge(options)
-
-        position = Datagrid::Utils.extract_position_from_options(filters_array, options_with_defaults)
-        filter = klass.new(self, name, **options_with_defaults, &block)
+        position = Datagrid::Utils.extract_position_from_options(filters_array, options)
+        filter = klass.new(self, name, **options, &block)
         filters_array.insert(position, filter)
 
         datagrid_attribute(name) do |value|

lib/datagrid/filters/base_filter.rb

@@ -15,7 +15,7 @@ class BaseFilter
       def initialize(grid_class, name, **options, &block)
         self.grid_class = grid_class
         self.name = name.to_sym
-        self.options = options
+        self.options = Datagrid::Utils.callable(grid_class.default_filter_options, self).merge(options)
         self.block = block
       end
 
@@ -76,7 +76,7 @@ def separator
 
       def header
         if (header = options[:header])
-          Datagrid::Utils.callable(header, self)
+          Datagrid::Utils.callable(header)
         else
           Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
         end

spec/datagrid/columns_spec.rb

@@ -101,7 +101,7 @@ class Report27 < Datagrid::Base
 
       it "uses configured default header" do
         grid = test_grid do
-          self.default_column_options = { header: ->(column) { I18n.t(column.name, scope: "other.location") } }
+          self.default_column_options = ->(column) { { header: -> { I18n.t(column.name, scope: "other.location") } } }
 
           scope { Entry }
           column(:name)

spec/datagrid/filters_spec.rb

@@ -205,7 +205,7 @@ class InheritedReport < TranslatedReport
 
     it "translates filter using configured default header" do
       grid = test_grid do
-        self.default_filter_options = { header: ->(filter) { I18n.t(filter.name, scope: "other.location") } }
+        self.default_filter_options = ->(filter) { { header: -> { I18n.t(filter.name, scope: "other.location") } } }
 
         scope { Entry }
         filter(:name)