activerecord-filter 5.0.0.7 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a17e5665d5d8476c382e7dca7ab1bcbb600da917
-  data.tar.gz: ac54d3aba9f451bd468a4e55943423307fc1e5cc
+SHA256:
+  metadata.gz: a535b323a4ffbf5fc7628089b0c25e8f5034c82d15002938ec5b13081a9ba13a
+  data.tar.gz: 8429eb3399716797f4b969e2205b5e47b1989abd6f65e55e0f2c4405860fb6ad
 SHA512:
-  metadata.gz: 4c5a83ec75a1bd656fcdf8c4a4505f3013cf155e03b0b3d638c0807ecc520a656b362ba9c8f75fd135ece248e030b984a95c24784b7947fab46b8f78b68688df
-  data.tar.gz: 7ec0169479bfb8edf3b9767f4cd5daed9ce607ed0b3472a15cfceb2f6a59654654cb1a822a7502c0ecbcbac04c65854c8473b8437f27eaebe0be79d39dbc19f6
+  metadata.gz: 6dfdd6e75dc5c276f8394a82bb7750e4c4db093c7d1744b4d1cff418a4606d31bb9530ea4c1e896703e6fe651d3923c3094e42a19cc6c98d181df99165b88dbe
+  data.tar.gz: 0ae3202e02a5b2e79be030189a1b73bc0fdfcb09b35574f36c05a0059834316ca5ac864d79941a4c7b228eefe5e0d9ccc65347f525286f1b19aaf226cc201688

data/lib/active_record/filter.rb

@@ -1,6 +1,5 @@
 require 'active_record'
 require 'arel/extensions'
-require 'action_controller/metal/strong_parameters'
 
 class ActiveRecord::UnkownFilterError < NoMethodError
 end
@@ -58,14 +57,15 @@ module ActiveRecord
             elsif value != true && value != false && value != 'true' && value != 'false' && !value.nil?
               relations << key
             end
-          elsif key.to_s.ends_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's')]
+          elsif !klass.columns_hash.has_key?(key.to_s) && key.to_s.ends_with?('_ids') && reflection = klass._reflections[key.to_s.gsub(/_ids$/, 's')]
             relations << reflection.name
           elsif reflection = klass.reflect_on_all_associations(:has_and_belongs_to_many).find {|r| r.join_table == key.to_s && value.keys.first.to_s == r.association_foreign_key.to_s }
-            reflection = klass._reflections[klass._reflections[reflection.name.to_s].delegate_reflection.options[:through].to_s]
+            reflection = klass._reflections[klass._reflections[reflection.name.to_s].send(:delegate_reflection).options[:through].to_s]
             relations << {reflection.name => build_filter_joins(reflection.klass, value)}
           end
         end
       end
+      puts [relations, custom].inspect
       [relations, custom]
     end
     
@@ -167,9 +167,9 @@ module ActiveRecord
     def expand_filter_for_arel_attribute(column, attribute, key, value)
       case key.to_sym
       when :contains
-        attribute.contains(column.array ? Array(convert_filter_value(column, value)) : convert_filter_value(column, value))
+        attribute.contains(column.array ? convert_filter_value(column, Array(value)) : convert_filter_value(column, value))
       when :contained_by
-        attribute.contained_by(column.array ? Array(convert_filter_value(column, value)) : convert_filter_value(column, value))
+        attribute.contained_by(column.array ? convert_filter_value(column, Array(value)) : convert_filter_value(column, value))
       when :equal_to, :eq
         attribute.eq(convert_filter_value(column, value))
       when :excludes
@@ -179,7 +179,11 @@ module ActiveRecord
       when :greater_than_or_equal_to, :gteq, :gte
         attribute.gteq(convert_filter_value(column, value))
       when :has_key
-        attribute.has_key(convert_filter_value(column, value))
+        attribute.has_key(value)
+      when :has_keys
+        attribute.has_keys(*Array(value))
+      when :has_any_key
+        attribute.has_any_key(*Array(value))
       when :in
         attribute.in(convert_filter_value(column, value))
       when :intersects
@@ -220,7 +224,17 @@ module ActiveRecord
           attribute.ts_query(convert_filter_value(column, value))
         end
       when :within
-        attribute.within(value)
+        if value.is_a?(String)
+          if /\A[0-9A-F]*\Z/i.match?(value) && (value.start_with?('00') || value.start_with?('01'))
+            attribute.within(Arel::Nodes::HexEncodedBinary.new(value))
+          else
+            attribute.within(Arel::Nodes.build_quoted(value))
+          end
+        elsif value.is_a?(Hash)
+          attribute.within(Arel::Nodes.build_quoted(value))
+        else
+          raise "Not Supported value for within: #{value.inspect}"
+        end
       else
         raise "Not Supported: #{key.to_sym}"
       end
@@ -265,7 +279,7 @@ module ActiveRecord
     end
     
     def expand_filter_for_join_table(relation, value, join_dependency)
-      relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].delegate_reflection.options[:through].to_s]
+      relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].send(:delegate_reflection).options[:through].to_s]
 
       builder = associated_predicate_builder(relation.name.to_sym)
       if join_dependency
@@ -288,8 +302,6 @@ module ActiveRecord
       end
 
       def build(filters, join_dependency)
-        binds = []
-
         if filters.is_a?(Hash) || filters.is_a?(Array)
           # attributes = predicate_builder.resolve_column_aliases(filters)
           # attributes = klass.send(:expand_hash_conditions_for_aggregates, attributes)
@@ -301,7 +313,7 @@ module ActiveRecord
           raise ArgumentError, "Unsupported argument type: #{filters.inspect} (#{filters.class})"
         end
         
-        WhereClause.new(parts, binds)
+        WhereClause.new(parts)
       end
 
       protected
@@ -314,8 +326,9 @@ end
 class ActiveRecord::Relation
   module Filter
 
-    def initialize(klass, table, predicate_builder, values = {})
+    def initialize(klass, table: klass.arel_table, predicate_builder: klass.predicate_builder, values: {})
       @filters = []
+      @join_dependency = nil
       super
     end
     
@@ -324,14 +337,18 @@ class ActiveRecord::Relation
       super
     end
     
-    def filter(filters)
-      if filters.is_a?(ActionController::Parameters)
-        filters = filters.to_unsafe_h 
-      elsif filters.is_a?(Array)
-        filters.map! do |f|
-          f.is_a?(ActionController::Parameters) ? f.to_unsafe_h : f
-        end
+    def clean_filters(value)
+      if value.class.name == 'ActionController::Parameters'.freeze
+        value.to_unsafe_h
+      elsif value.is_a?(Array)
+        value.map { |v| clean_filters(v) }
+      else
+        value
       end
+    end
+
+    def filter(filters)
+      filters = clean_filters(filters)
       
       if filters.nil? || filters.empty?
         self
@@ -350,13 +367,13 @@ class ActiveRecord::Relation
       @filter_clause_factory ||= FilterClauseFactory.new(klass, predicate_builder)
     end
     
-    def build_arel
+    def build_arel(aliases)
       arel = super
       build_filters(arel)
       arel
     end
 
-    def build_join_query(manager, buckets, join_type)
+    def build_join_query(manager, buckets, join_type, aliases)
       buckets.default = []
 
       association_joins         = buckets[:association_join]
@@ -364,33 +381,36 @@ class ActiveRecord::Relation
       join_nodes                = buckets[:join_node].uniq
       string_joins              = buckets[:string_join].map(&:strip).uniq
 
-      join_list = join_nodes + convert_join_strings_to_ast(manager, string_joins)
+      join_list = join_nodes + convert_join_strings_to_ast(string_joins)
+      alias_tracker = alias_tracker(join_list, aliases)
 
       join_dependency = ActiveRecord::Associations::JoinDependency.new(
-        @klass,
-        association_joins,
-        join_list
+        klass, table, association_joins, alias_tracker
       )
       
-      join_infos = join_dependency.join_constraints stashed_association_joins, join_type
+      joins = join_dependency.join_constraints(stashed_association_joins, join_type)
+      joins.each { |join| manager.from(join) }
+      # join_infos = join_dependency.join_constraints stashed_association_joins, join_type
 
-      join_infos.each do |info|
-        info.joins.each { |join| manager.from(join) }
-        manager.bind_values.concat info.binds
-      end
+      # join_infos.each do |info|
+      #   info.joins.each { |join| manager.from(join) }
+      #   manager.bind_values.concat info.binds
+      # end
+
+      # manager.join_sources.concat(join_list)
 
       manager.join_sources.concat(join_list)
 
-      if @klass.connection.class.name != 'ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter'
+      if klass.connection.class.name != 'ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter'
         @join_dependency = join_dependency
       end
       
-      manager
+      alias_tracker.aliases
     end
     
     def build_filters(manager)
       @filters.each do |filters|
-        manager.where(filter_clause_factory.build(filters, @join_dependency&.join_root).ast)
+        manager.where(filter_clause_factory.build(filters, @join_dependency&.send(:join_root)).ast)
       end
     end
 

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '5.0.0.7'
+    VERSION = '5.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.0.0.7
+  version: 5.2.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,74 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: arel-extensions
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,14 +148,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A safe way to accept user parameters and query against your ActiveRecord