activerecord-filter 5.0.0.1 → 5.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fe442ec2d9469a50ef10c77bb05d728407be95
-  data.tar.gz: d6670cedb256f494a36d7af5ffa2a582398ffd16
+  metadata.gz: 68bc3dfb112ded5ee45418075110ef888aba01a5
+  data.tar.gz: 73407b0438f5a6f71c9f8b3d9c2a4f83d60c778e
 SHA512:
-  metadata.gz: c42f5aab8ec42ea638761946ba345e2b79900c426b8fec9d794cb2715c787ce3792db73229529656bdafe6e9141e4266dd05187be38bdd040582218638e49eb4
-  data.tar.gz: 459451d4a977fcf775047da9677ddf9011f88572436ac15d81f48044e6856ec0de832d32179a71a8f4d5783258f112053c3977739e230c9a7d5ca42a66ed4052
+  metadata.gz: b9b0b4704b1700f97feb2697d2d0ccb6e32aeb9576f1b2aed4735627f4ccb7a9197706031e07fe547205f3c8e47ac1c4eb73e3dddfc97834607072b0cafffbf3
+  data.tar.gz: 71dcd0b33b1d4d2dc17dd15eb00cf8eaf0bb29a5f35d77da8fbe7858d9368aa400d08255afed643522a87cc1926e441765fa7fa4915c0ce0a3bee16a71999e72

data/lib/active_record/filter.rb

@@ -40,7 +40,7 @@ module ActiveRecord::Filter
 
   def filter_for(key, value, options={})
     column = columns_hash[key.to_s]
-
+    
     if column && column.array
       all.filter_for_array(key, value, options)
     elsif column
@@ -137,6 +137,8 @@ module ActiveRecord::Filter
         when :filter_for_boolean then where(table[column].eq(value.try(:send, send_method)))
         else where(table[column].eq(nil))
         end
+      elsif value == nil
+        where(table[column].eq(value).or(table[column].eq(nil)))
       # when ''
       #   # TODO support nil. Currently rails params encode nil as empty strings,
       #   # and we can't tell which is desired, so do both
@@ -225,7 +227,7 @@ module ActiveRecord::Filter
     elsif resource.klass == relation.klass
       options[:table_alias] = "#{relation.name}_#{relation.klass.table_name}"
     end
-    
+
     if value.is_a?(Hash) || value.class.name == "ActionController::Parameters".freeze
       resource = resource.joins(relation.name) #if !resource.references?(relation.name)
       resource = resource.merge(relation.klass.filter(value, options))

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '5.0.0.1'
+    VERSION = '5.0.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.0.0.1
+  version: 5.0.0.2
 platform: ruby
 authors:
 - Jon Bracy
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord