polyamorous 0.6.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a960cff78a0b7755b3cb84f7d44ce6fd99f0db3
-  data.tar.gz: ed14c61ab54556d57ab445b50635b48466c36ba1
+  metadata.gz: f3950028cc987da204d7fa91c77f8ff80488e3a3
+  data.tar.gz: b43069b9cf219debd61e9e4370c313a943cd4664
 SHA512:
-  metadata.gz: 4e826b11b91c37bbedc7bc9201c90515a5a4ba02e085ff9b0827dfe2da116bba36545526a720e205a9c4a878e66ba8c384bb6942174c038cc6d15083d5777614
-  data.tar.gz: 2dfd89eab419e1e5301c51b30f2edff793bd721f7ce27d4a6fe4726dde9c180afcfc15a5faf703b88d80b87a6f3457c2227e4d88ea399b08f3f5da632a11945c
+  metadata.gz: 40bb92cc9b88a5c321f6c1538272cfd01ea01d88ec564e66f7b9ce437d9a37429be380e6e3719ee0d42df935a5acf1ecf4a7a32dc8ad6b6b92e3cc6cc0cc8c51
+  data.tar.gz: 053e1bfb41cbf82c4e52c3068d3e05d7f835830e2692061cdca6a2ce7a82f674d554c845a756777f0d1bef9075206a31ff208e73102892216a817ebdc11b56b7

data/.travis.yml

@@ -0,0 +1,32 @@
+language: ruby
+
+before_install:
+  - travis_retry gem install bundler
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+
+env:
+  - RAILS=4-1-stable DB=sqlite
+  - RAILS=4-1-stable DB=mysql
+  - RAILS=4-1-stable DB=postgres
+  - RAILS=4-0-stable DB=sqlite
+  - RAILS=4-0-stable DB=mysql
+  - RAILS=4-0-stable DB=postgres
+  - RAILS=3-2-stable DB=sqlite
+  - RAILS=3-2-stable DB=mysql
+  - RAILS=3-2-stable DB=postgres
+  - RAILS=3-1-stable DB=sqlite
+  - RAILS=3-1-stable DB=mysql
+  - RAILS=3-1-stable DB=postgres
+  - RAILS=3-0-stable DB=sqlite
+  - RAILS=3-0-stable DB=mysql
+  - RAILS=3-0-stable DB=postgres
+
+before_script:
+  - mysql -e 'create database ransack collate utf8_general_ci;'
+  - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'
+  - psql -c 'create database ransack;' -U postgres
+

data/Gemfile

@@ -1,21 +1,9 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
 
 rails = ENV['RAILS'] || 'master'
-arel = ENV['AREL'] || 'master'
-
-arel_opts = case arel
-when /\// # A path
-  {:path => arel}
-when /^v/ # A tagged version
-  {:git => 'git://github.com/rails/arel.git', :tag => arel}
-else
-  {:git => 'git://github.com/rails/arel.git', :branch => arel}
-end
-
-gem 'arel', arel_opts
 
 case rails
 when /\// # A path

data/README.md

@@ -1,5 +1,7 @@
 # Polyamorous
 
-This is just a long-overdue extraction from MetaSearch 1.1.x, Ransack, and Squeel.
+Polyamorous is an extraction from MetaSearch 1.1.x, Ransack, and Squeel by [Ernie Miller](http://twitter.com/erniemiller).
 
-Move along. Nothing to see here.
+## Copyright
+
+Copyright © 2011-2014 [Ernie Miller](http://twitter.com/erniemiller)

data/lib/polyamorous.rb

@@ -1,26 +1,33 @@
 require "polyamorous/version"
-require 'active_record'
 
-module Polyamorous
-  if defined?(::ActiveRecord::Associations::JoinDependency)
-    JoinDependency  = ::ActiveRecord::Associations::JoinDependency
-    JoinAssociation = ::ActiveRecord::Associations::JoinDependency::JoinAssociation
-    JoinBase = ::ActiveRecord::Associations::JoinDependency::JoinBase
-  else
-    JoinDependency  = ::ActiveRecord::Associations::ClassMethods::JoinDependency
-    JoinAssociation = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
-    JoinBase = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinBase
+if defined?(::ActiveRecord)
+  module Polyamorous
+    if defined?(::ActiveRecord::Associations::JoinDependency)
+      JoinDependency  = ::ActiveRecord::Associations::JoinDependency
+      JoinAssociation = ::ActiveRecord::Associations::JoinDependency::JoinAssociation
+      JoinBase = ::ActiveRecord::Associations::JoinDependency::JoinBase
+    else
+      JoinDependency  = ::ActiveRecord::Associations::ClassMethods::JoinDependency
+      JoinAssociation = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
+      JoinBase = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinBase
+    end
   end
-end
 
-require 'polyamorous/join'
-require 'polyamorous/join_association'
-require 'polyamorous/join_dependency'
+  require 'polyamorous/join'
+
+  if ActiveRecord::VERSION::STRING >= "4.1"
+    require 'polyamorous/activerecord_4.1/join_association'
+    require 'polyamorous/activerecord_4.1/join_dependency'
+  else
+    require 'polyamorous/activerecord_3_and_4.0/join_association'
+    require 'polyamorous/activerecord_3_and_4.0/join_dependency'
+  end
 
-Polyamorous::JoinDependency.send(:include, Polyamorous::JoinDependencyExtensions)
-Polyamorous::JoinAssociation.send(:include, Polyamorous::JoinAssociationExtensions)
-Polyamorous::JoinBase.class_eval do
-  if method_defined?(:active_record)
-    alias_method :base_klass, :active_record
+  Polyamorous::JoinDependency.send(:include, Polyamorous::JoinDependencyExtensions)
+  Polyamorous::JoinAssociation.send(:include, Polyamorous::JoinAssociationExtensions)
+  Polyamorous::JoinBase.class_eval do
+    if method_defined?(:active_record)
+      alias_method :base_klass, :active_record
+    end
   end
 end

data/lib/polyamorous/{join_dependency.rb → activerecord_3_and_4.0/join_dependency.rb}

@@ -1,6 +1,5 @@
 module Polyamorous
   module JoinDependencyExtensions
-
     def self.included(base)
       base.class_eval do
         alias_method_chain :build, :polymorphism
@@ -13,12 +12,23 @@ module Polyamorous
 
     def graft_with_polymorphism(*associations)
       associations.each do |association|
-        unless join_associations.detect {|a| association == a}
+        unless join_associations.detect { |a| association == a }
           if association.reflection.options[:polymorphic]
-            build(Join.new(association.reflection.name, association.join_type, association.reflection.klass),
-                  association.find_parent_in(self) || join_base, association.join_type)
+            build(
+              Join.new(
+                association.reflection.name,
+                association.join_type,
+                association.reflection.klass
+                ),
+              association.find_parent_in(self) || join_base,
+              association.join_type
+              )
           else
-            build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
+            build(
+              association.reflection.name,
+              association.find_parent_in(self) || join_base,
+              association.join_type
+              )
           end
         end
       end
@@ -40,11 +50,17 @@ module Polyamorous
       when Join
         parent ||= _join_parts.last
         reflection = parent.reflections[associations.name] or
-          raise ::ActiveRecord::ConfigurationError, "Association named '#{ associations.name }' was not found; perhaps you misspelled it?"
+          raise ::ActiveRecord::ConfigurationError,
+            "Association named '#{associations.name
+              }' was not found; perhaps you misspelled it?"
 
-        unless join_association = find_join_association_respecting_polymorphism(reflection, parent, associations.klass)
+        unless join_association = find_join_association_respecting_polymorphism(
+          reflection, parent, associations.klass
+          )
           @reflections << reflection
-          join_association = build_join_association_respecting_polymorphism(reflection, parent, associations.klass)
+          join_association = build_join_association_respecting_polymorphism(
+            reflection, parent, associations.klass
+            )
           join_association.join_type = associations.type
           _join_parts << join_association
           cache_joined_association(join_association)
@@ -73,6 +89,5 @@ module Polyamorous
         JoinAssociation.new(reflection, self, parent)
       end
     end
-
   end
 end

data/lib/polyamorous/activerecord_4.1/join_association.rb

@@ -0,0 +1,73 @@
+module Polyamorous
+  module JoinAssociationExtensions
+    def self.included(base)
+      base.class_eval do
+        alias_method_chain :initialize, :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
+        else
+          alias_method_chain :build_constraint, :polymorphism
+        end
+      end
+    end
+
+    def initialize_with_polymorphism(reflection, children, polymorphic_class = nil)
+      if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
+        swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
+          initialize_without_polymorphism(reflection, children)
+          self.reflection.options[:polymorphic] = true
+        end
+      else
+        initialize_without_polymorphism(reflection, children)
+      end
+    end
+
+    def swapping_reflection_klass(reflection, klass)
+      new_reflection = reflection.clone
+      new_reflection.instance_variable_set(:@options, reflection.options.clone)
+      new_reflection.options.delete(:polymorphic)
+      new_reflection.instance_variable_set(:@klass, klass)
+      yield new_reflection
+    end
+
+    # Reference https://github.com/rails/rails/commit/9b15db51b78028bfecdb85595624de4b838adbd1
+    # NOTE Not sure we still need it?
+    def ==(other)
+      base_klass == other.base_klass
+    end
+
+    def build_constraint_with_polymorphism(klass, table, key, foreign_table, foreign_key)
+      if reflection.options[:polymorphic]
+        build_constraint_without_polymorphism(klass, table, key, foreign_table, foreign_key).and(
+          foreign_table[reflection.foreign_type].eq(reflection.klass.name)
+        )
+      else
+        build_constraint_without_polymorphism(klass, table, key, foreign_table, foreign_key)
+      end
+    end
+
+    def association_join_with_polymorphism
+      return @join if @Join
+
+      @join = association_join_without_polymorphism
+
+      if reflection.macro == :belongs_to && reflection.options[:polymorphic]
+        aliased_table = Arel::Table.new(table_name, :as      => @aliased_table_name,
+                                                    :engine  => arel_engine,
+                                                    :columns => klass.columns)
+
+        parent_table = Arel::Table.new(parent.table_name, :as      => parent.aliased_table_name,
+                                                          :engine  => arel_engine,
+                                                          :columns => parent.base_klass.columns)
+
+        @join << parent_table[reflection.options[:foreign_type]].eq(reflection.klass.name)
+      end
+
+      @join
+    end
+  end
+end

data/lib/polyamorous/activerecord_4.1/join_dependency.rb

@@ -0,0 +1,71 @@
+module Polyamorous
+  module JoinDependencyExtensions
+    def self.included(base)
+      base.extend ClassMethods
+
+      base.class_eval do
+        class << self
+          alias_method_chain :walk_tree, :polymorphism
+        end
+
+        alias_method_chain :build, :polymorphism
+        if base.method_defined?(:active_record)
+          alias_method :base_klass, :active_record
+        end
+      end
+    end
+
+    def build_with_polymorphism(associations, base_klass)
+      associations.map do |name, right|
+        if name.is_a? Join
+          reflection = find_reflection base_klass, name.name
+          reflection.check_validity!
+
+          if reflection.options[:polymorphic]
+            JoinAssociation.new reflection, build(right, name.klass || base_klass), name.klass
+          else
+            JoinAssociation.new reflection, build(right, reflection.klass), name.klass
+          end
+        else
+          reflection = find_reflection base_klass, name
+          reflection.check_validity!
+
+          if reflection.options[:polymorphic]
+            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
+          end
+
+          JoinAssociation.new reflection, build(right, reflection.klass)
+        end
+      end
+    end
+
+    def find_join_association_respecting_polymorphism(reflection, parent, klass)
+      if association = parent.children.find { |j| j.reflection == reflection }
+        unless reflection.options[:polymorphic]
+          association
+        else
+          association if association.base_klass == klass
+        end
+      end
+    end
+
+    def build_join_association_respecting_polymorphism(reflection, parent, klass)
+      if reflection.options[:polymorphic] && klass
+        JoinAssociation.new(reflection, self, klass)
+      else
+        JoinAssociation.new(reflection, self)
+      end
+    end
+
+    module ClassMethods
+      def walk_tree_with_polymorphism(associations, hash)
+        case associations
+        when Join
+          hash[associations] ||= {}
+        else
+          walk_tree_without_polymorphism(associations, hash)
+        end
+      end
+    end
+  end
+end

data/lib/polyamorous/version.rb

@@ -1,3 +1,3 @@
 module Polyamorous
-  VERSION = "0.6.4"
+  VERSION = "1.0.0"
 end

data/polyamorous.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "polyamorous"
 
   s.add_dependency 'activerecord', '>= 3.0'
-  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'

data/spec/helpers/polyamorous_helper.rb

@@ -1,4 +1,13 @@
 module PolyamorousHelper
+  if ActiveRecord::VERSION::STRING >= "4.1"
+    def new_join_association(reflection, children, klass)
+      Polyamorous::JoinAssociation.new reflection, children, klass
+    end
+  else
+    def new_join_association(reflection, join_dependency, parent, klass)
+      Polyamorous::JoinAssociation.new reflection, join_dependency, parent, klass
+    end
+  end
 
   def new_join_dependency(klass, associations = {})
     Polyamorous::JoinDependency.new klass, associations, []

data/spec/polyamorous/join_association_spec.rb

@@ -2,41 +2,10 @@ 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) }
-    let(:join_association) { JoinAssociation.new(reflection, join_dependency, parent, Article) }
-    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
-
-    it 'leaves the orginal reflection intact for thread safety' do
-      reflection.instance_variable_set(:@klass, Article)
-      join_association.swapping_reflection_klass(reflection, Person) do |new_reflection|
-        new_reflection.options.should_not equal reflection.options
-        new_reflection.options.should_not have_key(:polymorphic)
-        new_reflection.klass.should == Person
-        reflection.klass.should == Article
-      end
-    end
-
-    it 'sets the polmorphic option to true after initializing' do
-      join_association.options[:polymorphic].should be_true
+    if ActiveRecord::VERSION::STRING >= "4.1"
+      include_examples "Join Association on ActiveRecord 4.1"
+    else
+      include_examples "Join Association on ActiveRecord 3 and 4.0"
     end
   end
 end

data/spec/polyamorous/join_dependency_spec.rb

@@ -2,59 +2,10 @@ require 'spec_helper'
 
 module Polyamorous
   describe JoinDependency do
-
-    context 'with symbol joins' do
-      subject { new_join_dependency Person, :articles => :comments }
-
-      specify { subject.join_associations.should have(2).associations }
-      specify { subject.join_associations.should be_all { |a| a.join_type == Arel::InnerJoin } }
-    end
-
-    context 'with has_many :through association' do
-      subject { new_join_dependency Person, :authored_article_comments }
-
-      specify { subject.join_associations.should have(1).association }
-      specify { subject.join_associations.first.table_name.should eq 'comments' }
+    if ActiveRecord::VERSION::STRING >= "4.1"
+      include_examples "Join Dependency on ActiveRecord 4.1"
+    else
+      include_examples "Join Dependency on ActiveRecord 3 and 4.0"
     end
-
-    context 'with outer join' do
-      subject { new_join_dependency Person, new_join(:articles, :outer) }
-
-      specify { subject.join_associations.should have(1).association }
-      specify { subject.join_associations.should be_all { |a| a.join_type == Arel::OuterJoin } }
-    end
-
-    context 'with nested outer joins' do
-      subject { new_join_dependency Person, new_join(:articles, :outer) => new_join(:comments, :outer) }
-
-      specify { subject.join_associations.should have(2).associations }
-      specify { subject.join_associations.should be_all { |a| a.join_type == Arel::OuterJoin } }
-    end
-
-    context 'with polymorphic belongs_to join' do
-      subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
-
-      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
-      subject { new_join_dependency Note, new_join(:notable, :inner, Person) => :comments }
-
-      specify { subject.join_associations.should have(2).association }
-      specify { subject.join_associations.should be_all { |a| a.join_type == Arel::InnerJoin } }
-      specify { subject.join_associations.first.table_name.should eq 'people' }
-      specify { subject.join_associations[1].table_name.should eq 'comments' }
-    end
-
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,8 @@ require 'polyamorous'
 
 Time.zone = 'Eastern Time (US & Canada)'
 
-Dir[File.expand_path('../{helpers,support,blueprints}/*.rb', __FILE__)].each do |f|
+Dir[File.expand_path('../{helpers,support,blueprints}/**/*.rb', __FILE__)]
+.each do |f|
   require f
 end
 
@@ -13,7 +14,7 @@ Sham.define do
   name     { Faker::Name.name }
   title    { Faker::Lorem.sentence }
   body     { Faker::Lorem.paragraph }
-  salary   {|index| 30000 + (index * 1000)}
+  salary   { |index| 30000 + (index * 1000) }
   tag_name { Faker::Lorem.words(3).join(' ') }
   note     { Faker::Lorem.words(7).join(' ') }
 end

data/spec/support/shared_examples/join_association_3_and_4.0.rb

@@ -0,0 +1,39 @@
+shared_examples "Join Association on ActiveRecord 3 and 4.0" do
+  let(:join_dependency) { new_join_dependency Note, {} }
+  let(:reflection) { Note.reflect_on_association(:notable) }
+  let(:parent) { join_dependency.join_base }
+  let(:join_association) { new_join_association(reflection, join_dependency, parent, Article) }
+
+  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
+
+  it 'leaves the orginal reflection intact for thread safety' do
+    reflection.instance_variable_set(:@klass, Article)
+    join_association.swapping_reflection_klass(reflection, Person) do |new_reflection|
+      new_reflection.options.should_not equal reflection.options
+      new_reflection.options.should_not have_key(:polymorphic)
+      new_reflection.klass.should == Person
+      reflection.klass.should == Article
+    end
+  end
+
+  it 'sets the polmorphic option to true after initializing' do
+    join_association.options[:polymorphic].should be_true
+  end
+end

data/spec/support/shared_examples/join_association_4.1.rb

@@ -0,0 +1,37 @@
+shared_examples "Join Association on ActiveRecord 4.1" do
+  let(:join_dependency) { new_join_dependency Note, {} }
+  let(:reflection) { Note.reflect_on_association(:notable) }
+  let(:parent) { join_dependency.join_root }
+  let(:join_association) { new_join_association(reflection, parent.children, Article) }
+
+  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
+
+  it 'leaves the orginal reflection intact for thread safety' do
+    reflection.instance_variable_set(:@klass, Article)
+    join_association.swapping_reflection_klass(reflection, Person) do |new_reflection|
+      new_reflection.options.should_not equal reflection.options
+      new_reflection.options.should_not have_key(:polymorphic)
+      new_reflection.klass.should == Person
+      reflection.klass.should == Article
+    end
+  end
+
+  it 'sets the polmorphic option to true after initializing' do
+    join_association.reflection.options[:polymorphic].should be_true
+  end
+end

data/spec/support/shared_examples/join_dependency_3_and_4.0.rb

@@ -0,0 +1,54 @@
+shared_examples "Join Dependency on ActiveRecord 3 and 4.0" do
+  context 'with symbol joins' do
+    subject { new_join_dependency Person, :articles => :comments }
+
+    specify { subject.join_associations.should have(2).associations }
+    specify { subject.join_associations.should be_all { |a| a.join_type == Arel::InnerJoin } }
+  end
+
+  context 'with has_many :through association' do
+    subject { new_join_dependency Person, :authored_article_comments }
+
+    specify { subject.join_associations.should have(1).association }
+    specify { subject.join_associations.first.table_name.should eq 'comments' }
+  end
+
+  context 'with outer join' do
+    subject { new_join_dependency Person, new_join(:articles, :outer) }
+
+    specify { subject.join_associations.should have(1).association }
+    specify { subject.join_associations.should be_all { |a| a.join_type == Arel::OuterJoin } }
+  end
+
+  context 'with nested outer joins' do
+    subject { new_join_dependency Person, new_join(:articles, :outer) => new_join(:comments, :outer) }
+
+    specify { subject.join_associations.should have(2).associations }
+    specify { subject.join_associations.should be_all { |a| a.join_type == Arel::OuterJoin } }
+  end
+
+  context 'with polymorphic belongs_to join' do
+    subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
+
+    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
+    subject { new_join_dependency Note, new_join(:notable, :inner, Person) => :comments }
+
+    specify { subject.join_associations.should have(2).association }
+    specify { subject.join_associations.should be_all { |a| a.join_type == Arel::InnerJoin } }
+    specify { subject.join_associations.first.table_name.should eq 'people' }
+    specify { subject.join_associations[1].table_name.should eq 'comments' }
+  end
+end

data/spec/support/shared_examples/join_dependency_4.1.rb

@@ -0,0 +1,46 @@
+shared_examples "Join Dependency on ActiveRecord 4.1" do
+  context 'with symbol joins' do
+    subject { new_join_dependency Person, :articles => :comments }
+    specify { subject.join_root.drop(1).should have(2).associations }
+  end
+
+  context 'with has_many :through association' do
+    subject { new_join_dependency Person, :authored_article_comments }
+
+    specify { subject.join_root.drop(1).should have(1).association }
+    specify { subject.join_root.drop(1).first.table_name.should eq 'comments' }
+  end
+
+  context 'with outer join' do
+    subject { new_join_dependency Person, new_join(:articles, :outer) }
+    specify { subject.join_root.drop(1).should have(1).association }
+  end
+
+  context 'with nested outer joins' do
+    subject { new_join_dependency Person, new_join(:articles, :outer) => new_join(:comments, :outer) }
+    specify { subject.join_root.drop(1).should have(2).associations }
+  end
+
+  context 'with polymorphic belongs_to join' do
+    subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
+
+    specify { subject.join_root.drop(1).should have(1).association }
+    specify { subject.join_root.drop(1).first.table_name.should eq 'people' }
+
+    it 'finds a join association respecting polymorphism' do
+      parent = subject.join_root
+      reflection = Note.reflect_on_association(:notable)
+      subject.find_join_association_respecting_polymorphism(
+        reflection, parent, Person
+      ).should eq subject.join_root.drop(1).first
+    end
+  end
+
+  context 'with polymorphic belongs_to join and nested symbol join' do
+    subject { new_join_dependency Note, new_join(:notable, :inner, Person) => :comments }
+
+    specify { subject.join_root.drop(1).should have(2).association }
+    specify { subject.join_root.drop(1).first.table_name.should eq 'people' }
+    specify { subject.join_root.drop(1)[1].table_name.should eq 'comments' }
+  end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 description: "\n    This is just an extraction from Ransack/Squeel. You probably don't
@@ -89,15 +89,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/polyamorous.rb
+- lib/polyamorous/activerecord_3_and_4.0/join_association.rb
+- lib/polyamorous/activerecord_3_and_4.0/join_dependency.rb
+- lib/polyamorous/activerecord_4.1/join_association.rb
+- lib/polyamorous/activerecord_4.1/join_dependency.rb
 - lib/polyamorous/join.rb
-- lib/polyamorous/join_association.rb
-- lib/polyamorous/join_dependency.rb
 - lib/polyamorous/version.rb
 - polyamorous.gemspec
 - spec/blueprints/articles.rb
@@ -111,6 +114,10 @@ files:
 - spec/polyamorous/join_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
+- spec/support/shared_examples/join_association_3_and_4.0.rb
+- spec/support/shared_examples/join_association_4.1.rb
+- spec/support/shared_examples/join_dependency_3_and_4.0.rb
+- spec/support/shared_examples/join_dependency_4.1.rb
 homepage: http://github.com/ernie/polyamorous
 licenses: []
 metadata: {}
@@ -120,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
@@ -146,3 +153,7 @@ test_files:
 - spec/polyamorous/join_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
+- spec/support/shared_examples/join_association_3_and_4.0.rb
+- spec/support/shared_examples/join_association_4.1.rb
+- spec/support/shared_examples/join_dependency_3_and_4.0.rb
+- spec/support/shared_examples/join_dependency_4.1.rb