slim_form_object 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce3b78974679cc29b22f510e32676f1f25a59662b441503ad0ef4bcd1562a88f
-  data.tar.gz: 58611fe0b47550ad918747cdf4ee247ef44c3a5fce7dd2f261a34de9757cb319
+  metadata.gz: 2e4f0412c8cb4946eff0db2874dc18f1eb89a5963fa37e93bebf5f6df43e6325
+  data.tar.gz: 0fcdf0fe63e50fce431424ad491d777b82ff526322bd0cd477e8410f5013d5cb
 SHA512:
-  metadata.gz: 8fad6de79c2ea9fd1beff0c3da68f5a25232ea155f55d6a4499e2e46f016fe44a16ca15ce1cf4a3cf81bbc4571d41f59ca9c7c0be5949868e00ca58ef18799f8
-  data.tar.gz: 00e3ad81c740a9d730973e9d7e35efc539316b56b718dd5a3bb70af00c876b0a6e0a2bb5ff59988fa1dec5a34054631486a5c427115bddecca3f65543e760682
+  metadata.gz: '0196290af54aa19b2bd8877aaf4fa65bc8e7457395a1591dc3b96c62985f98e35be934509984a7e6f095d8c9785e6f72efb61d2471aadd49bb22cb7815e7988d'
+  data.tar.gz: 04f5c24113803d60c5ecf5c29ce3ad10a3abdf39450902fefcdbf83ac1fe76c4970b5e272f218f48e316c4cb3e7c4fe994f8e7af98962efdf2c8475efc4ebb4d

data/lib/slim_form_object/assign.rb

@@ -20,11 +20,14 @@ module SlimFormObject
       parse_params(params)
       @data_objects_arr = make_data_objects(data_for_assign)
       clean_data_objects_arr(data_objects_arr)
+      
       associate_all_objects(data_objects_arr)
 
       data_objects_arr
     end
 
+
+
     private
 
     # data_for_assign format
@@ -96,32 +99,35 @@ module SlimFormObject
       end
     end
 
-    def associate_objects(data_objects)
-      objects = Array.new(data_objects)
-      while data_object_1 = objects.delete( objects[0] )
-        associate_all_objects(data_object_1.nested)
-        objects.each do |data_object_2|
-          data_object_1.associate_with(data_object_2.object)
-        end
+    def clean_data_objects_arr(objects)
+      objects.select! do |data_object|
+        clean_data_objects_arr(data_object.nested)
+        validator.allow_object_processing?(data_object)
       end
     end
 
+    # ASSOCIATE
     def associate_all_objects(objects)
-      associate_objects(objects)
+      associate_nested_objects(objects)
+      associate_parents_with_nested_objects(objects)
+    end
 
-      objects.each do |data_object|
-        data_object.nested.each do |nested_data_object|  
-          data_object.associate_with(nested_data_object.object)
+    def associate_nested_objects(data_objects)
+      cloned_objects = Array.new(data_objects)
+      while data_object_1 = cloned_objects.delete(cloned_objects[0])
+        associate_nested_objects(data_object_1.nested)
+        cloned_objects.each do |data_object_2|
+          data_object_1.associate_with(data_object_2.object)
         end
       end
     end
 
-    def clean_data_objects_arr(objects)
-      objects.select! do |data_object|
-        clean_data_objects_arr(data_object.nested)
-        validator.allow_object_processing?(data_object)
+    def associate_parents_with_nested_objects(data_objects)
+      iterate_parents_with_nested_objects(data_objects) do |data_object, nested_data_object|
+        data_object.associate_with(nested_data_object.object)
       end
     end
+    # END ASSOCIATE
 
   end
 end

data/lib/slim_form_object/data_object.rb

@@ -15,8 +15,8 @@ module SlimFormObject
       assign_attributes!
     end
 
-    def associate_with(other_object, stage: nil)
-      return object if (stage != Saver::STAGE_3 and !object.new_record? and !other_object.new_record?)
+    def associate_with(other_object, force: false)
+      return object if ( force and (!object.new_record? and !other_object.new_record?) )
 
       to_bind_models(object, other_object)
     end

data/lib/slim_form_object/extensions.rb

@@ -0,0 +1,11 @@
+class Array
+
+  def iterate_with_each_pair
+    cloned_objects = Array.new(self)
+    while object_1 = cloned_objects.delete(cloned_objects[0])
+      cloned_objects.each do |object_2|
+        yield(object_1, object_2)
+      end
+    end
+  end
+end

data/lib/slim_form_object/helpers.rb

@@ -4,8 +4,8 @@ module HelperMethods
   end
 
   def make_constant_name(snake_model_name, base_module=nil)
-      pref = base_module ? (base_module.to_s + '::') : ''
-      pref + snake_model_name.to_s.split('_').map(&:capitalize).join
+    pref = base_module ? (base_module.to_s + '::') : ''
+    pref + snake_model_name.to_s.split('_').map(&:capitalize).join
   end
 
   def get_class_of(snake_model_name, base_module=nil)
@@ -29,7 +29,7 @@ module HelperMethods
   def assignment_to_each_other(object_1, object_2)
     type, method_name = get_type_and_name_of_association(object_1.class, object_2.class)
 
-    if    type == :belongs_to or type == :has_one
+    if type == :belongs_to or type == :has_one
       object_1.send( "#{method_name.to_s}=", object_2 )
     elsif type == :has_many   or type == :has_and_belongs_to_many
       object_1.method(method_name).call << object_2
@@ -83,4 +83,14 @@ module HelperMethods
     end
   end
 
+  def iterate_parents_with_nested_objects(data_objects, &block)
+    data_objects.each do |data_object|
+      iterate_parents_with_nested_objects(data_object.nested, &block)
+      data_object.nested.each do |nested_data_object|
+        block.call(data_object, nested_data_object) if block
+      end
+    end
+  end
+
 end
+

data/lib/slim_form_object/saver.rb

@@ -4,8 +4,6 @@ module SlimFormObject
 
     attr_reader :form_object, :params, :validator, :data_objects_arr
 
-    STAGE_3 = 3
-
     def initialize(form_object)
       @form_object                     = form_object
       @params                          = form_object.params
@@ -47,6 +45,7 @@ module SlimFormObject
         stage_1(data_objects_arr)
         stage_2(data_objects_arr)
         stage_3(data_objects_arr)
+        stage_4(data_objects_arr)
         form_object.after_save_form_block.call(form_object)
       end
     end
@@ -61,7 +60,7 @@ module SlimFormObject
       end
     end
 
-    # save all objects
+    # save all nested objects
     def stage_2(objects)
       objects.each do |data_object|
         stage_2(data_object.nested)
@@ -79,12 +78,17 @@ module SlimFormObject
     end
 
     def associate_and_save_objects(data_objects)
-      objects = Array.new(data_objects)
-      while data_object_1 = objects.delete( objects[0] )
-        objects.each do |data_object_2|
-          obj = data_object_1.associate_with(data_object_2.object, stage: STAGE_3)
-          save_object(obj)
-        end
+      data_objects.iterate_with_each_pair do |data_object_1, data_object_2|
+        obj = data_object_1.associate_with(data_object_2.object, force: true)
+        save_object(obj)
+      end
+    end
+
+    # association per parent with all nested objects with FORCE TRUE option
+    def stage_4(objects)
+      iterate_parents_with_nested_objects(objects) do |data_object, nested_data_object|
+        obj = data_object.associate_with(nested_data_object.object, force: true)
+        save_object(obj)
       end
     end
 
@@ -93,6 +97,5 @@ module SlimFormObject
           object_of_model.save!
       end
     end
-
   end
 end

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "3.3.4"
+  VERSION = "3.3.5"
 end

data/lib/slim_form_object.rb

@@ -1,4 +1,5 @@
 require "slim_form_object/version"
+require "slim_form_object/extensions"
 require "slim_form_object/helpers"
 require "slim_form_object/validator"
 require "slim_form_object/processing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - nerzh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -149,6 +149,7 @@ files:
 - lib/slim_form_object.rb
 - lib/slim_form_object/assign.rb
 - lib/slim_form_object/data_object.rb
+- lib/slim_form_object/extensions.rb
 - lib/slim_form_object/form_helpers/extension_actionview.rb
 - lib/slim_form_object/helpers.rb
 - lib/slim_form_object/processing.rb