slim_form_object 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877cf82dafb6d5693d503c5082512650aed41d5b
-  data.tar.gz: f3ca78c6f2793d2cc4ea675f429b1980640f6df0
+  metadata.gz: 4a1a89125979213f45b4bf5df265aaaf83c0c4a9
+  data.tar.gz: 7b0a6cbab44b3b32c20d92d20e9d736f5c519b7b
 SHA512:
-  metadata.gz: a134e57ba709ffee092dc233c48f44e3254093eab46b5a12a891b2d9ab5bde4f2bceab064d74076a5c5317d981f365a92ec052beabff7ebd64b5370e1754c76a
-  data.tar.gz: 4b7e216b9556c3458d1113f2eafcb6af0eee02237099e6a1a8c3725ccd8b1e82777b4e6daa08fbc0e1968d9e0ad1608880a1a6b81f5d2eb3ddeea379fe57e61b
+  metadata.gz: 1e38ae5d94058cd6f8b6ee7171bc7d2fc85c41aec3ee2ce1a31203dd52bf912699bc25a08cf62d7890da55b38dd63024385145aa8133a6fae3e8852aa77a5e33
+  data.tar.gz: 51ed0c4650d16d2cde08d4670a3b1e3ec46900b37aa7a289783b861560ee351c3f8ac302eeca18c90b874be2c5897b76ebf946200d8b7f6c233d4f7f25d77566

data/lib/slim_form_object/processing.rb

@@ -37,6 +37,7 @@ module SlimFormObject
   end
 
   def submit
+    @array_of_models ||= array_of_models.reject{ |model| array_of_models_without_validates.include?(model) }
     update_attributes
     update_attributes_for_collection
     self
@@ -46,7 +47,7 @@ module SlimFormObject
 
   def save
     if valid?
-      models = Array.new(array_of_models)
+      models = Array.new(@array_of_models)
       while model1 = models.delete( models[0] )
         models.each{ |model2| save_models(model1, model2) }
       end
@@ -55,30 +56,28 @@ module SlimFormObject
     false
   end
 
+  def not_validate(*args)
+    define_singleton_method(:array_of_models_without_validates) { args }
+  end
+
   private
 
   def save_models(model1, model2)
     self_object_of_model1 = method( snake(model1.to_s) ).call
     self_object_of_model2 = method( snake(model2.to_s) ).call
-
-    case get_association(model1, model2)
-      when :belongs_to
-        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
-        self_object_of_model1.save!
-      when :has_one
-        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
-        self_object_of_model1.save!
-      when :has_many
-        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
-        self_object_of_model1.save!
-      when :has_and_belongs_to_many
-        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
-        self_object_of_model1.save!
+    association           = get_association(model1, model2)
+
+    if    association == :belongs_to or association == :has_one
+      self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
+      self_object_of_model1.save!
+    elsif association == :has_many   or association == :has_and_belongs_to_many
+      self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
+      self_object_of_model1.save!
     end
   end
 
   def validation_models
-    array_of_models.each do |model|
+    @array_of_models.each do |model|
       set_errors( method(snake(model.to_s)).call.errors ) unless method( snake(model.to_s) ).call.valid?
     end
   end
@@ -90,14 +89,14 @@ module SlimFormObject
   end
 
   def update_attributes
-    array_of_models.each do |model|
+    @array_of_models.each do |model|
       model_attributes = make_attributes_of_model(model)
       method( snake(model.to_s) ).call.assign_attributes( get_attributes_for_update(model_attributes, model) )
     end
   end
 
   def update_attributes_for_collection
-    array_of_models.each do |model|
+    @array_of_models.each do |model|
       assign_attributes_for_collection(model)
     end
   end
@@ -105,7 +104,7 @@ module SlimFormObject
   def keys_of_collections
     @keys ||= []
     params.keys.each do |key|
-      array_of_models.each do |model|
+      @array_of_models.each do |model|
         self_object_of_model = method( snake(model.to_s) ).call
         method_name          = key.to_s[/#{snake(model.to_s)}_(.*)/, 1]
         @keys << method_name if self_object_of_model.respond_to? method_name.to_s
@@ -116,7 +115,7 @@ module SlimFormObject
 
   def exist_any_errors_without_collections?
     keys_of_collections.each do |method_name|
-      array_of_models.each do |model|
+      @array_of_models.each do |model|
         name_of_model          = method_name.to_s[/^(.+)_ids$/, 1]
         name_of_constant_model = name_of_model.split('_').map(&:capitalize).join
         name_of_key_error      = Object.const_get(name_of_constant_model).table_name

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "0.5.21"
+  VERSION = "0.5.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel