activerecord-filter 5.2.1.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50c6dcde39aec10b2037328f63d5b4bbd051a0054b4f21feac732660e3814cf
-  data.tar.gz: 5c17d22575163abee4958f403ebd5b7038dd8f6282f3a0f424a7f46d6fb85f20
+  metadata.gz: eb5558c10ab1700003d9bf88d48bd0d70a68e8cba26e802036f1c540b9e105db
+  data.tar.gz: edabdc23ec140c5cb0ae15078de8f56a8da63e8a813cea36ee9b94b1abf44455
 SHA512:
-  metadata.gz: 6ec8a2f4070bb84beb6083e0909b792a3558b1706ec439997f155cb8505af81da9dca388abf2f68bc7e3049cf14067c7684726a533728fdd03d22fb7a4f9a671
-  data.tar.gz: 168d718fa70364ff0e947a635cb995fa9cc1c74e02b1d154a932322f5483146fe31af0bb0f015d7790b3bc69c4ec6cfb9bbf303bea5e201015ca73d3a3676e96
+  metadata.gz: 10393c5284c77f55c91d386e696ad6067841db807286ebd0228c0df4a743a5ee66f283b14b2294e6be3d7c7f705f86079c5f9b46280da6cc57065eb2ed1a25a6
+  data.tar.gz: 8fc0d573ee06224c5c0f9cf245f37011518fac4309689206c5d8f4417efc59ce6e315dc10e36d94af4f00bc9f154d0256e3ba85c52cba6faae6b4cea33a4611f

data/README.md

@@ -46,17 +46,21 @@ It can also work with array columns:
 
 ```ruby
 Property.filter(:tags => 'Skyscraper').to_sql
-# => "...WHERE 'Skyscraper' = ANY(properties.tags)..."
+# => "...WHERE properties.tags = '{'Skyscraper'}'..."
 
 Property.filter(:tags => ['Skyscraper', 'Brick']).to_sql
-# => "...WHERE (properties.aliases && '{"Skyscraper", "Brick"}')..."
+# => "...WHERE (properties.tags = '{"Skyscraper", "Brick"}')..."
+
+Property.filter(:tags => {overlaps: ['Skyscraper', 'Brick']}).to_sql
+# => "...WHERE properties.tags && '{"Skyscraper", "Brick"}')..."
+
+Property.filter(:tags => {contains: ['Skyscraper', 'Brick']}).to_sql
+# => "...WHERE accounts.tags @> '{"Skyscraper", "Brick"}')..."
+
 ```
 It can also sort on relations:
 
 ```ruby
-Photo.filter(:property => 10).to_sql
-# => "...WHERE photos.property_id = 5"
-
 Photo.filter(:property => {name: 'Empire State'}).to_sql
 # => "...INNER JOIN properties ON properties.id = photos.property_id
 # => "   WHERE properties.name = 'Empire State'"

data/lib/active_record/filter.rb

@@ -30,7 +30,8 @@ module ActiveRecord
   class PredicateBuilder # :nodoc:
 
     def self.filter_joins(klass, filters)
-      build_filter_joins(klass, filters).inject(&:+)
+      custom = []
+      [build_filter_joins(klass, filters, [], custom), custom]
     end
     
     def self.build_filter_joins(klass, filters, relations=[], custom=[])
@@ -40,20 +41,27 @@ module ActiveRecord
         filters.each do |key, value|
           if klass.filters.has_key?(key.to_sym)
             js = klass.filters.dig(key.to_sym, :joins)
+            
             if js.is_a?(Array)
               js.each do |j|
-                if j.is_a?(Hash)
-                  relations << j
-                else
+                if j.is_a?(String)
                   custom << j
+                else
+                  relations << j
                 end
               end
             elsif js
-              relations << js
+              if js.is_a?(String)
+                custom << js
+              else
+                relations << js
+              end
             end
           elsif reflection = klass._reflections[key.to_s]
             if value.is_a?(Hash)
-              relations << {key => build_filter_joins(reflection.klass, value)}
+              relations << {
+                key => build_filter_joins(reflection.klass, value, [], custom)
+              }
             elsif value != true && value != false && value != 'true' && value != 'false' && !value.nil?
               relations << key
             end
@@ -65,7 +73,8 @@ module ActiveRecord
           end
         end
       end
-      [relations, custom]
+      
+      relations
     end
     
     def build_from_filter_hash(attributes, join_dependency)
@@ -216,6 +225,8 @@ module ActiveRecord
         attribute.not_in(convert_filter_value(column, value))
       when :overlaps
         attribute.overlaps(convert_filter_value(column, value))
+      when :not_overlaps
+        attribute.not_overlaps(convert_filter_value(column, value))
       when :ts_match
         if value.is_a?(Array)
           attribute.ts_query(*convert_filter_value(column, value))
@@ -271,7 +282,7 @@ module ActiveRecord
       
       if join_dependency
         join_dependency = join_dependency.children.find { |c| c.reflection.name == relation.name }
-        builder.table.instance_variable_set(:@arel_table, join_dependency.tables.first)
+        builder.send(:table).instance_variable_set(:@arel_table, join_dependency.tables.first)
       end
       
       builder.build_from_filter_hash(value, join_dependency)
@@ -283,7 +294,7 @@ module ActiveRecord
       builder = associated_predicate_builder(relation.name.to_sym)
       if join_dependency
         join_dependency = join_dependency.children.find { |c| c.reflection.name == relation.name }
-        builder.table.instance_variable_set(:@arel_table, join_dependency.tables.first)
+        builder.send(:table).instance_variable_set(:@arel_table, join_dependency.tables.first)
       end
       builder.build_from_filter_hash(value, join_dependency)
     end
@@ -357,7 +368,10 @@ class ActiveRecord::Relation
     end
     
     def filter!(filters)
-      joins!(ActiveRecord::PredicateBuilder.filter_joins(klass, filters))
+      js = ActiveRecord::PredicateBuilder.filter_joins(klass, filters)
+      js.each do |j|
+        joins!(j) if j.present?
+      end
       @filters << filters
       self
     end

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '5.2.1.1'
+    VERSION = '6.0.0'
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.2.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -56,36 +56,30 @@ dependencies:
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -217,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord