slim_form_object 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb83b2555e0774293968cf63af140307e868227c
-  data.tar.gz: ea270672e17684d5db94c684b18e1debe00c9c84
+  metadata.gz: da6582abfd769d9af8238cfad6ca79a890b62308
+  data.tar.gz: b6b7e88761e2684826122f454d8374413981f532
 SHA512:
-  metadata.gz: f7b059c728efba05791fa2e4594c8114e0b93a3cf9f29e01a098c352eb83cc508908045ca0ffbc964331689a1b39d73233d1a88e386b083bb1e621eef40dc27c
-  data.tar.gz: 278ecb3ff653d5568832d8c19772ac0e7938098b6af30c936a0372209a9db90ef132819b27a5eb346da7a96aac721ddd0ed0a88f3b3ea90ede68b5e5995ec9a5
+  metadata.gz: 1f6b7b6a8bcc973b1ad647960fffd088e2a07ceb9efc34fa30af6d823398c80bf744ec492b1d16caaa6a06b9ba5e4398ccd4b281ed477e66d8730510bfdf425b
+  data.tar.gz: 1accda12ed241795b42024073ead360d49fb0a2cfbf15df6fa22fbec275587e5988fe3d65bcbdf65bd8338bd135e1711705ec3580b9502a92bce8d57176ee047

data/lib/slim_form_object.rb

@@ -37,6 +37,7 @@ module SlimFormObject
 
   def submit
     update_attributes
+    update_attributes_for_collection
   end
 
   def save
@@ -89,10 +90,43 @@ module SlimFormObject
     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|
       assign_attributes_for_collection(model)
     end
   end
 
+  def keys_of_collections
+    @keys ||= params.keys.select{ |key| key =~ /^.+_ids$/ }
+  end
+
+  def exist_any_arrors_without_collections?(model)
+    keys_of_collections.each do |key|
+      name_of_model = key.to_s[/^#{snake(model.to_s)}_(.*)_ids$/, 1].split('_').map(&:capitalize).join
+      name_of_key_error = Object.const_get(name_of_model).table_name
+      errors.messages.delete(name_of_key_error.to_sym)
+    end unless valid?
+    errors.messages.empty?
+  end
+
+  def assign_attributes_for_collection(model)
+    self_object_of_model = method( snake(model.to_s) ).call
+
+    keys_of_collections.each do |key|
+      method_name = key.to_s[/#{snake(model.to_s)}_(.*)/, 1]
+      if self_object_of_model.respond_to? method_name.to_s
+        old_attribute = self_object_of_model.method( method_name ).call
+        unless self_object_of_model.update_attributes( {method_name.to_s => params[key]} )
+          set_errors(self_object_of_model.errors)
+          self_object_of_model.update_attributes( {method_name.to_s => old_attribute} )
+        end if exist_any_arrors_without_collections?(model)
+      end
+    end
+  end
+
   def make_attributes_of_model(model)
     model_attributes = []
     model.column_names.each do |name|
@@ -112,19 +146,4 @@ module SlimFormObject
     class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first.try(:macro)
   end
 
-  def keys_of_collections
-    params.keys.select{ |key| key =~ /^.+_ids$/ }
-  end
-
-  def assign_attributes_for_collection(model)
-    self_object_of_model = method( snake(model.to_s) ).call
-
-    keys_of_collections.each do |key|
-      key.to_s =~ /#{snake(model.to_s)}_(.*)/
-      if self_object_of_model.respond_to? $1.to_s
-        self_object_of_model.assign_attributes( {$1.to_s => params[key]} )
-      end
-    end
-  end
-
 end

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/slim_form_object_spec.rb

@@ -176,7 +176,6 @@ describe TestModule do
       expect(object).to receive(:array_of_models).and_return( [TestOneModel] )
       expect(object).to receive(:make_attributes_of_model).and_return( attributes_of_model )
       expect(object).to receive(:get_attributes_for_update).and_return( attributes_for_update )
-      expect(object).to receive(:assign_attributes_for_collection).and_return( true )
       object.stub(:test_one_model).and_return( TestOneModel.new )
       object.send :update_attributes
     end
@@ -202,7 +201,7 @@ describe TestModule do
 
   context 'assign_attributes_for_collection' do
     before :each do
-      @test_object = TestOneModel.new
+      @test_object = TestOneModel.create(title:'title', descr:'descr')
       (1...4).each { TestFourModel.create(title:'title', descr:'descr') }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord