slim_form_object 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76df6c6f6b9c3318cf166532415097aeeecc01e
-  data.tar.gz: b3bb60a33463ba3b22fe3b3c11224536a1e0fc4c
+  metadata.gz: cb83b2555e0774293968cf63af140307e868227c
+  data.tar.gz: ea270672e17684d5db94c684b18e1debe00c9c84
 SHA512:
-  metadata.gz: 8bbe5a41ad2ee548bb194acf4531a6ea2a46e07584c624e7417ee36f37ff104cd85ebbf59a7fd19bb844ab659920d0ec966fc3424330e9a1cb6823c7474ff2f6
-  data.tar.gz: 60cef2c3cb0bb795ac8d22cd480f8d0d9a90eac3d1aedfde323c0e42b4731b0b1a41ab30972a8f129d1660548edf132c53166d52c514fcd9f29a6c8f27922c9b
+  metadata.gz: f7b059c728efba05791fa2e4594c8114e0b93a3cf9f29e01a098c352eb83cc508908045ca0ffbc964331689a1b39d73233d1a88e386b083bb1e621eef40dc27c
+  data.tar.gz: 278ecb3ff653d5568832d8c19772ac0e7938098b6af30c936a0372209a9db90ef132819b27a5eb346da7a96aac721ddd0ed0a88f3b3ea90ede68b5e5995ec9a5

data/lib/slim_form_object/helpers.rb

@@ -0,0 +1,5 @@
+module HelperMethods
+  def snake(string)
+    string.gsub(/((\w)([A-Z]))/,'\2_\3').downcase
+  end
+end

data/lib/slim_form_object/version.rb

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

data/lib/slim_form_object.rb

@@ -1,13 +1,17 @@
 require "slim_form_object/version"
+require "slim_form_object/helpers"
 
 module SlimFormObject
 
   def self.included(base)
-    base.include(ActiveModel::Model)
-    base.extend(ClassMethods)
+    base.include ActiveModel::Model
+    base.include HelperMethods
+    base.extend  ClassMethods
+    base.extend  HelperMethods
   end
 
   module ClassMethods
+
     def init_models(*args)
       self.instance_eval do
         define_method(:array_of_models) { args }
@@ -15,10 +19,6 @@ module SlimFormObject
       add_attributes(args)
     end
 
-    def snake(string)
-      string.gsub(/((\w)([A-Z]))/,'\2_\3').downcase
-    end
-
     def add_attributes(models)
       #attr_accessor for models and env params
       attr_accessor :params
@@ -41,7 +41,7 @@ module SlimFormObject
 
   def save
     if valid?
-      models = get_model_for_save
+      models = Array.new(array_of_models)
       while model1 = models.delete( models[0] )
         array_of_models.each{ |model2| save_models(model1, model2) }
       end
@@ -54,28 +54,28 @@ module SlimFormObject
   private
 
   def save_models(model1, model2)
-    self_model1 = method( self.class.snake(model1.to_s) ).call
-    self_model2 = method( self.class.snake(model2.to_s) ).call
+    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_model1.send( "#{self.class.snake(model2.to_s)}=", self_model2 )
-        self_model1.save
+        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
+        self_object_of_model1.save!
       when :has_one
-        self_model1.send( "#{self.class.snake(model2.to_s)}=", self_model2 )
-        self_model1.save
+        self_object_of_model1.send( "#{snake(model2.to_s)}=", self_object_of_model2 )
+        self_object_of_model1.save!
       when :has_many
-        self_model1.method("#{model2.table_name}").call << self_model2
-        self_model1.save
+        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_model1.method("#{model2.table_name}").call << self_model2
-        self_model1.save
+        self_object_of_model1.method("#{model2.table_name}").call << self_object_of_model2
+        self_object_of_model1.save!
     end
   end
 
   def validation_models
-    get_model_for_save.each do |model|
-      set_errors( method(self.class.snake(model.to_s)).call.errors ) unless method( self.class.snake(model.to_s) ).call.valid?
+    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
 
@@ -88,14 +88,15 @@ module SlimFormObject
   def update_attributes
     array_of_models.each do |model|
       model_attributes = make_attributes_of_model(model)
-      method( self.class.snake(model.to_s) ).call.assign_attributes( get_attributes_for_update(model_attributes, model) )
+      method( snake(model.to_s) ).call.assign_attributes( get_attributes_for_update(model_attributes, model) )
+      assign_attributes_for_collection(model)
     end
   end
 
   def make_attributes_of_model(model)
     model_attributes = []
     model.column_names.each do |name|
-      model_attributes << "#{self.class.snake(model.to_s)}_#{name}"
+      model_attributes << "#{snake(model.to_s)}_#{name}"
     end
     model_attributes
   end
@@ -103,26 +104,27 @@ module SlimFormObject
   def get_attributes_for_update(model_attributes, model)
     update_attributes = {}
     hash_attributes   = params.slice(*model_attributes)
-    hash_attributes.each{ |attr, val| update_attributes[attr.gsub(/#{self.class.snake(model.to_s)}_(.*)/, '\1')] = val }
+    hash_attributes.each{ |attr, val| update_attributes[attr.gsub(/#{snake(model.to_s)}_(.*)/, '\1')] = val }
     update_attributes
   end
 
-  def get_model_for_save
-    keys = params.keys
-    models = []
-    array_of_models.each do |model|
-      model.column_names.each do |name|
-        keys.each do |key|
-          models << model if key.to_s == "#{self.class.snake(model.to_s)}_#{name}"
-        end
-      end
-    end
-    models.uniq!
-    models
+  def get_association(class1, class2)
+    class1.reflections.slice(snake(class2.to_s), class2.table_name).values.first.try(:macro)
   end
 
-  def get_association(class1, class2)
-    class1.reflections.slice(self.class.snake(class2.to_s), class2.table_name).values.first.try(:macro)
+  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/spec/slim_form_object_spec.rb

@@ -154,7 +154,7 @@ describe TestModule do
     it 'errors is present' do
       object.stub(:test_one_model).and_return( TestOneModel.new(descr: 'desc') )
 
-      expect(object).to receive(:get_model_for_save).and_return([TestOneModel])
+      expect(object).to receive(:array_of_models).and_return([TestOneModel])
       expect(object).to receive(:set_errors).and_return( true )
       object.send :validation_models
     end
@@ -162,7 +162,7 @@ describe TestModule do
     it 'errors is not exist' do
       object.stub(:test_one_model).and_return( TestOneModel.new(title: 'title', descr: 'desc') )
 
-      expect(object).to receive(:get_model_for_save).and_return([TestOneModel])
+      expect(object).to receive(:array_of_models).and_return([TestOneModel])
       expect(object).not_to receive(:set_errors)
       object.send :validation_models
     end
@@ -176,6 +176,7 @@ 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
@@ -199,19 +200,42 @@ describe TestModule do
     end
   end
 
-  context 'get_model_for_save' do
-    it 'get models from params (exist)' do
-      object.stub(:array_of_models).and_return( [TestOneModel, TestTwoModel, TestThreeModel] )
-      object.stub(:params).and_return( {'test_one_model_title'=>'Test Title', 'test_two_model_descr'=>'Test Descr'} )
+  context 'assign_attributes_for_collection' do
+    before :each do
+      @test_object = TestOneModel.new
+      (1...4).each { TestFourModel.create(title:'title', descr:'descr') }
+    end
+
+    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.send(:assign_attributes_for_collection, TestOneModel)
+
+      expect(@test_object.test_four_model_ids).to eq( [1, 2, 3] )
+    end
+
+    it 'must don\'t assign attributes for test_one_model' do
+      object.stub(:params).and_return( {test_ids: [1], _ids: [1], ids_test: [1], test_one_model_test_four_model_idss: [1], test_ids_one: [1]} )
+      object.stub_chain(:method, :call) { @test_object }
+      object.stub(:keys_of_collections).and_return( [:test_ids, :_ids, :ids_test, :test_one_model_test_four_model_idss, :test_ids_one] )
+      object.send(:assign_attributes_for_collection, TestOneModel)
+
+      expect(@test_object.test_four_model_ids).to eq( [] )
+    end
+  end
+
+  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]} )
 
-      expect(object.send :get_model_for_save).to eq( [TestOneModel, TestTwoModel] )
+      expect(object.send :keys_of_collections).to eq( [:test_one_model_test_four_model_ids] )
     end
 
-    it 'get models from params (must be return empty array)' do
-      object.stub(:array_of_models).and_return( [TestOneModel, TestTwoModel, TestThreeModel] )
-      object.stub(:params).and_return( {} )
+    it 'must be return array without values' do
+      object.stub(:params).and_return( {_ids: [1], ids_test: [1], test_one_model_test_four_model_idss: [1], test_ids_one: [1]} )
 
-      expect(object.send :get_model_for_save).to eq( [] )
+      expect(object.send :keys_of_collections).to eq( [] )
     end
   end
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'active_record'
 require 'rspec/collection_matchers'
 require 'database_cleaner'
 require 'helpers/connect_to_base'
+require 'byebug'
 
 RSpec.configure do |config|
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - bin/slim_form_object
 - lib/slim_form_object.rb
+- lib/slim_form_object/helpers.rb
 - lib/slim_form_object/version.rb
 - spec/db/database.yml
 - spec/db/database.yml.travis