baby_squeel 1.4.0.beta1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df3535278f1724c6db1656ab9c5bbe0e9097e80ee6f2c1fdaeb3491bc838ae9
-  data.tar.gz: bddd464023f9f53f0ff32cc1fbaa88928f5736b3e6541418b8c36f26b01b8d34
+  metadata.gz: c1c744d9857aadfec2192c82fef09f2fb3f1c67765852da080bfcf3a1f5aba72
+  data.tar.gz: d3dfb10bcf6496c530f29a87146a53039c925cc3dc86fe9cfbced8eb8d0afd6f
 SHA512:
-  metadata.gz: 44f8ecb2269017a1e141f0f90d5c9a7eee7d5b877500897aba0a60646f38de0cdae4b992f505d022740c03e73d6293990d9f509d5b3188b5be8051819e168069
-  data.tar.gz: a63f7b474504ef598508879d8ad702396f194c663cc46ececdb9c8dd31aabb10752323332bc26b3cec5cfb2df93e5328e11d2ce1983efe23793c618ccce9294d
+  metadata.gz: 211d541b43c1117bf46f79f220c34fbe5959fbc3597440ccfc3b4565fe087192d23342d365f757bda6ed5f03ba80cfbe2b03eea6e40955489f53e5f5813bb688
+  data.tar.gz: 431218e9d183f1507095036417af43b3d80b2189bb0c9abab5dc9e99c995f44cd79a0965b249ae468442ce3fa7436c8b86db2258efa6531a5ed80d00f16495ee

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 ## [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
@@ -139,7 +154,10 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.3.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

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

@@ -329,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

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   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', '~> 2'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/baby_squeel/active_record/calculations.rb

@@ -1,12 +1,10 @@
 require 'baby_squeel/calculation'
-require 'baby_squeel/pluck'
 
 module BabySqueel
   module ActiveRecord
     module Calculations
       def plucking(&block)
         nodes = Array.wrap(DSL.evaluate(self, &block))
-        nodes = nodes.map { |node| Pluck.decorate(node) }
         pluck(*nodes)
       end
 
@@ -40,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,9 +24,7 @@ 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
@@ -38,7 +34,7 @@ module BabySqueel
         # 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'
+        if at_least?("5.2.3")
           join_dependency.send(:construct_tables!, join_dependency.send(:join_root))
         end
 
@@ -48,17 +44,85 @@ module BabySqueel
 
       private
 
+      Associations = ::ActiveRecord::Associations
+
       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 }
+          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
+
+      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
+
+      def exactly?(version)
+        ::ActiveRecord.gem_version == Gem::Version.new(version)
+      end
+
+      def at_least?(version)
+        ::ActiveRecord.gem_version >= Gem::Version.new(version)
+      end
     end
   end
 end

data/lib/baby_squeel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta1
+  version: 1.4.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -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
@@ -160,9 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key:

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.decorate(node); node; end
-    else
-      def self.decorate(node); new(node); end
-    end
-
-    def initialize(node)
-      @node = node
-    end
-
-    def to_s
-      @node
-    end
-  end
-end