polyamorous 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a256aa59edc7952f875968b4de3aba8b9ae2ef1
-  data.tar.gz: 44fe6b2d97fde89c883db2b58d2fe847d8e70217
+  metadata.gz: a754ac3545728f4de5d4d5e4f75687991f7b41ca
+  data.tar.gz: c2a55008f158f99fd534e66b2306e045271edf1d
 SHA512:
-  metadata.gz: 17b12b0d0ade5088d17bf164b03145b239ee184c5115d294cc7feda1d57e7085cceb1891b5a1640702fd1a182507277af155387732810d5719418f4bbb48cdea
-  data.tar.gz: 5090142ad7882a7efa7c3fa4ca72f74627d64d5537b1310c0f156325e4b54b004e2d09b0666b33cb981fad74bf3eca68ae6cf92538a13a39002571306576a64d
+  metadata.gz: 1ae3f57016adf1c30563485ae3ae7155aa3e95c880241231e346930de0ab16e1a75082d79563ba2850f2f2513ab7f7a92dd78a5d14e88c19e0aebaf551cdf422
+  data.tar.gz: e0f9296bbbe67e09691d67e5d70b4a0809e71db9ae9a79fcd6bfed483834cf9dae15bf733ed22f645009a7cca66d4f4f79a7fd6aef3952a28fd75d4259e41f06

data/.travis.yml

@@ -1,33 +1,54 @@
 language: ruby
 
+sudo: false
+
 before_install:
   - travis_retry gem install bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.2.1
+  - 2.1
+  - 2.0
+  - 1.9
 
 env:
-  - RAILS=master AREL=master DB=sqlite
-  - RAILS=master AREL=master DB=mysql
-  - RAILS=master AREL=master DB=postgres
+  - RAILS=4-2-stable AREL=6-0-stable DB=sqlite
+  - RAILS=4-2-stable AREL=6-0-stable DB=mysql
+  - RAILS=4-2-stable AREL=6-0-stable 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
 
+matrix:
+  include:
+    - rvm: 2.2.1
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.2.1
+      env: RAILS=master DB=mysql
+    - rvm: 2.2.1
+      env: RAILS=master DB=postgres
+  allow_failures:
+    - env: RAILS=master DB=sqlite3
+    - env: RAILS=master DB=mysql
+    - env: RAILS=master 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%";'

data/Gemfile

@@ -4,28 +4,30 @@ 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}
+if 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
 end
 
-gem 'arel', arel_opts
-
 case rails
 when /\// # A path
-  gem 'activerecord', :path => "#{rails}/activerecord"
+  gem 'activerecord', path: "#{rails}/activerecord"
 when /^v/ # A tagged version
-  git 'git://github.com/rails/rails.git', :tag => rails do
+  git 'git://github.com/rails/rails.git', tag: rails do
     gem 'activerecord'
   end
 else
-  git 'git://github.com/rails/rails.git', :branch => rails do
+  git 'git://github.com/rails/rails.git', branch: rails do
     gem 'activerecord'
   end
 end

data/README.md

@@ -6,8 +6,13 @@
 (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).
+[Ernie Miller](http://twitter.com/erniemiller) and maintained by
+[Ryan Bigg](http://twitter.com/ryanbigg),
+[Xiang Li](http://bigxiang.github.io),
+[Jon Atack](http://twitter.com/jonatack) and a great group of
+[contributors]
+(https://github.com/activerecord-hackery/polyamorous/graphs/contributors).
 
 ## Copyright
 
-Copyright © 2011-2014 [Ernie Miller](http://twitter.com/erniemiller)
+Copyright © 2011-2015 [Ernie Miller](http://twitter.com/erniemiller)

data/lib/polyamorous.rb

@@ -1,4 +1,4 @@
-require "polyamorous/version"
+require 'polyamorous/version'
 
 if defined?(::ActiveRecord)
   module Polyamorous
@@ -23,20 +23,38 @@ if defined?(::ActiveRecord)
 
   require 'polyamorous/tree_node'
   require 'polyamorous/join'
+  require 'polyamorous/swapping_reflection_class'
 
-  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
-    require 'polyamorous/activerecord_3_and_4.0/join_association'
-    require 'polyamorous/activerecord_3_and_4.0/join_dependency'
+  ar_version =
+    case ::ActiveRecord::VERSION::STRING[0,3]
+    when '4.2', '5.0'
+      '4.2'
+    when '4.1'
+      '4.1'
+    else
+      '3_and_4.0'
+    end
+
+  method, ruby_version =
+    if RUBY_VERSION >= '2.0' && ar_version >= '4.1'
+      # Ruby 2; we can use `prepend` to patch Active Record cleanly.
+      [:prepend, '2']
+    else
+      # Ruby 1.9; we must use `alias_method` to patch Active Record.
+      [:include, '1.9']
+    end
+
+  %w(join_association join_dependency).each do |file|
+    require "polyamorous/activerecord_#{ar_version}_ruby_#{ruby_version}/#{file}"
+  end
+
+  Polyamorous::JoinDependency.send(method, Polyamorous::JoinDependencyExtensions)
+  if method == :prepend
+    Polyamorous::JoinDependency.singleton_class
+    .send(:prepend, Polyamorous::JoinDependencyExtensions::ClassMethods)
   end
+  Polyamorous::JoinAssociation.send(method, Polyamorous::JoinAssociationExtensions)
 
-  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

data/lib/polyamorous/{activerecord_3_and_4.0 → activerecord_3_and_4.0_ruby_1.9}/join_association.rb

@@ -1,6 +1,7 @@
+# active_record_3_and_4.0_ruby_1.9/join_association.rb
 module Polyamorous
   module JoinAssociationExtensions
-
+    include SwappingReflectionClass
     def self.included(base)
       base.class_eval do
         alias_method_chain :initialize, :polymorphism
@@ -18,7 +19,9 @@ module Polyamorous
       end
     end
 
-    def initialize_with_polymorphism(reflection, join_dependency, parent = nil, polymorphic_class = nil)
+    def initialize_with_polymorphism(
+      reflection, join_dependency, parent = nil, polymorphic_class = nil
+    )
       if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
         swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
           initialize_without_polymorphism(reflection, join_dependency, parent)
@@ -29,47 +32,45 @@ module Polyamorous
       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
-
     def equality_with_polymorphism(other)
       equality_without_polymorphism(other) && base_klass == other.base_klass
     end
 
-    def build_constraint_with_polymorphism(reflection, table, key, foreign_table, foreign_key)
+    def build_constraint_with_polymorphism(
+      reflection, table, key, foreign_table, foreign_key
+    )
       if reflection.options[:polymorphic]
-        build_constraint_without_polymorphism(reflection, table, key, foreign_table, foreign_key).and(
-          foreign_table[reflection.foreign_type].eq(reflection.klass.name)
+        build_constraint_without_polymorphism(
+          reflection, table, key, foreign_table, foreign_key
         )
+        .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
       else
-        build_constraint_without_polymorphism(reflection, table, key, foreign_table, foreign_key)
+        build_constraint_without_polymorphism(
+          reflection, 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)
+        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_3_and_4.0 → activerecord_3_and_4.0_ruby_1.9}/join_dependency.rb

@@ -1,3 +1,4 @@
+# active_record_3_and_4.0_ruby_1.9/join_dependency.rb
 module Polyamorous
   module JoinDependencyExtensions
     def self.included(base)
@@ -45,22 +46,24 @@ module Polyamorous
       end
     end
 
-    def build_with_polymorphism(associations, parent = nil, join_type = InnerJoin)
+    def build_with_polymorphism(
+      associations, parent = nil, join_type = InnerJoin
+    )
       case associations
       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?"
+            }' was not found; perhaps you misspelled it?"
 
         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.join_type = associations.type
           _join_parts << join_association
           cache_joined_association(join_association)

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

@@ -0,0 +1,2 @@
+# active_record_4.1_ruby_1.9/join_association.rb
+require 'polyamorous/activerecord_4.2_ruby_1.9/join_association'

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

@@ -0,0 +1,4 @@
+# active_record_4.1_ruby_1.9/join_dependency.rb
+require 'polyamorous/activerecord_4.2_ruby_2/join_dependency'
+require 'polyamorous/activerecord_4.2_ruby_1.9/join_dependency'
+require 'polyamorous/activerecord_4.1_ruby_2/make_joins'

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

@@ -0,0 +1,2 @@
+# active_record_4.1_ruby_2/join_association.rb
+require 'polyamorous/activerecord_4.2_ruby_2/join_association'

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

@@ -0,0 +1,3 @@
+# active_record_4.1_ruby_2/join_dependency.rb
+require 'polyamorous/activerecord_4.2_ruby_2/join_dependency'
+require 'polyamorous/activerecord_4.1_ruby_2/make_joins'

data/lib/polyamorous/activerecord_4.1_ruby_2/make_joins.rb

@@ -0,0 +1,11 @@
+module Polyamorous
+  module JoinDependencyExtensions
+    # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
+    def make_joins(parent, child)
+      make_constraints(
+        parent, child, child.tables, child.join_type || Arel::Nodes::InnerJoin
+      )
+      .concat child.children.flat_map { |c| make_inner_joins(child, c) }
+    end
+  end
+end

data/lib/polyamorous/activerecord_4.2_ruby_1.9/join_association.rb

@@ -0,0 +1,46 @@
+# active_record_4.2_ruby_1.9/join_association.rb
+module Polyamorous
+  module JoinAssociationExtensions
+    include SwappingReflectionClass
+    def self.included(base)
+      base.class_eval do
+        attr_reader :join_type
+        alias_method_chain :initialize, :polymorphism
+        alias_method_chain :build_constraint, :polymorphism
+      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
+
+    # Reference https://github.com/rails/rails/commit/9b15db51b78028bfecdb85595624de4b838adbd1
+    def ==(other)
+      base_klass == other.base_klass
+    end
+
+    def build_constraint_with_polymorphism(
+      klass, table, key, foreign_table, foreign_key
+    )
+      if reflection.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
+  end
+end

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

@@ -0,0 +1,94 @@
+# active_record_4.2_ruby_1.9/join_dependency.rb
+require 'polyamorous/activerecord_4.2_ruby_2/join_dependency'
+
+module Polyamorous
+  module JoinDependencyExtensions
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_eval do
+        class << self
+          alias_method :walk_tree_without_polymorphism, :walk_tree
+          alias_method :walk_tree, :walk_tree_with_polymorphism
+        end
+
+        alias_method :build_without_polymorphism, :build
+        alias_method :build, :build_with_polymorphism
+
+        alias_method :join_constraints_without_polymorphism, :join_constraints
+        alias_method :join_constraints, :join_constraints_with_polymorphism
+      end
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#build
+    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.polymorphic?
+            JoinAssociation.new(
+              reflection,
+              build(right, name.klass || base_klass),
+              name.klass,
+              name.type
+            )
+          else
+            JoinAssociation.new(
+              reflection,
+              build(right, reflection.klass),
+              name.klass,
+              name.type
+            )
+          end
+        else
+          reflection = find_reflection base_klass, name
+          reflection.check_validity!
+          if reflection.polymorphic?
+            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
+          end
+          JoinAssociation.new reflection, build(right, reflection.klass)
+        end
+      end
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
+    # to call #make_joins instead of #make_inner_joins.
+    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
+
+    module ClassMethods
+    # Replaces ActiveRecord::Associations::JoinDependency#self.walk_tree
+      def walk_tree_with_polymorphism(associations, hash)
+        case 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
+      end
+    end
+  end
+end