polyamorous 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3950028cc987da204d7fa91c77f8ff80488e3a3
-  data.tar.gz: b43069b9cf219debd61e9e4370c313a943cd4664
+  metadata.gz: 5a256aa59edc7952f875968b4de3aba8b9ae2ef1
+  data.tar.gz: 44fe6b2d97fde89c883db2b58d2fe847d8e70217
 SHA512:
-  metadata.gz: 40bb92cc9b88a5c321f6c1538272cfd01ea01d88ec564e66f7b9ce437d9a37429be380e6e3719ee0d42df935a5acf1ecf4a7a32dc8ad6b6b92e3cc6cc0cc8c51
-  data.tar.gz: 053e1bfb41cbf82c4e52c3068d3e05d7f835830e2692061cdca6a2ce7a82f674d554c845a756777f0d1bef9075206a31ff208e73102892216a817ebdc11b56b7
+  metadata.gz: 17b12b0d0ade5088d17bf164b03145b239ee184c5115d294cc7feda1d57e7085cceb1891b5a1640702fd1a182507277af155387732810d5719418f4bbb48cdea
+  data.tar.gz: 5090142ad7882a7efa7c3fa4ca72f74627d64d5537b1310c0f156325e4b54b004e2d09b0666b33cb981fad74bf3eca68ae6cf92538a13a39002571306576a64d

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.ruby-version
+.ruby-gemset

data/.travis.yml

@@ -9,24 +9,26 @@ rvm:
   - 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
+  - RAILS=master AREL=master DB=sqlite
+  - RAILS=master AREL=master DB=mysql
+  - RAILS=master AREL=master DB=postgres
+  - RAILS=4-1-stable AREL=5-0-stable DB=sqlite
+  - RAILS=4-1-stable AREL=5-0-stable DB=mysql
+  - RAILS=4-1-stable AREL=5-0-stable DB=postgres
+  - RAILS=4-0-stable AREL=4-0-stable DB=sqlite
+  - RAILS=4-0-stable AREL=4-0-stable DB=mysql
+  - RAILS=4-0-stable AREL=4-0-stable DB=postgres
+  - RAILS=3-2-stable AREL=3-0-stable DB=sqlite
+  - RAILS=3-2-stable AREL=3-0-stable DB=mysql
+  - RAILS=3-2-stable AREL=3-0-stable DB=postgres
+  - RAILS=3-1-stable AREL=2-2-stable DB=sqlite
+  - RAILS=3-1-stable AREL=2-2-stable DB=mysql
+  - RAILS=3-1-stable AREL=2-2-stable DB=postgres
+  - RAILS=3-0-stable AREL=2-0-stable DB=sqlite
+  - RAILS=3-0-stable AREL=2-0-stable DB=mysql
+  - RAILS=3-0-stable AREL=2-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

@@ -4,6 +4,18 @@ 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
@@ -16,4 +28,4 @@ else
   git 'git://github.com/rails/rails.git', :branch => rails do
     gem 'activerecord'
   end
-end
+end

data/README.md

@@ -1,7 +1,13 @@
 # Polyamorous
 
-Polyamorous is an extraction from MetaSearch 1.1.x, Ransack, and Squeel by [Ernie Miller](http://twitter.com/erniemiller).
+[![Build Status](https://travis-ci.org/activerecord-hackery/polyamorous.svg)]
+(https://travis-ci.org/activerecord-hackery/polyamorous)
+[![Gem Version](https://badge.fury.io/rb/polyamorous.svg)]
+(http://badge.fury.io/rb/polyamorous)
+
+Polyamorous is an extraction from MetaSearch 1.1.x, Ransack, and Squeel by
+[Ernie Miller](http://twitter.com/erniemiller).
 
 ## Copyright
 
-Copyright © 2011-2014 [Ernie Miller](http://twitter.com/erniemiller)
+Copyright © 2011-2014 [Ernie Miller](http://twitter.com/erniemiller)

data/lib/polyamorous.rb

@@ -2,6 +2,14 @@ require "polyamorous/version"
 
 if defined?(::ActiveRecord)
   module Polyamorous
+    if defined?(Arel::InnerJoin)
+      InnerJoin = Arel::InnerJoin
+      OuterJoin = Arel::OuterJoin
+    else
+      InnerJoin = Arel::Nodes::InnerJoin
+      OuterJoin = Arel::Nodes::OuterJoin
+    end
+
     if defined?(::ActiveRecord::Associations::JoinDependency)
       JoinDependency  = ::ActiveRecord::Associations::JoinDependency
       JoinAssociation = ::ActiveRecord::Associations::JoinDependency::JoinAssociation
@@ -13,9 +21,13 @@ if defined?(::ActiveRecord)
     end
   end
 
+  require 'polyamorous/tree_node'
   require 'polyamorous/join'
 
-  if ActiveRecord::VERSION::STRING >= "4.1"
+  if ActiveRecord::VERSION::STRING >= "4.2"
+    require 'polyamorous/activerecord_4.1/join_association'
+    require 'polyamorous/activerecord_4.2/join_dependency'
+  elsif ActiveRecord::VERSION::STRING >= "4.1"
     require 'polyamorous/activerecord_4.1/join_association'
     require 'polyamorous/activerecord_4.1/join_dependency'
   else

data/lib/polyamorous/activerecord_3_and_4.0/join_dependency.rb

@@ -45,7 +45,7 @@ module Polyamorous
       end
     end
 
-    def build_with_polymorphism(associations, parent = nil, join_type = Arel::InnerJoin)
+    def build_with_polymorphism(associations, parent = nil, join_type = InnerJoin)
       case associations
       when Join
         parent ||= _join_parts.last

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

@@ -2,6 +2,7 @@ module Polyamorous
   module JoinAssociationExtensions
     def self.included(base)
       base.class_eval do
+        attr_reader :join_type
         alias_method_chain :initialize, :polymorphism
         if base.method_defined?(:active_record)
           alias_method :base_klass, :active_record
@@ -15,7 +16,8 @@ module Polyamorous
       end
     end
 
-    def initialize_with_polymorphism(reflection, children, polymorphic_class = nil)
+    def initialize_with_polymorphism(reflection, children, polymorphic_class = nil, join_type = Arel::Nodes::InnerJoin)
+      @join_type = join_type
       if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
         swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
           initialize_without_polymorphism(reflection, children)

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

@@ -9,6 +9,8 @@ module Polyamorous
         end
 
         alias_method_chain :build, :polymorphism
+        alias_method_chain :join_constraints, :polymorphism
+
         if base.method_defined?(:active_record)
           alias_method :base_klass, :active_record
         end
@@ -22,9 +24,9 @@ module Polyamorous
           reflection.check_validity!
 
           if reflection.options[:polymorphic]
-            JoinAssociation.new reflection, build(right, name.klass || base_klass), name.klass
+            JoinAssociation.new reflection, build(right, name.klass || base_klass), name.klass, name.type
           else
-            JoinAssociation.new reflection, build(right, reflection.klass), name.klass
+            JoinAssociation.new reflection, build(right, reflection.klass), name.klass, name.type
           end
         else
           reflection = find_reflection base_klass, name
@@ -57,11 +59,48 @@ module Polyamorous
       end
     end
 
+    def join_constraints_with_polymorphism(outer_joins)
+      joins = join_root.children.flat_map { |child|
+        make_joins join_root, child
+      }
+
+      joins.concat outer_joins.flat_map { |oj|
+        if join_root.match? oj.join_root
+          walk join_root, oj.join_root
+        else
+          oj.join_root.children.flat_map { |child|
+            make_outer_joins oj.join_root, child
+          }
+        end
+      }
+    end
+
+    def make_joins(parent, child)
+      tables    = child.tables
+      joins     = make_constraints parent, child, tables, child.join_type || Arel::Nodes::InnerJoin
+
+      joins.concat child.children.flat_map { |c| make_joins(child, c) }
+    end
+
+    private :make_joins
+
     module ClassMethods
       def walk_tree_with_polymorphism(associations, hash)
         case associations
-        when Join
-          hash[associations] ||= {}
+        when TreeNode
+          associations.add_to_tree(hash)
+        when Hash
+          associations.each do |k, v|
+            cache =
+              case k
+                when TreeNode
+                  k.add_to_tree(hash)
+                else
+                  hash[k] ||= {}
+                end
+
+            walk_tree(v, cache)
+          end
         else
           walk_tree_without_polymorphism(associations, hash)
         end

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

@@ -0,0 +1,12 @@
+require 'polyamorous/activerecord_4.1/join_dependency'
+
+module Polyamorous
+  module JoinDependencyExtensions
+    def make_joins(parent, child)
+      tables    = child.tables
+      info      = make_constraints parent, child, tables, child.join_type || Arel::Nodes::InnerJoin
+
+      [info] + child.children.flat_map { |c| make_joins(child, c) }
+    end
+  end
+end

data/lib/polyamorous/join.rb

@@ -1,9 +1,11 @@
 module Polyamorous
   class Join
+    include TreeNode
+
     attr_accessor :name
     attr_reader :type, :klass
 
-    def initialize(name, type = Arel::InnerJoin, klass = nil)
+    def initialize(name, type = InnerJoin, klass = nil)
       @name = name
       @type = convert_to_arel_join_type(type)
       @klass = convert_to_class(klass) if klass
@@ -30,16 +32,20 @@ module Polyamorous
 
     alias :== :eql?
 
+    def add_to_tree(hash)
+      hash[self] ||= {}
+    end
+
     private
 
     def convert_to_arel_join_type(type)
       case type
       when 'inner', :inner
-        Arel::InnerJoin
+        InnerJoin
       when 'outer', :outer
-        Arel::OuterJoin
+        OuterJoin
       when Class
-        if [Arel::InnerJoin, Arel::OuterJoin].include? type
+        if [InnerJoin, OuterJoin].include? type
           type
         else
           raise ArgumentError, "#{type} cannot be converted to an ARel join type"
@@ -61,4 +67,4 @@ module Polyamorous
     end
 
   end
-end
+end

data/lib/polyamorous/tree_node.rb

@@ -0,0 +1,7 @@
+module Polyamorous
+  module TreeNode
+    def add_to_tree(hash)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/polyamorous/version.rb

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

data/spec/helpers/polyamorous_helper.rb

@@ -13,8 +13,8 @@ module PolyamorousHelper
     Polyamorous::JoinDependency.new klass, associations, []
   end
 
-  def new_join(name, type = Arel::InnerJoin, klass = nil)
+  def new_join(name, type = Polyamorous::InnerJoin, klass = nil)
     Polyamorous::Join.new name, type, klass
   end
 
-end
+end

data/spec/polyamorous/join_spec.rb

@@ -2,5 +2,18 @@ require 'spec_helper'
 
 module Polyamorous
   describe Join do
+    it "is a tree node" do
+      join = new_join(:articles, :outer)
+      expect(join).to be_kind_of(TreeNode)
+    end
+
+    it "can be add to a tree" do
+      join = new_join(:articles, :outer)
+
+      tree_hash = {}
+      join.add_to_tree(tree_hash)
+
+      expect(tree_hash[join]).to be {}
+    end
   end
-end
+end

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

@@ -11,12 +11,12 @@ shared_examples "Join Association on ActiveRecord 3 and 4.0" do
   }
 
   it 'respects polymorphism on equality test' do
-    subject.should eq(
+    expect(subject).to eq(
       join_dependency.build_join_association_respecting_polymorphism(
         reflection, parent, Person
       )
     )
-    subject.should_not eq(
+    expect(subject).not_to eq(
       join_dependency.build_join_association_respecting_polymorphism(
         reflection, parent, Article
       )
@@ -26,14 +26,14 @@ shared_examples "Join Association on ActiveRecord 3 and 4.0" do
   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
+      expect(new_reflection.options).not_to equal reflection.options
+      expect(new_reflection.options).not_to have_key(:polymorphic)
+      expect(new_reflection.klass).to eq(Person)
+      expect(reflection.klass).to eq(Article)
     end
   end
 
   it 'sets the polmorphic option to true after initializing' do
-    join_association.options[:polymorphic].should be_true
+    expect(join_association.options[:polymorphic]).to be_true
   end
 end

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

@@ -11,10 +11,10 @@ shared_examples "Join Association on ActiveRecord 4.1" do
   }
 
   it 'respects polymorphism on equality test' do
-    subject.should eq(
+    expect(subject).to eq(
       join_dependency.build_join_association_respecting_polymorphism(reflection, parent, Person)
     )
-    subject.should_not eq(
+    expect(subject).not_to eq(
       join_dependency.build_join_association_respecting_polymorphism(
         reflection, parent, Article
       )
@@ -24,14 +24,14 @@ shared_examples "Join Association on ActiveRecord 4.1" do
   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
+      expect(new_reflection.options).not_to equal reflection.options
+      expect(new_reflection.options).not_to have_key(:polymorphic)
+      expect(new_reflection.klass).to eq(Person)
+      expect(reflection.klass).to eq(Article)
     end
   end
 
   it 'sets the polmorphic option to true after initializing' do
-    join_association.reflection.options[:polymorphic].should be_true
+    expect(join_association.reflection.options[:polymorphic]).to be_true
   end
 end

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

@@ -2,53 +2,53 @@ 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 } }
+    specify { expect(subject.join_associations.size).to eq(2) }
+    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::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' }
+    specify { expect(subject.join_associations.size).to eq(1) }
+    specify { expect(subject.join_associations.first.table_name).to 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 } }
+    specify { expect(subject.join_associations.size).to eq(1) }
+    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::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 } }
+    specify { expect(subject.join_associations.size).to eq(2) }
+    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::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' }
+    specify { expect(subject.join_associations.size).to eq(1) }
+    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::InnerJoin } }
+    specify { expect(subject.join_associations.first.table_name).to 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(
+      expect(subject.find_join_association_respecting_polymorphism(
         reflection, parent, Person
-      ).should eq subject.join_associations.first
+      )).to 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' }
+    specify { expect(subject.join_associations.size).to eq(2) }
+    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::InnerJoin } }
+    specify { expect(subject.join_associations.first.table_name).to eq 'people' }
+    specify { expect(subject.join_associations[1].table_name).to eq 'comments' }
   end
 end

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

@@ -1,46 +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 }
+    specify { expect(subject.join_root.drop(1).size).to eq(2) }
   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' }
+    specify { expect(subject.join_root.drop(1).size).to eq(1) }
+    specify { expect(subject.join_root.drop(1).first.table_name).to 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 }
+    specify { expect(subject.join_root.drop(1).size).to eq(1) }
   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 }
+    specify { expect(subject.join_root.drop(1).size).to eq(2) }
   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' }
+    specify { expect(subject.join_root.drop(1).size).to eq(1) }
+    specify { expect(subject.join_root.drop(1).first.table_name).to 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(
+      expect(subject.find_join_association_respecting_polymorphism(
         reflection, parent, Person
-      ).should eq subject.join_root.drop(1).first
+      )).to 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' }
+    specify { expect(subject.join_root.drop(1).size).to eq(2) }
+    specify { expect(subject.join_root.drop(1).first.table_name).to eq 'people' }
+    specify { expect(subject.join_root.drop(1)[1].table_name).to eq 'comments' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,7 +100,9 @@ files:
 - 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/activerecord_4.2/join_dependency.rb
 - lib/polyamorous/join.rb
+- lib/polyamorous/tree_node.rb
 - lib/polyamorous/version.rb
 - polyamorous.gemspec
 - spec/blueprints/articles.rb
@@ -141,19 +143,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
-test_files:
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
-- spec/helpers/polyamorous_helper.rb
-- spec/polyamorous/join_association_spec.rb
-- spec/polyamorous/join_dependency_spec.rb
-- 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
+test_files: []