slim_form_object 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f6c5f47c07161c3e2d610f4094fdfb648cdfbf
-  data.tar.gz: 95fe4c99fc97171eabe7abbbeeff5a15de41f8bd
+  metadata.gz: d2aed3c55c37bbeb4b8f1fa75688bcbf70eb6f6f
+  data.tar.gz: cba65de38298064fcd60551819b2646b1d1b5026
 SHA512:
-  metadata.gz: 3a00c88bf1314247263aa0bda2c615090ea4b61e117ce2c812bd349804b3ecb7674709c8878d893726b1997d3ebbe4981aab55f38c7843fd074d8cb093d1a7bf
-  data.tar.gz: a5c3def15d7c99d6a2fa1a6cb3bb760ba82dac27289bb7c4373bf36e719d441373166a1638c7317fae6beb27f6b779cc040dd9f63a1df5f3fb27dbc2793a9c4c
+  metadata.gz: 3f32e57070632547c8670b7a23f9d7016384411e059fbe954a8578436c9af18a0e7f0edcd407c2c17b3f431bd867a0c8c49cf206f45f5f23bd8fa062890d4707
+  data.tar.gz: d3038714911637b3f38a4eddc1daa7873481c2a2a23938f6472a5eba12f3c8d4b1b5b74c563b46eafcaa2e6bd74e27a965015d3a077eff77b93be63f313d1948

data/lib/slim_form_object/assign.rb

@@ -8,12 +8,12 @@ module SlimFormObject
       @form_object                 = form_object
       @params                      = form_object.params
       @array_all_objects_for_save  = form_object.array_all_objects_for_save
-      @not_save_this_model         = form_object.not_save_this_model
+      # @not_save_this_model         = form_object.not_save_this_model
       @result_hash_updated_objects = {objects: [], nested_objects: {}}
     end
 
     def apply_parameters
-      filter_not_save_objects
+      # filter_not_save_objects
       update_objects_attributes
       make_nested_objects
 
@@ -22,11 +22,11 @@ module SlimFormObject
 
     private
 
-    def filter_not_save_objects
-      array_all_objects_for_save.reject do |object|
-        not_save_this_model.include?(object.class)
-      end
-    end
+    # def filter_not_save_objects
+    #   array_all_objects_for_save.reject do |object|
+    #     not_save_this_model.include?(object.class)
+    #   end
+    # end
 
     # STANDART OBJECTS
 

data/lib/slim_form_object/form_helpers/extension_actionview.rb

@@ -137,7 +137,6 @@ module ActionView
 
         def value(object)
           method_name = sfo_get_method_name(@method_name)
-          # byebug
           object.public_send method_name if object
         end
 

data/lib/slim_form_object/helpers.rb

@@ -1,6 +1,4 @@
 module HelperMethods
-  private
-
   def snake(string)
     string = string.to_s
     string.gsub!(/((\w)([A-Z]))/,'\2_\3')

data/lib/slim_form_object/processing.rb

@@ -16,15 +16,10 @@ module SlimFormObject
       end
       alias_method :init_models, :init_single_models
 
-      def not_save_this_model(*args)
+      def not_save_empty_object_for(*args)
+        args.each { |model| raise "#{model.to_s} - type is not a Class" if model.class != Class }
         self.instance_eval do
-          define_method(:not_save_this_model) { args }
-        end
-      end
-
-      def force_save_if_all_attr_is_nil(*args)
-        self.instance_eval do
-          define_method(:force_save_if_all_attr_is_nil) { args }
+          define_method(:array_models_which_not_save_if_empty) { args }
         end
       end
 
@@ -101,8 +96,7 @@ module SlimFormObject
     end
     
     def check_array_settings_with_settings
-      define_singleton_method(:not_save_this_model) { [] } unless respond_to?(:not_save_this_model)
-      define_singleton_method(:force_save_if_all_attr_is_nil) { [] } unless respond_to?(:force_save_if_all_attr_is_nil)
+      define_singleton_method(:array_models_which_not_save_if_empty) { [] } unless respond_to?(:array_models_which_not_save_if_empty)
     end
 
   end

data/lib/slim_form_object/validator.rb

@@ -2,22 +2,34 @@ module SlimFormObject
   class Validator
     include ::HelperMethods
 
-    attr_reader   :form_object, :params, :hash_objects_for_save
+    attr_reader   :form_object, :params, :hash_objects_for_save, :array_models_which_not_save_if_empty
 
     def initialize(form_object)
-      @form_object           = form_object
-      @params                = form_object.params
-      @hash_objects_for_save = form_object.hash_objects_for_save
+      @form_object                          = form_object
+      @params                               = form_object.params
+      @hash_objects_for_save                = form_object.hash_objects_for_save
+      @array_models_which_not_save_if_empty = form_object.array_models_which_not_save_if_empty
     end
 
     def validate_form_object
-      filter_nil_objects
+      filter_models
+      validation_objects
+      validation_nested_objects
+    end
+
+    def valid_model_for_save?(object)
+      true
+    end
+
+    private
 
+    def validation_objects
       hash_objects_for_save[:objects].each do |object|
-        next if all_attributes_is_nil?(object)
         set_errors( snake(object.class), object.errors ) unless object.valid?
       end
+    end
 
+    def validation_nested_objects
       hash_objects_for_save[:nested_objects].keys.each do |snake_model_name|
         hash_objects_for_save[:nested_objects][snake_model_name].each do |object|
           set_errors( snake(object.class), object.errors ) unless object.valid?
@@ -25,15 +37,13 @@ module SlimFormObject
       end
     end
 
-    def valid_model_for_save?(object)
-      true
+    def filter_models
+      filter_nil_objects
     end
 
-    private
-
     def filter_nil_objects
       hash_objects_for_save[:objects].reject! do |object|
-        all_attributes_is_nil?(object)
+        !save_if_object_is_empty?(object)
       end
     end
 
@@ -44,6 +54,10 @@ module SlimFormObject
       true
     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 set_errors(object_name, object_errors)
       object_errors.each do |attribute, message|
         form_object.errors.add(object_name, { attribute => message})

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel