active_scaffold 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce255799e0bff6d3854d55afdf9278d3a283f68f6d0b1a639acf5bd229b359a
-  data.tar.gz: 62761ad0b3530526880f7d8ac464f1f61623f76a6cbdd55512ab6e6102b6f963
+  metadata.gz: a411ae5638102ae3b9052929c30afcb44f769c9eeb528fdddd995ba7407bc5b9
+  data.tar.gz: 0171ab0f4fbde3b09cffae2553d7a7d90248bb5529f548e2321acb525610edd2
 SHA512:
-  metadata.gz: ad75a5aef07ab0ed9a6997847249ebfd30b749ffe6502472a74066e86ff08fd196b85579bdec112108a71d149f7918af79cfeec64cdee23d095440594a33dba0
-  data.tar.gz: 6bcb9392ee5554b46ebb708d957b061c890b23fc613298c8296370276480b27bae10c4dc7fbb683aeed615aec9bbb1c83de7ac11ada6e1714fcf1d5b6958813b
+  metadata.gz: d39d363d9ff5a27b07c124bf7718962d5355c879a77e48f5085f195d739b821276fdbda602078a0995c5385290dd158b2604acf75b863d323ce6ca1ac45d108d
+  data.tar.gz: 6afacdeacd3fd4b13d0115a8a7c3faba454c2e755bdea68485ebbbdb2c7a305b7022ca833e8960aa4c5df3258ce72236b5959c450d51306049ab652365429a6c

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+- Support setting form_ui_options with nil, for subforms
+- Support saving when embedded on through singular association, as it's supported for nested too
+
 = 4.2.1
 - Fix replacing tinymce fields with update_columns
 - Support refresh_link in radio form UI

data/lib/active_scaffold/actions/core.rb

@@ -146,6 +146,16 @@ module ActiveScaffold::Actions
       "#{params[:parent_controller].camelize}Controller"
     end
 
+    def create_on_through_singular(record, association, parent_record)
+      through = parent_record.send(association.through_reflection.name) ||
+                parent_record.send(:"build_#{association.through_reflection.name}")
+      if association.source_reflection.reverse_association.collection?
+        record.send(association.source_reflection.reverse) << through
+      else
+        record.send(:"#{association.source_reflection.reverse}=", through)
+      end
+    end
+
     def setup_parent
       cfg = main_form_controller.active_scaffold_config
       parent = cfg.model.new

data/lib/active_scaffold/actions/nested.rb

@@ -107,13 +107,7 @@ module ActiveScaffold::Actions
       if nested.child_association&.singular?
         record.send(:"#{nested.child_association.name}=", nested_parent_record)
       elsif nested.create_through_singular?
-        through = nested_parent_record.send(nested.association.through_reflection.name) ||
-                  nested_parent_record.send(:"build_#{nested.association.through_reflection.name}")
-        if nested.source_reflection.reverse_association.collection?
-          record.send(nested.source_reflection.reverse) << through
-        else
-          record.send(:"#{nested.source_reflection.reverse}=", through)
-        end
+        create_on_through_singular(record, nested.association, nested_parent_record)
       else
         record.send(nested.child_association.name) << nested_parent_record
       end

data/lib/active_scaffold/constraints.rb

@@ -171,7 +171,9 @@ module ActiveScaffold
       constraints.each do |k, v|
         column = config.columns[k]
         if column&.association
-          if column.association.collection?
+          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
@@ -183,7 +185,7 @@ module ActiveScaffold
             else
               record.send(:"#{column.association.foreign_type}=", v[0])
             end
-          elsif !column.association.source_reflection&.options&.include?(:through) && # regular singular association, or one-level through association
+          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))
 

data/lib/active_scaffold/data_structures/association/active_record.rb

@@ -6,7 +6,7 @@ module ActiveScaffold::DataStructures::Association
       klass.reflect_on_all_associations
     end
 
-    delegate :collection?, :polymorphic?, :association_primary_key, :foreign_type, :table_name, :nested?, :scope, to: :@association
+    delegate :collection?, :polymorphic?, :association_primary_key, :foreign_type, :table_name, :nested?, :scope, :class_name, to: :@association
 
     def through?
       @association.options[:through].present?
@@ -17,11 +17,11 @@ module ActiveScaffold::DataStructures::Association
     end
 
     def through_reflection
-      @association.through_reflection if through?
+      @through_reflection ||= self.class.new(@association.through_reflection) if through?
     end
 
     def source_reflection
-      @association.source_reflection if through?
+      @source_reflection ||= self.class.new(@association.source_reflection) if through?
     end
 
     def inverse_klass

data/lib/active_scaffold/data_structures/column.rb

@@ -746,10 +746,14 @@ module ActiveScaffold::DataStructures
 
     def valid_action_ui_params?(value)
       if value.is_a?(Array)
-        value.size <= 2 && value[0].is_a?(Symbol) && (value[1].nil? || value[1].is_a?(Hash))
+        value.size <= 2 && valid_form_ui?(value[0]) && (value[1].nil? || value[1].is_a?(Hash))
       else
-        value.nil? || value.is_a?(Symbol)
+        valid_form_ui?(value)
       end
     end
+
+    def valid_form_ui?(value)
+      value.nil? || value.is_a?(Symbol)
+    end
   end
 end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -104,8 +104,8 @@ module ActiveScaffold::DataStructures
     #    RatesController has employee in create action columns (reverse is vendor, and through association employee is in create form).
     def readonly_through_association?(columns)
       return false unless through_association?
-      return true if association.through_reflection.options[:through] # create not possible, too many levels
-      return true if association.source_reflection.options[:through] # create not possible, too many levels
+      return true if association.through_reflection.through? # create not possible, too many levels
+      return true if association.source_reflection.through? # create not possible, too many levels
       return false if create_through_singular? # create allowed, AS has code for this
       return false unless association.source_reflection.collection? # create allowed if source is singular, rails creates joint model
 
@@ -114,7 +114,7 @@ module ActiveScaffold::DataStructures
     end
 
     def create_through_singular?
-      association.through_singular? && source_reflection.reverse
+      association.through_singular? && association.source_reflection.reverse
     end
 
     def create_with_parent?
@@ -125,10 +125,6 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    def source_reflection
-      @source_reflection ||= ActiveScaffold::DataStructures::Association::ActiveRecord.new(association.source_reflection)
-    end
-
     def through_association?
       association.through?
     end

data/lib/active_scaffold/finder.rb

@@ -245,7 +245,7 @@ module ActiveScaffold
       def logical_search_condition(column, search, parser = nil)
         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, columns: column.logical_search, parser: parser)
+        query = ::LogicalQueryParser.search(search, subquery || model, column.logical_search, parser: parser)
         if subquery
           model.where(same_table_exists_subquery(query))
         else

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -167,15 +167,13 @@ module ActiveScaffold
       def build_associated(association, parent_record)
         if association.through? && association.through_reflection.collection?
           # build full chain, only check create_associated on initial parent_record
-          parent_record = build_associated(association.class.new(association.through_reflection), parent_record)
-          source_assoc = association.class.new(association.source_reflection)
-          build_associated(source_assoc, parent_record).tap do |record|
-            save_record_to_association(record, source_assoc.reverse_association, parent_record) # set inverse
+          parent_record = build_associated(association.through_reflection, parent_record)
+          build_associated(association.source_reflection, parent_record).tap do |record|
+            save_record_to_association(record, association.source_reflection.reverse_association, parent_record) # set inverse
           end
         elsif association.through? # through belongs_to/has_one
           parent_record = parent_record.send(association.through_reflection.name)
-          source_assoc = association.class.new(association.source_reflection)
-          build_associated(source_assoc, parent_record)
+          build_associated(association.source_reflection, parent_record)
         elsif association.collection?
           parent_record.send(association.name).build
         elsif association.belongs_to? || parent_record.new_record? || parent_record.send(association.name).nil?

data/lib/active_scaffold/version.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
     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.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dartsass-sprockets