baby_squeel 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763bb8a79bfc992f8fd3dfab9f6fd10075ad6ebdc10a1c1c6136f7b41be96805
-  data.tar.gz: d895cddcf544c0c04b02908b8bb8423fdb378d132df6454766e4770973b82abc
+  metadata.gz: 8d571146af43e191254a5673d5486af29b31a8762f3f169075cef91ff50bdb09
+  data.tar.gz: aedddf1851a4507025d7b291db17c7dcee4ac93c2c66a44f289db031b1872afb
 SHA512:
-  metadata.gz: 3034a5daf5a2473fdeab546af7501fba5840e57977b802448fa3d976933ba17745e79511291156105f5da1ee748a5fe597084cdeade003c9df49850c6d387383
-  data.tar.gz: b506444e62ef4c58aead98f1c6d3a8a201b6dc47f9d3245129c492520ff6541e248f7b7463b4407e9125683199cc4396f696973e78ea19fd5ba4bf0a31459e4c
+  metadata.gz: 18d9b7499e8e3b1e0d9f015e6dc2ca1bf89e35d7ca161a9c29a8b0979e57d142698b66d428d27a9f791a2d29c8275352f1b30d6a784d893e183e204d7c006062
+  data.tar.gz: 07c5c306ca8b90756234cecd9ac1eb2463c959ac4e5caedd91fd38e5bf8cb356c6ab438819400c247a7f799a1802d3a93109c43b6804e27a3f68c66a41526827

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [4.0.0] - 2024-11-29
+
+- Remove ActiveRecord boundary
+- Added support for ActiveRecord 8.1
+- Added support for Ransack 4.4 (#134)
+- Added support for ActiveRecord 8.0
+- Added support for ActiveRecord 7.2
+- Droped support for ActiveRecord 6.1 and 7.0
+- Added Ruby 3.3 and 3.4 to test matrix
+- Droped support for Ruby 3.0 and 3.1
+
 ## [3.0.0] - 2023-11-20
 
 - Added support for ActiveRecord 7.1 (#125)
@@ -244,7 +255,8 @@
 
 - Initial support for selects, orders, wheres, and joins.
 
-[unreleased]: https://github.com/rzane/baby_squeel/compare/v3.0.0...HEAD
+[unreleased]: https://github.com/rzane/baby_squeel/compare/v4.0.0...HEAD
+[4.0.0]: https://github.com/rzane/baby_squeel/compare/v3.0.0...v4.0.0
 [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

data/ISSUE_TEMPLATE.md

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

data/README.md

@@ -329,12 +329,30 @@ 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=6.1.4`.
+1. Pick an Active Record version to develop against, then export it: `export AR=7.2.2`.
 2. Run `bin/setup` to install dependencies.
 3. Run `rake` to run the specs.
 
+One-liner to run the specs with different rails versions:
+
+```
+export AR='~> 7.1.6'; rm Gemfile.lock; bin/setup; rake
+export AR='~> 7.2.3'; rm Gemfile.lock; bin/setup; rake
+export AR='~> 8.0.4'; rm Gemfile.lock; bin/setup; rake
+export AR='~> 8.1.1'; rm Gemfile.lock; bin/setup; rake
+```
+
 You can also run `bin/console` to open up a prompt where you'll have access to some models to experiment with.
 
+## Rails update
+
+1. Update [baby_squeel.gemspec](baby_squeel.gemspec)
+2. Add the version to test matrix [build.yml](.github/workflows/build.yml)
+3. Update development section in the [README.md](README.md)
+4. If you need to change the code consider to add a version check methode in [version_helper.rb](lib/baby_squeel/active_record/version_helper.rb)
+5. Run the specs with all supported versions
+6. Add comment to the unreleased section in [CHANGELOG.md](CHANGELOG.md)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/rzane/baby_squeel.

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 6+'
+  spec.summary       = 'An expressive query DSL for Active Record 7.1+'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/rzane/baby_squeel'
   spec.license       = 'MIT'
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 6.1.5', '< 7.2'
+  spec.add_dependency 'activerecord', '>= 7.1.5'
   spec.add_dependency 'ransack', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 2'

data/lib/baby_squeel/active_record/calculations.rb

@@ -28,7 +28,7 @@ module BabySqueel
         maximum Calculation.new(DSL.evaluate(self, &block))
       end
 
-      private
+      protected
 
       # @override
       def aggregate_column(column_name)

data/lib/baby_squeel/active_record/query_methods.rb

@@ -1,6 +1,5 @@
 require 'baby_squeel/dsl'
 require 'baby_squeel/join_dependency'
-require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   module ActiveRecord

data/lib/baby_squeel/active_record/version_helper.rb

@@ -10,6 +10,11 @@ module BabySqueel
       #   ::ActiveRecord::VERSION::MAJOR > 7 ||
       #     ::ActiveRecord::VERSION::MAJOR == 7 && ::ActiveRecord::VERSION::MINOR >= 1
       # end
+
+      def self.at_least_7_2?
+        ::ActiveRecord::VERSION::MAJOR > 7 ||
+          ::ActiveRecord::VERSION::MAJOR == 7 && ::ActiveRecord::VERSION::MINOR >= 2
+      end
     end
   end
 end

data/lib/baby_squeel/association.rb

@@ -1,5 +1,4 @@
 require 'baby_squeel/relation'
-require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   class Association < Relation

data/lib/baby_squeel/join_dependency.rb

@@ -119,7 +119,9 @@ module BabySqueel
 
         join_list = join_nodes + joins
 
-        alias_tracker = Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
+        alias_tracker = Associations::AliasTracker.create(
+          BabySqueel::ActiveRecord::VersionHelper.at_least_7_2? ? relation.klass.connection_pool : relation.klass.connection,
+          relation.table.name, join_list)
         join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::InnerJoin)
         join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
 

data/lib/baby_squeel/nodes/attribute.rb

@@ -35,19 +35,8 @@ module BabySqueel
 
       private
 
-      # NullRelation must be treated as a special case, because
-      # NullRelation#to_sql returns an empty string. As such,
-      # we need to convert the NullRelation to regular relation.
-      # Conveniently, this approach automatically adds a 1=0.
-      # I have literally no idea why, but I'll take it.
       def sanitize_relation(rel)
-        if ::ActiveRecord::VERSION::MAJOR < 7 && rel.kind_of?(::ActiveRecord::NullRelation)
-          other = rel.spawn
-          other.extending_values -= [::ActiveRecord::NullRelation]
-          sanitize_relation rel.unscoped.merge(other)
-        else
-          Arel.sql rel.to_sql
-        end
+        Arel.sql(rel.to_sql)
       end
     end
   end

data/lib/baby_squeel/nodes/proxy.rb

@@ -2,7 +2,7 @@ module BabySqueel
   module Nodes
     # This proxy class allows us to quack like any arel object. When a
     # method missing is hit, we'll instantiate a new proxy object.
-    class Proxy < ActiveSupport::ProxyObject
+    class Proxy < BasicObject
       # Resolve constants the normal way
       def self.const_missing(name)
         ::Object.const_get(name)

data/lib/baby_squeel/version.rb

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

data/lib/baby_squeel.rb

@@ -4,10 +4,6 @@ require 'active_record/relation'
 require 'polyamorous/polyamorous'
 require 'baby_squeel/version'
 require 'baby_squeel/errors'
-require 'baby_squeel/active_record/base'
-require 'baby_squeel/active_record/query_methods'
-require 'baby_squeel/active_record/calculations'
-require 'baby_squeel/active_record/where_chain'
 
 module BabySqueel
   class << self
@@ -43,6 +39,11 @@ module BabySqueel
 end
 
 ActiveSupport.on_load :active_record do
+  require 'baby_squeel/active_record/base'
+  require 'baby_squeel/active_record/query_methods'
+  require 'baby_squeel/active_record/calculations'
+  require 'baby_squeel/active_record/where_chain'
+
   ::ActiveRecord::Base.extend BabySqueel::ActiveRecord::Base
   ::ActiveRecord::Relation.prepend BabySqueel::ActiveRecord::QueryMethods
   ::ActiveRecord::Relation.prepend BabySqueel::ActiveRecord::Calculations

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ray Zane
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
+        version: 7.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
+        version: 7.1.5
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +93,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: An expressive query DSL for Active Record 6+
+description: An expressive query DSL for Active Record 7.1+
 email:
 - ray@promptworks.com
 executables: []
@@ -141,7 +134,6 @@ homepage: https://github.com/rzane/baby_squeel
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: An expressive query DSL for Active Record 6+
+summary: An expressive query DSL for Active Record 7.1+
 test_files: []