slim_form_object 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9ec59874945c8a7ee3c6abb9fb4fd58999d9fd5ade2e950957e4cdd5ceff95
-  data.tar.gz: d1b79735bb67d58cce0982f6e91be53599226c0b7d9835f52791f2c6140ef33f
+  metadata.gz: 5c312bc3e24f891d533dd197c4b064a676b6bf18fd4f5c7d655830462e2c0d1b
+  data.tar.gz: cb1d25b857e75dd4b85021c348be78fb23ca16fcb263dbf68da5c3538eabc805
 SHA512:
-  metadata.gz: f1889239d73747ed8812c5e10d20494cf876d434500b3576f8143035155e622cb33a6d8f39d8f12ae006e6289ae41feb2fd0006b40978ad5e2463db0f89ad705
-  data.tar.gz: dc5e445500ca32ef4b761d1721f9037fd258d682d0a51c6963d703615c430a08e5d2d4d46f6380a2b260ef2e3958f6e0f97f9e7cb6241009cbac5e53c6029e11
+  metadata.gz: 7f23ff7c1c057e3b662dfe0c506476db9fb978f939b05c2825cf3d3ab32742f34587c493c9d7eeb8b83c3e125dd0f623e0044c956eb9cba8ed506210ed59beb3
+  data.tar.gz: 8e29fadfdf6d4a153296161eb062bc6bc44582f02caeb4dba8083cc11e684b7d68fae19f8e659cc109f7fd98442d083941ab43f080cc74d8e439b5fe5984c7c2

data/lib/slim_form_object/assign.rb

@@ -2,13 +2,14 @@ module SlimFormObject
   class Assign
     include ::HelperMethods
 
-    attr_reader :form_object, :params, :data_for_assign
+    attr_reader :form_object, :params, :data_for_assign, :validator
     attr_accessor :data_objects_arr
 
     def initialize(form_object)
       @form_object                     = form_object
       @params                          = form_object.params
       @structure                       = form_object.data_structure
+      @validator                       = Validator.new(form_object)
       @data_for_assign                 = []
       @data_objects_arr                = []
     end
@@ -16,6 +17,7 @@ module SlimFormObject
     def apply_parameters_and_make_objects
       parse_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
@@ -43,10 +45,10 @@ module SlimFormObject
 
       value_params.each do |key, value|
         if is_nested?(value)
-          if value.is_a?(Array)
+          if nested_as_hash?(value)
+            value.values.each { |hash_params| nested << make_hash_objects_and_nested_objects(key, hash_params) }
+          elsif value.is_a?(Array)
             value.each { |hash_params| nested << make_hash_objects_and_nested_objects(key, hash_params) }
-          elsif value.is_a?(ActionController::Parameters)
-            value.each { |index, hash_params| nested << make_hash_objects_and_nested_objects(key, hash_params) }
           else
             nested << make_hash_objects_and_nested_objects(key, value)
           end
@@ -59,15 +61,19 @@ module SlimFormObject
       {model: model, attributes: attributes, nested: nested}
     end
 
+    def nested_as_hash?(values)
+      values.select{ |key, value| key.to_i.to_s == key }.size == values.size
+    end
+
     def parse_params
-      params.each do |main_model_name, attributes|
+      params.to_h.each do |main_model_name, attributes|
         data_for_assign << make_hash_objects_and_nested_objects(main_model_name, attributes)
       end
     end
 
     def is_nested?(value)
       def nested?(e)
-        e.class == ActionController::Parameters or e.class == Hash
+        e.class == ActionController::Parameters or e.class == Hash or e.class == ActiveSupport::HashWithIndifferentAccess
       end
 
       return true if nested?(value)
@@ -90,7 +96,7 @@ module SlimFormObject
       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.associated_object)
+          data_object_1.associate_with(data_object_2.object)
         end
       end
     end
@@ -100,7 +106,7 @@ module SlimFormObject
 
       objects.each do |data_object|
         data_object.nested.each do |nested_data_object|  
-          data_object.associate_with(nested_data_object.associated_object)
+          data_object.associate_with(nested_data_object.object)
         end
       end
     end
@@ -108,7 +114,7 @@ module SlimFormObject
     def clean_data_objects_arr(objects)
       objects.select! do |data_object|
         clean_data_objects_arr(data_object.nested)
-        data_object.save_if_nil_or_empty?
+        validator.allow_object_processing?(data_object)
       end
     end
 

data/lib/slim_form_object/data_object.rb

@@ -2,7 +2,7 @@ module SlimFormObject
   class DataObject
     include ::HelperMethods
 
-    attr_reader :name, :model, :attributes, :object, :associated_object, :form_object
+    attr_reader :name, :model, :attributes, :object, :form_object, :validator
     attr_accessor :nested
 
     def initialize(name: nil, attributes: {}, form_object: nil)
@@ -11,57 +11,37 @@ module SlimFormObject
       @attributes        = attributes
       @form_object       = form_object
       @object            = make_object
-      @associated_object = assign_attributes_for(make_object)
+      @validator         = Validator.new(form_object)
       assign_attributes!
     end
 
     def associate_with(other_object, stage: nil)
-      case stage
-      when 1
-        obj = object
-      when 2
-        obj = object
-      else
-        obj = associated_object  
-      end
+      return object if (stage != Saver::STAGE_3 and !object.new_record? and !other_object.new_record?)
 
-      return obj if (stage != 2 and !obj.new_record? and !other_object.new_record?)
-
-      to_bind_models(obj, other_object)
+      to_bind_models(object, other_object)
     end
 
-    def save_if_nil_or_empty?
-      save_if_empty? and save_if_nil?
+    def blank_or_empty?(except_fileds: [])
+      validator.blank_or_empty_object?(self, except_fileds: except_fileds)
     end
 
-    def save_if_empty?
-      !form_object.not_save_if_empty_arr.include?(model) or !empty_attributes?
+    def empty_attributes?
+      validator.empty_attributes?(attributes)
     end
 
-    def save_if_nil?
-      !form_object.not_save_if_nil_arr.include?(model) or !nil_attributes?
+    def only_blank_strings_in_attributes?
+      validator.only_blank_strings_in_attributes?(attributes)
     end
 
-    private
-
-    def empty_attributes?
-      return false if nil_attributes?
-      attributes.each { |key, value| return false if value&.to_s&.strip != '' }
-      true
-    end
-
-    def nil_attributes?
-      attributes.empty?
+    def regenerate_object
+      @object = make_object
     end
 
     def assign_attributes!
-      assign_attributes_for(object)
+      object.assign_attributes(attributes)
     end
 
-    def assign_attributes_for(obj)
-      obj.assign_attributes(attributes)
-      obj
-    end
+    private
 
     def make_object
       attributes[:id].to_i > 0 ? model.find(attributes[:id]) : model.new
@@ -69,5 +49,3 @@ module SlimFormObject
   end
 end
 
-
-

data/lib/slim_form_object/form_helpers/extension_actionview.rb

@@ -54,7 +54,6 @@ module HelperMethods
   end
 end
 
-
 if const_exists?('ActionView::Helpers')
 
   module ActionView
@@ -76,10 +75,8 @@ if const_exists?('ActionView::Helpers')
           return sfo_get_date_tag_name(prefix, field_name, options) if sfo_date_attr?(field_name)
 
           @options[:discard_type] ? prefix : "#{prefix}[#{field_name}]"
-
         end
       end
-
       
     end
   end

data/lib/slim_form_object/helpers.rb

@@ -61,4 +61,12 @@ module HelperMethods
     return $1 if string =~ /^.+::(.+)$/
     string
   end
+  
+  def define_classes_array_with_name(name, args)
+    args.each { |model| raise "#{model.to_s} - type is not a Class" if model.class != Class }
+    instance_eval do
+      define_method(name) { args }
+    end
+  end
+
 end

data/lib/slim_form_object/processing.rb

@@ -22,23 +22,15 @@ module SlimFormObject
         define_array_of_models(:array_of_all_models, get_main_models_from_structure(structure))
       end
 
-      # array_models_which_not_save_if_empty
-      def not_save_empty_object_for(*args)
-        args.each { |model| raise "#{model.to_s} - type is not a Class" if model.class != Class }
-        instance_eval do
-          define_method(:not_save_if_empty_arr) { args }
-        end
-      end
-
-      def not_save_nil_object_for(*args)
-        args.each { |model| raise "#{model.to_s} - type is not a Class" if model.class != Class }
-        instance_eval do
-          define_method(:not_save_if_nil_arr) { args }
-        end
-      end
-
       # CALLBACKS
-      %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|
+      [
+        'after_validation_form',
+        'after_save_form',         
+        'after_save_object', 
+        'allow_to_save_object', 
+        'allow_to_validate_object',
+        'allow_object_processing'
+      ].each do |method_name|
         define_method("#{method_name}".to_sym) do |&block|
           instance_eval do
             define_method("#{method_name}_block".to_sym) { block }
@@ -138,14 +130,18 @@ module SlimFormObject
     end
     
     def default_settings
-      define_singleton_method(:not_save_if_empty_arr)            { [] } unless respond_to?(:not_save_if_empty_arr)
-      define_singleton_method(:not_save_if_nil_arr)              { [] } unless respond_to?(:not_save_if_nil_arr)
-      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)
+      define_singleton_method(:after_validation_form_block)    { Proc.new {} }       unless respond_to?(:after_validation_form_block)
+      define_singleton_method(:after_save_form_block)          { Proc.new {} }       unless respond_to?(:before_save_form_block)
+      define_singleton_method(:after_save_object_block)        { Proc.new { true } } unless respond_to?(:allow_to_save_object_block)
+      define_singleton_method(:allow_to_validate_object_block) { Proc.new { true } } unless respond_to?(:allow_to_validate_object_block)
+      
+      define_singleton_method(:allow_to_save_object_block) do 
+        Proc.new { |object|  object.valid? and object.changed? } 
+      end unless respond_to?(:allow_to_save_object_block)
+
+      define_singleton_method(:allow_object_processing_block) do
+        Proc.new { |data_object| data_object.blank_or_empty? } 
+      end unless respond_to?(:allow_object_processing_block)
     end
 
   end

data/lib/slim_form_object/saver.rb

@@ -4,6 +4,8 @@ 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
@@ -30,9 +32,18 @@ module SlimFormObject
 
     private
 
+    def regenerate_objects_with_attributes(objects)
+      objects.each do |object|
+        object.regenerate_object
+        object.assign_attributes!
+        regenerate_objects_with_attributes(object.nested)
+      end
+    end
+
     def _save
+      regenerate_objects_with_attributes(data_objects_arr)
+
       ActiveRecord::Base.transaction do
-        form_object.before_save_form_block.call(form_object)
         stage_1(data_objects_arr)
         stage_2(data_objects_arr)
         stage_3(data_objects_arr)
@@ -44,7 +55,7 @@ module SlimFormObject
     def stage_1(objects)
       objects.each do |data_object|
         data_object.nested.each do |nested_data_object|
-          data_object.associate_with(nested_data_object.object, stage: 1)
+          data_object.associate_with(nested_data_object.object)
         end
         stage_1(data_object.nested)
       end
@@ -71,18 +82,14 @@ module SlimFormObject
       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: 2)
+          obj = data_object_1.associate_with(data_object_2.object, stage: STAGE_3)
           save_object(obj)
         end
       end
     end
 
-    def allow_to_save(object_of_model)
-      object_of_model.valid? and object_of_model.changed? and validator.allow_to_save_object?(object_of_model)
-    end
-
     def save_object(object_of_model)
-      if allow_to_save(object_of_model)
+      if validator.allow_to_save_object?(object_of_model)
           object_of_model.save!
       end
     end

data/lib/slim_form_object/validator.rb

@@ -2,18 +2,14 @@ module SlimFormObject
   class Validator
     include ::HelperMethods
 
-    attr_reader :form_object, :params, :not_save_if_empty_arr, :not_save_if_nil_arr, :data_objects_arr
+    attr_reader :form_object, :data_objects_arr
 
     def initialize(form_object)
       @form_object                          = form_object
-      @params                               = form_object.params
       @data_objects_arr                     = form_object.data_objects_arr
-      @not_save_if_empty_arr                = form_object.not_save_if_empty_arr
-      @not_save_if_nil_arr                  = form_object.not_save_if_nil_arr
     end
 
     def validate_form_object
-      form_object.before_validation_form_block.call(form_object)
       validation_objects(data_objects_arr)
       form_object.after_validation_form_block.call(form_object)
     end
@@ -22,15 +18,39 @@ module SlimFormObject
       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)
+    def allow_to_validate_object?(data_object)
+      form_object.allow_to_validate_object_block.call(data_object) 
+    end
+
+    def empty_attributes?(attributes)
+      attributes.empty?
+    end
+
+    def only_blank_strings_in_attributes?(attributes)
+      return false if empty_attributes?(attributes)
+      attributes.each { |key, value| return false if value&.to_s&.strip != '' }
+      true
+    end
+
+    def only_blank_or_empty_attributes(attributes)
+      empty_attributes?(attributes) or only_blank_strings_in_attributes?(attributes)
+    end
+
+    def blank_or_empty_object?(data_object, except_fileds: [])
+      attributes = data_object.attributes.reject { |key| except_fileds.map{|name| name.to_s }.include?(key.to_s) }
+      only_blank_or_empty_attributes(attributes) and data_object.nested.empty?
+    end
+
+    def allow_object_processing?(data_object)
+      form_object.allow_object_processing_block.call(data_object)
     end
 
     private
 
     def validation_objects(objects)
       objects.each do |data_object|
-        set_errors( snake(data_object.model), data_object.associated_object.errors ) unless data_object.associated_object.valid?
+        next unless allow_to_validate_object?(data_object)
+        set_errors( snake(data_object.model), data_object.object.errors ) unless data_object.object.valid?
         validation_objects(data_object.nested)
       end
     end

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel