baby_squeel 1.1.5 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '01931ce5553f1202e28f1698e03ac5edf72a0166'
-  data.tar.gz: 6c3a49f9b7a5cb8c9d72f280d05cf0e165ddf3fc
+SHA256:
+  metadata.gz: 2df3535278f1724c6db1656ab9c5bbe0e9097e80ee6f2c1fdaeb3491bc838ae9
+  data.tar.gz: bddd464023f9f53f0ff32cc1fbaa88928f5736b3e6541418b8c36f26b01b8d34
 SHA512:
-  metadata.gz: 335dd7d2f9e2f8f3d263339441069e68eca7a632b7296f4ed523f91be621ae727e8e63a8725c8f8b216db43a7a7d8b0f70b2fe407a861104885ae032d7ba88b5
-  data.tar.gz: d25f185e663890ecf277045612eb71206de192d4e79883046a2deaa981378987e872a9516cc654e910ffe5cfb45113bccf3d2880fde90e6129b8e784a9fa14f1
+  metadata.gz: 44f8ecb2269017a1e141f0f90d5c9a7eee7d5b877500897aba0a60646f38de0cdae4b992f505d022740c03e73d6293990d9f509d5b3188b5be8051819e168069
+  data.tar.gz: a63f7b474504ef598508879d8ad702396f194c663cc46ececdb9c8dd31aabb10752323332bc26b3cec5cfb2df93e5328e11d2ce1983efe23793c618ccce9294d

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 Nothing to see here.
 
+## [1.3.1] - 2018-05-15
+## Fixed
+- Upgraded `join_dependency` requirement, which fixes [issue #1](https://github.com/rzane/join_dependency/issues/1).
+
+## [1.3.0] - 2018-05-04
+## Added
+- The ability to use `plucking` with an array of nodes. For example, `User.plucking { [id, name] }`.
+
+## [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`.
+- `on` expressions can now be given a block that will yield the current node (#77).
+
+## [1.1.5] - 2017-05-26
+### Fixed
+- Returning an empty hash from a `where.has {}` block would generate invalid SQL (#69).
+
 ## [1.1.4] - 2017-04-13
 ### Fixed
 - Nodes::Attribute#in and #not_in generate valid SQL when given ActiveRecord::NullRelations.
@@ -118,8 +139,13 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.1.4...HEAD
-[1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.3...v1.1.4
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/rzane/baby_squeel/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/rzane/baby_squeel/compare/v1.2.1...v1.3.0
+[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
 [1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/rzane/baby_squeel/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/rzane/baby_squeel/compare/v1.1.0...v1.1.1

data/README.md

@@ -1,10 +1,7 @@
-# BabySqueel
+# BabySqueel 🐷
 
-[![Build Status](https://travis-ci.org/rzane/baby_squeel.svg?branch=master)](https://travis-ci.org/rzane/baby_squeel)
-[![Code Climate](https://codeclimate.com/github/rzane/baby_squeel/badges/gpa.svg)](https://codeclimate.com/github/rzane/baby_squeel)
-[![Coverage Status](https://coveralls.io/repos/github/rzane/baby_squeel/badge.svg?branch=master)](https://coveralls.io/github/rzane/baby_squeel?branch=master)
-
-<img align="right" src="http://static.thefrisky.com/uploads/2010/07/01/pig_in_boots_070110_m.jpg" alt="biddy piggy">
+![Build](https://github.com/rzane/baby_squeel/workflows/Build/badge.svg)
+![Version](https://img.shields.io/gem/v/baby_squeel)
 
 Have you ever used the [Squeel](https://github.com/activerecord-hackery/squeel) gem? It's a really nice way to build complex queries. However, Squeel monkeypatches Active Record internals, because it was aimed at enhancing the existing API with the aim of inclusion into Rails. However, that inclusion never happened, and it left Squeel susceptible to breakage from arbitrary changes in Active Record, eventually burning out the maintainer.
 
@@ -172,9 +169,13 @@ Post.joining { author.outer.posts }
 # LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id"
 # INNER JOIN "posts" "posts_authors" ON "posts_authors"."author_id" = "authors"."id"
 
-Post.joining { author.alias('a').on((author.id == author_id) | (author.name == title)) }
+Post.joining { author.on((author.id == author_id) | (author.name == title)) }
+# SELECT "posts".* FROM "posts"
+# INNER JOIN "authors" ON ("authors"."id" = "posts"."author_id" OR "authors"."name" = "posts"."title")
+
+Post.joining { |post| post.author.as('a').on { (id == post.author_id) | (name == post.title) } }
 # SELECT "posts".* FROM "posts"
-# INNER JOIN "authors" "a" ON ("authors"."id" = "posts"."author_id" OR "authors"."name" = "posts"."title")
+# INNER JOIN "authors" "a" ON ("a"."id" = "posts"."author_id" OR "a"."name" = "posts"."title")
 
 Picture.joining { imageable.of(Post) }
 # SELECT "pictures".* FROM "pictures"
@@ -215,6 +216,21 @@ Post.joins(:author).where.has {
 # )
 ```
 
+##### Exists
+
+```ruby
+Post.where.has {
+  exists Post.where.has { author_id == 1 }
+}
+# SELECT "posts".* FROM "posts"
+# WHERE (
+#   EXISTS(
+#     SELECT "posts".* FROM "posts"
+#     WHERE "posts"."author_id" = 1
+#   )
+# )
+```
+
 ##### Custom SQL Operators
 
 ```ruby
@@ -236,6 +252,26 @@ Post.joining {
 }
 ```
 
+##### Polymorphism
+
+Given this polymorphism:
+
+```ruby
+# app/models/picture.rb
+belongs_to :imageable, polymorphic: true
+
+# app/models/post.rb
+has_many :pictures, as: :imageable
+```
+
+The query might look like this:
+
+```ruby
+Picture.
+  joining { imageable.of(Post) }.
+  selecting { imageable.of(Post).id }
+```
+
 ##### Helpers
 
 ```ruby
@@ -279,7 +315,7 @@ Post.joins(:author).where.has {
 The following methods give you access to BabySqueel's DSL:
 
 | BabySqueel    | Active Record Equivalent |
-|---------------|--------------------------|
+| ------------- | ------------------------ |
 | `selecting`   | `select`                 |
 | `ordering`    | `order`                  |
 | `joining`     | `joins`                  |

data/baby_squeel.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 4.2.0'
-  spec.add_dependency 'polyamorous', '~> 1.3'
+  spec.add_dependency 'activerecord', '~> 5.2'
+  spec.add_dependency 'ransack', '~> 2.3'
+  spec.add_dependency 'join_dependency', '~> 0.1.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
 end

data/lib/baby_squeel.rb

@@ -1,6 +1,11 @@
 require 'active_record'
 require 'active_record/relation'
-require 'polyamorous'
+begin
+  require 'polyamorous'
+rescue LoadError
+  # Trying loading from 'ransack' as of commit c9cc20de9 (post v2.3.2)
+  require 'polyamorous/polyamorous'
+end
 require 'baby_squeel/version'
 require 'baby_squeel/errors'
 require 'baby_squeel/active_record/base'

data/lib/baby_squeel/active_record/base.rb

@@ -3,10 +3,19 @@ require 'baby_squeel/dsl'
 module BabySqueel
   module ActiveRecord
     module Base
-      delegate :joining, :joining!, :selecting, :ordering,
-               :grouping, :when_having, :plucking,
-               :averaging, :counting, :maximizing,
-               :minimizing, :summing, to: :all
+      delegate :joining,
+               :selecting,
+               :ordering,
+               :reordering,
+               :grouping,
+               :when_having,
+               :plucking,
+               :averaging,
+               :counting,
+               :maximizing,
+               :minimizing,
+               :summing,
+               to: :all
 
       # Define a sifter that can be used within DSL blocks.
       #

data/lib/baby_squeel/active_record/calculations.rb

@@ -5,7 +5,9 @@ module BabySqueel
   module ActiveRecord
     module Calculations
       def plucking(&block)
-        pluck Pluck.wrap(DSL.evaluate(self, &block))
+        nodes = Array.wrap(DSL.evaluate(self, &block))
+        nodes = nodes.map { |node| Pluck.decorate(node) }
+        pluck(*nodes)
       end
 
       def counting(&block)

data/lib/baby_squeel/active_record/query_methods.rb

@@ -1,30 +1,35 @@
 require 'baby_squeel/dsl'
-require 'baby_squeel/join_dependency/injector'
+require 'baby_squeel/join_dependency'
 
 module BabySqueel
   module ActiveRecord
     module QueryMethods
-      # Constructs Arel for ActiveRecord::Base#joins using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#joins using the DSL.
       def joining(&block)
         joins DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#select using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#select using the DSL.
       def selecting(&block)
         select DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#order using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#order using the DSL.
       def ordering(&block)
         order DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#group using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#reorder using the DSL.
+      def reordering(&block)
+        reorder DSL.evaluate(self, &block)
+      end
+
+      # Constructs Arel for ActiveRecord::QueryMethods#group using the DSL.
       def grouping(&block)
         group DSL.evaluate(self, &block)
       end
 
-      # Constructs Arel for ActiveRecord::Base#having using the DSL.
+      # Constructs Arel for ActiveRecord::QueryMethods#having using the DSL.
       def when_having(&block)
         having DSL.evaluate(self, &block)
       end
@@ -34,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,
@@ -85,7 +85,7 @@ module BabySqueel
     def _arel(associations = [])
       if _on
         super
-      elsif _table.is_a? Arel::Nodes::TableAlias
+      elsif alias?
         raise AssociationAliasingError.new(_reflection.name, _table.right)
       elsif _reflection.polymorphic? && _polymorphic_klass.nil?
         raise PolymorphicNotSpecifiedError.new(_reflection.name)

data/lib/baby_squeel/compat.rb

@@ -8,6 +8,46 @@ module BabySqueel
       ::ActiveRecord::Relation.prepend QueryMethods
     end
 
+    class KeyPath
+      def self.evaluate(&block)
+        if block.arity.zero?
+          unwrap new.instance_eval(&block)
+        else
+          unwrap yield(new)
+        end
+      end
+
+      def self.unwrap(path)
+        if path.kind_of? self
+          path.value
+        elsif path.respond_to? :map
+          path.map(&method(:unwrap))
+        else
+          []
+        end
+      end
+
+      def initialize(*path)
+        @path = path
+      end
+
+      def value
+        @path.reverse.reduce({}) do |acc, name|
+          { name => acc }
+        end
+      end
+
+      private
+
+      def respond_to_missing?(*)
+        true
+      end
+
+      def method_missing(name, *)
+        self.class.new(*@path, name)
+      end
+    end
+
     module DSL
       # An alias for BabySqueel::DSL#sql
       def `(str)
@@ -36,6 +76,33 @@ module BabySqueel
         end
       end
 
+      # Overrides ActiveRecord::QueryMethods#includes
+      def includes(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
+      # Overrides ActiveRecord::QueryMethods#eager_load
+      def eager_load(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
+      # Overrides ActiveRecord::QueryMethods#preload
+      def preload(*args, &block)
+        if block_given? && args.empty?
+          super KeyPath.evaluate(&block)
+        else
+          super
+        end
+      end
+
       # Heads up, Array#select conflicts with
       # ActiveRecord::QueryMethods#select. So, if arity
       # is given to the block, we'll use Array#select.
@@ -61,6 +128,14 @@ module BabySqueel
         end
       end
 
+      def reorder(*args, &block)
+        if block_given? && args.empty?
+          reordering(&block)
+        else
+          super
+        end
+      end
+
       # Overrides ActiveRecord::QueryMethods#group
       def group(*args, &block)
         if block_given? && args.empty?

data/lib/baby_squeel/dsl.rb

@@ -85,16 +85,6 @@ module BabySqueel
       sql _scope.connection.quote(value)
     end
 
-    # Evaluates a DSL block. If arity is given, this method
-    # `yield` itself, rather than `instance_eval`.
-    def evaluate(&block)
-      if block.arity.zero?
-        instance_eval(&block)
-      else
-        yield(self)
-      end
-    end
-
     private
 
     def resolver

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,64 @@
+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)
+        # If we tell join_dependency to construct its tables, Active Record
+        # handles building the correct aliases and attaching them to its
+        # JoinDepenencies.
+        if ::ActiveRecord::VERSION::STRING >= '5.2.3'
+          join_dependency.send(:construct_tables!, join_dependency.send(:join_root))
+        end
+
+        join_association = find_join_association(associations)
+        join_association.table
+      end
+
+      private
+
+      def find_join_association(associations)
+        current = join_dependency.send(:join_root)
+
+        associations.each do |association|
+          name = association._reflection.name
+          current = current.children.find { |c| c.reflection.name == name }
+          break if current.nil?
+        end
+
+        current
+      end
+    end
+  end
+end

data/lib/baby_squeel/nodes/attribute.rb

@@ -26,7 +26,7 @@ module BabySqueel
       end
 
       def _arel
-        if @parent.kind_of? BabySqueel::Association
+        if @parent.kind_of?(BabySqueel::Association) && !@parent.alias?
           @parent.find_alias[@name]
         else
           super

data/lib/baby_squeel/nodes/node.rb

@@ -7,6 +7,11 @@ module BabySqueel
     # In the future, these proxy classes should be more specific and only
     # include necessary/applicable modules.
     class Node < Proxy
+      def initialize(node)
+        super
+        node.extend Arel::Math
+      end
+
       extend Operators::ArelAliasing
       include Operators::Comparison
       include Operators::Equality

data/lib/baby_squeel/pluck.rb

@@ -9,9 +9,9 @@ module BabySqueel
     # bother to use this there.
 
     if ::ActiveRecord::VERSION::MAJOR >= 5
-      def self.wrap(node); node; end
+      def self.decorate(node); node; end
     else
-      def self.wrap(node); new(node); end
+      def self.decorate(node); new(node); end
     end
 
     def initialize(node)

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
@@ -20,6 +20,10 @@ module BabySqueel
       @_join ||= Arel::Nodes::InnerJoin
     end
 
+    def as(alias_name)
+      self.alias(alias_name)
+    end
+
     # Alias a table. This is only possible when joining
     # an association explicitly.
     def alias(alias_name)
@@ -31,6 +35,10 @@ module BabySqueel
       self
     end
 
+    def alias?
+      _table.kind_of? Arel::Nodes::TableAlias
+    end
+
     # Instruct the table to be joined with a LEFT OUTER JOIN.
     def outer
       clone.outer!
@@ -52,22 +60,32 @@ module BabySqueel
     end
 
     # Specify an explicit join.
-    def on(node)
-      clone.on! node
+    def on(node = nil, &block)
+      clone.on!(node, &block)
     end
 
-    def on!(node) # :nodoc:
-      self._on = node
+    def on!(node = nil, &block) # :nodoc:
+      self._on = node || evaluate(&block)
       self
     end
 
+    # Evaluates a DSL block. If arity is given, this method
+    # `yield` itself, rather than `instance_eval`.
+    def evaluate(&block)
+      if block.arity.zero?
+        instance_eval(&block)
+      else
+        yield(self)
+      end
+    end
+
     # When referencing a joined table, the tables that
     # attributes reference can change (due to aliasing).
     # 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
 
@@ -78,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.1.5'.freeze
+  VERSION = '1.4.0.beta1'.freeze
 end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.4.0.beta1
 platform: ruby
 authors:
 - Ray Zane
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: polyamorous
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: join_dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: An expressive query DSL for Active Record 4 and 5.
 email:
 - ray@promptworks.com
@@ -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
@@ -136,7 +149,7 @@ homepage: https://github.com/rzane/baby_squeel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,13 +160,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: An expressive query DSL for Active Record 4 and 5.
 test_files: []

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