polyamorous 1.1.0 → 1.2.0

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

@@ -1,8 +1,10 @@
-shared_examples "Join Association on ActiveRecord 4.1" do
+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) }
+  let(:join_association) {
+    new_join_association(reflection, parent.children, Article)
+  }
 
   subject {
     join_dependency.build_join_association_respecting_polymorphism(
@@ -12,7 +14,9 @@ shared_examples "Join Association on ActiveRecord 4.1" do
 
   it 'respects polymorphism on equality test' do
     expect(subject).to eq(
-      join_dependency.build_join_association_respecting_polymorphism(reflection, parent, Person)
+      join_dependency.build_join_association_respecting_polymorphism(
+        reflection, parent, Person
+      )
     )
     expect(subject).not_to eq(
       join_dependency.build_join_association_respecting_polymorphism(
@@ -23,7 +27,8 @@ 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|
+    join_association
+    .swapping_reflection_klass(reflection, Person) do |new_reflection|
       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)

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

@@ -3,36 +3,43 @@ shared_examples "Join Dependency on ActiveRecord 3 and 4.0" do
     subject { new_join_dependency Person, :articles => :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)
+      .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 { expect(subject.join_associations.size).to eq(1) }
-    specify { expect(subject.join_associations.first.table_name).to eq 'comments' }
+    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 { expect(subject.join_associations.size).to eq(1) }
-    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::OuterJoin } }
+    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) }
+    subject { new_join_dependency Person,
+      new_join(:articles, :outer) => new_join(:comments, :outer) }
 
     specify { expect(subject.join_associations.size).to eq(2) }
-    specify { expect(subject.join_associations).to be_all { |a| a.join_type == Polyamorous::OuterJoin } }
+    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 { 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' }
+    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
@@ -44,11 +51,15 @@ shared_examples "Join Dependency on ActiveRecord 3 and 4.0" do
   end
 
   context 'with polymorphic belongs_to join and nested symbol join' do
-    subject { new_join_dependency Note, new_join(:notable, :inner, Person) => :comments }
+    subject { new_join_dependency Note,
+      new_join(:notable, :inner, Person) => :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' }
+    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,31 +1,45 @@
 shared_examples "Join Dependency on ActiveRecord 4.1" do
   context 'with symbol joins' do
     subject { new_join_dependency Person, :articles => :comments }
+
     specify { expect(subject.join_root.drop(1).size).to eq(2) }
+    specify { expect(subject.join_root.drop(1).map(&:join_type))
+      .to be_all { Polyamorous::InnerJoin } }
   end
 
   context 'with has_many :through association' do
     subject { new_join_dependency Person, :authored_article_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' }
+    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 { expect(subject.join_root.drop(1).size).to eq(1) }
+    specify { expect(subject.join_root.drop(1).first.join_type)
+      .to eq Polyamorous::OuterJoin }
   end
 
   context 'with nested outer joins' do
-    subject { new_join_dependency Person, new_join(:articles, :outer) => new_join(:comments, :outer) }
+    subject { new_join_dependency Person,
+      new_join(:articles, :outer) => new_join(:comments, :outer) }
+
     specify { expect(subject.join_root.drop(1).size).to eq(2) }
+    specify { expect(subject.join_root.drop(1).map(&:join_type))
+      .to be_all { Polyamorous::OuterJoin } }
   end
 
   context 'with polymorphic belongs_to join' do
     subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
 
     specify { expect(subject.join_root.drop(1).size).to eq(1) }
-    specify { expect(subject.join_root.drop(1).first.table_name).to eq 'people' }
+    specify { expect(subject.join_root.drop(1).first.join_type)
+      .to eq Polyamorous::InnerJoin }
+    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
@@ -37,10 +51,15 @@ shared_examples "Join Dependency on ActiveRecord 4.1" do
   end
 
   context 'with polymorphic belongs_to join and nested symbol join' do
-    subject { new_join_dependency Note, new_join(:notable, :inner, Person) => :comments }
+    subject { new_join_dependency Note,
+      new_join(:notable, :inner, Person) => :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' }
+    specify { expect(subject.join_root.drop(1).map(&:join_type))
+      .to be_all { Polyamorous::InnerJoin } }
+    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,17 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ernie Miller
+- Ryan Bigg
+- Jon Atack
+- Xiang Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,7 +87,10 @@ description: "\n    This is just an extraction from Ransack/Squeel. You probably
   want to use this\n    directly. It extends ActiveRecord's associations to support
   polymorphic belongs_to\n    associations.\n  "
 email:
-- ernie@metautonomo.us
+- ernie@erniemiller.org
+- radarlistener@gmail.com
+- jonnyatack@gmail.com
+- bigxiang@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,12 +102,19 @@ files:
 - 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/activerecord_4.2/join_dependency.rb
+- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_4.1_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/make_joins.rb
+- lib/polyamorous/activerecord_4.2_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_4.2_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_4.2_ruby_2/join_dependency.rb
 - lib/polyamorous/join.rb
+- lib/polyamorous/swapping_reflection_class.rb
 - lib/polyamorous/tree_node.rb
 - lib/polyamorous/version.rb
 - polyamorous.gemspec
@@ -120,8 +133,9 @@ files:
 - 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: []
+homepage: https://github.com/activerecord-hackery/polyamorous
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,8 +153,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
-test_files: []
+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

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

@@ -1,75 +0,0 @@
-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
-        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, 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)
-          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.2/join_dependency.rb

@@ -1,12 +0,0 @@
-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