Merge branch '4-2-stable'

Author: scambra

active_scaffold.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency('dartsass-sprockets', '~> 3.2.0')
   s.add_dependency('ice_nine', '~> 0.11') # Deep Freeze Ruby Objects
+  s.add_dependency('method_source', '~> 1.1')
   s.add_dependency('rails', '>= 7.2.0')
   s.add_dependency('request_store', '~> 1.3')
-  s.add_dependency('method_source', '~> 1.1')
   s.metadata['rubygems_mfa_required'] = 'true'
 end

lib/active_scaffold/bridges/logical_query_parser/keyword_query_parser.rb

@@ -9,10 +9,12 @@ class KeywordQueryParser
       define_method(method_name, &method)
     end
 
-    # Define a new method with the same source code
-    class_eval <<-RUBY
+    # Copy search method from LogicalQueryParser
+    # rubocop:disable Style/DocumentDynamicEvalDefinition
+    class_eval <<-RUBY, __FILE__, __LINE__ + 1
       #{LogicalQueryParser.method(:search).source}
     RUBY
+    # rubocop:enable Style/DocumentDynamicEvalDefinition
 
     def initialize(operator)
       @operator = operator