polyamorous 0.6.0 → 0.6.2

data/lib/polyamorous/join_association.rb

@@ -6,6 +6,9 @@ module Polyamorous
         alias_method_chain :initialize, :polymorphism
         alias_method :equality_without_polymorphism, :==
         alias_method :==, :equality_with_polymorphism
+        if base.method_defined?(:active_record)
+          alias_method :base_klass, :active_record
+        end
 
         if ActiveRecord::VERSION::STRING =~ /^3\.0\./
           alias_method_chain :association_join, :polymorphism
@@ -35,7 +38,7 @@ module Polyamorous
     end
 
     def equality_with_polymorphism(other)
-      equality_without_polymorphism(other) && active_record == other.active_record
+      equality_without_polymorphism(other) && base_klass == other.base_klass
     end
 
     def build_constraint_with_polymorphism(reflection, table, key, foreign_table, foreign_key)
@@ -60,7 +63,7 @@ module Polyamorous
 
         parent_table = Arel::Table.new(parent.table_name, :as      => parent.aliased_table_name,
                                                           :engine  => arel_engine,
-                                                          :columns => parent.active_record.columns)
+                                                          :columns => parent.base_klass.columns)
 
         @join << parent_table[reflection.options[:foreign_type]].eq(reflection.klass.name)
       end
@@ -69,4 +72,4 @@ module Polyamorous
     end
 
   end
-end
+end

data/lib/polyamorous/join_dependency.rb

@@ -5,6 +5,9 @@ module Polyamorous
       base.class_eval do
         alias_method_chain :build, :polymorphism
         alias_method_chain :graft, :polymorphism
+        if base.method_defined?(:active_record)
+          alias_method :base_klass, :active_record
+        end
       end
     end
 
@@ -58,7 +61,7 @@ module Polyamorous
         unless reflection.options[:polymorphic]
           association
         else
-          association if association.active_record == klass
+          association if association.base_klass == klass
         end
       end
     end
@@ -72,4 +75,4 @@ module Polyamorous
     end
 
   end
-end
+end

data/lib/polyamorous/version.rb

@@ -1,3 +1,3 @@
 module Polyamorous
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/spec/polyamorous/join_association_spec.rb

@@ -2,5 +2,26 @@ require 'spec_helper'
 
 module Polyamorous
   describe JoinAssociation do
+    let(:join_dependency) { new_join_dependency Note, {} }
+    let(:parent) { join_dependency.join_base }
+    let(:reflection) { Note.reflect_on_association(:notable) }
+    subject {
+      join_dependency.build_join_association_respecting_polymorphism(
+        reflection, parent, Person
+      )
+    }
+
+    it 'respects polymorphism on equality test' do
+      subject.should eq(
+        join_dependency.build_join_association_respecting_polymorphism(
+          reflection, parent, Person
+        )
+      )
+      subject.should_not eq(
+        join_dependency.build_join_association_respecting_polymorphism(
+          reflection, parent, Article
+        )
+      )
+    end
   end
-end
+end

data/spec/polyamorous/join_dependency_spec.rb

@@ -37,6 +37,14 @@ module Polyamorous
       specify { subject.join_associations.should have(1).association }
       specify { subject.join_associations.should be_all { |a| a.join_type == Arel::InnerJoin } }
       specify { subject.join_associations.first.table_name.should eq 'people' }
+
+      it 'finds a join association respecting polymorphism' do
+        parent = subject.join_base
+        reflection = Note.reflect_on_association(:notable)
+        subject.find_join_association_respecting_polymorphism(
+          reflection, parent, Person
+        ).should eq subject.join_associations.first
+      end
     end
 
     context 'with polymorphic belongs_to join and nested symbol join' do
@@ -49,4 +57,4 @@ module Polyamorous
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064198230970801175
+      hash: 2316863332699379483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064198230970801175
+      hash: 2316863332699379483
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...