slim_form_object 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da6582abfd769d9af8238cfad6ca79a890b62308
-  data.tar.gz: b6b7e88761e2684826122f454d8374413981f532
+  metadata.gz: 20e76ba7c91e9ca6496af6eddddec79358576136
+  data.tar.gz: 47d1ddf450ab45e020d63d0b5c43e16a54ce8946
 SHA512:
-  metadata.gz: 1f6b7b6a8bcc973b1ad647960fffd088e2a07ceb9efc34fa30af6d823398c80bf744ec492b1d16caaa6a06b9ba5e4398ccd4b281ed477e66d8730510bfdf425b
-  data.tar.gz: 1accda12ed241795b42024073ead360d49fb0a2cfbf15df6fa22fbec275587e5988fe3d65bcbdf65bd8338bd135e1711705ec3580b9502a92bce8d57176ee047
+  metadata.gz: ee29067605105c217d60e76cb3978ee26e38c83df2065ed4625e2e25d1a379b2d126ac3fbeb973acce18efd394ef4b685a236639de16c6151ecf1632c8c5baaf
+  data.tar.gz: 5b1b27cabb0f566e4cfed1a2c9ca65ffde2fef082814ec744d8231a5066cd336a1554965aa6cc00eca8d9cb5760b5dbcff696c242ef62e5af82bcb721c5fbb18

data/lib/slim_form_object/version.rb

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

data/lib/slim_form_object.rb

@@ -100,14 +100,26 @@ module SlimFormObject
   end
 
   def keys_of_collections
-    @keys ||= params.keys.select{ |key| key =~ /^.+_ids$/ }
+    @keys ||= []
+    params.keys.each do |key|
+      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
+      end if key[/^.+_ids$/]
+    end if @keys.empty?
+    @keys
   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)
+  def exist_any_arrors_without_collections?
+    keys_of_collections.each do |method_name|
+      array_of_models.each do |model|
+        self_object_of_model = method( snake(model.to_s) ).call
+        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
+        errors.messages.delete(name_of_key_error.to_sym)
+      end
     end unless valid?
     errors.messages.empty?
   end
@@ -115,14 +127,13 @@ module SlimFormObject
   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
+    keys_of_collections.each do |method_name|
+      if self_object_of_model.respond_to? method_name
         old_attribute = self_object_of_model.method( method_name ).call
-        unless self_object_of_model.update_attributes( {method_name.to_s => params[key]} )
+        unless self_object_of_model.update_attributes( {method_name.to_s => params["#{snake(model.to_s)}_#{method_name}".to_sym]} )
           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 if exist_any_arrors_without_collections?
       end
     end
   end

data/spec/slim_form_object_spec.rb

@@ -208,7 +208,7 @@ describe TestModule do
     it 'assign attributes for test_one_model' do
       object.stub(:params).and_return( {test_one_model_test_four_model_ids: [1, 2, 3]} )
       object.stub_chain(:method, :call) { @test_object }
-      object.stub(:keys_of_collections).and_return( [:test_one_model_test_four_model_ids] )
+      object.stub(:keys_of_collections).and_return( ['test_four_model_ids'] )
       object.send(:assign_attributes_for_collection, TestOneModel)
 
       expect(@test_object.test_four_model_ids).to eq( [1, 2, 3] )
@@ -227,8 +227,9 @@ describe TestModule do
   context 'keys_of_collections' do
     it 'must be return array with values' do
       object.stub(:params).and_return( {test_one_model_test_four_model_ids: [1, 2, 3]} )
+      object.stub_chain(:method, :call) { TestOneModel.create(title:'title', descr:'descr') }
 
-      expect(object.send :keys_of_collections).to eq( [:test_one_model_test_four_model_ids] )
+      expect(object.send :keys_of_collections).to eq( ['test_four_model_ids'] )
     end
 
     it 'must be return array without values' do
@@ -238,6 +239,42 @@ describe TestModule do
     end
   end
 
+  context 'exist_any_arrors_without_collections?' do
+    before :each do
+      object.instance_eval do
+        def test_one_model
+          TestOneModel.create(title:'title', descr:'descr')
+        end
+        def test_four_model
+          TestFourModel.create(title:'title', descr:'descr')
+        end
+      end
+    end
+
+    it 'must be return true' do
+      object.stub(:keys_of_collections).and_return( ['test_one_model_ids', 'test_four_model_ids'] )
+      object.stub(:array_of_models).and_return( [TestOneModel, TestFourModel] )
+      object.stub(:valid?).and_return( false )
+      object.stub_chain(:errors, :messages).and_return( {:test_one_models=>'error', :test_four_models=>'error'} )
+
+      expect(object.send :exist_any_arrors_without_collections?).to eq( true )
+    end
+
+    it 'must be return true' do
+      object.instance_eval do
+        def test_one_model
+          TestThreeModel.create(title:'title', descr:'')
+        end
+      end
+      object.stub(:keys_of_collections).and_return( ['test_one_model_ids', 'test_four_model_ids'] )
+      object.stub(:array_of_models).and_return( [TestOneModel, TestFourModel] )
+      object.stub(:valid?).and_return( false )
+      object.stub_chain(:errors, :messages).and_return( {:test_one_models=>'error', :test_four_models=>'error', :descr=>'error'} )
+
+      expect(object.send :exist_any_arrors_without_collections?).to eq( false )
+    end
+  end
+
 end
 
 

metadata

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