acts_has_many 0.1.2 → 0.1.3

data/README.md

@@ -99,7 +99,7 @@ delete_id 	# => 1
 
 company.destroy # => true
 
-# this situation with delete_id best way is "company.delete" because you miss recheck actuality
+# this situation with delete_id best way is "company.delete" because you miss unnecessary check actuality
 ```
 
 ### has_many_update_through used with has_many :through and get array parameters
@@ -129,7 +129,5 @@ new_rows, delete_ids = Company.has_many_update_through( update: data, new: date,
 
 user.companies = new_rows # update user companies
 
-delete_ids.each do |id|
-  Company.finde(id).destroy # necessary for correct delete record ( will be fixed)
-end
+Company.delete(delete_ids) # for delete_ids from has_many_update_through best way is to use "delete" and miss unnecessary check
 ```

data/lib/acts_has_many/active_record/acts/has_many.rb

@@ -75,10 +75,11 @@ module ActiveRecord
                 unless options[:new].nil?
                   options[:new].uniq!
                   options[:new].each do |data|
-                    date = data.symbolize_keys
+                    data = data.symbolize_keys
                     record_add << #{self}
                       .where('#{options[:compare]}' => data['#{options[:compare]}'.to_sym])
                       .first_or_create(data)
+                    record_del.delete record_add.last.id
                   end 
                 end
                 
@@ -117,7 +118,7 @@ module ActiveRecord
         
         def has_many_update(options)
           options_default = { 
-            :data => { :title => ""}
+            :data => { title: "" }
           }
 
           options = options_default.merge options
@@ -127,7 +128,7 @@ module ActiveRecord
           object_id = id
           delete_id = nil
           
-          if actuale? :relation => options[:relation]
+          if actuale? relation: options[:relation]
             # create new object and finish
             object = model.where(full_compare).first_or_create(options[:data])
             object_id = object.id
@@ -161,7 +162,7 @@ module ActiveRecord
         #   :relation( string, symbol) - exclude current relation 
         #
         
-        def actuale? (options = { :relation => "" })
+        def actuale? (options = { relation: "" })
           actuale = false
           
           depend_relations.each do |relation|

data/lib/acts_has_many/version.rb

@@ -1,3 +1,3 @@
 module ActsHasMany
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/has_many_spec.rb

@@ -1,70 +1,122 @@
 require 'helper'
 
-describe 'acts_has_many' do
-  it 'update' do
-    location = Location.create :title => "italy"
-    experience = Experience.create :location => location, :title => "test experience1"
-            
-    add_loc, del_loc = experience.location.has_many_update(
-        :data => {"title" => "ukraine"}, :relation => "experiences")
-    location = Location.find(add_loc)
-    experience.location = location
-    Location.delete(del_loc) unless del_loc.nil?
-    
-    experience.location.title.should == "ukraine"
-    Location.all.size.should == 1
-    
-    Experience.create :location => location, :title => "test experience2" 
+(1..3).each do |c|
+
+  case c
+  when 1
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      has_many :experiences
+      validates :title, :presence =>  true
         
-    add_loc, del_loc = experience.location.has_many_update(
-        :data => {"title" => "italy"}, :relation => "experiences")
-    experience.location = Location.find(add_loc)
-    Location.delete(del_loc) unless del_loc.nil?
-    
-    experience.location.id.should == add_loc
-    Location.all.size.should == 2
-    
-    add_loc, del_loc = experience.location.has_many_update(
-        :data => {"title" => "ukraine"}, :relation => "experiences")
-    experience.location = Location.find(add_loc)
-    Location.delete(del_loc) unless del_loc.nil?
-    
-    experience.location.should == location
-    Location.all.size.should == 1
-  end
+      acts_has_many
+    end
   
-  it 'destroy' do
-    Location.delete_all
-    Experience.delete_all
-    
-    location = Location.create(:title => "ukraine")
-    
-    Experience.create( :location => location, :title => "test" )
-    
-    location.destroy
-    Location.all.size.should == 1
-    
-    Experience.all[0].destroy
-    location.destroy
-    Location.all.size.should == 0
-  end  
+  when 2
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      acts_has_many relations: [:experiences], compare: :title
+
+      has_many :experiences
+      validates :title, :presence =>  true
+    end
   
-  it 'actuale?' do
-    Location.delete_all
-    
-    location = Location.create(:title => "ukraine")
-    
-    location.actuale?.should == false
-    location.actuale?(:relation => "experiences").should == false
-    
-    Experience.create( :title => 'test', :location => location )
+  when 3
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      acts_has_many relations: ['experiences'], compare: 'title'
+
+      has_many :experiences
+      validates :title, :presence =>  true
+    end
+  end
+
+  describe "Initialization tipe #{c}" do
+    describe 'acts_has_many' do
+      it 'update' do
+        Location.delete_all
+        Experience.delete_all
+
+        location = Location.create :title => "italy"
+        experience = Experience.create :location => location, :title => "test experience1"
+                
+        add_loc, del_loc = experience.location.has_many_update(
+            :data => {"title" => "ukraine"}, :relation => "experiences")
+        
+        Location.all.size.should == 1
+        location.id.should == add_loc
+        del_loc.should == nil
+        experience.location.title.should == "ukraine"
+        
+        Experience.create :location => location, :title => "test experience2" 
+            
+        add_loc, del_loc = experience.location.has_many_update(
+            :data => {"title" => "italy"}, :relation => "experiences")
+        
+        Location.all.size.should == 2
+        location.id.should_not == add_loc
+        del_loc.should == nil
+        experience.location = Location.find(add_loc)
+        experience.location.title.should == "italy"
+        
+        add_loc, del_loc = experience.location.has_many_update(
+            :data => {"title" => "ukraine"}, :relation => "experiences")
+        
+        location.id.should == add_loc
+        experience.location.id.should == del_loc
+      end
+      
+      it 'destroy' do
+        Location.delete_all
+        Experience.delete_all
+        
+        location = Location.create(:title => "ukraine")
+        
+        Experience.create( :location => location, :title => "test" )
+        
+        location.destroy
+        Location.all.size.should == 1
+        
+        Experience.all[0].destroy
+        location.destroy
+        Location.all.size.should == 0
+      end  
+      
+      it 'actuale?' do
+        Location.delete_all
+        
+        location = Location.create(:title => "ukraine")
+        
+        location.actuale?.should == false
+        location.actuale?(:relation => "experiences").should == false
 
-    location.actuale?.should == true
-    location.actuale?(:relation => "experiences").should == false
+        Experience.create( :title => 'test', :location => location )
 
-    Experience.create( :title => 'test', :location => location )
-    
-    location.actuale?.should == true
-    location.actuale?(:relation => "experiences").should == true
-  end 
+        location.actuale?.should == true
+        location.actuale?(:relation => "experiences").should == false
+        location.actuale?(:relation => :experiences).should == false
+        location.actuale?(:relation => "Experience").should == false
+
+        Experience.create( :title => 'test', :location => location )
+        
+        location.actuale?.should == true
+        location.actuale?(:relation => "experiences").should == true
+      end 
+
+      it 'compare' do
+        location = Location.create(:title => "ukraine")
+        location.compare.should == :title
+      end
+
+      it 'model' do
+        location = Location.create(:title => "ukraine")
+        location.model.should == Location
+      end
+
+      it 'depend_relations' do
+        location = Location.create(:title => "ukraine")
+        location.depend_relations.should == ['experiences']
+      end
+    end
+  end
 end

data/spec/has_many_through_spec.rb

@@ -0,0 +1,106 @@
+require 'helper'
+
+(1..3).each do |c|
+
+  case c
+  when 1
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      validates :title, :presence =>  true
+
+      has_many :companies, :through => :company_locals
+      acts_has_many :through => true
+      has_many :company_locals
+    end
+  
+  when 2
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      validates :title, :presence =>  true
+
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
+      acts_has_many through: true, relations: [:companies], compare: :title
+    end
+  
+  when 3
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      validates :title, :presence =>  true
+
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
+      acts_has_many :through => true, relations: ['companies'], compare: 'title'
+    end
+  end
+
+  describe "Initialization tipe #{c}" do
+    describe 'acts_has_many with :through' do
+      it 'update' do
+        Local.delete_all
+        
+        Local.all.size.should == 0
+        
+        new_row, del_ids = Local.has_many_through_update( :new => [
+          { title: 'test0'},
+          { title: 'test1'},
+          { title: 'test2'},
+          { title: 'test3'},
+          { title: 'test0'},
+        ], relation: :companies)
+
+        new_row.count.should == 4
+        del_ids.should == []
+        Local.all.size.should == 4
+
+        new_row1, del_ids1 = Local.has_many_through_update( 
+        :new => [
+          { title: 'test0'},
+          { 'title' => 'test1'}],
+        :update => {
+          new_row[2].id => {title: 'test2s'},
+          new_row[3].id.to_s => {'title' => 'test3s'}
+        }, relation: 'companies')
+
+        new_row1[0].id.should == new_row[0].id
+        new_row1[1].id.should == new_row[1].id
+        new_row1[2].id.should == new_row[2].id
+        new_row1[3].id.should == new_row[3].id
+        del_ids1.should == []
+        Local.find(new_row[2].id).title.should == 'test2s'
+        Local.find(new_row[3].id).title.should == 'test3s'
+        Local.all.size.should == 4
+
+
+        new_row, del_ids = Local.has_many_through_update( 
+        :new => [
+          { title: 'test0'},
+          { title: 'test3s'}],
+        :update => {
+          new_row1[2].id => {title: 'test2s'},
+          new_row1[3].id => {title: ''}
+        }, relation: :companies)
+
+        del_ids.should == []
+        new_row.size.should == 3
+
+        new_row, del_ids = Local.has_many_through_update( 
+        :update => {
+          new_row1[2].id => {title: 'test2s'},
+          new_row1[3].id => {title: ''}
+        }, relation: :companies)
+
+        del_ids.should == [new_row1[3].id]
+        new_row.size.should == 1
+
+        new_row, del_ids = Local.has_many_through_update( 
+        :new => [{ title: 'test0'}],
+        :update => { new_row1[2].id => {title: 'test0'} }, relation: :companies)
+
+        new_row.size.should == 1
+
+        Local.all.size.should == 4
+      end
+    end
+  end
+end

data/spec/helper.rb

@@ -23,6 +23,17 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :locations do |t|
     t.string :title
   end    
+  
+  create_table :locals do |t|
+    t.string :title
+  end    
+  create_table :company_locals do |t|
+    t.references :local
+    t.references :company
+  end    
+  create_table :companies do |t|
+    t.string :title
+  end    
 end
 
 class Experience < ActiveRecord::Base
@@ -30,10 +41,14 @@ class Experience < ActiveRecord::Base
   belongs_to :location, :dependent => :destroy
 end
 
-class Location < ActiveRecord::Base
-  self.table_name = 'locations'
-  has_many :experiences
-  validates :title, :presence =>  true
-  
-  acts_has_many
+class CompanyLocal < ActiveRecord::Base
+  self.table_name = 'company_locals'
+  belongs_to :local
+  belongs_to :company
+end
+
+class Company < ActiveRecord::Base
+  self.table_name = 'companies'
+  has_many :company_locals, :dependent => :destroy
+  has_many :locals, :through => :company_locals
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_has_many
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,7 @@ files:
 - lib/acts_has_many/active_record/acts/has_many.rb
 - lib/acts_has_many/version.rb
 - spec/has_many_spec.rb
+- spec/has_many_through_spec.rb
 - spec/helper.rb
 homepage: https://github.com/igor04/acts_has_many
 licenses: []