activerecord-filter 7.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48643ae6cc991c1dff7397b4d72c5f2f0c125809f06c03deda47557f9f5102d8
-  data.tar.gz: adcc3b342d478ad0802882041abf9ef583abd552d35d8ffccb574987f66d7a4b
+  metadata.gz: '09732db42dbc93213eb9cb72360f1fe556cb8ee1be65ef4ab9a5ea66460e463e'
+  data.tar.gz: a363687983fb83cdb7db3a65c02e279ec56b57566c2199a844dc6bc973c50382
 SHA512:
-  metadata.gz: 464eae805db85247060f6553cf242a49f852ff5d04e4aed17d3613e6a155e4dbaa49c72dcca89c14449fa2aee70ee15ef39afefdce6ed29f18d4c6141e31c8f3
-  data.tar.gz: 116e8b496f68e08f8b6c350432cd806de28b7a830898c84a02c0b4da4d6968d42c2da870e585eeeb247116592ee3db66189f078b88f5cacdd777633971e73b5b
+  metadata.gz: b98da863c302b2aba54a339f3a78de317a9dbf11235f318f6ffb750bdb80265e5fde571d1a7d7eef72066bb37ad7e9a70bcbf7095b598b9d6b66911e9fd1db03
+  data.tar.gz: d2969b02282399759622892ad30ef2fc181358bd2c9c2c2051f772c7d08395f951f446588a0cd7a060573580b582970ac614252d9be68a1c937c781cfada928f

data/lib/active_record/filter/filter_clause_factory.rb

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

data/lib/active_record/filter/predicate_builder_extension.rb

@@ -33,7 +33,7 @@ module ActiveRecord::Filter::PredicateBuilderExtension
                 relations << js
               end
             end
-          elsif reflection = klass._reflections[key.to_s]
+           elsif reflection = klass._reflections[key.to_sym]
             if value.is_a?(Hash)
               relations << if reflection.polymorphic?
                 value = value.dup
@@ -65,11 +65,11 @@ module ActiveRecord::Filter::PredicateBuilderExtension
             elsif value != true && value != false && value != 'true' && value != 'false' && !value.nil?
               relations << key
             end
-          elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.end_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's')]
+          elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.end_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's').to_sym]
             relations << reflection.name
           elsif reflection = klass.reflect_on_all_associations(:has_and_belongs_to_many).find {|r| r.join_table == key.to_s && value.keys.first.to_s == r.association_foreign_key.to_s }
-            reflection = klass._reflections[klass._reflections[reflection.name.to_s].send(:delegate_reflection).options[:through].to_s]
-            relations << {reflection.name => build_filter_joins(reflection.klass, value)}
+            reflection = klass._reflections[klass._reflections[reflection.name].send(:delegate_reflection).options[:through]]
+            relations << { reflection.name => build_filter_joins(reflection.klass, value) }
           else
             {key => value}
           end
@@ -314,9 +314,8 @@ module ActiveRecord::Filter::PredicateBuilderExtension
 
   end
 
-
   def expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
-    relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].send(:delegate_reflection).options[:through].to_s]
+    relation = relation.active_record._reflections[relation.active_record._reflections[relation.name].send(:delegate_reflection).options[:through]]
     builder = self.class.new(ActiveRecord::TableMetadata.new(
       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) },

data/lib/active_record/filter/query_methods_extension.rb

@@ -30,7 +30,7 @@ private
 
     joins = joins_values.dup
     if joins.last.is_a?(ActiveRecord::Associations::JoinDependency)
-      stashed_eager_load = joins.pop if joins.last.base_klass == klass
+      stashed_eager_load = joins.pop if joins.last.base_klass == model
     end
 
     joins.each_with_index do |join, i|
@@ -49,7 +49,7 @@ private
     buckets[:named_join] = select_named_joins(joins, buckets[:stashed_join]) do |join|
       if join.is_a?(Arel::Nodes::Join)
         buckets[:join_node] << join
-      elsif join.is_a?(CTEJoin)
+      elsif join.is_a?(ActiveRecord::QueryMethods::CTEJoin)
         buckets[:join_node] << build_with_join_node(join.name)
       else
         raise "unknown class: %s" % join.class.name

data/lib/active_record/filter/relation_extension.rb

@@ -1,6 +1,6 @@
 module ActiveRecord::Filter::RelationExtension
 
-  def initialize(klass, table: klass.arel_table, predicate_builder: klass.predicate_builder, values: {})
+  def initialize(*, **)
     @filters = []
     super
   end
@@ -49,13 +49,22 @@ module ActiveRecord::Filter::RelationExtension
     @filter_clause_factory ||= ActiveRecord::Filter::FilterClauseFactory.new(klass, predicate_builder)
   end
 
-  def build_arel(aliases = nil)
-    arel = super
-    my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(connection, table.name, [])
-    build_filters(arel, my_alias_tracker)
-    arel
+  if ActiveRecord.version >= "7.2"
+    def build_arel(connection, aliases = nil)
+      arel = super
+      my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(model.connection_pool, table.name, [])
+      build_filters(arel, my_alias_tracker)
+      arel
+    end
+  else
+    def build_arel(aliases = nil)
+      arel = super
+      my_alias_tracker = ActiveRecord::Associations::AliasTracker.create(connection, table.name, [])
+      build_filters(arel, my_alias_tracker)
+      arel
+    end
   end
-
+  
   def build_filters(manager, alias_tracker)
     @filters.each do |filters|
       manager.where(filter_clause_factory.build(filters, alias_tracker).ast)

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '7.0.1'
+    VERSION = '8.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord