Merge branch '4-2-stable'

Author: scambra

CHANGELOG.rdoc

@@ -3,6 +3,9 @@
 - Use :subform_columns option in :horizontal and :vertical show_ui too
 - Add layout multiple support to ActionColumns, so forms can have columns
 
+= 4.2.3 (unreleased)
+- Make simplified searches on LogicalQueryParser bridge working with upstream gem, no need for my fork
+
 = 4.2.2
 - Support setting form_ui_options with nil, for subforms
 - Support saving when embedded on through singular association, as it's supported for nested too

Gemfile.lock

@@ -10,6 +10,7 @@ PATH
     active_scaffold (4.2.2)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
+      method_source (~> 1.1)
       rails (>= 7.2.0)
       request_store (~> 1.3)
 
@@ -168,6 +169,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.1.0)
+    method_source (1.1.0)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)

active_scaffold.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |s|
   s.add_dependency('ice_nine', '~> 0.11') # Deep Freeze Ruby Objects
   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.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 class ActiveScaffold::Bridges::LogicalQueryParser < ActiveScaffold::DataStructures::Bridge
+  autoload :TokensGrammar, 'active_scaffold/bridges/logical_query_parser/tokens_grammar'
+  autoload :KeywordQueryParser, 'active_scaffold/bridges/logical_query_parser/keyword_query_parser'
+
   def self.install
-    require File.join(File.dirname(__FILE__), 'logical_query_parser/tokens_grammar')
-    ActiveScaffold::Finder.send(:remove_const, :LOGICAL_COMPARATORS)
     ActiveScaffold::Finder.const_set :LOGICAL_COMPARATORS, %w[all_tokens any_token logical].freeze
   end
 end

lib/active_scaffold/bridges/logical_query_parser/keyword_query_parser.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'method_source'
+
+class ActiveScaffold::Bridges::LogicalQueryParser
+  class KeywordQueryParser
+    LogicalQueryParser.singleton_methods.each do |method_name|
+      method = LogicalQueryParser.method(method_name)
+      define_method(method_name, &method)
+    end
+
+    # Define a new method with the same source code
+    class_eval <<-RUBY
+      #{LogicalQueryParser.method(:search).source}
+    RUBY
+
+    def initialize(operator)
+      @operator = operator
+    end
+
+    def new
+      ActiveScaffold::Bridges::LogicalQueryParser::TokensGrammar::Parser.new(@operator)
+    end
+  end
+end

lib/active_scaffold/data_structures/column.rb

@@ -346,7 +346,7 @@ def search_sql
       end
 
       def searchable?
-        search_sql.present? || (logical_search.present? && ActiveScaffold::Finder::LOGICAL_COMPARATORS.present?)
+        search_sql.present? || (logical_search.present? && ActiveScaffold::Finder.logical_comparators.present?)
       end
 
       def link

lib/active_scaffold/finder.rb

@@ -6,6 +6,10 @@ def self.like_operator
       @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name.in?(%w[PostgreSQL PostGIS]) ? 'ILIKE' : 'LIKE'
     end
 
+    def self.logical_comparators
+      ActiveScaffold::Finder::LOGICAL_COMPARATORS if ActiveScaffold::Finder.const_defined? :LOGICAL_COMPARATORS
+    end
+
     module ClassMethods
       def self.extended(klass)
         return unless klass.active_scaffold_config
@@ -231,21 +235,21 @@ def condition_for_range(column, value, like_pattern = nil)
           ['(%<search_sql>s BETWEEN ? AND ?)', value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(value[:opt])
           ["%<search_sql>s #{value[:opt]} ?", value[:from]]
-        elsif ActiveScaffold::Finder::LOGICAL_COMPARATORS.include?(value[:opt])
+        elsif ActiveScaffold::Finder.logical_comparators&.include?(value[:opt])
           operator =
             case value[:opt]
             when 'all_tokens' then 'AND'
             when 'any_token'  then 'OR'
             end
-          parser = ActiveScaffold::Bridges::LogicalQueryParser::TokensGrammar::Parser.new(operator) if operator
-          [logical_search_condition(column, value[:from], parser)]
+          parser = ActiveScaffold::Bridges::LogicalQueryParser::KeywordQueryParser.new(operator) if operator
+          [logical_search_condition(column, value[:from], parser || ::LogicalQueryParser)]
         end
       end
 
-      def logical_search_condition(column, search, parser = nil)
+      def logical_search_condition(column, search, parser)
         model = column.active_record_class
         subquery = alias_query_for_same_table_exists(model.all) if column.logical_search.any?(Hash)
-        query = ::LogicalQueryParser.search(search, subquery || model, column.logical_search, parser: parser)
+        query = parser.search(search, subquery || model, column.logical_search)
         if subquery
           model.where(same_table_exists_subquery(query))
         else
@@ -526,7 +530,6 @@ def condition_for_null_type(column, value, like_pattern = nil)
       doesnt_begin_with: 'not_?%',
       doesnt_end_with:   'not_%?'
     }.freeze
-    LOGICAL_COMPARATORS = [].freeze
     NULL_COMPARATORS = %w[null not_null].freeze
     DATE_COMPARATORS = %w[PAST FUTURE RANGE].freeze
     DATE_UNITS = %w[DAYS WEEKS MONTHS YEARS].freeze

lib/active_scaffold/helpers/search_column_helpers.rb

@@ -213,8 +213,8 @@ def active_scaffold_search_range_comparator_options(column, ui_options: column.o
           if column.search_sql.present?
             select_options.concat(ActiveScaffold::Finder::STRING_COMPARATORS.collect { |title, comp| [as_(title), comp] })
           end
-          if ActiveScaffold::Finder::LOGICAL_COMPARATORS.present? && column.logical_search.present?
-            select_options.concat(ActiveScaffold::Finder::LOGICAL_COMPARATORS.collect { |comp| [as_(comp.downcase.to_sym), comp] })
+          if ActiveScaffold::Finder.logical_comparators.present? && column.logical_search.present?
+            select_options.concat(ActiveScaffold::Finder.logical_comparators.collect { |comp| [as_(comp.downcase.to_sym), comp] })
           end
         end
         if column.search_sql.present?