baby_squeel 1.2.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f491f71692c6a13ed97203fd5cf7c9b08afeac2b
-  data.tar.gz: 5da604986d6d6478b703414f9b78307871ca8adf
+SHA256:
+  metadata.gz: c1c744d9857aadfec2192c82fef09f2fb3f1c67765852da080bfcf3a1f5aba72
+  data.tar.gz: d3dfb10bcf6496c530f29a87146a53039c925cc3dc86fe9cfbced8eb8d0afd6f
 SHA512:
-  metadata.gz: 60f3bfa7c9de2b6fdcc470a65f23e945d340d538f1dd54f19237f8844a1c5b348d8cf713d74f36e7a333dc9e836fd44ae3b234acfc57173bb1556844963065f8
-  data.tar.gz: 5739d55d7eaf421f1091ab580cff50e263a73543ade85b4a43bab64a79342269111c988d8144daff5bb7eac72d511e38194256a124998352d2add127c19ed789
+  metadata.gz: 211d541b43c1117bf46f79f220c34fbe5959fbc3597440ccfc3b4565fe087192d23342d365f757bda6ed5f03ba80cfbe2b03eea6e40955489f53e5f5813bb688
+  data.tar.gz: 431218e9d183f1507095036417af43b3d80b2189bb0c9abab5dc9e99c995f44cd79a0965b249ae468442ce3fa7436c8b86db2258efa6531a5ed80d00f16495ee

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 ## [Unreleased]
 
-Nothing to see here.
+## [1.4.1] - 2021-06-17
+## Fixed
+- Fixed a bug related to checking the Active Record version.
+
+## [1.4.0] - 2021-06-17
+## Fixed
+- Fix table alias when joining a polymorphic table twice (#108)
+- Removed internal class `BabySqueel::Pluck`. You can still use `plucking`. For example, `Post.joining { author }.plucking { author.name }`
+- Removed old code from Active Record < 5.2
+- Removed dependency `join_dependency`
+
+## [1.4.0.beta1] - 2021-04-21
+## Fixed
+- Add Support for activerecord '>= 5.2.3'
+- Drop Support for Active Record versions that have reached EOL (activerecord < 5.2)
+- Use polyamorous from ransack '~> 2.3'
+
+## [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
@@ -131,7 +154,12 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.2.1...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.1...HEAD
+[1.4.1]: https://github.com/rzane/baby_squeel/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/rzane/baby_squeel/compare/v1.4.0.beta1...v1.4.0
+[1.4.0.beta1]: https://github.com/rzane/baby_squeel/compare/v1.3.1...v1.4.0.beta1
+[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

data/ISSUE_TEMPLATE.md

@@ -11,7 +11,7 @@ require 'minitest/autorun'
 
 gemfile true do
   source 'https://rubygems.org'
-  gem 'activerecord', '~> 5.0.0' # which Active Record version?
+  gem 'activerecord', '~> 5.2.0' # which Active Record version?
   gem 'sqlite3'
   gem 'baby_squeel', github: 'rzane/baby_squeel'
 end

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.
 
@@ -219,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
@@ -240,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
@@ -283,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`                  |
@@ -297,7 +329,7 @@ Check out the [migration guide](https://github.com/rzane/baby_squeel/wiki/Migrat
 
 ## Development
 
-1. Pick an Active Record version to develop against, then export it: `export AR=4.2.6`.
+1. Pick an Active Record version to develop against, then export it: `export AR=5.2.0`.
 2. Run `bin/setup` to install dependencies.
 3. Run `rake` to run the specs.
 

data/baby_squeel.gemspec

@@ -19,12 +19,11 @@ 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 'join_dependency', '~> 0.1.1'
+  spec.add_dependency 'activerecord', '~> 5.2'
+  spec.add_dependency 'ransack', '~> 2.3'
 
-  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/calculations.rb

@@ -1,11 +1,11 @@
 require 'baby_squeel/calculation'
-require 'baby_squeel/pluck'
 
 module BabySqueel
   module ActiveRecord
     module Calculations
       def plucking(&block)
-        pluck Pluck.wrap(DSL.evaluate(self, &block))
+        nodes = Array.wrap(DSL.evaluate(self, &block))
+        pluck(*nodes)
       end
 
       def counting(&block)
@@ -38,17 +38,6 @@ module BabySqueel
           super
         end
       end
-
-      if ::ActiveRecord::VERSION::MAJOR < 5
-        # @override
-        def type_for(field)
-          if field.kind_of? Calculation
-            field
-          else
-            super
-          end
-        end
-      end
     end
   end
 end

data/lib/baby_squeel/active_record/query_methods.rb

@@ -40,14 +40,8 @@ module BabySqueel
       # Active Record will call `group_by` on the `joins`. The
       # Injector has a custom `group_by` method that handles
       # 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
+      def build_joins(manager, joins, aliases)
+        super manager, BabySqueel::JoinDependency::Injector.new(joins), aliases
       end
     end
   end

data/lib/baby_squeel/association.rb

@@ -96,19 +96,13 @@ module BabySqueel
 
     private
 
-    if ActiveRecord::VERSION::MAJOR >= 5
-      def build_where_clause(other)
-        if valid_where_clause?(other)
-          relation = @parent._scope.all
-          factory = relation.send(:where_clause_factory)
-          factory.build({ _reflection.name => other }, [])
-        else
-          raise AssociationComparisonError.new(_reflection.name, other)
-        end
-      end
-    else
-      def build_where_clause(_)
-        raise AssociationComparisonNotSupportedError.new(_reflection.name)
+    def build_where_clause(other)
+      if valid_where_clause?(other)
+        relation = @parent._scope.all
+        factory = relation.send(:where_clause_factory)
+        factory.build({ _reflection.name => other }, [])
+      else
+        raise AssociationComparisonError.new(_reflection.name, other)
       end
     end
 

data/lib/baby_squeel/calculation.rb

@@ -6,12 +6,6 @@ module BabySqueel
       @node = node
     end
 
-    # This is only used in 4.2. We're just pretending to be
-    # a database column to fake the casting here.
-    def type_cast_from_database(value)
-      value
-    end
-
     # In Active Record 5, we don't *need* this class to make
     # calculations work. They happily accept arel. However,
     # when grouping with a calculation, there's a really,

data/lib/baby_squeel/errors.rb

@@ -62,14 +62,4 @@ module BabySqueel
       super "You can't compare association '#{name}' to #{other}."
     end
   end
-
-  class AssociationComparisonNotSupportedError < StandardError # :nodoc:
-    MESSAGE =
-      "Querying association '%{name}' with '==' and '!=' " \
-      "is only supported for ActiveRecord >=5."
-
-    def initialize(name)
-      super format(MESSAGE, name: name)
-    end
-  end
 end

data/lib/baby_squeel/join_dependency.rb

@@ -1,5 +1,3 @@
-require 'join_dependency'
-
 module BabySqueel
   module JoinDependency
     # This class allows BabySqueel to slip custom
@@ -26,52 +24,104 @@ module BabySqueel
       attr_reader :join_dependency
 
       def initialize(relation)
-        @join_dependency = ::JoinDependency.from_relation(relation) do |join|
-          :association_join if join.kind_of? BabySqueel::Join
-        end
+        @join_dependency = build(relation, collect_joins(relation))
       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)
+        # If we tell join_dependency to construct its tables, Active Record
+        # handles building the correct aliases and attaching them to its
+        # JoinDepenencies.
+        if at_least?("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
 
+      Associations = ::ActiveRecord::Associations
+
       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
-            )
+        current = join_dependency.send(:join_root)
+
+        associations.each do |association|
+          name = association._reflection.name
+          current = current.children.find { |c| c.reflection.name == name && klass_equal?(association, c) }
+          break if current.nil?
+        end
+
+        current
+      end
+
+      # If association is not polymorphic return true.
+      # If association is polymorphic compare the association polymorphic class with the join association base_klass
+      def klass_equal?(assoc, join_association)
+        return true unless assoc._reflection.polymorphic?
+
+        assoc._polymorphic_klass == join_association.base_klass
+      end
+
+      def collect_joins(relation)
+        joins = []
+        joins += relation.joins_values
+        joins += relation.left_outer_joins_values if at_least?("5")
+
+        buckets = joins.group_by do |join|
+          case join
+          when String
+            :string_join
+          when Hash, Symbol, Array
+            :association_join
+          when Associations::JoinDependency
+            :stashed_join
+          when Arel::Nodes::Join
+            :join_node
+          when BabySqueel::Join
+            :association_join
+          else
+            raise("unknown class: %s" % join.class.name)
           end
         end
       end
 
-      # Compare two reflections and see if they're the same.
-      def reflections_equal?(a, b)
-        comparable_reflection(a) == comparable_reflection(b)
+      def build(relation, buckets)
+        buckets.default = []
+        association_joins         = buckets[:association_join]
+        stashed_association_joins = buckets[:stashed_join]
+        join_nodes                = buckets[:join_node].uniq
+        string_joins              = buckets[:string_join].map(&:strip).uniq
+
+        joins = string_joins.map do |join|
+          relation.table.create_string_join(Arel.sql(join)) unless join.blank?
+        end.compact
+
+        join_list = join_nodes + joins
+
+        alias_tracker = Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
+        if exactly?("5.2.0")
+          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
+        else
+          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins)
+          join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+        end
+        join_nodes.each do |join|
+          join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
+        end
+
+        join_dependency
       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
+      def exactly?(version)
+        ::ActiveRecord.gem_version == Gem::Version.new(version)
       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)
+      def at_least?(version)
+        ::ActiveRecord.gem_version >= Gem::Version.new(version)
       end
     end
   end

data/lib/baby_squeel/version.rb

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

metadata

@@ -1,113 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Ray Zane
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2021-06-17 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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: polyamorous
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: join_dependency
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '2.3'
 - !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
@@ -140,7 +126,6 @@ files:
 - lib/baby_squeel/nodes/node.rb
 - lib/baby_squeel/nodes/proxy.rb
 - lib/baby_squeel/operators.rb
-- lib/baby_squeel/pluck.rb
 - lib/baby_squeel/relation.rb
 - lib/baby_squeel/resolver.rb
 - lib/baby_squeel/table.rb
@@ -149,7 +134,7 @@ homepage: https://github.com/rzane/baby_squeel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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/pluck.rb

@@ -1,25 +0,0 @@
-module BabySqueel
-  class Pluck # :nodoc:
-    # In Active Record 4.2, #pluck chokes when you give it
-    # Arel. It calls #to_s on whatever you pass in. So the
-    # hacky solution is to wrap the node in a class that
-    # returns the node when you call #to_s. Then, it works!
-    #
-    # In Active Record 5, #pluck accepts Arel, so we won't
-    # bother to use this there.
-
-    if ::ActiveRecord::VERSION::MAJOR >= 5
-      def self.wrap(node); node; end
-    else
-      def self.wrap(node); new(node); end
-    end
-
-    def initialize(node)
-      @node = node
-    end
-
-    def to_s
-      @node
-    end
-  end
-end