slim_form_object 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6019f9dbb3ed83560faee79ecd06b76a7474c26f
-  data.tar.gz: 0a007f576b563a08a6dff13fbcfa23dde13e8dc2
+  metadata.gz: 12cea860eec0074e7737bb46424261f647672057
+  data.tar.gz: 6af0624727291ad8f5f80379ba864e7da3d77f2e
 SHA512:
-  metadata.gz: 13f9a38fd56a7b1b377df6d1baa3338bc0908057528101d1f08faa5e3f9044c1159f7317ba1d0327df29b330de9316dc69d6c8eba8de3ac7ad719f2ec39a0da7
-  data.tar.gz: a68b19d0fc7bc3f03d3d7f02679731f066c0927b7962f6f36786199b5d8a3d4eebcb1fd25d9c9b681164ac5f1c8ba64b0bfff1c0b47926ddc137ee6e8c9213d5
+  metadata.gz: 0275aaf993739ab2263a636a3b4dabf788206b6c719c4f5114cbb68cb56f9bdd6d072e20f7852be42157a8fcfcd373c726d3bf6a01bd306927cd958c98580176
+  data.tar.gz: 01e985532ef0b11295528582e75fd37cd01af7b662f8801f6b85f0288c21a97aa7a84a22438f7a9e91529e0770cd92b3ba3159bc2f57ba76e0683a7bf5f78f4e

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/slim_form_object.rb

@@ -8,21 +8,23 @@ module SlimFormObject
 
   module ClassMethods
     def init_models(*args)
-      @models = args
-      add_attributes
+      self.instance_eval do
+        define_method(:array_of_models) { args }
+      end
+      add_attributes(args)
     end
 
     def snake(string)
       string.gsub(/((\w)([A-Z]))/,'\2_\3').downcase
     end
 
-    def add_attributes
+    def add_attributes(models)
       #attr_accessor for models and env params
       attr_accessor :params
-      @models.each{ |model| attr_accessor snake(model.to_s).to_sym }
+      models.each{ |model| attr_accessor snake(model.to_s).to_sym }
 
       #delegate attributes of models
-      @models.each do |model|
+      models.each do |model|
         model.column_names.each do |attr|
           delegate attr.to_sym, "#{attr}=".to_sym,
                    to: snake(model.to_s).to_sym,
@@ -40,7 +42,7 @@ module SlimFormObject
     if valid?
       models = get_model_for_save
       while model1 = models.delete( models[0] )
-        get_models.each{ |model2| save_models(model1, model2) }
+        array_of_models.each{ |model2| save_models(model1, model2) }
       end
 
       return true
@@ -50,10 +52,6 @@ module SlimFormObject
 
   private
 
-  def get_models
-    self.class.instance_variable_get(:@models)
-  end
-
   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
@@ -87,22 +85,31 @@ module SlimFormObject
   end
 
   def update_attributes
-    get_models.each do |model|
-      model_attributes = []
-      model.column_names.each do |name|
-        model_attributes << "#{self.class.snake(model.to_s)}_#{name}"
-      end
-      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 }
-      method( self.class.snake(model.to_s) ).call.assign_attributes(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) )
     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}"
+    end
+    model_attributes
+  end
+
+  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 }
+    update_attributes
+  end
+
   def get_model_for_save
     keys = params.keys
     models = []
-    get_models.each do |model|
+    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}"

data/spec/db/migrate/001_create_model_one.rb

@@ -0,0 +1,13 @@
+
+class CreateModelOne < ActiveRecord::Migration
+  def self.up
+    create_table :test_one_models do |t|
+      t.string :title
+      t.string :descr
+    end
+  end
+ 
+  def self.down
+    drop_table :test_one_model
+  end
+end

data/spec/db/migrate/002_create_model_two.rb

@@ -0,0 +1,14 @@
+
+class CreateModelTwo < ActiveRecord::Migration
+  def self.up
+    create_table :test_two_models do |t|
+      t.string  :title
+      t.string  :descr
+      t.integer :test_one_model_id
+    end
+  end
+ 
+  def self.down
+    drop_table :test_two_model
+  end
+end

data/spec/db/migrate/003_create_model_three.rb

@@ -0,0 +1,14 @@
+
+class CreateModelThree < ActiveRecord::Migration
+  def self.up
+    create_table :test_three_models do |t|
+      t.string  :title
+      t.string  :descr
+      t.integer :test_one_model_id
+    end
+  end
+ 
+  def self.down
+    drop_table :test_three_model
+  end
+end

data/spec/db/migrate/004_create_model_four.rb

@@ -0,0 +1,13 @@
+
+class CreateModelFour < ActiveRecord::Migration
+  def self.up
+    create_table :test_four_models do |t|
+      t.string :title
+      t.string :descr
+    end
+  end
+ 
+  def self.down
+    drop_table :test_four_model
+  end
+end

data/spec/db/migrate/005_create_model_one_four.rb

@@ -0,0 +1,13 @@
+
+class CreateModelOneFour < ActiveRecord::Migration
+  def self.up
+    create_table :test_one_four_models do |t|
+      t.integer :test_one_model_id
+      t.integer :test_four_model_id
+    end
+  end
+ 
+  def self.down
+    drop_table :test_one_four_model
+  end
+end

data/spec/db/migrate/006_create_model_two_three.rb

@@ -0,0 +1,13 @@
+
+class CreateModelTwoThree < ActiveRecord::Migration
+  def self.up
+    create_table :test_three_model_test_two_models do |t|
+      t.integer :test_three_model_id
+      t.integer :test_two_model_id
+    end
+  end
+ 
+  def self.down
+    drop_table :test_three_model_test_two_model
+  end
+end

data/spec/helpers/models.rb

@@ -3,21 +3,29 @@ class TestOneModel < ActiveRecord::Base
   has_many :test_three_models
   has_many :test_one_four_models
   has_many :test_four_models, through: :test_one_four_models
+
+  validates :title, :descr, presence: true
 end
 
 class TestTwoModel < ActiveRecord::Base
   belongs_to :test_one_model
   has_and_belongs_to_many :test_three_models
+
+  validates :title, :descr, presence: true
 end
 
 class TestThreeModel < ActiveRecord::Base
   belongs_to :test_one_model
   has_and_belongs_to_many :test_two_models
+
+  validates :title, :descr, presence: true
 end
 
 class TestFourModel < ActiveRecord::Base
   has_many :test_one_four_models
   has_many :test_one_models, through: :test_one_four_models
+
+  validates :title, :descr, presence: true
 end
 
 class TestOneFourModel < ActiveRecord::Base

data/spec/slim_form_object_spec.rb

@@ -1,12 +1,18 @@
 require 'spec_helper'
 require 'helpers/models'
+require 'byebug'
 
 class TestModule
+  include ActiveModel::Model
+  include SlimFormObject
 end
 
 describe TestModule do
 
-  include SlimFormObject
+  let!(:object) { TestModule.new }
+
+  it { expect(TestModule).to include(ActiveModel::Model) }
+  it { expect(TestModule).to include(SlimFormObject) }
 
   it 'has a version number' do
     expect(SlimFormObject::VERSION).not_to be nil
@@ -14,79 +20,208 @@ describe TestModule do
 
   context 'get_association' do
     it 'model1 has_one model2' do
-      association = send :get_association, TestOneModel, TestTwoModel
+      association = object.send :get_association, TestOneModel, TestTwoModel
       expect(association).to eq(:has_one)
     end
 
     it 'model2 belongs_to model1' do
-      association = send :get_association, TestTwoModel, TestOneModel
+      association = object.send :get_association, TestTwoModel, TestOneModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1 has_many model3' do
-      association = send :get_association, TestOneModel, TestThreeModel
+      association = object.send :get_association, TestOneModel, TestThreeModel
       expect(association).to eq(:has_many)
     end
 
     it 'model3 belongs_to model1' do
-      association = send :get_association, TestThreeModel, TestOneModel
+      association = object.send :get_association, TestThreeModel, TestOneModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1 has_many :test_four_models, through: :test_one_four_models' do
-      association = send :get_association, TestOneModel, TestFourModel
+      association = object.send :get_association, TestOneModel, TestFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model2 has_and_belongs_to_many model3' do
-      association = send :get_association, TestTwoModel, TestThreeModel
+      association = object.send :get_association, TestTwoModel, TestThreeModel
       expect(association).to eq(:has_and_belongs_to_many)
     end
 
     it 'model3 has_and_belongs_to_many model2' do
-      association = send :get_association, TestThreeModel, TestTwoModel
+      association = object.send :get_association, TestThreeModel, TestTwoModel
       expect(association).to eq(:has_and_belongs_to_many)
     end
 
     it 'model3 has_and_belongs_to_many model2' do
-      association = send :get_association, TestThreeModel, TestTwoModel
+      association = object.send :get_association, TestThreeModel, TestTwoModel
       expect(association).to eq(:has_and_belongs_to_many)
     end
 
     it 'model4 has_many :test_one_models, through: :test_one_four_models' do
-      association = send :get_association, TestFourModel, TestOneModel
+      association = object.send :get_association, TestFourModel, TestOneModel
       expect(association).to eq(:has_many)
     end
 
     it 'model1-4 belongs_to model1' do
-      association = send :get_association, TestOneFourModel, TestOneModel
+      association = object.send :get_association, TestOneFourModel, TestOneModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1-4 belongs_to model4' do
-      association = send :get_association, TestOneFourModel, TestFourModel
+      association = object.send :get_association, TestOneFourModel, TestFourModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1 has_many model1-4' do
-      association = send :get_association, TestOneModel, TestOneFourModel
+      association = object.send :get_association, TestOneModel, TestOneFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model4 has_many model1-4' do
-      association = send :get_association, TestFourModel, TestOneFourModel
+      association = object.send :get_association, TestFourModel, TestOneFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model2 don\'t have model4' do
-      association = send :get_association, TestTwoModel, TestFourModel
+      association = object.send :get_association, TestTwoModel, TestFourModel
       expect(association).to eq(nil)
     end
 
   end
 
-  it 'a' do
-    # expect(TestOneModel).to eq(true)
+  context 'init_models' do
+    it 'init variable @models' do
+      object.class.stub(:add_attributes).and_return(true)
+      object.class.init_models(TestOneModel, TestTwoModel)
+
+      expect( object.array_of_models ).to eq([TestOneModel, TestTwoModel])
+    end
+
+    it 'must be called add_attributes' do
+      expect(object.class).to receive(:add_attributes).and_return(true)
+      object.class.init_models(TestOneModel, TestTwoModel)
+    end
+  end
+
+  context 'snake' do
+    it { expect( object.class.snake(TestOneModel.to_s) ).to eq('test_one_model') }
+    it { expect( object.class.snake('123_Asd') ).to eq('123__asd') }
+    it { expect( object.class.snake('_zA') ).to eq('_z_a') }
+    it { expect( object.class.snake('_zA12') ).to eq('_z_a12') }
+    it { expect( object.class.snake('_zA-12_') ).to eq('_z_a-12_') }
+  end
+
+  context 'add_attributes' do
+    it 'attributes do not exist' do
+      expect(object.respond_to? :params).to eq(false)
+      expect(object.respond_to? :test_one_model_title).to eq(false)
+      expect(object.respond_to? :test_two_model_title).to eq(false)
+      expect(object.respond_to? :test_three_model_title).to eq(false)
+      expect(object.respond_to? :test_four_model_title).to eq(false)
+    end
+
+    it 'attributes exist' do
+      object.class.add_attributes([TestOneModel, TestTwoModel])
+
+      expect(object.respond_to? :params).to eq(true)
+      expect(object.respond_to? :test_one_model_title).to eq(true)
+      expect(object.respond_to? :test_one_model_descr).to eq(true)
+      expect(object.respond_to? :test_two_model_title).to eq(true)
+      expect(object.respond_to? :test_two_model_descr).to eq(true)
+      expect(object.respond_to? :test_two_model_test_one_model_id).to eq(true)
+    end
+  end
+
+  context 'set_errors' do
+    before :each do
+      @test_object = TestModule.new
+    end
+    
+    it 'errors is present' do
+      error = {title: "can't be blank"}
+      @test_object.send :set_errors, error
+
+      expect( @test_object.errors.messages ).to eq( {title: ["can't be blank"]} )
+    end
+
+    it 'errors is not exist' do
+      expect( @test_object.errors.messages ).to eq( {} )
+    end
+  end
+
+  context 'validation_models' 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(: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(:get_model_for_save).and_return([TestOneModel])
+      expect(object).not_to receive(:set_errors)
+      object.send :validation_models
+    end
+  end
+
+  context 'update_attributes' do
+    it 'must call this methods' 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] )
+      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 )
+      object.send :update_attributes
+    end
+  end
+
+  context 'get_attributes_for_update' do
+    it 'make attributes for update model' do
+      object.stub(:params).and_return( {'test_one_model_title'=>'Test Title', 'test_one_model_descr'=>'Test Descr'} )
+      model_attributes = ["test_one_model_id", "test_one_model_title", "test_one_model_descr"]
+      update_attributes = object.send :get_attributes_for_update, model_attributes, TestOneModel
+
+      expect(update_attributes).to eq( {"title"=>"Test Title", "descr"=>"Test Descr"} )
+    end
+  end
+
+  context 'make_attributes_of_model' do
+    it 'make attributes of model' do
+      update_attributes = object.send :make_attributes_of_model, TestOneModel
+
+      expect(update_attributes).to eq( ["test_one_model_id", "test_one_model_title", "test_one_model_descr"] )
+    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'} )
+
+      expect(object.send :get_model_for_save).to eq( [TestOneModel, TestTwoModel] )
+    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( {} )
+
+      expect(object.send :get_model_for_save).to eq( [] )
+    end
   end
 
 end
+
+
+
+
+
+
+
+

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'slim_form_object'
 require 'bundler/setup'
 require 'active_record'
 require 'rspec/collection_matchers'
+require 'database_cleaner'
 require 'helpers/connect_to_base'
 
 RSpec.configure do |config|
@@ -11,4 +12,10 @@ RSpec.configure do |config|
     c.syntax = [:should, :expect]
   end
 
+  config.before(:suite) do
+    ActiveRecord::Base.establish_connection dbconfig['test']
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.4
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It's works
 email:
 - roboucrop@gmail.com
@@ -107,6 +135,12 @@ files:
 - lib/slim_form_object/version.rb
 - spec/db/database.yml
 - spec/db/database.yml.travis
+- spec/db/migrate/001_create_model_one.rb
+- spec/db/migrate/002_create_model_two.rb
+- spec/db/migrate/003_create_model_three.rb
+- spec/db/migrate/004_create_model_four.rb
+- spec/db/migrate/005_create_model_one_four.rb
+- spec/db/migrate/006_create_model_two_three.rb
 - spec/helpers/connect_to_base.rb
 - spec/helpers/models.rb
 - spec/slim_form_object_spec.rb
@@ -138,6 +172,12 @@ summary: This is form object
 test_files:
 - spec/db/database.yml
 - spec/db/database.yml.travis
+- spec/db/migrate/001_create_model_one.rb
+- spec/db/migrate/002_create_model_two.rb
+- spec/db/migrate/003_create_model_three.rb
+- spec/db/migrate/004_create_model_four.rb
+- spec/db/migrate/005_create_model_one_four.rb
+- spec/db/migrate/006_create_model_two_three.rb
 - spec/helpers/connect_to_base.rb
 - spec/helpers/models.rb
 - spec/slim_form_object_spec.rb