active_scaffold 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a411ae5638102ae3b9052929c30afcb44f769c9eeb528fdddd995ba7407bc5b9
-  data.tar.gz: 0171ab0f4fbde3b09cffae2553d7a7d90248bb5529f548e2321acb525610edd2
+  metadata.gz: d279597d030fea168fba4fbcc8cd44c99d02f44b4596c774ec4476db04d53cd1
+  data.tar.gz: 48fd530b7990ec28454a1b3adebd5da80ca1d833727b22563a85cef1e140747f
 SHA512:
-  metadata.gz: d39d363d9ff5a27b07c124bf7718962d5355c879a77e48f5085f195d739b821276fdbda602078a0995c5385290dd158b2604acf75b863d323ce6ca1ac45d108d
-  data.tar.gz: 6afacdeacd3fd4b13d0115a8a7c3faba454c2e755bdea68485ebbbdb2c7a305b7022ca833e8960aa4c5df3258ce72236b5959c450d51306049ab652365429a6c
+  metadata.gz: 1317103cf2e2344d0340f76f020a7df076f7aedff8f07b1c0a19499338d2d7941e762c51b33757cbcf3cd039d0d9f8bc8b57653282098f23fadfc069fd631bf0
+  data.tar.gz: 1300926c2397ea724f788a2b9899397e6c1e0ec6ca5a55a77677edf93dc98e5ed70e1b742c9a6ee8618067e4c378e58899d18e0fba9514e41cbde943c5589c01

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+= 4.2.3
+- Make simplified searches on LogicalQueryParser bridge working with upstream gem, no need for my fork
+- Styles for radio form_ui
+- Fix style for checkbox list in subform
+- Fix constraints (broken on 4.2.2 on some cases)
+
+= 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
 

data/app/assets/stylesheets/active_scaffold_layout.scss

@@ -750,6 +750,12 @@ float: left;
 .active-scaffold li.form-element dd input[type="checkbox"] {
 margin-top: 6px;
 }
+.active-scaffold form input[type=radio] {
+  margin-right: 5px;
+}
+.active-scaffold form label:has(input[type=radio]) {
+  margin-right: 10px;
+}
 
 .active-scaffold li.form-element dd .select-field:not(.draggable-lists-container) {
   display: inline-block;
@@ -1039,7 +1045,7 @@ padding: 0 2px 2px 2px;
 border: solid 1px;
 }
 
-.active-scaffold .sub-form .checkbox-list label {
+.active-scaffold .sub-form .checkbox-list li {
 display: block;
 }
 

data/lib/active_scaffold/bridges/logical_query_parser/keyword_query_parser.rb

@@ -0,0 +1,23 @@
+# 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
+
+    # Copy search method from LogicalQueryParser
+    class_eval(LogicalQueryParser.method(:search).source, __FILE__, __LINE__)
+
+    def initialize(operator)
+      @operator = operator
+    end
+
+    def new
+      ActiveScaffold::Bridges::LogicalQueryParser::TokensGrammar::Parser.new(@operator)
+    end
+  end
+end

data/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

data/lib/active_scaffold/constraints.rb

@@ -155,6 +155,41 @@ module ActiveScaffold
       "Malformed constraint `#{klass}##{column_name}'. If it's a legitimate column, and you are using a nested scaffold, please specify or double-check the reverse association name."
     end
 
+    def apply_constraint_on_association(record, association, value, allow_autosave: false)
+      if association.through_singular? && association.source_reflection.reverse
+        create_on_through_singular(record, association, association.klass.find(value))
+      elsif association.collection?
+        record.send(k.to_s).send(:<<, association.klass.find(value)) unless association.nested?
+      elsif association.polymorphic?
+        apply_constraint_on_polymorphic_association(record, association, value)
+      elsif !association.source_reflection&.through? && # regular singular association, or one-level through association
+            !value.is_a?(Array)
+        record.send(:"#{association.name}=", association.klass.find(value))
+
+        # setting the belongs_to side of a has_one isn't safe. if the has_one was already
+        # specified, rails won't automatically clear out the previous associated record.
+        #
+        # note that we can't take the extra step to correct this unless we're permitted to
+        # run operations where activerecord auto-saves the object.
+        reverse = association.reverse_association
+        if reverse&.singular? && !reverse.belongs_to? && allow_autosave
+          record.send(association.name).send(:"#{reverse.name}=", record)
+        end
+      end
+    end
+
+    def apply_constraint_on_polymorphic_association(record, association, value)
+      unless value.is_a?(Array) && value.size >= 2
+        raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller
+      end
+
+      if value.size == 2
+        record.send(:"#{association.name}=", value[0].constantize.find(value[1]))
+      else
+        record.send(:"#{association.foreign_type}=", value[0])
+      end
+    end
+
     # Applies constraints to the given record.
     #
     # Searches through the known columns for association columns. If the given constraint is an association,
@@ -163,42 +198,12 @@ module ActiveScaffold
     #
     # For some operations ActiveRecord will automatically update the database. That's not always ok.
     # If it *is* ok (e.g. you're in a transaction), then set :allow_autosave to true.
-    def apply_constraints_to_record(record, options = {})
-      options[:allow_autosave] = false if options[:allow_autosave].nil?
-      constraints = options[:constraints] || active_scaffold_constraints
-
+    def apply_constraints_to_record(record, allow_autosave: false, constraints: active_scaffold_constraints)
       config = record.is_a?(active_scaffold_config.model) ? active_scaffold_config : active_scaffold_config_for(record.class)
       constraints.each do |k, v|
         column = config.columns[k]
         if column&.association
-          if column.association.through_singular? && column.association.source_reflection.reverse
-            create_on_through_singular(record, column.association, column.association.klass.find(v))
-          elsif column.association.collection?
-            record.send(k.to_s).send(:<<, column.association.klass.find(v)) unless column.association.nested?
-          elsif column.association.polymorphic?
-            unless v.is_a?(Array) && v.size >= 2
-              raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller
-            end
-
-            if v.size == 2
-              record.send(:"#{k}=", v[0].constantize.find(v[1]))
-            else
-              record.send(:"#{column.association.foreign_type}=", v[0])
-            end
-          elsif !column.association.source_reflection&.through? && # regular singular association, or one-level through association
-                !v.is_a?(Array)
-            record.send(:"#{k}=", column.association.klass.find(v))
-
-            # setting the belongs_to side of a has_one isn't safe. if the has_one was already
-            # specified, rails won't automatically clear out the previous associated record.
-            #
-            # note that we can't take the extra step to correct this unless we're permitted to
-            # run operations where activerecord auto-saves the object.
-            reverse = column.association.reverse_association
-            if reverse&.singular? && !reverse.belongs_to? && options[:allow_autosave]
-              record.send(k).send(:"#{reverse.name}=", record)
-            end
-          end
+          apply_constraint_on_association(record, column.association, v, allow_autosave: allow_autosave)
         else
           record.send(:"#{k}=", v)
         end

data/lib/active_scaffold/data_structures/column.rb

@@ -346,7 +346,7 @@ module ActiveScaffold::DataStructures
       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

data/lib/active_scaffold/finder.rb

@@ -6,6 +6,10 @@ module ActiveScaffold
       @@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 @@ module ActiveScaffold
           ['(%<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 @@ module ActiveScaffold
       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

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -213,8 +213,8 @@ module ActiveScaffold
           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?

data/lib/active_scaffold/version.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-20 00:00:00.000000000 Z
+date: 2026-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dartsass-sprockets
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +256,7 @@ files:
 - lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb
 - lib/active_scaffold/bridges/file_column/test/mock_model.rb
 - lib/active_scaffold/bridges/logical_query_parser.rb
+- lib/active_scaffold/bridges/logical_query_parser/keyword_query_parser.rb
 - lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.rb
 - lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.treetop
 - lib/active_scaffold/bridges/paper_trail.rb