slim_form_object 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de1e0db09d9602bafd6f0cc1450a17fdc71e86a
-  data.tar.gz: bab8598dda0efe82bdebc1b95e7c44bc6445cef4
+  metadata.gz: 5117a69b875232f6d8bc23f95e09ff8b84e49f9d
+  data.tar.gz: ceac637e0890c87c2eb25340f1f41c7f0054fcfb
 SHA512:
-  metadata.gz: 6cc0412036eb444986de4106610fb8583c09835e2dd1fd043da1412db77d0ac8bade9fc4daffcee70280223f407ed880a6c6ee88da5a775934369262bc6e866c
-  data.tar.gz: 439ff3ebeaf41d1f2d58927f03452435a1d9d1f73be2744eaf76fe50da2f60c6a2d8b809894542defbf7749b1490c4cbcf7ff569f84610fee6f7c75267bbfb19
+  metadata.gz: aa2987d5ce904144c14c0e09b791599a0bc012136f081233dabcf81280356d7e76bfca1adeae98a52001bcad1fd585397dcddb6e496edea4160b10ef97a05613
+  data.tar.gz: ef5e893bdb0fd7d491fd50bbc421ae925c4aec47290a2348a6073944b0721224230af95712266bd82ec37abfb869fb67c0b6e5a6e30abe7163b1ab24b1a2adc9

data/lib/slim_form_object/assign.rb

@@ -2,7 +2,7 @@ module SlimFormObject
   class Assign
     include ::HelperMethods
 
-    attr_reader :form_object, :params, :all_updated_objects, :base_module, :validator
+    attr_reader :form_object, :params, :data_for_save, :base_module, :validator
 
     def initialize(form_object)
       @form_object                 = form_object
@@ -10,29 +10,29 @@ module SlimFormObject
       @params                      = form_object.params
       @array_all_objects_for_save  = form_object.array_all_objects_for_save
       @validator                   = Validator.new(form_object)
-      @all_updated_objects         = []
+      @data_for_save               = []
     end
 
     def apply_parameters
       make_all_objects_with_attributes
       clear_nil_objects
 
-      all_updated_objects
+      data_for_save
     end
 
     def associate_objects
-      associate_all_nested_objects(all_updated_objects)
-      associate_all_main_objects(all_updated_objects)
+      associate_all_nested_objects(data_for_save)
+      associate_all_main_objects(data_for_save)
 
-      all_updated_objects
+      data_for_save
     end
 
     private
 
     def clear_nil_objects
       arr_ids_nil_object = []
-      find_ids_nil_object(arr_ids_nil_object, all_updated_objects)
-      delete_hash_nil_objects(arr_ids_nil_object, all_updated_objects)
+      find_ids_nil_object(arr_ids_nil_object, data_for_save)
+      delete_hash_nil_objects(arr_ids_nil_object, data_for_save)
     end
 
     def delete_hash_nil_objects(ids_arr, nested_array)
@@ -51,13 +51,13 @@ module SlimFormObject
 
     def associate_all_nested_objects(nested_array, object=nil)
       nested_array.each do |hash|
-        to_bind_models(object, hash[:essence][:object]) if object
+        to_bind_models(object, hash[:essence][:object]) if object and validator.allow_to_associate_objects?(object, hash[:essence][:object])
         associate_all_nested_objects(hash[:nested], hash[:essence][:object])
       end
     end
 
-    def associate_all_main_objects(all_updated_objects)
-      objects = Array.new(all_updated_objects)
+    def associate_all_main_objects(data_for_save)
+      objects = Array.new(data_for_save)
       while object = objects.delete( objects[0] )
         object_1 = object[:essence][:object]
         objects.each do |hash|
@@ -70,7 +70,7 @@ module SlimFormObject
 
     def make_all_objects_with_attributes
       params.each do |main_model_name, hash|
-        assign_objects_attributes(main_model_name, hash, all_updated_objects, :main)
+        assign_objects_attributes(main_model_name, hash, data_for_save, :main)
       end
     end
 
@@ -123,7 +123,7 @@ module SlimFormObject
     #   }
     # }
 
-    # make_all_objects_with_attributes() EXAMPLE @all_updated_objects FORMAT
+    # make_all_objects_with_attributes() EXAMPLE @data_for_save FORMAT
     #
     # [
     #   {

data/lib/slim_form_object/processing.rb

@@ -47,13 +47,11 @@ module SlimFormObject
       end
 
       # CALLBACKS
-      %w(before_save after_save before_validation after_validation).each do |method_name|
-        define_singleton_method("#{method_name}_form".to_sym) do |&block|
-          if block_given?
-            self.instance_eval do
-              define_method("#{method_name}_block".to_sym) { block }
-            end
-          end
+      %w(allow_to_save_object allow_to_associate_objects before_save_form after_save_form before_validation_form after_validation_form).each do |method_name|
+        define_method("#{method_name}".to_sym) do |&block|
+          self.instance_eval do
+            define_method("#{method_name}_block".to_sym) { block }
+          end if block
         end
       end
       # END CALLBACKS
@@ -104,9 +102,9 @@ module SlimFormObject
     end
 
     def apply
-      assign                 = Assign.new(self)
-      @data_for_save = assign.apply_parameters
-      @data_for_save = assign.associate_objects
+      assign             = Assign.new(self)
+      self.data_for_save = assign.apply_parameters
+      self.data_for_save = assign.associate_objects
     end
 
     def get_or_add_default_objects
@@ -121,12 +119,13 @@ module SlimFormObject
     
     def default_settings
       define_singleton_method(:array_models_which_not_save_if_empty) { [] } unless respond_to?(:array_models_which_not_save_if_empty)
-      define_singleton_method(:before_save_block) { Proc.new {} } unless respond_to?(:before_save_block)
-      define_singleton_method(:after_save_block) { Proc.new {} } unless respond_to?(:after_save_block)
-      define_singleton_method(:before_validation_block) { Proc.new {} } unless respond_to?(:before_validation_block)
-      define_singleton_method(:after_validation_block) { Proc.new {} } unless respond_to?(:after_validation_block)
+      define_singleton_method(:allow_to_associate_objects_block) { Proc.new { true } } unless respond_to?(:allow_to_associate_objects_block)
+      define_singleton_method(:allow_to_save_object_block) { Proc.new { true } } unless respond_to?(:allow_to_save_object_block)
+      define_singleton_method(:before_save_form_block) { Proc.new {} } unless respond_to?(:before_save_form_block)
+      define_singleton_method(:after_save_form_block) { Proc.new {} } unless respond_to?(:after_save_form_block)
+      define_singleton_method(:before_validation_form_block) { Proc.new {} } unless respond_to?(:before_validation_form_block)
+      define_singleton_method(:after_validation_form_block) { Proc.new {} } unless respond_to?(:after_validation_form_block)
     end
-
   end
 end
 

data/lib/slim_form_object/saver.rb

@@ -33,9 +33,10 @@ module SlimFormObject
 
     def save_all
       ActiveRecord::Base.transaction do
-        form_object.before_save_block.call(form_object)
+        form_object.before_save_form_block.call(form_object)
         save_main_objects
-        form_object.after_save_block.call(form_object)
+        save_nested_objects
+        form_object.after_save_form_block.call(form_object)
       end
     end
 
@@ -48,20 +49,27 @@ module SlimFormObject
       end
     end
 
+    def save_nested_objects
+      data_for_save.each do |main_object|
+        main_object[:nested].each do |object|
+          save_object(object[:essence][:object])
+        end
+      end
+    end
+
     def save_objects(object_1, object_2)
       object_for_save = to_bind_models(object_1, object_2)
       save_object(object_for_save)
     end
 
     def save_object(object_of_model)
-      object_of_model.save!
+      object_of_model.save! if validator.allow_to_save_object?(object_of_model)
     end
 
     def save_last_model_if_not_associations(object_1)
       association_trigger = false
       data_for_save.each { |hash| association_trigger = true if get_reflection(object_1.class, hash[:essence][:object].class) }
-      object_1.save! unless association_trigger
+      save_object(object_1) unless association_trigger
     end
-
   end
 end

data/lib/slim_form_object/validator.rb

@@ -13,15 +13,23 @@ module SlimFormObject
     end
 
     def validate_form_object
-      form_object.before_validation_block.call(form_object)
+      form_object.before_validation_form_block.call(form_object)
       validation_objects(data_for_save)
-      form_object.after_validation_block.call(form_object)
+      form_object.after_validation_form_block.call(form_object)
     end
 
     def save_if_object_is_empty?(object)
       !(all_attributes_is_nil?(object) and array_models_which_not_save_if_empty.include?(object.class))
     end
 
+    def allow_to_save_object?(object)
+      form_object.allow_to_save_object_block.call(object)
+    end
+
+    def allow_to_associate_objects?(object_1, object_2)
+      form_object.allow_to_associate_objects_block.call(object_1, object_2)
+    end
+
     private
 
     def validation_objects(nested_array)

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel