slim_form_object 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae4155e3a53b282d248dd3328278d852ace1e28
-  data.tar.gz: a34baa8a40b0604775ce5db1f35b5c49b796c464
+  metadata.gz: 10f6c5f47c07161c3e2d610f4094fdfb648cdfbf
+  data.tar.gz: 95fe4c99fc97171eabe7abbbeeff5a15de41f8bd
 SHA512:
-  metadata.gz: eb8a312ebbc9fec0ea66c14d5c0e17f21a176c0eda0e7f7369d2d055939043a859acfc742b610504235887b244a6f0d9f18b7b806e358b44b66ed3db554acb52
-  data.tar.gz: 55a50c5f168ef4fec9015f8112d88acbffc9d45174f7311e9c63e25b97613bfc2a0361fb598f8be45a2eef62867f6bb50dc4bb7169175f2cb27857d22f684db2
+  metadata.gz: 3a00c88bf1314247263aa0bda2c615090ea4b61e117ce2c812bd349804b3ecb7674709c8878d893726b1997d3ebbe4981aab55f38c7843fd074d8cb093d1a7bf
+  data.tar.gz: a5c3def15d7c99d6a2fa1a6cb3bb760ba82dac27289bb7c4373bf36e719d441373166a1638c7317fae6beb27f6b779cc040dd9f63a1df5f3fb27dbc2793a9c4c

data/lib/slim_form_object/form_helpers/extension_actionview.rb

@@ -31,6 +31,10 @@ module ActionView
         /^([^-]+)-([^-]+)(\([\s\S]+\))$/
       end
 
+      def sfo_collection_ads_regexp
+        /_ids$/
+      end
+
       def sfo_form_attribute?(object)
         object.class.ancestors[1] == SlimFormObject::Base if object
       end
@@ -51,6 +55,10 @@ module ActionView
         tag_name.to_s[sfo_date_attr_regexp] ? true : false
       end
 
+      def sfo_collection_ads_attr?(tag_name)
+        tag_name.to_s[sfo_collection_ads_regexp] ? true : false
+      end
+
       def sfo_get_tag_name(object_name, method, multiple)
         model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
 
@@ -64,7 +72,7 @@ module ActionView
       end
 
       def sfo_get_method_name(method)
-        if sfo_single_attr?(method)
+        if sfo_single_attr?(method) and !sfo_collection_ads_attr?(method)
           model_name, attr_name = apply_expression_text(method, sfo_single_attr_regexp)
           method = "#{model_name}_#{attr_name}"
         end
@@ -129,6 +137,7 @@ module ActionView
 
         def value(object)
           method_name = sfo_get_method_name(@method_name)
+          # byebug
           object.public_send method_name if object
         end
 

data/lib/slim_form_object/helpers.rb

@@ -1,4 +1,6 @@
 module HelperMethods
+  private
+
   def snake(string)
     string = string.to_s
     string.gsub!(/((\w)([A-Z]))/,'\2_\3')
@@ -17,4 +19,26 @@ module HelperMethods
   def get_class_of_snake_model_name(snake_model_name)
     Object.const_get( snake_model_name.to_s.split('_').map(&:capitalize).join )
   end
+
+  def get_model_and_method_names(method)
+    if sfo_single_attr?(method)
+      apply_expression_text(method, sfo_single_attr_regexp)
+    end
+  end
+
+  def sfo_single_attr?(method)
+    method.to_s[sfo_single_attr_regexp] ? true : false
+  end
+
+  def sfo_single_attr_regexp
+    /^([^-]+)-([^-]+)$/
+  end
+
+  def apply_expression_text(string, exp)
+    string[exp]
+    model_name = $1
+    attr_name  = $2
+
+    [model_name, attr_name]
+  end
 end

data/lib/slim_form_object/processing.rb

@@ -1,5 +1,3 @@
-require 'byebug'
-
 module SlimFormObject
   class Base
     include ActiveModel::Model
@@ -52,23 +50,20 @@ module SlimFormObject
       end
     end
 
+    def method_missing(name, *args, &block)
+      if name[/_ids$/]
+        model_name, attr_name = get_model_and_method_names(name)
+        return self.send(model_name.to_sym).send(attr_name.to_sym)
+      end
+      super(name, args, block)
+    end
+
     def initialize(params: {})
       self.params = params
       get_or_add_default_objects
     end
-
-    def get_or_add_default_objects
-      array_of_all_models.map do |model|
-        if get_self_object(model) == nil
-          method( "#{snake(model.to_s)}=" ).call(model.new)
-        else
-          get_self_object(model)
-        end
-      end
-    end
     # INIT END
 
-
     def apply_parameters
       check_array_settings_with_settings
       apply
@@ -94,6 +89,16 @@ module SlimFormObject
       assign                 = Assign.new(self)
       @hash_objects_for_save = assign.apply_parameters
     end
+
+    def get_or_add_default_objects
+      array_of_all_models.map do |model|
+        if get_self_object(model) == nil
+          method( "#{snake(model.to_s)}=" ).call(model.new)
+        else
+          get_self_object(model)
+        end
+      end
+    end
     
     def check_array_settings_with_settings
       define_singleton_method(:not_save_this_model) { [] } unless respond_to?(:not_save_this_model)

data/lib/slim_form_object/version.rb

@@ -1,3 +1,3 @@
 module SlimFormObject
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/db/database.yml

@@ -3,7 +3,7 @@ test:
   encoding: unicode
   host: localhost
   port: 5432
-  database: test_sof
+  database: test_sfo
   pool: 5
   username: rails_app
   password: password1

data/spec/slim_form_object_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 require 'helpers/models'
 
-class TestModule
-  include ActiveModel::Model
-  include SlimFormObject
+class TestModule < SlimFormObject::Base
+  init_models TestOneModel, TestTwoModel, TestThreeModel, TestFourModel
 end
 
-describe TestModule do
+describe TestModule, enviroment: :test do
 
   let!(:object) { TestModule.new }
+  let!(:saver)  { SlimFormObject::Saver.new(object) }
 
   it { expect(TestModule).to include(ActiveModel::Model) }
-  it { expect(TestModule).to include(SlimFormObject) }
+  it { expect(TestModule).to be < SlimFormObject::Base }
 
   it 'has a version number' do
     expect(SlimFormObject::VERSION).not_to be nil
@@ -19,87 +19,88 @@ describe TestModule do
 
   context 'get_association' do
     it 'model1 has_one model2' do
-      association = object.send :get_association, TestOneModel, TestTwoModel
+      association = saver.send :get_association, TestOneModel, TestTwoModel
       expect(association).to eq(:has_one)
     end
 
     it 'model2 belongs_to model1' do
-      association = object.send :get_association, TestTwoModel, TestOneModel
+      association = saver.send :get_association, TestTwoModel, TestOneModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1 has_many model3' do
-      association = object.send :get_association, TestOneModel, TestThreeModel
+      association = saver.send :get_association, TestOneModel, TestThreeModel
       expect(association).to eq(:has_many)
     end
 
     it 'model3 belongs_to model1' do
-      association = object.send :get_association, TestThreeModel, TestOneModel
+      association = saver.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 = object.send :get_association, TestOneModel, TestFourModel
+      association = saver.send :get_association, TestOneModel, TestFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model2 has_and_belongs_to_many model3' do
-      association = object.send :get_association, TestTwoModel, TestThreeModel
+      association = saver.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 = object.send :get_association, TestThreeModel, TestTwoModel
+      association = saver.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 = object.send :get_association, TestThreeModel, TestTwoModel
+      association = saver.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 = object.send :get_association, TestFourModel, TestOneModel
+      association = saver.send :get_association, TestFourModel, TestOneModel
       expect(association).to eq(:has_many)
     end
 
     it 'model1-4 belongs_to model1' do
-      association = object.send :get_association, TestOneFourModel, TestOneModel
+      association = saver.send :get_association, TestOneFourModel, TestOneModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1-4 belongs_to model4' do
-      association = object.send :get_association, TestOneFourModel, TestFourModel
+      association = saver.send :get_association, TestOneFourModel, TestFourModel
       expect(association).to eq(:belongs_to)
     end
 
     it 'model1 has_many model1-4' do
-      association = object.send :get_association, TestOneModel, TestOneFourModel
+      association = saver.send :get_association, TestOneModel, TestOneFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model4 has_many model1-4' do
-      association = object.send :get_association, TestFourModel, TestOneFourModel
+      association = saver.send :get_association, TestFourModel, TestOneFourModel
       expect(association).to eq(:has_many)
     end
 
     it 'model2 don\'t have model4' do
-      association = object.send :get_association, TestTwoModel, TestFourModel
+      association = saver.send :get_association, TestTwoModel, TestFourModel
       expect(association).to eq(nil)
     end
 
   end
 
   context 'init_models' do
-    it 'init variable @models' do
-      object.class.stub(:add_attributes).and_return(true)
-      object.class.init_models(TestOneModel, TestTwoModel)
+    class Test < SlimFormObject::Base; end
+    Test.init_models(TestOneModel, TestTwoModel)
+    object = Test.new
 
-      expect( object.array_of_models ).to eq([TestOneModel, TestTwoModel])
+    it 'init variable @models' do
+      expect( object.array_of_all_models ).to eq([TestOneModel, TestTwoModel])
     end
 
     it 'must be called add_attributes' do
-      expect(object.class).to receive(:add_attributes).and_return(true)
+      expect(object.class).to receive(:define_array_of_models).and_return(true)
       object.class.init_models(TestOneModel, TestTwoModel)
     end
   end
@@ -113,8 +114,12 @@ describe TestModule do
   end
 
   context 'add_attributes' do
+    class Test2 < SlimFormObject::Base; end
+    Test2.init_models()
+    object = Test2.new
+
     it 'attributes do not exist' do
-      expect(object.respond_to? :params).to eq(false)
+      expect(object.respond_to? :params).to eq(true)
       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)
@@ -122,7 +127,7 @@ describe TestModule do
     end
 
     it 'attributes exist' do
-      object.class.add_attributes([TestOneModel, TestTwoModel])
+      object.class.init_models(TestOneModel, TestTwoModel)
 
       expect(object.respond_to? :params).to eq(true)
       expect(object.respond_to? :test_one_model_title).to eq(true)
@@ -136,13 +141,14 @@ describe TestModule do
   context 'set_errors' do
     before :each do
       @test_object = TestModule.new
+      @validator   = SlimFormObject::Validator.new(@test_object)
     end
     
     it 'errors is present' do
       error = {title: "can't be blank"}
-      @test_object.send :set_errors, error
+      @validator.send :set_errors, 'object_name', error
 
-      expect( @test_object.errors.messages ).to eq( {title: ["can't be blank"]} )
+      expect( @test_object.errors.messages ).to eq( {object_name: [{title: "can't be blank"}]} )
     end
 
     it 'errors is not exist' do
@@ -150,129 +156,35 @@ describe TestModule do
     end
   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(: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).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"}
-
-      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 )
-      object.send :update_attributes
-    end
+    # 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"}
+    #
+    #   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 )
+    #   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
+    # 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 'assign_attributes_for_collection' do
-    before :each do
-      @test_object = TestOneModel.create(title:'title', descr:'descr')
-      (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_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.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') }
-
-      expect(object.send :keys_of_collections).to eq( ['test_four_model_ids'] )
-    end
-
-    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 :keys_of_collections).to eq( [] )
-    end
-  end
-
-  context 'exist_any_errors_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
-        @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(:valid?).and_return( false )
-      object.stub_chain(:errors, :messages).and_return( {:test_one_models=>'error', :test_four_models=>'error'} )
-
-      expect(object.send :exist_any_errors_without_collections?).to eq( true )
-    end
-
-    it 'must be return false' 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(: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_errors_without_collections?).to eq( false )
-    end
+    # 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
 
 end

data/spec/spec_helper.rb

@@ -1,20 +1,22 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'slim_form_object'
 require 'bundler/setup'
+require 'byebug'
+require 'yaml'
 require 'active_record'
-require 'rspec/collection_matchers'
 require 'database_cleaner'
+require 'rspec/collection_matchers'
 require 'helpers/connect_to_base'
-require 'byebug'
+require 'slim_form_object'
 
 RSpec.configure do |config|
+  ActiveRecord::Base.establish_connection( dbconfig['test'] )
 
   config.mock_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
 
   config.before(:suite) do
-    ActiveRecord::Base.establish_connection dbconfig['test']
+    # ActiveRecord::Base.establish_connection( dbconfig['test'] )
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_form_object
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - woodcrust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel