baby_squeel 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49777d549c657b766ebef88cb758b6883cbf4e2e
-  data.tar.gz: 5d4f4e51737e5b252ff0783303b7081cfd8b5d37
+  metadata.gz: f491f71692c6a13ed97203fd5cf7c9b08afeac2b
+  data.tar.gz: 5da604986d6d6478b703414f9b78307871ca8adf
 SHA512:
-  metadata.gz: 4bf0eea8486a351b13221d37040202906e83b92da78570e5ddae25944ddc82e4ae31acaa9302f3ecb4948677a99966f6a0b297049045f40dc195cd5b9a7a8699
-  data.tar.gz: 4d2a82db29d4613dc73a2079bd773bc1e75cf570f51375ab554e00a3c2ca28bd6f40d0c12402843e83986c6ca065de6ce3c0854c0958e36ebd3e741b99509143
+  metadata.gz: 60f3bfa7c9de2b6fdcc470a65f23e945d340d538f1dd54f19237f8844a1c5b348d8cf713d74f36e7a333dc9e836fd44ae3b234acfc57173bb1556844963065f8
+  data.tar.gz: 5739d55d7eaf421f1091ab580cff50e263a73543ade85b4a43bab64a79342269111c988d8144daff5bb7eac72d511e38194256a124998352d2add127c19ed789

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Nothing to see here.
 
+## [1.2.1] - 2018-04-25
+## Fixed
+- Added support for Active Record 5.2
+
 ## [1.2.0] - 2017-10-20
 ### Added
 - `reordering`, which is just a BabySqueel version of Active Record's `reorder`.
@@ -127,7 +131,8 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/rzane/baby_squeel/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/rzane/baby_squeel/compare/v1.1.5...v1.2.0
 [1.1.5]: https://github.com/rzane/baby_squeel/compare/v1.1.4...v1.1.5
 [1.1.4]: https://github.com/rzane/baby_squeel/compare/v1.1.3...v1.1.4

data/baby_squeel.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 4.2.0'
   spec.add_dependency 'polyamorous', '~> 1.3'
+  spec.add_dependency 'join_dependency', '~> 0.1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/baby_squeel/active_record/query_methods.rb

@@ -1,5 +1,5 @@
 require 'baby_squeel/dsl'
-require 'baby_squeel/join_dependency/injector'
+require 'baby_squeel/join_dependency'
 
 module BabySqueel
   module ActiveRecord
@@ -39,9 +39,15 @@ module BabySqueel
       # This is a monkey patch, and I'm not happy about it.
       # Active Record will call `group_by` on the `joins`. The
       # Injector has a custom `group_by` method that handles
-      # BabySqueel::JoinExpression nodes.
-      def build_joins(manager, joins)
-        super manager, BabySqueel::JoinDependency::Injector.new(joins)
+      # BabySqueel::Join nodes.
+      if ::ActiveRecord::VERSION::MAJOR >= 5 && ::ActiveRecord::VERSION::MINOR >= 2
+        def build_joins(manager, joins, aliases)
+          super manager, BabySqueel::JoinDependency::Injector.new(joins), aliases
+        end
+      else
+        def build_joins(manager, joins)
+          super manager, BabySqueel::JoinDependency::Injector.new(joins)
+        end
       end
     end
   end

data/lib/baby_squeel/association.rb

@@ -47,7 +47,7 @@ module BabySqueel
       _join == Arel::Nodes::OuterJoin || _reflection.polymorphic?
     end
 
-    # See JoinExpression#add_to_tree.
+    # See Join#add_to_tree.
     def add_to_tree(hash)
       polyamorous = Polyamorous::Join.new(
         _reflection.name,

data/lib/baby_squeel/{join_expression.rb → join.rb}

@@ -2,8 +2,8 @@ module BabySqueel
   # This is the thing that gets added to Active Record's joins_values.
   # By including Polyamorous::TreeNode, when this instance is found when
   # traversing joins in ActiveRecord::Associations::JoinDependency::walk_tree,
-  # JoinExpression#add_to_tree will be called.
-  class JoinExpression
+  # Join#add_to_tree will be called.
+  class Join
     include Polyamorous::TreeNode
 
     def initialize(associations)

data/lib/baby_squeel/join_dependency.rb

@@ -0,0 +1,78 @@
+require 'join_dependency'
+
+module BabySqueel
+  module JoinDependency
+    # This class allows BabySqueel to slip custom
+    # joins_values into Active Record's JoinDependency
+    class Injector < Array # :nodoc:
+      # Active Record will call group_by on this object
+      # in ActiveRecord::QueryMethods#build_joins. This
+      # allows BabySqueel::Joins to be treated
+      # like typical join hashes until Polyamorous can
+      # deal with them.
+      def group_by
+        super do |join|
+          case join
+          when BabySqueel::Join
+            :association_join
+          else
+            yield join
+          end
+        end
+      end
+    end
+
+    class Builder # :nodoc:
+      attr_reader :join_dependency
+
+      def initialize(relation)
+        @join_dependency = ::JoinDependency.from_relation(relation) do |join|
+          :association_join if join.kind_of? BabySqueel::Join
+        end
+      end
+
+      # Find the alias of a BabySqueel::Association, by passing
+      # a list (in order of chaining) of associations and finding
+      # the respective JoinAssociation at each level.
+      def find_alias(associations)
+        table = find_join_association(associations).table
+        reconstruct_with_type_caster(table, associations)
+      end
+
+      private
+
+      def find_join_association(associations)
+        associations.inject(join_dependency.send(:join_root)) do |parent, assoc|
+          parent.children.find do |join_association|
+            reflections_equal?(
+              assoc._reflection,
+              join_association.reflection
+            )
+          end
+        end
+      end
+
+      # Compare two reflections and see if they're the same.
+      def reflections_equal?(a, b)
+        comparable_reflection(a) == comparable_reflection(b)
+      end
+
+      # Get the parent of the reflection if it has one.
+      # In AR4, #parent_reflection returns [name, reflection]
+      # In AR5, #parent_reflection returns just a reflection
+      def comparable_reflection(reflection)
+        [*reflection.parent_reflection].last || reflection
+      end
+
+      # Active Record 5's AliasTracker initializes Arel tables
+      # with the type_caster belonging to the wrong model.
+      #
+      # See: https://github.com/rails/rails/pull/27994
+      def reconstruct_with_type_caster(table, associations)
+        return table if ::ActiveRecord::VERSION::MAJOR < 5
+        type_caster = associations.last._scope.type_caster
+        ::Arel::Table.new(table.name, type_caster: type_caster)
+      end
+    end
+  end
+end

data/lib/baby_squeel/table.rb

@@ -1,6 +1,6 @@
 require 'baby_squeel/resolver'
-require 'baby_squeel/join_expression'
-require 'baby_squeel/join_dependency/builder'
+require 'baby_squeel/join'
+require 'baby_squeel/join_dependency'
 
 module BabySqueel
   class Table
@@ -84,8 +84,8 @@ module BabySqueel
     # This method allows BabySqueel::Nodes::Attribute
     # instances to find what their alias will be.
     def find_alias(associations = [])
-      builder = JoinDependency::Builder.new(_scope.all)
-      builder.ensure_associated _arel(associations)
+      rel = _scope.joins _arel(associations)
+      builder = JoinDependency::Builder.new(rel)
       builder.find_alias(associations)
     end
 
@@ -96,13 +96,13 @@ module BabySqueel
     # 2. Implicit join without using an outer join. In this case, we'll just
     #    give a hash to Active Record, and join the normal way.
     # 3. Implicit join using an outer join. In this case, we need to use
-    #    Polyamorous to build the join. We'll return a JoinExpression.
+    #    Polyamorous to build the join. We'll return a Join.
     #
     def _arel(associations = [])
       if _on
         _join.new(_table, Arel::Nodes::On.new(_on))
       elsif associations.any?(&:needs_polyamorous?)
-        JoinExpression.new(associations)
+        Join.new(associations)
       elsif associations.any?
         associations.reverse.inject({}) do |names, assoc|
           { assoc._reflection.name => names }

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: join_dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,9 +130,8 @@ files:
 - lib/baby_squeel/compat.rb
 - lib/baby_squeel/dsl.rb
 - lib/baby_squeel/errors.rb
-- lib/baby_squeel/join_dependency/builder.rb
-- lib/baby_squeel/join_dependency/injector.rb
-- lib/baby_squeel/join_expression.rb
+- lib/baby_squeel/join.rb
+- lib/baby_squeel/join_dependency.rb
 - lib/baby_squeel/nodes.rb
 - lib/baby_squeel/nodes/attribute.rb
 - lib/baby_squeel/nodes/binary.rb

data/lib/baby_squeel/join_dependency/builder.rb

@@ -1,121 +0,0 @@
-require 'baby_squeel/join_dependency/injector'
-
-module BabySqueel
-  module JoinDependency
-    # Unfortunately, this is mostly all duplication of
-    # ActiveRecord::QueryMethods#build_joins
-    class Builder # :nodoc:
-      attr_reader :relation
-
-      def initialize(relation)
-        @relation = relation
-        @joins_values = relation.joins_values.dup
-      end
-
-      def ensure_associated(*values)
-        @joins_values += values
-      end
-
-      def join_dependency
-        ::ActiveRecord::Associations::JoinDependency.new(
-          relation.model,
-          association_joins,
-          join_list
-        )
-      end
-      delegate :join_root, to: :join_dependency
-
-      def find_join_association(associations)
-        associations.inject(join_root) do |parent, assoc|
-          parent.children.find do |join_association|
-            reflections_equal?(
-              assoc._reflection,
-              join_association.reflection
-            )
-          end
-        end
-      end
-
-      # Find the alias of a BabySqueel::Association, by passing
-      # a list (in order of chaining) of associations and finding
-      # the respective JoinAssociation at each level.
-      def find_alias(associations)
-        table = find_join_association(associations).table
-        reconstruct_with_type_caster(table, associations)
-      end
-
-      private
-
-      # Compare two reflections and see if they're the same.
-      def reflections_equal?(a, b)
-        comparable_reflection(a) == comparable_reflection(b)
-      end
-
-      # Get the parent of the reflection if it has one.
-      # In AR4, #parent_reflection returns [name, reflection]
-      # In AR5, #parent_reflection returns just a reflection
-      def comparable_reflection(reflection)
-        [*reflection.parent_reflection].last || reflection
-      end
-
-      # Active Record 5's AliasTracker initializes Arel tables
-      # with the type_caster belonging to the wrong model.
-      #
-      # See: https://github.com/rails/rails/pull/27994
-      def reconstruct_with_type_caster(table, associations)
-        return table if ::ActiveRecord::VERSION::MAJOR < 5
-        type_caster = associations.last._scope.type_caster
-        ::Arel::Table.new(table.name, type_caster: type_caster)
-      end
-
-      def join_list
-        join_nodes + join_strings_as_ast
-      end
-
-      def association_joins
-        buckets[:association_join] || []
-      end
-
-      def stashed_association_joins
-        buckets[:stashed_join] || []
-      end
-
-      def join_nodes
-        (buckets[:join_node] || []).uniq
-      end
-
-      def string_joins
-        (buckets[:string_join] || []).map(&:strip).uniq
-      end
-
-      if Arel::VERSION >= '7.0.0'
-        def join_strings_as_ast
-          manager = Arel::SelectManager.new(relation.table)
-          relation.send(:convert_join_strings_to_ast, manager, string_joins)
-        end
-      else
-        def join_strings_as_ast
-          manager = Arel::SelectManager.new(relation.table.engine, relation.table)
-          relation.send(:custom_join_ast, manager, string_joins)
-        end
-      end
-
-      def buckets
-        @buckets ||= Injector.new(@joins_values).group_by do |join|
-          case join
-          when String
-            :string_join
-          when Hash, Symbol, Array
-            :association_join
-          when ::ActiveRecord::Associations::JoinDependency
-            :stashed_join
-          when ::Arel::Nodes::Join
-            :join_node
-          else
-            raise 'unknown class: %s' % join.class.name
-          end
-        end
-      end
-    end
-  end
-end

data/lib/baby_squeel/join_dependency/injector.rb

@@ -1,23 +0,0 @@
-module BabySqueel
-  module JoinDependency
-    # This class allows BabySqueel to slip custom
-    # joins_values into Active Record's JoinDependency
-    class Injector < Array # :nodoc:
-      # Active Record will call group_by on this object
-      # in ActiveRecord::QueryMethods#build_joins. This
-      # allows BabySqueel::JoinExpressions to be treated
-      # like typical join hashes until Polyamorous can
-      # deal with them.
-      def group_by
-        super do |join|
-          case join
-          when BabySqueel::JoinExpression
-            :association_join
-          else
-            yield join
-          end
-        end
-      end
-    end
-  end
-end