BaseFilter#default_scope? method

Author: bogdan

Diff for: lib/datagrid/filters/base_filter.rb

@@ -17,7 +17,7 @@ def initialize(grid_class, name, options = {}, &block)
         self.grid_class = grid_class
         self.name = name.to_sym
         self.options = options
-        self.block = block || default_filter_block
+        self.block = block
       end
 
       def parse(value)
@@ -39,7 +39,7 @@ def apply(grid_object, scope, value)
 
         return scope unless result
 
-        result = default_filter(value, scope, grid_object) if result == Datagrid::Filters::DEFAULT_FILTER_BLOCK
+        result = default_filter(value, scope) if result == Datagrid::Filters::DEFAULT_FILTER_BLOCK
         unless grid_object.driver.match?(result)
           raise(
             Datagrid::FilteringError,
@@ -116,13 +116,6 @@ def self.form_builder_helper_name
         :"datagrid_#{to_s.demodulize.underscore}"
       end
 
-      def default_filter_block
-        filter = self
-        lambda do |value, scope, grid|
-          filter.default_filter(value, scope, grid)
-        end
-      end
-
       def supports_range?
         self.class.ancestors.include?(::Datagrid::Filters::RangedFilter)
       end
@@ -150,17 +143,23 @@ def enum_checkboxes?
         false
       end
 
+      def default_scope?
+        !block
+      end
+
       protected
 
       def default_filter_where(scope, value)
         driver.where(scope, name, value)
       end
 
       def execute(value, scope, grid_object)
-        if block.arity == 1
+        if block&.arity == 1
           scope.instance_exec(value, &block)
-        else
+        elsif block
           Datagrid::Utils.apply_args(value, scope, grid_object, &block)
+        else
+          default_filter(value, scope)
         end
       end
 
@@ -185,7 +184,7 @@ def driver
         grid_class.driver
       end
 
-      def default_filter(value, scope, _grid)
+      def default_filter(value, scope)
         return nil if dummy?
 
         if !driver.scope_has_column?(scope, name) && scope.respond_to?(name, true)

Diff for: spec/datagrid/filters/base_filter_spec.rb

@@ -15,4 +15,20 @@ def name_default
     expect(report.assets).not_to include(Entry.create!(name: "world"))
     expect(report.assets).not_to include(Entry.create!(name: ""))
   end
+
+  describe "#default_scope?" do
+
+    it "identifies filters without custom block" do
+      grid = test_report do
+        scope { Entry }
+        filter(:id, :integer)
+        filter(:group_id, :integer) do |value, scope|
+          scope("group_id >= ?", value)
+        end
+      end
+
+      expect(grid.filter_by_name(:id)).to be_default_scope
+      expect(grid.filter_by_name(:group_id)).to_not be_default_scope
+    end
+  end
 end