slim_form_object 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da8a71ee07485bfcf11b18dfedcfcd0703278ac
-  data.tar.gz: bd5ed87f1494dbd888610909963f98f9738d38f5
+  metadata.gz: 4ae4155e3a53b282d248dd3328278d852ace1e28
+  data.tar.gz: a34baa8a40b0604775ce5db1f35b5c49b796c464
 SHA512:
-  metadata.gz: 5b7157593f83036e3b0bed6c2365911afbfaa4f8f43ab99f1bdd2d5120e2f6e762c9f0b513c89a9d428256730e9fcc838ac4dde2905bd38bd97d024c50596b02
-  data.tar.gz: fc0ca44c0709fa9d9634a2835c60e9aace36792fb7ce5c14e9667530fdbeb575811118a72882a4662c1ddb358c9b7a5057227280a13fe5d986ac0dd1e3074ef9
+  metadata.gz: eb8a312ebbc9fec0ea66c14d5c0e17f21a176c0eda0e7f7369d2d055939043a859acfc742b610504235887b244a6f0d9f18b7b806e358b44b66ed3db554acb52
+  data.tar.gz: 55a50c5f168ef4fec9015f8112d88acbffc9d45174f7311e9c63e25b97613bfc2a0361fb598f8be45a2eef62867f6bb50dc4bb7169175f2cb27857d22f684db2

data/lib/slim_form_object/assign.rb

@@ -5,11 +5,11 @@ module SlimFormObject
     attr_reader :form_object, :params, :array_all_objects_for_save, :not_save_this_model, :result_hash_updated_objects
 
     def initialize(form_object)
-      @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
-      @result_hash_updated_objects  = {objects: [], nested_objects: {}}
+      @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
+      @result_hash_updated_objects = {objects: [], nested_objects: {}}
     end
 
     def apply_parameters
@@ -20,6 +20,8 @@ module SlimFormObject
       result_hash_updated_objects
     end
 
+    private
+
     def filter_not_save_objects
       array_all_objects_for_save.reject do |object|
         not_save_this_model.include?(object.class)
@@ -36,7 +38,6 @@ module SlimFormObject
       result_hash_updated_objects[:objects] = array_all_objects_for_save
     end
 
-
     def hash_params_of_object(object)
       if force_permit(params[snake(object.class.to_s)])
         params[snake(object.class.to_s)]
@@ -76,7 +77,6 @@ module SlimFormObject
         end
       end
     end
-
   end
 end
 

data/lib/slim_form_object/form_helpers/extension_actionview.rb

@@ -52,15 +52,11 @@ module ActionView
       end
 
       def sfo_get_tag_name(object_name, method, multiple)
+        model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
+
         if sfo_multiple_attr?(object_name)
-          method.to_s[sfo_single_attr_regexp]
-          model_name = $1
-          attr_name  = $2
           tag_name   = "#{object_name}[#{model_name}][][#{attr_name}]#{"[]" if multiple}"
         elsif sfo_single_attr?(method)
-          method.to_s[sfo_single_attr_regexp]
-          model_name = $1
-          attr_name  = $2
           tag_name   = "#{object_name}[#{model_name}][#{attr_name}]#{"[]" if multiple}"
         end
 
@@ -69,31 +65,41 @@ module ActionView
 
       def sfo_get_method_name(method)
         if sfo_single_attr?(method)
-          method.to_s[sfo_single_attr_regexp]
-          model_name = $1
-          attr_name  = $2
-          method     = "#{model_name}_#{attr_name}"
+          model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
+          method = "#{model_name}_#{attr_name}"
         end
 
         method
       end
 
       def sfo_get_date_tag_name(prefix, tag_name)
+        model_name, attr_name, date_type = apply_expression_date(tag_name, sfo_date_attr_regexp)
+
         if sfo_multiple_attr?(prefix)
-          tag_name[sfo_date_attr_regexp]
-          model_name = $1
-          attr_name  = $2
-          date_type  = $3
           tag_name   = "#{prefix}[#{model_name}][][#{attr_name}#{date_type}]"
-        elsif tag_name[sfo_date_attr_regexp]
-          model_name = $1
-          attr_name  = $2
-          date_type  = $3
+        else
           tag_name   = "#{prefix}[#{model_name}][#{attr_name}#{date_type}]"
         end
 
         tag_name
       end
+
+      def apply_expression_date(string, exp)
+        string[exp]
+        model_name = $1
+        attr_name  = $2
+        date_type  = $3
+
+        [model_name, attr_name, date_type]
+      end
+
+      def apply_expression_text(string, exp)
+        string[exp]
+        model_name = $1
+        attr_name  = $2
+
+        [model_name, attr_name]
+      end
     end
 
     class DateTimeSelector

data/lib/slim_form_object/processing.rb

@@ -9,7 +9,6 @@ module SlimFormObject
     attr_accessor :params, :array_objects_for_save, :hash_objects_for_save
 
     class << self
-
       def set_model_name(name)
         define_method(:model_name) { ActiveModel::Name.new(self, nil, name) }
       end
@@ -85,7 +84,11 @@ module SlimFormObject
       Validator.new(self).validate_form_object
     end
 
-    # POMOGAY
+    def array_all_objects_for_save
+      array_objects_for_save ||= get_or_add_default_objects
+    end
+
+    private
 
     def apply
       assign                 = Assign.new(self)
@@ -97,16 +100,6 @@ module SlimFormObject
       define_singleton_method(:force_save_if_all_attr_is_nil) { [] } unless respond_to?(:force_save_if_all_attr_is_nil)
     end
 
-    def set_errors(object_errors)
-      object_errors.each do |attribute, message|
-        errors.add(attribute, message)
-      end
-    end
-
-    def array_all_objects_for_save
-      array_objects_for_save ||= get_or_add_default_objects
-    end
-
   end
 end
 

data/lib/slim_form_object/saver.rb

@@ -5,10 +5,10 @@ module SlimFormObject
     attr_reader :form_object, :params, :validator, :hash_objects_for_save
 
     def initialize(form_object)
-      @form_object            = form_object
-      @params                 = form_object.params
-      @hash_objects_for_save  = form_object.hash_objects_for_save
-      @validator              = Validator.new(form_object)
+      @form_object           = form_object
+      @params                = form_object.params
+      @hash_objects_for_save = form_object.hash_objects_for_save
+      @validator             = Validator.new(form_object)
     end
 
     def save
@@ -19,12 +19,14 @@ module SlimFormObject
         end
         return true
       end
+
       false
     rescue
-      # p "ERROR"
       false
     end
 
+    private
+
     def save_main_objects
       objects = Array.new(hash_objects_for_save[:objects])
       while object_1 = objects.delete( objects[0] )

data/lib/slim_form_object/validator.rb

@@ -5,9 +5,9 @@ module SlimFormObject
     attr_reader   :form_object, :params, :hash_objects_for_save
 
     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
     end
 
     def validate_form_object
@@ -15,30 +15,26 @@ module SlimFormObject
 
       hash_objects_for_save[:objects].each do |object|
         next if all_attributes_is_nil?(object)
-        form_object.set_errors( object.errors ) unless object.valid?
+        set_errors( snake(object.class), object.errors ) unless object.valid?
       end
 
       hash_objects_for_save[:nested_objects].keys.each do |snake_model_name|
         hash_objects_for_save[:nested_objects][snake_model_name].each do |object|
-          form_object.set_errors( object.errors ) unless object.valid?
+          set_errors( snake(object.class), object.errors ) unless object.valid?
         end
       end
     end
 
-    def filter_nil_objects
-      hash_objects_for_save[:objects].reject! do |object|
-        all_attributes_is_nil?(object)
-      end
-    end
-
     def valid_model_for_save?(object)
-      # ( (attributes_is_present?(object) and object.id != nil) or (object.id == nil and !all_attributes_is_empty?(object)) )
       true
     end
 
-    def both_model_attributes_exist?(object_1, object_2)
-      # valid_model_for_save?(object_1) and valid_model_for_save?(object_2)
-      !(all_attributes_is_nil?(object_1) and all_attributes_is_nil?(object_2))
+    private
+
+    def filter_nil_objects
+      hash_objects_for_save[:objects].reject! do |object|
+        all_attributes_is_nil?(object)
+      end
     end
 
     def all_attributes_is_nil?(object)
@@ -48,6 +44,12 @@ module SlimFormObject
       true
     end
 
+    def set_errors(object_name, object_errors)
+      object_errors.each do |attribute, message|
+        form_object.errors.add(object_name, { attribute => message})
+      end
+    end
+
   end
 end
 

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - woodcrust