activerecord-filter 5.0.0 → 5.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fdf28c6e50c3f887b05980cf00e7070bab91b91
-  data.tar.gz: 491ce24013f744189405c9a92845a7f275b7ca23
+  metadata.gz: d1fe442ec2d9469a50ef10c77bb05d728407be95
+  data.tar.gz: d6670cedb256f494a36d7af5ffa2a582398ffd16
 SHA512:
-  metadata.gz: fa8bec5eb557ce931bd580d0a32e4cf014c734f22a32652d5778aa247220bf8dee24efa1af7db6ce44ef73134ecb8066d32bfed19a787fa844ed82d5e95033e7
-  data.tar.gz: b9b9867c21937111b5770269dbe6b6327cd0eb626974c23f898e718d1eb6a6132ecdaabd0cfb2a836f374a161b4b25b4cb89a1dfe2d2f6ba6a0d107e3dc22c62
+  metadata.gz: c42f5aab8ec42ea638761946ba345e2b79900c426b8fec9d794cb2715c787ce3792db73229529656bdafe6e9141e4266dd05187be38bdd040582218638e49eb4
+  data.tar.gz: 459451d4a977fcf775047da9677ddf9011f88572436ac15d81f48044e6856ec0de832d32179a71a8f4d5783258f112053c3977739e230c9a7d5ca42a66ed4052

data/lib/active_record/filter.rb

@@ -3,13 +3,6 @@ require 'arel/extensions'
 require 'action_controller/metal/strong_parameters'
 
 class ActiveRecord::UnkownFilterError < NoMethodError
-  attr_reader :klass, :filter
-
-  def initialize(klass, filter)
-    @klass = klass
-    @filter = filter.to_s
-    super("unkown filter #{filter.inspect} for #{klass}.")
-  end
 end
 
 module ActiveRecord::Filter
@@ -47,28 +40,15 @@ 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
       all.send("filter_for_#{column.type}", key, value, options)
+    elsif relation = reflect_on_association(key)
+      self.send("filter_for_#{relation.macro}", relation, value)
     else
-      if relation = reflect_on_association(key)
-        self.send("filter_for_#{relation.macro}", relation, value)
-      else
-        # Custom filter, try to guess based on value
-        method = if value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
-          "filter_for_#{value.values.first.class.to_s.downcase}"
-        else
-          "filter_for_#{value.class.to_s.downcase}"
-        end
-
-        puts method, all.respond_to?(method)
-        if all.respond_to?(method)
-          all.send(method, key, value, options)
-        else
-          raise ActiveRecord::UnkownFilterError.new(self, key)          
-        end
-      end
+      raise ActiveRecord::UnkownFilterError.new("Unkown filter \"#{key}\" for #{self}.")
     end
   end
 
@@ -161,8 +141,10 @@ module ActiveRecord::Filter
       #   # TODO support nil. Currently rails params encode nil as empty strings,
       #   # and we can't tell which is desired, so do both
       #   where(table[column].eq(value).or(table[column].eq(nil)))
-      else
+      elsif value.respond_to?(send_method)
         where(table[column].eq(value.try(:send, send_method)))
+      else
+        raise ActiveRecord::UnkownFilterError.new("Unkown type for #{column}. (type #{value.class})")
       end
     end
   end
@@ -238,10 +220,12 @@ module ActiveRecord::Filter
     resource = all
   
     options = {}
-    if resource.klass == relation.klass
+    if connection.class.name == 'ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter'
+      options[:table_alias] = relation.name
+    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'
+    VERSION = '5.0.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-09-02 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