acts_has_many 0.3.0 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 899f42f7868ed45b0eb22bdd0e56d3cf4a2385af
+  data.tar.gz: 95a0effdaf788f947e92fabea3dec9e7a51e219d
+SHA512:
+  metadata.gz: 724009b91d5dee328d7eca99829c8212a31a778f29132cad80aa0f6aebbf4bb3e501e204213faffdcf7cd05ffd12658ee94345d8c60bf1debc24b597dbd29436
+  data.tar.gz: bb297b2056cd2f77a74ef544daf0bea950fd4781a3b49b92cc27b858812f15728ff303d251b98fd4e07a4d1763a4874f851687689fda06e3a82aee2d2e4cfd5b

data/README.md

@@ -12,7 +12,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -25,54 +25,74 @@ Or install it yourself as:
 
 4. If only `acts_has_many` is used:
 ```ruby
-    class User < ActiveRecord::Base
-      belongs_to :company, dependent: :destroy
+    class Posting < ActiveRecord::Base
+      belongs_to :tag, dependent: :destroy
     end
 
-    class Company < ActiveRecord::Base
-      has_many :users
+    class Tag < ActiveRecord::Base
+      has_many :postings
 
-      acts_has_many :users
+      acts_has_many :postings
     end
 ```
     In this case you have `has_many_update` method:
 ```ruby
-    Company.first.has_many_update {title: 'Google'}
+    new_record, delete_record =  Tag.first.has_many_update {title: 'ruby'}
 ```
-    if you use `acts_has_many` with `through: true` paramters:
+    if you use `acts_has_many` with `through: true` parameters:
 ```ruby
-    new_records, delete_ids = Company.has_many_through_update(update: data, new: date)
+    new_records, delete_ids = Tag.has_many_through_update(update: data, new: date)
 ```
 
 5. If you use `acts_has_many` with `acts_has_many_for`
 ```ruby
-    class User < ActiveRecord::Base
-      belongs_to :company, dependent: :destroy
+    class Posting < ActiveRecord::Base
+      belongs_to :tag, dependent: :destroy
 
-      acts_has_many_for :company
+      acts_has_many_for :tag
     end
 
-    class Company < ActiveRecord::Base
-      has_many :users
+    class Tag < ActiveRecord::Base
+      has_many :postings
 
-      acts_has_many :users
+      acts_has_many :postings
     end
 ```
     In this case you can use the same that is in 4-th point and also:
 ```ruby
-    User.first.company_attributes = {title: 'Google'}
+    Posting.first.tag_attributes = {title: 'ruby'}
 ```
-    if you use `acts_has_many` with `through: true` paramters
+    if you use `acts_has_many` with `through: true` parameters
 ```ruby
-    User.first.companies_collection = [{title: 'Google'}, {title: 'Apple'}]
+    Posting.first.tags_collection = [{title: 'ruby'}, {title: 'python'}]
 ```
 
+New in v0.3.2
+--------------
+Use `block` to change condition, default search is `where :compare => :value`
+```ruby
+  class Tag < ActiveRecord::Base
+    has_many :postings
+
+    acts_has_many :postings do |params|
+      where arel_table[:title].matches(params[:title])
+    end
+  end
+```
+Replace `compare` method to `condition`
+
+Notice, if block is defined:
+   >* `:compare` argument will be ignored
+   >* auto `validates :compare, uniqueness: true` is off
+
+
 More
 ----
    `acts_has_many` options:
    >* list relations or after necessary relations
    >* :compare( string or symbol; default: :title) - name column with unique elements in table
    >* :through( boolean; default: false) - if you use has_many :through
+   >* &block(should return ActiveRecord::Relation; default: `where compare: params[:compare]`) - change condition
 
    `acts_has_many_for` options:
    >* list necessary relations
@@ -90,13 +110,99 @@ More
   `<relation>_collection` options:
   >* data - Array (Records, Hash, Empty)
 
-  additionl
+  Additional
   >* `depend_relations` - show depend relations(Array)
   >* `actual?`  - check actuality(Boolean)
-  >* `compare`  - return compare column(String)
+  >* `condition` - call block(in: params, out: ActiveRecord::Relation)
   >* `destroy!` - standart destroy
   >* `destroy`  - destroy with cheking actuality record
 
+Examples
+--------
+Use with `has_manay`:
+```ruby
+  class Posting < ActiveRecord::Base
+    belongs_to :tag, dependent: :destroy
+
+    acts_has_many_for :tag
+  end
+
+  class Tag < ActiveRecord::Base
+    has_many :postings
+
+    acts_has_many :postings, compare: :name
+  end
+
+  posting = Posting.create title: 'First posting',
+                           tag_attributes: {name: 'ruby'}
+
+  posting.tag # => #<Tag id: 1, title: "ruby">
+  Tag.all # => [#<Tag id: 1, title: "ruby">]
+
+  posting = Posting.create title: 'Second posting',
+                           tag_attributes: {name: 'ruby'}
+
+  posting.tag # => #<Tag id: 1, title: "ruby">
+  Tag.all # => [#<Tag id: 1, title: "ruby">]
+
+  posting.update_attributes tag_attributes: {name: 'python'}
+
+  posting.tag # => #<Tag id: 2, title: "python">
+  Tag.all # => [#<Tag id: 1, title: "ruby">, #<Tag id: 2, title: "python">]
+
+  posting.tag_attributes = Tag.first
+  posting.save
+
+  Tag.all # => [#<Tag id: 1, title: "ruby">]
+```
+Use with `has_many :through`
+```ruby
+  class Posting < ActiveRecord::Base
+    has_many :posting_tags, dependent: :destroy
+    has_many :tags, through: :posting_tags
+
+    acts_has_many_for :tags
+  end
+
+  class PostingTag < ActiveRecord::Base
+    belongs_to :posting
+    belongs_to :tag
+  end
+
+  class Tag < ActiveRecord::Base
+    has_many :postings, through: :posting_tags
+    has_many :posting_tags
+
+    acts_has_many :postings, through: true
+  end
+
+  posting = Posting.create title: 'First posting',
+                           tags_collection: [{name: 'ruby'}, {name: 'python'}]
+
+  posting.tags
+  # => [#<Tag id: 1, title: "ruby">, #<Tag id: 2, title: "python">]
+  Tag.all
+  # => [#<Tag id: 1, title: "ruby">, #<Tag id: 2, title: "python">]
+
+  posting = Posting.create title: 'Second posting',
+                           tags_collection: [{name: 'ruby'}, {name: 'java'}]
+
+  posting.tags
+  # => [#<Tag id: 1, title: "ruby">, #<Tag id: 3, title: "java">]
+  Tag.all
+  # => [#<Tag id: 1, title: "ruby">, #<Tag id: 2, title: "python">, #<Tag id: 3, title: "java">]
+
+  posting.update_attributes tags_collection: [Tag.first]
+
+  posting.tags # => [#<Tag id: 2, title: "ruby">]
+  Tag.all
+  # => [#<Tag id: 1, title: "ruby">, #<Tag id: 2, title: "python">]
+
+  Posting.first.destroy
+
+  Tag.all # => [#<Tag id: 1, title: "ruby">]
+```
+
 Contributing
 ------------
 You can help improve this project.
@@ -107,7 +213,7 @@ Here are some ways *you* can contribute:
 * by suggesting new features
 * by writing or editing documentation
 * by writing specifications
-* by writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
+* by writing code
 * by refactoring code
 * by closing [issues](https://github.com/igor04/acts_has_many/issues)
 * by reviewing patches

data/lib/acts_has_many/active_record/acts_has_many/child.rb

@@ -1,40 +1,32 @@
 module ActiveRecord
   module ActsHasMany
-
-    # Class methods:
-    #   <tt>has_many_through_update</tt>
-    #
-    # Instance methods:
-    #   <tt>has_many_update</tt>
-    #   <tt>actual?</tt>
-    #   <tt>destroy</tt>
-    #   <tt>destroy!</tt>
     module Child
-
-      # <tt>has_many_update</tt> (return: array) - [new_record, delete_record]
-      # options: data (type: hash) - data for updte
       def has_many_update data
-        data = { model.compare => ''}.merge data
+        current = self
+        condition = current.class.condition(data.symbolize_keys)
 
-        has_many_cleaner data.symbolize_keys
+        if actual? || current.new_record?
+          [condition.first_or_create(data), nil]
+        elsif exists = condition.first
+          [exists, (current == exists ? nil : current)]
+        else
+          update_attributes data
+          [current, nil]
+        end
       end
 
-      # destroy with check actuality
       def destroy
         return false if actual? false
         super
       end
 
-      # original destroy
       def destroy!
         self.class.superclass.instance_method(:destroy).bind(self).call
       end
 
-      # <tt>actual?</tt> - check the acutuality of element in has_many table
-      # options: exclude (boolean, default: true) - ignore one record or no
       def actual? exclude = true
         actual = 0
-        model.dependent_relations.each do |dependent_relation|
+        self.class.dependent_relations.each do |dependent_relation|
           tmp = self.send dependent_relation
           actual += tmp.all.size
         end
@@ -43,46 +35,7 @@ module ActiveRecord
       end
     end
 
-  private
-
-    # <tt>has_many_cleaner</tt> - base mothod
-    def has_many_cleaner data
-      compare = { model.compare => data[model.compare] }
-
-      new_record = self
-      del_record = nil
-
-      if actual?
-        new_record = model.where(compare).first_or_create data
-      else
-        object_tmp = model.where(compare).first
-        if object_tmp.nil?
-          if new_record.id.nil?
-            new_record = model.where(compare).first_or_create data
-          else
-            if data[model.compare].blank?
-              del_record, new_record = new_record, nil
-            else
-              update_attributes data
-            end
-          end
-        else
-          del_record = (new_record.id == object_tmp.id) ? nil : new_record
-          new_record = object_tmp
-        end
-      end
-      [new_record, del_record]
-    end
-
-
     module ChildThrough
-
-      # <tt>has_many_through_update</tt> (return array) [ 1 - array new records, 2 - array delete records ]
-      # options
-      #   :update (array) - data for update (id and data)
-      #   :new (array) - data for create record (data)
-      #
-      # +for delete records need use method destroy !!!+
       def has_many_through_update(options)
         record_add = []
         record_del = []
@@ -96,8 +49,7 @@ module ActiveRecord
         unless options[:new].nil?
           options[:new].uniq!
           options[:new].each do |data|
-            data = data.symbolize_keys
-            record_add << where(compare => data[compare]).first_or_create(data)
+            record_add << new.has_many_update(data).first
             record_del.delete record_add.last
           end
         end

data/lib/acts_has_many/active_record/acts_has_many/parent.rb

@@ -1,32 +1,17 @@
 module ActiveRecord
   module ActsHasMany
-
-    # Class methods:
-    #   <tt><relation>_attributes=</tt>
-    #   <tt><relation>_collection=</tt>
     module Parent
+      extend ActiveSupport::Concern
 
-      def self.included base
-
-        # Generate class methods
-        #   <tt><relation>_attributes=</tt> - set one element (use with belogns_to)
-        #   options: data (type: Hash, existing recod, NilClass)
-        #
-        #   Create or update child record and set to parent when `data` is Hash
-        #   Change data with delating or leaving child record when `data` is exists record, or NilClass
-        #
-        #   <tt><relation>_collection=</tt> - set many elements (use with has_many :through)
-        #   options: data (type: Array with (exist records or Hash)
-        #
-        #   Create or select exists records and set to parent, unused record try destory
-        base.dependent_relations.each do |relation|
-          unless base.reflect_on_association relation.to_sym
+      included  do
+        dependent_relations.each do |relation|
+          unless reflect_on_association relation.to_sym
             raise ArgumentError, "No association found for name `#{relation}`. Has it been defined yet?"
           end
 
           relation = relation.to_s
-          unless base.reflect_on_association(relation.to_sym).collection?
-            base.class_eval <<-EOV, __FILE__ , __LINE__ + 1
+          unless reflect_on_association(relation.to_sym).collection?
+            class_eval <<-EOV, __FILE__ , __LINE__ + 1
             def #{relation}_attributes= data
               self.tmp_garbage ||= {}
               current = self.#{relation}
@@ -47,7 +32,7 @@ module ActiveRecord
             end
             EOV
           else
-            base.class_eval <<-EOV, __FILE__ , __LINE__ + 1
+            class_eval <<-EOV, __FILE__ , __LINE__ + 1
             def #{relation}_collection= data
               self.tmp_garbage ||= {}
 
@@ -76,7 +61,6 @@ module ActiveRecord
 
     private
 
-      #  <tt>clear_garbage</tt> work with after_save and try destroied records from tmp_garbage
       def clear_garbage
         self.tmp_garbage.each do |relation, record|
           if record.is_a? Array

data/lib/acts_has_many/active_record/acts_has_many.rb

@@ -1,33 +1,17 @@
 module ActiveRecord
   module ActsHasMany
-
-    # Class methods: (for use in your model)
-    #   <tt>acts_has_many_for</tt>
-    #   <tt>acts_has_many</tt>
-    def self.included base
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
-
-      # Class methods:
-      #   <tt>dependent_relations</tt>
-      #   <tt>compare</tt>
-      #   <tt>model</tt>
-      #   <tt>has_many_through_update</tt>
-      # Instance mothods:
-      #   <tt>actual?</tt>
-      #   <tt>has_many_update</tt>
-      # Set:
-      #   validates for <compare_element> (uniqueness: true, presence: true)
-      def acts_has_many *opt
-        options = { compare: :title, through: false }
+      def acts_has_many *opt, &block
+        options = {compare: :title, through: false}
         options.update opt.extract_options!
         options.assert_valid_keys :compare, :through
-        options[:relations] = opt
 
-        options[:relations] = self.reflect_on_all_associations(:has_many)
-          .map(&:name) if options[:relations].blank?
+        options[:relations] = opt
+        if options[:relations].blank?
+          options[:relations] = self.reflect_on_all_associations(:has_many).map(&:name)
+        end
 
         dependent_relations = []
         options[:relations].each do |relation|
@@ -38,33 +22,26 @@ module ActiveRecord
           end
         end
 
+        if block_given?
+          self.class.send :define_method, :condition, block
+        else
+          self.class.send :define_method, :condition do |data|
+            where options[:compare] => data[options[:compare]]
+          end
+        end
+
         class_eval <<-EOV, __FILE__ , __LINE__ + 1
           def self.dependent_relations
             #{dependent_relations}
           end
 
-          def self.compare
-            '#{options[:compare]}'.to_sym
-          end
-
           include ActiveRecord::ActsHasMany::Child
-          #{'extend  ActiveRecord::ActsHasMany::ChildThrough' if options[:through]}
+          #{"extend  ActiveRecord::ActsHasMany::ChildThrough" if options[:through]}
 
-          def model
-            #{self}
-          end
-
-          validates :#{options[:compare]}, uniqueness: true, presence: true
+          #{"validates :#{options[:compare]}, uniqueness: true" unless block_given?}
         EOV
       end
 
-      # Class methods:
-      #   <tt>dependent_relations</tt>
-      #   <tt><relation>_attributes=</tt>
-      #   <tt><relation>_collection=</tt>
-      # Set:
-      #   after save filter
-      #   attribut accessor tmp_garbage
       def acts_has_many_for *relations
         class_eval <<-EOV, __FILE__ , __LINE__ + 1
           def self.dependent_relations
@@ -78,7 +55,6 @@ module ActiveRecord
           after_save :clear_garbage
         EOV
       end
-
     end
   end
 end

data/lib/acts_has_many/version.rb

@@ -1,3 +1,3 @@
 module ActsHasMany
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/spec/has_many_common.rb

@@ -0,0 +1,134 @@
+shared_examples_for 'acts_has_many' do
+  context 'update method' do
+    let(:location){Location.create :title => "italy"}
+    let(:experience){Experience.create :location => location, :title => "test experience1"}
+    before :each do
+      Location.delete_all
+      Experience.delete_all
+    end
+
+    it 'has_many_update data' do
+      add_loc, del_loc = experience.location.has_many_update({"title" => "ukraine"})
+
+      expect(Location.all.size).to be 1
+      expect(location).to eq add_loc
+      expect(del_loc).to be nil
+      expect(experience.location.title).to eq "ukraine"
+
+      Experience.create :location => location, :title => "test experience2"
+
+      add_loc, del_loc = experience.location.has_many_update({"title" => "italy"})
+
+      expect(Location.all.size).to be 2
+      expect(location).not_to eq add_loc
+      expect(del_loc).to be nil
+
+      experience.location = Location.find(add_loc)
+      expect(experience.location.title).to eq "italy"
+
+      add_loc, del_loc = experience.location.has_many_update({"title" => "ukraine"})
+
+      expect(location).to eq add_loc
+      expect(experience.location).to eq del_loc
+    end
+
+    it "parent.child_attributes= Hash" do
+      experience = Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
+
+      Location.all.size.should be 1
+      experience.location.title.should eq "ukraine"
+
+      Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
+      Location.all.size.should be 1
+
+      experience.location_attributes = {"title" => "italy"}
+      experience.save
+
+      Location.all.size.should be 2
+      experience.location.title.should eq "italy"
+
+      experience.location_attributes = {"title" => "ukraine"}
+      experience.save
+
+      Location.all.size.should be 1
+      experience.location.title.should eq "ukraine"
+    end
+
+    it "parent.child_attributes= exist_record" do
+      experience = Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
+
+      Location.all.size.should be 1
+      experience.location.title.should eq "ukraine"
+
+      Experience.create location_attributes: Location.first, title: "test experience2"
+      Location.all.size.should be 1
+
+      experience.location_attributes = {"title" => "italy"}
+      experience.save
+
+      Location.all.size.should be 2
+      experience.location.title.should eq "italy"
+
+      experience.location_attributes = Location.first
+      experience.save
+
+      Location.all.size.should be 1
+      experience.location.title.should eq "ukraine"
+    end
+  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.all.size.should == 0
+  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 == 0
+  end
+
+  it 'actual?' do
+    Location.delete_all
+
+    location = Location.create(:title => "ukraine")
+
+    location.actual?.should == false
+    location.actual?(false).should == false
+
+    Experience.create( :title => 'test', :location => location )
+
+    location.actual?.should == false
+    location.actual?(false).should == true
+
+    Experience.create( :title => 'test', :location => location )
+
+    location.actual?.should == true
+    location.actual?(false).should == true
+  end
+
+  it 'dependent_relations' do
+    Location.dependent_relations.should == ['experiences']
+  end
+
+  it 'condition' do
+    where = Location.condition(:title => "ukraine")
+    expect(where).to eq Location.where(:title => "ukraine")
+  end
+end

data/spec/has_many_spec.rb

@@ -1,147 +1,64 @@
 require 'helper'
+require 'has_many_common'
 
-class Location < ActiveRecord::Base
-  self.table_name = 'locations'
-  has_many :experiences
+describe "acts_has_many clear initialization" do
+  before(:each) do
+    Object.send :remove_const, :Location if defined? Location
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      has_many :experiences
 
-  acts_has_many :experiences, compare: 'title'
-end
-
-describe 'acts_has_many' do
-  context 'update method' do
-    let(:location){Location.create :title => "italy"}
-    let(:experience){Experience.create :location => location, :title => "test experience1"}
-    before :each do
-      Location.delete_all
-      Experience.delete_all
-    end
-
-    it 'has_many_update data' do
-      add_loc, del_loc = experience.location.has_many_update({"title" => "ukraine"})
-
-      expect(Location.all.size).to be 1
-      expect(location).to eq add_loc
-      expect(del_loc).to be nil
-      expect(experience.location.title).to eq "ukraine"
-
-      Experience.create :location => location, :title => "test experience2"
-
-      add_loc, del_loc = experience.location.has_many_update({"title" => "italy"})
-
-      expect(Location.all.size).to be 2
-      expect(location).not_to eq add_loc
-      expect(del_loc).to be nil
-
-      experience.location = Location.find(add_loc)
-      expect(experience.location.title).to eq "italy"
-
-      add_loc, del_loc = experience.location.has_many_update({"title" => "ukraine"})
-
-      expect(location).to eq add_loc
-      expect(experience.location).to eq del_loc
-    end
-
-    it "parent.child_attributes= Hash" do
-      experience = Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
-
-      Location.all.size.should be 1
-      experience.location.title.should eq "ukraine"
-
-      Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
-      Location.all.size.should be 1
-
-      experience.location_attributes = {"title" => "italy"}
-      experience.save
-
-      Location.all.size.should be 2
-      experience.location.title.should eq "italy"
-
-      experience.location_attributes = {"title" => "ukraine"}
-      experience.save
-
-      Location.all.size.should be 1
-      experience.location.title.should eq "ukraine"
-    end
-
-    it "parent.child_attributes= exist_record" do
-      experience = Experience.create location_attributes: {title: "ukraine"}, title: "test experience2"
-
-      Location.all.size.should be 1
-      experience.location.title.should eq "ukraine"
-
-      Experience.create location_attributes: Location.first, title: "test experience2"
-      Location.all.size.should be 1
-
-      experience.location_attributes = {"title" => "italy"}
-      experience.save
-
-      Location.all.size.should be 2
-      experience.location.title.should eq "italy"
-
-      experience.location_attributes = Location.first
-      experience.save
-
-      Location.all.size.should be 1
-      experience.location.title.should eq "ukraine"
+      acts_has_many
     end
   end
+  it_behaves_like 'acts_has_many'
+end
 
-  it 'destroy' do
-    Location.delete_all
-    Experience.delete_all
-
-    location = Location.create(:title => "ukraine")
-
-    Experience.create( :location => location, :title => "test" )
+describe "acts_has_many ititialize with relation" do
+  before(:each) do
+    Object.send :remove_const, :Location if defined? Location
 
-    location.destroy
-    Location.all.size.should == 1
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      has_many :experiences
 
-    Experience.all[0].destroy
-    Location.all.size.should == 0
+      acts_has_many :experiences
+    end
   end
+  it_behaves_like 'acts_has_many'
+end
 
-  it 'destroy' do
-    Location.delete_all
-    Experience.delete_all
-
-    location = Location.create(:title => "ukraine")
+describe "acts_has_many initialize with :compare" do
+  before(:each) do
+    Object.send :remove_const, :Location if defined? Location
 
-    Experience.create( :location => location, :title => "test" )
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      has_many :experiences
 
-    location.destroy!
-    Location.all.size.should == 0
+      acts_has_many compare: :title
+    end
   end
+  it_behaves_like 'acts_has_many'
+end
 
-  it 'actual?' do
-    Location.delete_all
-
-    location = Location.create(:title => "ukraine")
-
-    location.actual?.should == false
-    location.actual?(false).should == false
-
-    Experience.create( :title => 'test', :location => location )
-
-    location.actual?.should == false
-    location.actual?(false).should == true
-
-    Experience.create( :title => 'test', :location => location )
+describe "acts_has_many initialize with block" do
+  before(:each) do
+    Object.send :remove_const, :Location if defined? Location
 
-    location.actual?.should == true
-    location.actual?(false).should == true
-  end
+    class Location < ActiveRecord::Base
+      self.table_name = 'locations'
+      has_many :experiences
 
-  it 'compare' do
-    Location.compare.should == :title
-  end
-
-  it 'model' do
-    location = Location.create(:title => "ukraine")
-    location.model.should == Location
+      acts_has_many do |data|
+        where arel_table[:title].eq(data[:title])
+      end
+    end
   end
+  it_behaves_like 'acts_has_many'
 
-  it 'dependent_relations' do
-    Location.dependent_relations.should == ['experiences']
+  it 'condition' do
+    where = Location.condition(:title => "ukraine")
+    expect(where).to eq Location.where(Location.arel_table[:title].eq("ukraine"))
   end
 end

data/spec/has_many_through_common.rb

@@ -0,0 +1,94 @@
+shared_examples_for 'acts_has_many through: true' do
+  it 'parent.child_colletion=<data>' do
+    Local.delete_all
+
+    company = Company.create title: 'test', locals_collection: [{title: 'testx'}]
+    company.locals.first.title.should eq 'testx'
+
+    company.locals_collection = [{title: 'test2'}]
+    company.locals.first.title.should eq 'test2'
+    Local.all.size.should be 2
+
+    company.save # after save we clear garbage
+    company.locals.first.title.should eq 'test2'
+    Local.all.size.should be 1
+
+    company2 = Company.create title: 'test2', locals_collection: [{title: 'test2'},{title: 'test1'}]
+    company.locals_collection = Local.all
+    company.locals.size.should be 2
+
+    company.save
+    Local.all.size.should be 2
+
+    company.locals_collection = [{title: 'test3'}, {title: 'test2'}]
+    company.save
+
+    company.locals.size.should be 2
+    Local.all.size.should be 3
+
+    company.locals_collection = [{title: 'test1'}]
+    Local.all.size.should be 3
+
+    company.save
+    Local.all.size.should be 2
+
+    company2.locals_collection = [Local.last]
+    Local.all.size.should be 2
+
+    company2.save
+    Local.all.size.should be 1
+    company2.locals.should eq company.locals
+
+    company2.locals_collection = []
+    company2.save
+    company2.locals.should eq []
+
+    company.locals_collection = []
+    company.save
+
+    Local.all.should eq []
+  end
+  it 'update' do
+    Local.delete_all
+
+    Local.all.size.should == 0
+
+    new_records, del_records = Local.has_many_through_update( :new => [
+      { title: 'test0'},
+      { title: 'test1'},
+      { title: 'test2'},
+      { title: 'test3'},
+      { title: 'test0'},
+    ])
+
+    expect(new_records.count).to be 4
+    expect(del_records).to eq []
+    expect(Local.all.size).to be 4
+
+    new_records_1, del_records_1 = Local.has_many_through_update(
+    :new => [
+      { title: 'test0'},
+      { 'title' => 'test1'}
+    ],
+    :update => {
+      new_records[2].id => {title: 'test2s'},
+      new_records[3].id.to_s => {'title' => 'test3s'}
+    })
+
+    expect(new_records_1.map(&:id).sort!).to eq new_records.map(&:id)
+    expect(Local.find(new_records[2].id).title).to eq 'test2s'
+    expect(Local.find(new_records[3].id).title).to eq 'test3s'
+    expect(Local.all.size).to be 4
+
+    new, del = Local.has_many_through_update(
+    :new => [
+      { title: 'test0'},
+      { title: 'test3s'}],
+    :update => {
+      new_records_1[0].id => {title: 'test0'},
+    })
+
+    expect(del.size).to be 1
+    expect(new.size).to be 3
+  end
+end

data/spec/has_many_through_spec.rb

@@ -1,106 +1,96 @@
 require 'helper'
+require 'has_many_through_common'
 
-class Local < ActiveRecord::Base
-  self.table_name = 'locals'
-  has_many :companies, :through => :company_locals
-  has_many :company_locals
+describe "acts_has_many :through" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-  acts_has_many :companies, :through => true, compare: 'title'
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
+
+      acts_has_many through: true
+    end
+  end
+  it_behaves_like 'acts_has_many through: true'
 end
 
-describe 'acts_has_many with :through' do
-  it 'parent.child_colletion=<data>' do
-    Local.delete_all
+describe "acts_has_many :through with relation" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-    company = Company.create title: 'test', locals_collection: [{title: 'testx'}]
-    company.locals.first.title.should eq 'testx'
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
 
-    company.locals_collection = [{title: 'test2'}]
-    company.locals.first.title.should eq 'test2'
-    Local.all.size.should be 2
+      acts_has_many :companies, through: true
+    end
+  end
+  it_behaves_like 'acts_has_many through: true'
+end
 
-    company.save # after save we clear garbage
-    company.locals.first.title.should eq 'test2'
-    Local.all.size.should be 1
+describe "acts_has_many :through with  :compare" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-    company2 = Company.create title: 'test2', locals_collection: [{title: 'test2'},{title: 'test1'}]
-    company.locals_collection = Local.all
-    company.locals.size.should be 2
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
 
-    company.save
-    Local.all.size.should be 2
+      acts_has_many compare: :title, through: true
+    end
+  end
+  it_behaves_like 'acts_has_many through: true'
+end
 
-    company.locals_collection = [{title: 'test3'}, {title: 'test2'}]
-    company.save
+describe "acts_has_many :through with relation and :compare" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-    company.locals.size.should be 2
-    Local.all.size.should be 3
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
 
-    company.locals_collection = [{title: 'test1'}]
-    Local.all.size.should be 3
+      acts_has_many :companies, compare: :title, through: true
+    end
+  end
+  it_behaves_like 'acts_has_many through: true'
+end
 
-    company.save
-    Local.all.size.should be 2
+describe "acts_has_many :through with relation and block" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-    company2.locals_collection = [Local.last]
-    Local.all.size.should be 2
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
 
-    company2.save
-    Local.all.size.should be 1
-    company2.locals.should eq company.locals
+      acts_has_many :companies, through: true do |local|
+        where arel_table[:title].eq local[:title]
+      end
+    end
+  end
+  it_behaves_like 'acts_has_many through: true'
+end
 
-    company2.locals_collection = []
-    company2.save
-    company2.locals.should eq []
+describe "acts_has_many :through with relation and block" do
+  before(:each) do
+    Object.send :remove_const, :Local if defined? Local
 
-    company.locals_collection = []
-    company.save
+    class Local < ActiveRecord::Base
+      self.table_name = 'locals'
+      has_many :companies, :through => :company_locals
+      has_many :company_locals
 
-    Local.all.should eq []
-  end
-  it 'update' do
-    Local.delete_all
-
-    Local.all.size.should == 0
-
-    new_records, del_records = Local.has_many_through_update( :new => [
-      { title: 'test0'},
-      { title: 'test1'},
-      { title: 'test2'},
-      { title: 'test3'},
-      { title: 'test0'},
-    ])
-
-    expect(new_records.count).to be 4
-    expect(del_records).to eq []
-    expect(Local.all.size).to be 4
-
-    new_records_1, del_records_1 = Local.has_many_through_update(
-    :new => [
-      { title: 'test0'},
-      { 'title' => 'test1'}
-    ],
-    :update => {
-      new_records[2].id => {title: 'test2s'},
-      new_records[3].id.to_s => {'title' => 'test3s'}
-    })
-
-    expect(new_records_1.map(&:id).sort!).to eq new_records.map(&:id)
-    expect(Local.find(new_records[2].id).title).to eq 'test2s'
-    expect(Local.find(new_records[3].id).title).to eq 'test3s'
-    expect(Local.all.size).to be 4
-
-
-    new, del = Local.has_many_through_update(
-    :new => [
-      { title: 'test0'},
-      { title: 'test3s'}],
-    :update => {
-      new_records_1[2].id => {title: 'test2s'},
-      new_records_1[3].id => {title: ''}
-    })
-
-    expect(del.size).to be 1
-    expect(new.size).to be 3
+      acts_has_many through: true do |local|
+        where arel_table[:title].eq local[:title]
+      end
+    end
   end
+  it_behaves_like 'acts_has_many through: true'
 end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: acts_has_many
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Igor IS04
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem gives functional for update elements has_many relation
@@ -109,35 +98,38 @@ files:
 - lib/acts_has_many/active_record/acts_has_many/child.rb
 - lib/acts_has_many/active_record/acts_has_many/parent.rb
 - lib/acts_has_many/version.rb
+- spec/has_many_common.rb
 - spec/has_many_spec.rb
+- spec/has_many_through_common.rb
 - spec/has_many_through_spec.rb
 - spec/helper.rb
 homepage: https://github.com/igor04/acts_has_many
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: All records must be used, otherwise they will be deleted. Clear logic with
   has_many
 test_files:
+- spec/has_many_common.rb
 - spec/has_many_spec.rb
+- spec/has_many_through_common.rb
 - spec/has_many_through_spec.rb
 - spec/helper.rb