baby_squeel 1.4.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54dbc98299ab8f9909d8c312e9663cc615543ea6421b81f2aab6efdd2bd9fe59
-  data.tar.gz: 97cc39dced57e0bd6bf16c854859f47902a2d6550e71c4120643fb01d0de9529
+  metadata.gz: 763bb8a79bfc992f8fd3dfab9f6fd10075ad6ebdc10a1c1c6136f7b41be96805
+  data.tar.gz: d895cddcf544c0c04b02908b8bb8423fdb378d132df6454766e4770973b82abc
 SHA512:
-  metadata.gz: 8f5e68cf4ac0e85d2dc8fce1741f2d64c2bd5b5ecc08c335d71ad3fae335fb3b580f5c3aa2c5f98053ec445d9a7fbc1d3ddec6c7218c99bcb9869a6767fa68c8
-  data.tar.gz: ca66ea54876dfb670177ccea3be1808c90b4d1affea3b7bc1cb5c515e6e8208a8b55fb9fcd06202c6411ea102a358ceb0aa7d0468f82ee7c857045fbc0c5e946
+  metadata.gz: 3034a5daf5a2473fdeab546af7501fba5840e57977b802448fa3d976933ba17745e79511291156105f5da1ee748a5fe597084cdeade003c9df49850c6d387383
+  data.tar.gz: b506444e62ef4c58aead98f1c6d3a8a201b6dc47f9d3245129c492520ff6541e248f7b7463b4407e9125683199cc4396f696973e78ea19fd5ba4bf0a31459e4c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [3.0.0] - 2023-11-20
+
+- Added support for ActiveRecord 7.1 (#125)
+- Added support for Ruby 3.2 (#128)
+- Updated ransack to 4.1. (#126)
+- Droped support for Ruby 2.6 and 2.7. (#126)
+- Droped support for ActiveRecord 6.0. (#126)
+
+## [2.0.0] - 2022-08-28
+
+- AR 6.1: fix - FrozenError: can't modify frozen object: []
+- Drop support for ActiveRecord older than 6.0.
+
 ## [1.4.4] - 2022-02-07
 
 ### Fixed
@@ -231,7 +244,9 @@
 
 - Initial support for selects, orders, wheres, and joins.
 
-[unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.4...HEAD
+[unreleased]: https://github.com/rzane/baby_squeel/compare/v3.0.0...HEAD
+[3.0.0]: https://github.com/rzane/baby_squeel/compare/v2.0.0...v3.0.0
+[2.0.0]: https://github.com/rzane/baby_squeel/compare/v1.4.4...v2.0.0
 [1.4.4]: https://github.com/rzane/baby_squeel/compare/v1.4.3...v1.4.4
 [1.4.3]: https://github.com/rzane/baby_squeel/compare/v1.4.2...v1.4.3
 [1.4.2]: https://github.com/rzane/baby_squeel/compare/v1.4.1...v1.4.2

data/ISSUE_TEMPLATE.md

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

data/baby_squeel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Ray Zane']
   spec.email         = ['ray@promptworks.com']
 
-  spec.summary       = 'An expressive query DSL for Active Record 4 and 5.'
+  spec.summary       = 'An expressive query DSL for Active Record 6+'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/rzane/baby_squeel'
   spec.license       = 'MIT'
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
-  spec.add_dependency 'ransack', '~> 2.3'
+  spec.add_dependency 'activerecord', '>= 6.1.5', '< 7.2'
+  spec.add_dependency 'ransack', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/baby_squeel/active_record/query_methods.rb

@@ -51,42 +51,22 @@ module BabySqueel
         having DSL.evaluate(self, &block)
       end
 
-      if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
-        def construct_join_dependency(associations, join_type)
-          result = super(associations, join_type)
-          if associations.any? { |assoc| assoc.is_a?(BabySqueel::Join) }
-            result.extend(BabySqueel::JoinDependency::Injector6_1)
-          end
-          result
+      def construct_join_dependency(associations, join_type)
+        result = super(associations, join_type)
+        if associations.any? { |assoc| assoc.is_a?(BabySqueel::Join) }
+          result.extend(BabySqueel::JoinDependency::Injector6_1)
         end
+        result
+      end
 
-        private
+      private
 
-        # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
-        def select_association_list(*args)
+      # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
+      def select_association_list(*args)
+        if args[0].any? { |join| join.is_a?(BabySqueel::Join) }
           args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
-          super *args
-        end
-      elsif BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
-        private
-
-        # Active Record will call `each` on the `joins`. The
-        # Injector has a custom `each` method that handles
-        # BabySqueel::Join nodes.
-        def build_joins(*args)
-          args[1] = BabySqueel::JoinDependency::Injector6_0.new(args.second)
-          super(*args)
-        end
-      else
-        private
-
-        # Active Record will call `group_by` on the `joins`. The
-        # Injector has a custom `group_by` method that handles
-        # BabySqueel::Join nodes.
-        def build_joins(*args)
-          args[1] = BabySqueel::JoinDependency::Injector5_2.new(args.second)
-          super(*args)
         end
+        super *args
       end
     end
   end

data/lib/baby_squeel/active_record/version_helper.rb

@@ -3,19 +3,13 @@ require 'baby_squeel/dsl'
 module BabySqueel
   module ActiveRecord
     class VersionHelper
-      def self.at_least_6_1?
-        ::ActiveRecord::VERSION::MAJOR > 6 ||
-          ::ActiveRecord::VERSION::MAJOR == 6 && ::ActiveRecord::VERSION::MINOR >= 1
-      end
-
-      def self.at_least_6_0?
-        ::ActiveRecord::VERSION::MAJOR >= 6
-      end
-
-      def self.at_least_5_2_3?
-        at_least_6_0? ||
-          ::ActiveRecord::VERSION::MAJOR >= 5 && ::ActiveRecord::VERSION::MINOR >= 2 && ::ActiveRecord::VERSION::TINY >= 3
-      end
+      # Example
+      #   BabySqueel::ActiveRecord::VersionHelper.at_least_7_1?
+      #
+      # def self.at_least_7_1?
+      #   ::ActiveRecord::VERSION::MAJOR > 7 ||
+      #     ::ActiveRecord::VERSION::MAJOR == 7 && ::ActiveRecord::VERSION::MINOR >= 1
+      # end
     end
   end
 end

data/lib/baby_squeel/association.rb

@@ -100,13 +100,7 @@ module BabySqueel
     def build_where_clause(other)
       if valid_where_clause?(other)
         relation = @parent._scope.all
-
-        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
-          relation.send(:build_where_clause, { _reflection.name => other }, [])
-        else
-          factory = relation.send(:where_clause_factory)
-          factory.build({ _reflection.name => other }, [])
-        end
+        relation.send(:build_where_clause, { _reflection.name => other }, [])
       else
         raise AssociationComparisonError.new(_reflection.name, other)
       end

data/lib/baby_squeel/join_dependency.rb

@@ -2,26 +2,6 @@ require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   module JoinDependency
-    # This class allows BabySqueel to slip custom
-    # joins_values into Active Record's JoinDependency
-    class Injector5_2 < 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
-
     # This class allows BabySqueel to slip custom
     # joins_values into Active Record's JoinDependency
     class Injector6_0 < Array # :nodoc:
@@ -66,20 +46,13 @@ module BabySqueel
       # a list (in order of chaining) of associations and finding
       # the respective JoinAssociation at each level.
       def find_alias(associations)
-        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
-          # construct_tables! got removed by rails
-          # https://github.com/rails/rails/commit/590b045ee2c0906ff162e6658a184afb201865d7
-          #
-          # construct_tables_for_association! is a method from the polyamorous (ransack) gem
-          join_root = join_dependency.send(:join_root)
-          join_root.each_children do |parent, child|
-            join_dependency.construct_tables_for_association!(parent, child)
-          end
-        elsif BabySqueel::ActiveRecord::VersionHelper.at_least_5_2_3?
-          # If we tell join_dependency to construct its tables, Active Record
-          # handles building the correct aliases and attaching them to its
-          # JoinDepenencies.
-          join_dependency.send(:construct_tables!, join_dependency.send(:join_root))
+        # construct_tables! got removed by rails
+        # https://github.com/rails/rails/commit/590b045ee2c0906ff162e6658a184afb201865d7
+        #
+        # construct_tables_for_association! is a method from the polyamorous (ransack) gem
+        join_root = join_dependency.send(:join_root)
+        join_root.each_children do |parent, child|
+          join_dependency.construct_tables_for_association!(parent, child)
         end
 
         join_association = find_join_association(associations)
@@ -115,7 +88,7 @@ module BabySqueel
         joins += relation.joins_values
         joins += relation.left_outer_joins_values
 
-        buckets = joins.group_by do |join|
+        _buckets = joins.group_by do |join|
           case join
           when String
             :string_join
@@ -147,16 +120,9 @@ module BabySqueel
         join_list = join_nodes + joins
 
         alias_tracker = Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
-        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
-          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::InnerJoin)
-          join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
-        elsif BabySqueel::ActiveRecord::VersionHelper.at_least_5_2_3?
-          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins)
-          join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
-        else
-          # Rails 5.2.0 - 5.2.2
-          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
-        end
+        join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::InnerJoin)
+        join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+
         join_nodes.each do |join|
           join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
         end

data/lib/baby_squeel/nodes/attribute.rb

@@ -41,7 +41,7 @@ module BabySqueel
       # Conveniently, this approach automatically adds a 1=0.
       # I have literally no idea why, but I'll take it.
       def sanitize_relation(rel)
-        if rel.kind_of? ::ActiveRecord::NullRelation
+        if ::ActiveRecord::VERSION::MAJOR < 7 && rel.kind_of?(::ActiveRecord::NullRelation)
           other = rel.spawn
           other.extending_values -= [::ActiveRecord::NullRelation]
           sanitize_relation rel.unscoped.merge(other)

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.4.4'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/baby_squeel.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Ray Zane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.1.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.1.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: An expressive query DSL for Active Record 4 and 5.
+description: An expressive query DSL for Active Record 6+
 email:
 - ray@promptworks.com
 executables: []
@@ -156,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
-summary: An expressive query DSL for Active Record 4 and 5.
+summary: An expressive query DSL for Active Record 6+
 test_files: []