activerecord-filter 5.0.0.3 → 5.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84e49f9cc530782e0526995e700902d7937fb7f
-  data.tar.gz: 1414458d78e798480fea0f2e0970e7a31b259597
+  metadata.gz: 0891c91632adac443eea01685d08f599c16b61f0
+  data.tar.gz: 893066947ef4c7ece89f7e7a613d2a51cd272bae
 SHA512:
-  metadata.gz: 90af8fd5f4e3fc6466ff416152e9141b920304f3f9b68f0b414b0326e5945ecbf575cde92a816079b9638f2ce8217325ae29f36e703296ff3128ae40e8747cb7
-  data.tar.gz: a12596a64b36cce8e3e4fbe92c13d74ca423b17da86a2860212befe3f08fbd2d720b52659b2611d2b49c656cd5cfea168fa6e10af5c2c8dbb7c9eee2b2cdb06d
+  metadata.gz: 27671c1a861dceecdb5c466d49bbcf9dd940cd9c892ede60e7444b322dadabfe35a838d6a2bf06b867eee16a32466dd979f790ccb9e30fc69c4b5a434bc89e96
+  data.tar.gz: 14ebd489fac3b544474b00c0e5ea8a12e9ac2a06d16b75856531b6eba3eec86e158bf812e122373c636a8d37eb82a41247ceaa793324b641ff8360de4044c9a1

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
@@ -155,19 +155,23 @@ module ActiveRecord::Filter
     table = options[:table_alias] ? arel_table.alias(options[:table_alias]) : arel_table
     column = table[column]
   
-    drill_for_json(column, value, all)
+    drill_for_json(column, value, all, 'jsonb')
   end
-  alias :filter_for_json :filter_for_jsonb
   
-  def drill_for_json(column, drill, resource)
-    if cast = drill.delete(:cast)
-      column = column.cast_as(cast)
-    end
-
+  def filter_for_json(column, value, options = {})
+    table = options[:table_alias] ? arel_table.alias(options[:table_alias]) : arel_table
+    column = table[column]
+  
+    drill_for_json(column, value, all, 'json')
+  end
+  
+  def drill_for_json(column, drill, resource, cast)
     drill.each do |key, value|
       if value.is_a?(Hash) || value.class.name == "ActionController::Parameters".freeze
-        resource = drill_for_json(column.key(key), value, resource)
+        resource = drill_for_json(column.key(key), value, resource, cast)
       else
+        value = Arel::Attributes::Cast.new(Arel::Nodes::Quoted.new(value.to_s), cast)
+        
         resource = case key.to_sym
         when :equal, :eq
           resource.where(column.eq(value))
@@ -227,7 +231,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.3'
+    VERSION = '5.0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.0.0.3
+  version: 5.0.0.5
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord