arel-helpers 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667479f8a68b5bb0af49054dea8aad1071976d752ca00f1e6cd4560005b71ba7
-  data.tar.gz: 0d7d43d81c584cf98a7a2becb0cc61e9f36af9cc24296146d0e4857855a9ef4b
+  metadata.gz: 1efc47376ccbcdad46e62a6065618121a0335003227ab3bfb9edc504094e6f44
+  data.tar.gz: 5b18eb15dc5ae7123b74a89360771568cd5b2e1ac5ce592e872c29dc3ed9c5a6
 SHA512:
-  metadata.gz: 07545d1df75177211b9e40302b3273df2eac33d29dc3ad42fa8c737b06711f2cdbf6455e1e2b90cb523a7248bfece31e8b16296501c103a8f65c513cf21dde02
-  data.tar.gz: 978312ef3268e698c8b155fad5bdbdf084a5175a1a753b8367386d8f116af2fbacb58601288987a3e8cc3a6755eb1efee9412eb459aec72a1990ecb6112e8c1a
+  metadata.gz: dee579a6df63b01c485c40e46574d24852f4cd95c546168dcaa58a527d6fd35cfe8de3d3dc33f428b7087abf7ec5da9c510fec2575ab3bb52f685c54c7e17541
+  data.tar.gz: ab160a5fbc698c823804a3caf55ca3f921512aa3b7892bef9871e20e579419fc879d84dfba41c03cc60a867e6f2c7c957aa1d0d21b3fc343681781bf46f794ae

data/README.md

@@ -215,7 +215,7 @@ This can become repetitive, and as an alternative you can choose to prepend `not
 
 ## Requirements
 
-Requires ActiveRecord >= 3.1.0, < 7. Depends on SQLite for testing purposes.
+Requires ActiveRecord >= 3.1.0, < 8. Depends on SQLite for testing purposes.
 
 ## Running Tests
 

data/arel-helpers.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'combustion', '~> 1.3'
-  s.add_development_dependency 'database_cleaner', '~> 1.8'
+  s.add_development_dependency 'database_cleaner', '~> 2.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'sqlite3', '~> 1.4.0'
+  s.add_development_dependency 'sqlite3', '~> 1.4'
 
   s.require_path = 'lib'
   s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'History.txt', 'README.md', 'Rakefile', 'arel-helpers.gemspec']

data/lib/arel-helpers/join_association.rb

@@ -18,7 +18,9 @@ module ArelHelpers
       # This method encapsulates that functionality and yields an intermediate object for chaining.
       # It also allows you to use an outer join instead of the default inner via the join_type arg.
       def join_association(table, association, join_type = Arel::Nodes::InnerJoin, options = {}, &block)
-        if version >= '6.1.0'
+        if version >= "7.2.0"
+          join_association_7_2_0(table, association, join_type, options, &block)
+        elsif version >= '6.1.0'
           join_association_6_1_0(table, association, join_type, options, &block)
         elsif version >= '6.0.0'
           join_association_6_0_0(table, association, join_type, options, &block)
@@ -262,6 +264,33 @@ module ArelHelpers
         end
       end
 
+      def join_association_7_2_0(table, association, join_type, options = {})
+        aliases = options.fetch(:aliases, []).index_by(&:table_name)
+        associations = association.is_a?(Array) ? association : [association]
+
+        alias_tracker = ActiveRecord::Associations::AliasTracker.create(
+          table.connection_pool, table.name, {}
+        )
+
+        join_dependency = ActiveRecord::Associations::JoinDependency.new(
+          table, table.arel_table, associations, join_type
+        )
+
+        constraints = join_dependency.join_constraints([], alias_tracker, [])
+
+        constraints.map do |join|
+          apply_aliases(join, aliases)
+
+          right = if block_given?
+            yield join.left.name.to_sym, join.right
+          else
+            join.right
+          end
+
+          join_type.new(join.left, right)
+        end
+      end
+
       def apply_aliases(node, aliases)
         case node
         when Arel::Nodes::Join

data/lib/arel-helpers/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ArelHelpers
-  VERSION = '2.14.0'
+  VERSION = '2.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 description: Useful tools to help construct database queries with ActiveRecord and
   Arel.
 email:
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Useful tools to help construct database queries with ActiveRecord and Arel.