brick 1.0.151 → 1.0.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8abfeb02b561a0ac8214de3c4791992947cab9f288f9f57c816a883dc4592a
-  data.tar.gz: 1ec0f9d11eea9b1741e454ac04aa2c51380a0d9676f4e84a5de2419d3ef751bd
+  metadata.gz: 4b4101e6f3437aaf0cb79eec97a94b9df6655d9db8a4773e761768556d2ec31f
+  data.tar.gz: 543bad78f1a359af9126373928789d868530b7ed09c17dbf18bf52a012a37763
 SHA512:
-  metadata.gz: 758e2ab6e10589689abdb77df64731e3df2fff341998e8f815bd5f180a73df89fb1282155a9520cc43102a49b1f7283114c02146329161e2324fc2fa79c6048e
-  data.tar.gz: 9a77d3d4318943225427c59e676c4a067c95a22351eaea88ed14bbc6da60ee834498117704bc0fe1dd493f6e10ab65a27db4bff3b060440f4e7dfaf3b31ad184
+  metadata.gz: 84d77e9a74428eea4e90f0a40b6e2a6dc824623a6b8975659698b4c79b73ec2ec5f5f26409c5d3d7f0c89c33e6c0aafb73a0c69b8cb3900654d10c528f3d4699
+  data.tar.gz: 556ad657abeb7a2368940a8b651ef85e6d3c410684e3ab7a088d741ea851e5c31b51bbe8f8baaa017231f56eb7fa177928782b68c6ee7b00c053d1267ac67a1f

data/lib/brick/config.rb

@@ -204,6 +204,15 @@ module Brick
       @mutex.synchronize { @has_ones = hos }
     end
 
+    # Associations upon which to add #accepts_nested_attributes_for logic
+    def nested_attributes
+      @mutex.synchronize { @nested_attributes }
+    end
+
+    def nested_attributes=(anaf)
+      @mutex.synchronize { @nested_attributes = anaf }
+    end
+
     # Polymorphic associations
     def polymorphics
       @mutex.synchronize { @polymorphics }

data/lib/brick/extensions.rb

@@ -344,6 +344,28 @@ module ActiveRecord
       def _br_cust_cols
         @_br_cust_cols ||= {}
       end
+
+      def _brick_find_permits(model_or_assoc, current_permits, done_permits = [])
+        unless done_permits.include?(model_or_assoc)
+          done_permits << model_or_assoc
+          self.reflect_on_all_associations.select { |assoc| !assoc.belongs_to? }.each_with_object([]) do |assoc, s|
+            if assoc.options[:through]
+              current_permits << { "#{assoc.name.to_s.singularize}_ids".to_sym => [] }
+              s << "#{assoc.name.to_s.singularize}_ids: []"
+            end
+            if self.instance_methods.include?(:"#{assoc.name}_attributes=")
+              # Support nested attributes which use the friendly_id gem
+              assoc.klass._brick_nested_friendly_id if Object.const_defined?('FriendlyId') &&
+                                                       assoc.klass.instance_variable_get(:@friendly_id_config)
+              new_attrib_text = assoc.klass._brick_find_permits(assoc, (new_permits = assoc.klass.columns_hash.keys.map(&:to_sym)), done_permits)
+              new_permits << :_destroy
+              current_permits << { "#{assoc.name}_attributes".to_sym => new_permits }
+              s << "#{assoc.name}_attributes: #{new_attrib_text}"
+            end
+          end
+        end
+        current_permits
+      end
     end
 
     # Search for custom column, BT, HM, and HMT DSL stuff
@@ -1639,18 +1661,23 @@ class Object
                 else
                   need_fk = "#{ActiveSupport::Inflector.singularize(assoc[:inverse][:inverse_table].split('.').last)}_id" != assoc[:fk]
                 end
+                singular_assoc_name = ActiveSupport::Inflector.singularize(assoc_name.tr('.', '_'))
                 has_ones = ::Brick.config.has_ones&.fetch(full_name, nil)
-                if has_ones&.key?(singular_assoc_name = ActiveSupport::Inflector.singularize(assoc_name.tr('.', '_')))
-                  assoc_name = if (custom_assoc_name = has_ones[singular_assoc_name])
-                                 need_class_name = custom_assoc_name != singular_assoc_name
-                                 custom_assoc_name
-                               else
-                                 singular_assoc_name
-                               end
-                  :has_one
-                else
-                  :has_many
-                end
+                macro = if has_ones&.key?(singular_assoc_name)
+                          assoc_name = if (custom_assoc_name = has_ones[singular_assoc_name])
+                                        need_class_name = custom_assoc_name != singular_assoc_name
+                                        custom_assoc_name
+                                      else
+                                        singular_assoc_name
+                                      end
+                          :has_one
+                        else
+                          :has_many
+                        end
+                # Auto-create an accepts_nested_attributes_for for this HM?
+                is_anaf = (anaf = ::Brick.config.nested_attributes&.fetch(full_name, nil)) &&
+                          (anaf.is_a?(Array) ? anaf.include?(assoc_name) : anaf == assoc_name)
+                macro
               end
       # Figure out if we need to specially call out the class_name and/or foreign key
       # (and if either of those then definitely also a specific inverse_of)
@@ -1686,6 +1713,10 @@ class Object
       assoc_name = assoc_name.tr('.', '_').to_sym
       code << "  #{macro} #{assoc_name.inspect}#{options.map { |k, v| ", #{k}: #{v.inspect}" }.join}\n"
       self.send(macro, assoc_name, **options)
+      if is_anaf
+        code << "  accepts_nested_attributes_for #{assoc_name.inspect}\n"
+        self.send(:accepts_nested_attributes_for, assoc_name)
+      end
     end
 
     def default_ordering(table_name, pk)
@@ -2194,6 +2225,9 @@ class Object
                   end
                 end
               end
+              if (upd_hash ||= upd_params).fetch(model.inheritance_column, nil).strip == ''
+                upd_hash[model.inheritance_column] = nil
+              end
               obj.send(:update, upd_hash || upd_params)
             end
 
@@ -2241,7 +2275,7 @@ class Object
 
           if is_need_params
             code << "  def #{params_name}\n"
-            permits_txt = self._brick_find_permits(model, (permits = model.columns_hash.keys.map(&:to_sym)))
+            permits_txt = model._brick_find_permits(model, permits = model.columns_hash.keys.map(&:to_sym))
             code << "    params.require(:#{require_name = model.name.underscore.tr('/', '_')
                              }).permit(#{permits_txt.map(&:inspect).join(', ')})\n"
             code << "  end\n"
@@ -2257,27 +2291,6 @@ class Object
       [built_controller, code]
     end
 
-    def _brick_find_permits(model, current_permits, done_permits = [])
-      unless done_permits.include?(self)
-        done_permits << self
-        model.reflect_on_all_associations.select { |assoc| assoc.macro == :has_many }.each_with_object([]) do |assoc, s|
-          if assoc.options[:through]
-            current_permits << { "#{assoc.name.to_s.singularize}_ids".to_sym => [] }
-            s << "#{assoc.name.to_s.singularize}_ids: []"
-          elsif assoc.active_record.instance_methods.include?(:"#{assoc.name}_attributes=")
-            # Support nested attributes which use the friendly_id gem
-            self._brick_nested_friendly_id if Object.const_defined?('FriendlyId') &&
-                                              assoc.klass.instance_variable_get(:@friendly_id_config)
-            new_attrib_text = self._brick_find_permits(assoc.klass, (new_permits = assoc.klass.columns_hash.keys.map(&:to_sym)), done_permits)
-            new_permits << :_destroy
-            current_permits << { "#{assoc.name}_attributes".to_sym => new_permits }
-            s << "#{assoc.name}_attributes: #{new_attrib_text}"
-          end
-        end
-      end
-      current_permits
-    end
-
     def _brick_nested_friendly_id
       unless @_brick_nested_friendly_id
         ::ActiveRecord::Base.class_exec do

data/lib/brick/frameworks/rails/engine.rb

@@ -257,6 +257,9 @@ function linkSchemas() {
         # Has one relationships
         ::Brick.has_ones = app.config.brick.fetch(:has_ones, nil)
 
+        # accepts_nested_attributes_for relationships
+        ::Brick.nested_attributes = app.config.brick.fetch(:nested_attributes, nil)
+
         # Polymorphic associations
         ::Brick.polymorphics = app.config.brick.fetch(:polymorphics, nil)
       end

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 151
+    TINY = 152
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -477,6 +477,12 @@ module Brick
       end
     end
 
+    # Associations upon which to add #accepts_nested_attributes_for logic
+    # @api public
+    def nested_attributes=(anaf)
+      Brick.config.nested_attributes = anaf
+    end
+
     # Polymorphic associations
     def polymorphics=(polys)
       polys = polys.each_with_object({}) { |poly, s| s[poly] = nil } if polys.is_a?(Array)

data/lib/generators/brick/install_generator.rb

@@ -256,6 +256,10 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # # instead of \"user_profile\", then apply that as a third parameter like this:
   # Brick.has_ones = [['User', 'user_profile', 'profile']]
 
+  # # Automatically establish #accepts_nested_attributes_for logic on has_many and has_one associations.
+  # # This video to demonstrates how this works:  https://github.com/lorint/brick/assets/5301131/82ac4f6d-bc23-4a55-adab-bc754bcb0f26
+  # Brick.nested_attributes = { 'User' => ['profile', 'posts'] }
+
   # # We normally don't show the timestamp columns \"created_at\", \"updated_at\", and \"deleted_at\", and also do
   # # not consider them when finding associative tables to support an N:M association.  (That is, ones that can be a
   # # part of a has_many :through association.)  If you want to use different exclusion columns than our defaults

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.151
+  version: 1.0.152
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord