slim_form_object 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd0b9f7cfacc36f4b8942582d15823dc758eb5c
-  data.tar.gz: cce413cf2d88d6ef030c30815d8256c8cd4fd5cb
+  metadata.gz: 3de1e0db09d9602bafd6f0cc1450a17fdc71e86a
+  data.tar.gz: bab8598dda0efe82bdebc1b95e7c44bc6445cef4
 SHA512:
-  metadata.gz: f9edb2bb9b7710fb6e5bc2f88d9922b3569a67589a563e02efb8287afa81330d30d7d78a0b664e764731ad4b3696812cf01ca7828be0ab2eda12ca7b69c28e2a
-  data.tar.gz: 5be93c1ad8b14b667be358db84669a0611901b9c1f15d992c22d5624b4153ef3850184530cf02eaf9d62d9dedb121224c12635348b77a706ad9eba7831704c61
+  metadata.gz: 6cc0412036eb444986de4106610fb8583c09835e2dd1fd043da1412db77d0ac8bade9fc4daffcee70280223f407ed880a6c6ee88da5a775934369262bc6e866c
+  data.tar.gz: 439ff3ebeaf41d1f2d58927f03452435a1d9d1f73be2744eaf76fe50da2f60c6a2d8b809894542defbf7749b1490c4cbcf7ff569f84610fee6f7c75267bbfb19

data/lib/slim_form_object/assign.rb

@@ -21,7 +21,8 @@ module SlimFormObject
     end
 
     def associate_objects
-      associate_all_objects(all_updated_objects)
+      associate_all_nested_objects(all_updated_objects)
+      associate_all_main_objects(all_updated_objects)
 
       all_updated_objects
     end
@@ -48,24 +49,34 @@ module SlimFormObject
       end
     end
 
-    def associate_all_objects(nested_array, object=nil)
+    def associate_all_nested_objects(nested_array, object=nil)
       nested_array.each do |hash|
         to_bind_models(object, hash[:essence][:object]) if object
-        associate_all_objects(hash[:nested], 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)
+      while object = objects.delete( objects[0] )
+        object_1 = object[:essence][:object]
+        objects.each do |hash|
+          object_2 = hash[:essence][:object]
+          next if !object_1.new_record? and !object_2.new_record?
+          to_bind_models(object_1, object_2) 
+        end
       end
     end
 
     def make_all_objects_with_attributes
-      object_hash = {}
       params.each do |main_model_name, hash|
-        assign_objects_attributes(main_model_name, hash, object_hash, @all_updated_objects)
+        assign_objects_attributes(main_model_name, hash, all_updated_objects, :main)
       end
     end
 
     def nested(model_name, nested_array, result_array)
-      object_hash = {}
       nested_array.each do |nested_object|
-        assign_objects_attributes(model_name, nested_object, object_hash, result_array)
+        assign_objects_attributes(model_name, nested_object, result_array, :nested)
       end
     end
 
@@ -74,8 +85,9 @@ module SlimFormObject
       value.select{ |e| e.class == ActionController::Parameters or e.class == Hash }.size == value.size
     end
 
-    def assign_objects_attributes(model_name, hash, object_hash, result_array)
-      object               = get_class_of_snake_model_name(model_name).new
+    def assign_objects_attributes(model_name, hash, result_array, type)
+      object_hash          = {}
+      object               = type == :main ? form_object.send(model_name.to_sym) : get_class_of(model_name, base_module).new
       object_hash[:nested] = []
       object_attrs         = {}
       hash.each do |key, val|

data/lib/slim_form_object/form_helpers/extension_actionview.rb

@@ -1,101 +1,90 @@
-module ActionView
-  module Helpers
-    module HelperMethods
-
-      private
-
-      def get_class_of_snake_model_name(snake_model_name)
-        Object.const_get( snake_model_name.split('_').map(&:capitalize).join )
-      end
-
-      def sfo_single_attr_regexp
-        /^([^-]+)-([^-]+)$/
-      end
-
-      def sfo_date_attr_regexp
-        /^([^-]+)-([^-]+)(\([\s\S]+\))$/
-      end
+module HelperMethods
 
-      def sfo_collection_ads_regexp
-        /_ids$/
-      end
-
-      def sfo_form_attribute?(object)
-        object.class.ancestors[1] == SlimFormObject::Base if object
-      end
+  private
 
-      def sfo_attr?(method)
-        sfo_single_attr?(method)
-      end
+  def get_class_of_snake_model_name(snake_model_name)
+    Object.const_get( snake_model_name.split('_').map(&:capitalize).join )
+  end
 
-      def sfo_single_attr?(method)
-        method.to_s[sfo_single_attr_regexp] ? true : false
-      end
+  def sfo_single_attr_regexp
+    /^([^-]+)-([^-]+)$/
+  end
 
-      def sfo_date_attr?(tag_name)
-        tag_name.to_s[sfo_date_attr_regexp] ? true : false
-      end
+  def sfo_date_attr_regexp
+    /^([^-]+)-([^-]+)(\([\s\S]+\))$/
+  end
 
-      def sfo_collection_ads_attr?(tag_name)
-        tag_name.to_s[sfo_collection_ads_regexp] ? true : false
-      end
+  def sfo_collection_ads_regexp
+    /_ids$/
+  end
 
-      def sfo_get_tag_name(object_name, method, multiple, options)
-        model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
+  def sfo_form_attribute?(object)
+    object.class.ancestors[1] == SlimFormObject::Base if object
+  end
 
-        if options[:sfo_nested]
-          if options[:sfo_main]
-            tag_name = "#{object_name}[#{model_name}][][#{attr_name}]#{"[]" if multiple}"
-          else
-            tag_name = "#{object_name}[][#{model_name}][][#{attr_name}]#{"[]" if multiple}"
-          end
-        elsif sfo_single_attr?(method)
-          tag_name   = "#{object_name}[#{model_name}][#{attr_name}]#{"[]" if multiple}"
-        end
+  def sfo_attr?(method)
+    sfo_single_attr?(method)
+  end
 
-        tag_name
-      end
+  def sfo_single_attr?(method)
+    method.to_s[sfo_single_attr_regexp] ? true : false
+  end
 
-      def sfo_get_method_name(method)
-        if sfo_single_attr?(method) and !sfo_collection_ads_attr?(method)
-          model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
-          method = "#{model_name}_#{attr_name}"
-        end
+  def sfo_date_attr?(tag_name)
+    tag_name.to_s[sfo_date_attr_regexp] ? true : false
+  end
 
-        method
-      end
+  def sfo_collection_ads_attr?(tag_name)
+    tag_name.to_s[sfo_collection_ads_regexp] ? true : false
+  end
 
-      def sfo_get_date_tag_name(prefix, tag_name, options)
-        model_name, attr_name, date_type = apply_expression_date(tag_name, sfo_date_attr_regexp)
+  def sfo_get_tag_name(object_name, method, multiple, options)
+    model_name, attr_name = apply_expression_text(method)
+    if options[:sfo_nested]
+      "#{object_name}[#{model_name}][][#{attr_name}]#{"[]" if multiple}"
+    else
+      "#{object_name}[#{model_name}][#{attr_name}]#{"[]" if multiple}"
+    end
+  end
 
-        if options[:sfo_nested]
-          tag_name   = "#{prefix}[#{model_name}][][#{attr_name}#{date_type}]"
-        else
-          tag_name   = "#{prefix}[#{model_name}][#{attr_name}#{date_type}]"
-        end
+  def sfo_get_method_name(method)
+    if sfo_single_attr?(method) and !sfo_collection_ads_attr?(method)
+      model_name, attr_name = apply_expression_text(method)
+      method = "#{model_name}_#{attr_name}"
+    end
 
-        tag_name
-      end
+    method
+  end
 
-      def apply_expression_date(string, exp)
-        string[exp]
-        model_name = $1
-        attr_name  = $2
-        date_type  = $3
+  def sfo_get_date_tag_name(prefix, tag_name, options)
+    model_name, attr_name, date_type = apply_expression_date(tag_name)
+    if options[:sfo_nested]
+      "#{prefix}[#{model_name}][][#{attr_name}#{date_type}]"
+    else
+      "#{prefix}[#{model_name}][#{attr_name}#{date_type}]"
+    end
+  end
 
-        [model_name, attr_name, date_type]
-      end
+  def apply_expression_date(string)
+    string[sfo_date_attr_regexp]
+    model_name = $1
+    attr_name  = $2
+    date_type  = $3
 
-      def apply_expression_text(string, exp)
-        string[exp]
-        model_name = $1
-        attr_name  = $2
+    [model_name, attr_name, date_type]
+  end
 
-        [model_name, attr_name]
-      end
-    end
+  def apply_expression_text(string)
+    string[sfo_single_attr_regexp]
+    model_name = $1
+    attr_name  = $2
 
+    [model_name, attr_name]
+  end
+end
 
+module ActionView
+  module Helpers
     # EXTENSIONS
 
     class DateTimeSelector
@@ -124,7 +113,7 @@ module ActionView
         private
 
         def value(object)
-          method_name = sfo_get_method_name(@method_name)
+          method_name = @options[:sfo_nested] ? apply_expression_text(@method_name)[1] : sfo_get_method_name(@method_name)
           object.public_send method_name if object
         end
 
@@ -164,11 +153,11 @@ module ActionView
       end
 
       def fields_for(record_name, record_object = nil, fields_options = {}, &block)
-        (self.options[:sfo_nested] and record_object) ? record_object.merge!({sfo_main: false}) : record_object.merge!({sfo_main: true})
         fields_options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
         fields_options[:builder] ||= options[:builder]
         fields_options[:namespace] = options[:namespace]
         fields_options[:parent_builder] = self
+        self.options[:sfo_nested] ? fields_options.merge!({sfo_main: false}) : fields_options.merge!({sfo_main: true})
 
         case record_name
         when String, Symbol
@@ -199,8 +188,8 @@ module ActionView
         fields_options[:child_index] = index
 
         if fields_options[:sfo_nested]
-          record_object = object
-          record_name = record_name + '[]'
+          record_object = object if !record_object
+          record_name   = record_name + '[][]' unless fields_options[:sfo_main]
         end
         @template.fields_for(record_name, record_object, fields_options, &block)
       end

data/lib/slim_form_object/helpers.rb

@@ -3,49 +3,62 @@ module HelperMethods
     method( snake(model.to_s).to_sym ).call
   end
 
-  def get_class_of_snake_model_name(snake_model_name)
-    pref = if self.base_module
-      self.base_module.to_s + '::'
+  def get_class_of(snake_model_name, base_modulenil)
+    pref = base_module ? (base_module.to_s + '::') : ''
+    Object.const_get( pref + snake_model_name.to_s.split('_').map(&:capitalize).join )
+  rescue
+    nil
+  end
+
+  def to_bind_models(object_1, object_2)
+    if object_2.new_record?
+      assignment_to_each_other(object_2, object_1)
     else
-      ''
+      assignment_to_each_other(object_1, object_2)
     end
-    Object.const_get( pref + snake_model_name.to_s.split('_').map(&:capitalize).join )
+
+    object_1
   end
 
-  def apply_expression_text(string, exp)
-    string[exp]
-    model_name = $1
-    attr_name  = $2
+  def assignment_to_each_other(object_1, object_2)
+    type, method_name = get_type_and_name_of_association(object_1.class, object_2.class)
 
-    [model_name, attr_name]
+    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
+    end
   end
 
-  def snake(string)
-    string = string.to_s
-    string.gsub!(/((\w)([A-Z]))/,'\2_\3')
-    class_name_if_module(string.downcase)
+  def get_type_and_name_of_association(class1, class2)
+    reflection  = get_reflection(class1, class2)
+    [type_association(reflection), method_name_association(reflection)]
   end
 
-  def to_bind_models(object_1, object_2)
-    association = get_association(object_1.class, object_2.class)
+  def get_reflection(class1, class2)
+    class1.reflections.select{ |k,v| v.klass == class2 }.values.first
+  end
 
-    if    association == :belongs_to or association == :has_one
-      object_1.send( "#{snake(object_2.class.to_s)}=", object_2 )
-    elsif association == :has_many   or association == :has_and_belongs_to_many
-      object_1.method("#{object_2.class.table_name}").call << object_2
-    end
+  def type_association(reflection)
+    reflection&.macro
+  end
 
-    object_1
+  def method_name_association(reflection)
+    reflection&.name
   end
 
-  def get_association(class1, class2)
-    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first&.macro
+  def type_and_name_of_association_back_and_forth(class1, class2)
+    get_type_and_name_of_association(class1, class2) + get_type_and_name_of_association(class2, class1)
   end
 
-  private
+  def snake(string)
+    string = string.to_s
+    string.gsub!(/((\w)([A-Z]))/,'\2_\3')
+    class_name_if_module(string.downcase)
+  end
   
   def class_name_if_module(string)
     return $1 if string =~ /^.+::(.+)$/
     string
   end
-end
+end

data/lib/slim_form_object/processing.rb

@@ -47,7 +47,7 @@ module SlimFormObject
       end
 
       # CALLBACKS
-      %w(after_initialize before_save after_save before_validation after_validation).each do |method_name|
+      %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
@@ -72,7 +72,6 @@ module SlimFormObject
       self.params = params
       get_or_add_default_objects
       default_settings
-      self.after_initialize_block.call(self)
     end
     # END INIT
 
@@ -92,7 +91,6 @@ module SlimFormObject
 
     def validation_models
       Validator.new(self).validate_form_object
-      # self.after_validation_block.call(self)
     end
 
     def array_all_objects_for_save
@@ -123,7 +121,6 @@ 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(:after_initialize_block) { Proc.new {} } unless respond_to?(:after_initialize_block)
       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)

data/lib/slim_form_object/saver.rb

@@ -54,15 +54,13 @@ module SlimFormObject
     end
 
     def save_object(object_of_model)
-      if validator.valid_model_for_save?(object_of_model.class)
-        object_of_model.save!  
-      end
+      object_of_model.save!
     end
 
     def save_last_model_if_not_associations(object_1)
       association_trigger = false
-      data_for_save.each { |hash| association_trigger = true if get_association(object_1.class, hash[:essence][:object].class) }
-      object_1.save unless association_trigger
+      data_for_save.each { |hash| association_trigger = true if get_reflection(object_1.class, hash[:essence][:object].class) }
+      object_1.save! unless association_trigger
     end
 
   end

data/lib/slim_form_object/validator.rb

@@ -43,7 +43,6 @@ module SlimFormObject
         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 = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

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