activerecord-filter 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09732db42dbc93213eb9cb72360f1fe556cb8ee1be65ef4ab9a5ea66460e463e'
-  data.tar.gz: a363687983fb83cdb7db3a65c02e279ec56b57566c2199a844dc6bc973c50382
+  metadata.gz: 4cee15d7015346ac808e7892435628ff50b19aa86ff9a1ce671a1125d21e1ba4
+  data.tar.gz: a27330b0c68a8913f5aee1c95cacad8d9475492c5fd889ebff3b78ddb7b0a6c4
 SHA512:
-  metadata.gz: b98da863c302b2aba54a339f3a78de317a9dbf11235f318f6ffb750bdb80265e5fde571d1a7d7eef72066bb37ad7e9a70bcbf7095b598b9d6b66911e9fd1db03
-  data.tar.gz: d2969b02282399759622892ad30ef2fc181358bd2c9c2c2051f772c7d08395f951f446588a0cd7a060573580b582970ac614252d9be68a1c937c781cfada928f
+  metadata.gz: 5fcc52cd1ef6c55ec62ee8c2472a4cf8d39abf0e974b468020cbfacd07dc0b4af1b132da7a83994b6d014ff751eaf12b16725f790e3072df384d8f2fd4a3d898
+  data.tar.gz: 304f6d204c1d2c9359066d94e2dff95af5350fde8d1598cd61e64c8c9019dc39ac4a502d7483dff23c1cb0a35e1803597f9543434910f925310a6e9f7647eda5

data/lib/active_record/filter/alias_tracker_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Filter::AliasTrackerExtension
 
   def initialize(*, **)

data/lib/active_record/filter/filter_clause_factory.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class ActiveRecord::Filter::FilterClauseFactory
 
   def initialize(model, predicate_builder)
-    @model = model
+    @klass = model
     @predicate_builder = predicate_builder
   end
 
@@ -17,6 +19,6 @@ class ActiveRecord::Filter::FilterClauseFactory
 
   protected
 
-  attr_reader :model, :predicate_builder
+  attr_reader :klass, :predicate_builder
 
 end

data/lib/active_record/filter/predicate_builder_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/concern"
 
 module ActiveRecord::Filter::PredicateBuilderExtension
@@ -297,18 +299,18 @@ module ActiveRecord::Filter::PredicateBuilderExtension
       value = value.dup
       klass = value.delete(:as).safe_constantize
 
-      builder = self.class.new(ActiveRecord::TableMetadata.new(
+      builder = new_predicate_builder_extension(
         klass,          
         alias_tracker.aliased_table_for_relation(relation_trail + ["#{klass.table_name}_as_#{relation.name}"], klass.arel_table) { klass.arel_table.name },
         relation
-      ))
+      )
       builder.build_from_filter_hash(value, relation_trail + ["#{klass.table_name}_as_#{relation.name}"], alias_tracker)
     else
-      builder = self.class.new(ActiveRecord::TableMetadata.new(
+      builder = new_predicate_builder_extension(
         relation.klass,
         alias_tracker.aliased_table_for_relation(relation_trail + [relation.name], relation.klass.arel_table) { relation.alias_candidate(table.arel_table.name || relation.klass.arel_table) },
         relation
-      ))
+      )
       builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
     end
 
@@ -316,12 +318,21 @@ module ActiveRecord::Filter::PredicateBuilderExtension
 
   def expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
     relation = relation.active_record._reflections[relation.active_record._reflections[relation.name].send(:delegate_reflection).options[:through]]
-    builder = self.class.new(ActiveRecord::TableMetadata.new(
+    builder = new_predicate_builder_extension(
       relation.klass,
       alias_tracker.aliased_table_for_relation(relation_trail + [relation.name], relation.klass.arel_table) { relation.alias_candidate(table.arel_table.name || relation.klass.arel_table) },
       relation
-    ))
+    )
     builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
   end
 
+  if ActiveRecord.version >= "8.1"
+    def new_predicate_builder_extension(a,b,c)
+      self.class.new(ActiveRecord::TableMetadata.new(a, b))
+    end
+  else
+    def new_predicate_builder_extension(a,b,c)
+      self.class.new(ActiveRecord::TableMetadata.new(a, b, c))
+    end
+  end
 end

data/lib/active_record/filter/query_methods_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Filter::QueryMethodsExtension
 private
   def build_join_buckets

data/lib/active_record/filter/relation_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Filter::RelationExtension
 
   def initialize(*, **)
@@ -49,7 +51,14 @@ module ActiveRecord::Filter::RelationExtension
     @filter_clause_factory ||= ActiveRecord::Filter::FilterClauseFactory.new(klass, predicate_builder)
   end
 
-  if ActiveRecord.version >= "7.2"
+  if ActiveRecord.version >= "8.1"
+    def build_arel(aliases = nil)
+      arel = super
+      my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(model.connection_pool, table.name, [])
+      build_filters(arel, my_alias_tracker)
+      arel
+    end
+  elsif ActiveRecord.version >= "7.2"
     def build_arel(connection, aliases = nil)
       arel = super
       my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(model.connection_pool, table.name, [])

data/lib/active_record/filter/spawn_methods_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Filter::SpawnMethodsExtension
 
   def except(*skips)

data/lib/active_record/filter/unkown_filter_error.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ActiveRecord::UnkownFilterError < NoMethodError
 end

data/lib/active_record/filter/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Filter
-    VERSION = '8.0.0'
+    VERSION = '8.1.0'
   end
 end

data/lib/active_record/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'arel/extensions'
 require 'active_record/filter/unkown_filter_error'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Jon Bracy
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +155,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +228,6 @@ homepage: https://github.com/malomalo/activerecord-filter
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -232,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.2
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord
   Models