slim_form_object 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1a89125979213f45b4bf5df265aaaf83c0c4a9
-  data.tar.gz: 7b0a6cbab44b3b32c20d92d20e9d736f5c519b7b
+  metadata.gz: c790c09a7f14bba8e6919633cf1e42b329b28e09
+  data.tar.gz: 9a56d7be9abf5a89d75a0e1528e3f5379d1e7f93
 SHA512:
-  metadata.gz: 1e38ae5d94058cd6f8b6ee7171bc7d2fc85c41aec3ee2ce1a31203dd52bf912699bc25a08cf62d7890da55b38dd63024385145aa8133a6fae3e8852aa77a5e33
-  data.tar.gz: 51ed0c4650d16d2cde08d4670a3b1e3ec46900b37aa7a289783b861560ee351c3f8ac302eeca18c90b874be2c5897b76ebf946200d8b7f6c233d4f7f25d77566
+  metadata.gz: 41588b2e3ee7615fa00c64d8bf6358f28c7ba77775247a02af54e0ce87fee09f943bbce12832677b18a3d80b87a1f2c59bb95d0c18726df11e8b3dfac82824ca
+  data.tar.gz: 0b2adebf258a068570ab894e0e27babe9888ce33389db897b4704a98801dee89c3fac6a5dfdcff80fd7e3908fcac6b253dd4fc839f43d72e25dd89b18b68502d

data/lib/slim_form_object/processing.rb

@@ -37,7 +37,9 @@ module SlimFormObject
   end
 
   def submit
-    @array_of_models ||= array_of_models.reject{ |model| array_of_models_without_validates.include?(model) }
+    @array_of_models ||= array_of_models.reject do |model| 
+      array_of_models_without_validates.include?(model) if self.respond_to?(:array_of_models_without_validates)
+    end
     update_attributes
     update_attributes_for_collection
     self
@@ -155,7 +157,7 @@ module SlimFormObject
   end
 
   def get_association(class1, class2)
-    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first.try(:macro)
+    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first&.macro
   end
 
 end

data/lib/slim_form_object/version.rb

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

data/spec/slim_form_object_spec.rb

@@ -151,18 +151,18 @@ describe TestModule do
   end
 
   context 'validation_models' do
+    before do
+      object.instance_eval{ @array_of_models = [TestOneModel] }
+    end
+
     it 'errors is present' do
       object.stub(:test_one_model).and_return( TestOneModel.new(descr: 'desc') )
-
-      expect(object).to receive(:array_of_models).and_return([TestOneModel])
       expect(object).to receive(:set_errors).and_return( true )
       object.send :validation_models
     end
 
     it 'errors is not exist' do
       object.stub(:test_one_model).and_return( TestOneModel.new(title: 'title', descr: 'desc') )
-
-      expect(object).to receive(:array_of_models).and_return([TestOneModel])
       expect(object).not_to receive(:set_errors)
       object.send :validation_models
     end
@@ -173,7 +173,7 @@ describe TestModule do
       attributes_of_model = ["test_one_model_id", "test_one_model_title", "test_one_model_descr"]
       attributes_for_update = {"title"=>"Test Title", "descr"=>"Test Descr"}
 
-      expect(object).to receive(:array_of_models).and_return( [TestOneModel] )
+      object.instance_eval{ @array_of_models = [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 )
       object.stub(:test_one_model).and_return( TestOneModel.new )
@@ -226,6 +226,7 @@ describe TestModule do
 
   context 'keys_of_collections' do
     it 'must be return array with values' do
+      object.instance_eval{ @array_of_models = [TestOneModel] }
       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') }
 
@@ -248,12 +249,12 @@ describe TestModule do
         def test_four_model
           TestFourModel.create(title:'title', descr:'descr')
         end
+        @array_of_models = [TestOneModel, TestFourModel]
       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'} )
 
@@ -267,7 +268,6 @@ describe TestModule do
         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'} )
 

metadata

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