activerecord-filter 1.0.2 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6972a66d47b1b0159da629d6176d8b778e3bf550
-  data.tar.gz: ab9d9691554164cd7359adaa9213e16e816f6315
+  metadata.gz: 0ad1d6c4fde489d32e18e7a09fded1dc6f885733
+  data.tar.gz: 90ad1edbedee643cb629ceb2d6a65181f535fc7e
 SHA512:
-  metadata.gz: 9cde58259c994ff059b9cdde7171f0fec6015d81925c0d76bf33d196990cb9d4bf8696ae04140c8f90ea1b52fe0dda17a2b36f6f83a83ada0dca05b4183df83e
-  data.tar.gz: 6d2f65e8d9a0aac71bdde88bb230c97d0dc742978c30f74f46ccfba2a7b93424c820bf7998f0b933788dd59fbd2d9efb9da641f2954db93fbdad0ab3440d7f0e
+  metadata.gz: f5bda8ea3d34ad175787b16981fc9d9cd6048aa885e97b09e29714a1b3f1b20fe3d0786333e82f50eaeb9db901f48c13e8ea2ef4b0a16ea8cd5c83ba8fdaf5a7
+  data.tar.gz: f36d565425a76172ab801cc3c84540daebaf579241c92e84bb8154deb6a3e6dcc192c68d369f4d8a9e059935097c6ece203ea009a78a12f140a72cfb5dd5a735

data/ext/active_record/base.rb

@@ -15,7 +15,7 @@ class ActiveRecord::Base
       resource = all
       return resource unless filters
 
-      if filters.is_a? Hash
+      if filters.is_a?(Hash) || filters.is_a?(ActionController::Parameters)
         filters.each do |key, value|
           if @filters[key]
             #TODO add test for this... not sure how rails does this lambda call,
@@ -54,13 +54,15 @@ class ActiveRecord::Base
       filter_for_text: :itself,
       filter_for_boolean: :itself,
       filter_for_string: :itself,
-      filter_for_decimal: :to_f
+      filter_for_uuid: :itself,
+      filter_for_decimal: :to_f,
+      filter_for_float: :to_f
     }.each_pair do |method_name, send_method|
       define_method(method_name) do |column, value, options={}|
         table = options[:table_alias] ? arel_table.alias(options[:table_alias]) : arel_table
 
         case value
-        when Hash
+        when Hash, ActionController::Parameters
           resource = all
           value.each_pair do |key, value|
             converted_value = value.try(:send, send_method)
@@ -87,7 +89,7 @@ class ActiveRecord::Base
               # end
               
               # TODO us above if to determin if SRID sent
-              geometry_value = if value.is_a?(Hash)
+              geometry_value = if value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
                 Arel::Nodes::NamedFunction.new('ST_SetSRID', [Arel::Nodes::NamedFunction.new('ST_GeomFromGeoJSON', [Arel::Nodes.build_quoted(JSON.generate(value))]), 4326])
               elsif value[0,1] == "\x00" || value[0,1] == "\x01" || value[0,4] =~ /[0-9a-fA-F]{4}/
                 Arel::Nodes::NamedFunction.new('ST_SetSRID', [Arel::Nodes::NamedFunction.new('ST_GeomFromEWKB', [Arel::Nodes.build_quoted(value)]), 4326])
@@ -142,7 +144,7 @@ class ActiveRecord::Base
       table = options[:table_alias] ? arel_table.alias(options[:table_alias]) : arel_table
 
       case value
-      when Hash
+      when Hash, ActionController::Parameters
         resource = all
         value.each_pair do |key, value|
           resource = case key.to_sym
@@ -150,6 +152,10 @@ class ActiveRecord::Base
             resource.where(Arel::Nodes::Contains.new(table[column], Arel::Attributes::Array.new(Array(value))))
           when :overlaps
             resource.where(Arel::Nodes::Overlaps.new(table[column], Arel::Attributes::Array.new(Array(value))))
+          when :not_overlaps
+            resource.where.not(Arel::Nodes::Overlaps.new(table[column], Arel::Attributes::Array.new(Array(value))))
+          when :not_contains
+            resource.where.not(Arel::Nodes::Contains.new(table[column], Arel::Attributes::Array.new(Array(value))))
           else
             raise "Not Supported: #{key.to_sym}"
           end
@@ -158,9 +164,7 @@ class ActiveRecord::Base
       when Array
         where(Arel::Nodes::Contains.new(table[column], Arel::Attributes::Array.new(value)))
       else
-        any_column = Arel::Nodes::NamedFunction.new('ANY', [table[column]])
-        predicate = Arel::Nodes::Equality.new(Arel::Nodes.build_quoted(value), any_column)
-        where(predicate)
+        where(Arel::Nodes::Contains.new(table[column], Arel::Attributes::Array.new([value])))
       end
     end
 
@@ -173,7 +177,7 @@ class ActiveRecord::Base
       end
       
       case value
-      when Hash
+      when Hash, ActionController::Parameters
         resource = resource.joins(relation.name) if !resource.references?(relation.name)
         resource = resource.merge(relation.klass.filter(value, options))
       when Integer
@@ -193,7 +197,7 @@ class ActiveRecord::Base
       resource = all
 
       case value
-      when Hash
+      when Hash, ActionController::Parameters
         if relation.options[:through]
           resource = resource.joins(relation.options[:through] => relation.source_reflection_name)
         else
@@ -235,7 +239,7 @@ class ActiveRecord::Base
         resource = resource.where(resource.arel_table[:"#{relation.foreign_key}"].not_eq(nil))
       when false, 'false'
         resource = resource.where(resource.arel_table[:"#{relation.foreign_key}"].eq(nil))
-      when Hash
+      when Hash, ActionController::Parameters
         if relation.polymorphic?
           raise 'no :as' if !value[:as]
           v = value.dup

data/ext/active_record/query_methods.rb

@@ -1,24 +1,24 @@
-module ActiveRecord::QueryMethods
-  
-  # # TODO: testme and rename to joins?
-  # def joined?(assoc)
-  #   joined_assocs = joins_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
-  #   joined_assocs.include?(assoc)
-  # end
-  #
-  # # TODO: testme and rename to includes?
-  # def included?(assoc)
-  #   included_assocs = includes_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
-  #   included_assocs.include?(assoc)
-  # end
-  
-  # TODO: testme and rename to 
-  def references?(assoc)
-    references_assocs = references_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
-    references_assocs.include?(assoc)
-  end
-  
-end
+# module ActiveRecord::QueryMethods
+#
+#   # # TODO: testme and rename to joins?
+#   # def joined?(assoc)
+#   #   joined_assocs = joins_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
+#   #   joined_assocs.include?(assoc)
+#   # end
+#   #
+#   # # TODO: testme and rename to includes?
+#   # def included?(assoc)
+#   #   included_assocs = includes_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
+#   #   included_assocs.include?(assoc)
+#   # end
+#
+#   # TODO: testme and rename to
+#   def references?(assoc)
+#     references_assocs = references_values.map{ |i| i.is_a?(Hash) ? i.keys : i.to_sym }.flatten
+#     references_assocs.include?(assoc)
+#   end
+#
+# end
 
 module ActiveRecord::Querying
   # delegate :joined?, :to => :all

data/ext/arel/visitors/postgresql.rb

@@ -29,7 +29,7 @@ module Arel
           ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.new("ActiveRecord::Type::#{dt}".constantize.new)
         end
 
-        collector << quote(type.type_cast_for_database(o.relation))
+        collector << quote(type.serialize(o.relation))
       end
       
     end

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '1.0.2'
+    VERSION = '5.0.0.beta1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,12 +172,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord