MONGOID-4918 Test embedded matchers with unusual document value types

lib/mongoid/matcher/all.rb

@@ -8,7 +8,7 @@ module All
           raise Errors::InvalidQuery, "$all argument must be an array: #{Errors::InvalidQuery.truncate_expr(condition)}"
         end
 
-        condition.any? && condition.all? do |c|
+        !condition.empty? && condition.all? do |c|
           case c
           when ::Regexp, BSON::Regexp::Raw
             Regex.matches_array_or_scalar?(value, c)

lib/mongoid/matcher/field_operator.rb

@@ -34,10 +34,18 @@ module FieldOperator
         end
       end
 
-      module_function def soft_apply_operator(operator, left, right)
-        left&.send(operator, right)
-      rescue ArgumentError
-        false
+      module_function def apply_comparison_operator(operator, left, right)
+        case left
+        when Numeric
+          case right
+          when Numeric
+            left.send(operator, right)
+          else
+            false
+          end
+        else
+          false
+        end
       end
     end
   end

lib/mongoid/matcher/gt.rb

@@ -5,7 +5,7 @@ module Matcher
     module Gt
       module_function def matches?(exists, value, condition)
         FieldOperator.apply_array_field_operator(exists, value, condition) do |v|
-          FieldOperator.soft_apply_operator(:>, v, condition)
+          FieldOperator.apply_comparison_operator(:>, v, condition)
         end
       end
     end

lib/mongoid/matcher/gte.rb

@@ -5,7 +5,7 @@ module Matcher
     module Gte
       module_function def matches?(exists, value, condition)
         FieldOperator.apply_array_field_operator(exists, value, condition) do |v|
-          FieldOperator.soft_apply_operator(:>=, v, condition)
+          FieldOperator.apply_comparison_operator(:>=, v, condition)
         end
       end
     end

lib/mongoid/matcher/lt.rb

@@ -5,7 +5,7 @@ module Matcher
     module Lt
       module_function def matches?(exists, value, condition)
         FieldOperator.apply_array_field_operator(exists, value, condition) do |v|
-          FieldOperator.soft_apply_operator(:<, v, condition)
+          FieldOperator.apply_comparison_operator(:<, v, condition)
         end
       end
     end

lib/mongoid/matcher/lte.rb

@@ -5,7 +5,7 @@ module Matcher
     module Lte
       module_function def matches?(exists, value, condition)
         FieldOperator.apply_array_field_operator(exists, value, condition) do |v|
-          FieldOperator.soft_apply_operator(:<=, v, condition)
+          FieldOperator.apply_comparison_operator(:<=, v, condition)
         end
       end
     end

lib/mongoid/matcher/regex.rb

@@ -4,18 +4,27 @@ module Matcher
     # @api private
     module Regex
       module_function def matches?(exists, value, condition)
-        if condition.respond_to?(:compile)
-          # BSON::Regexp::Raw
-          condition = condition.compile
-        end
-        case condition
+        condition = case condition
         when Regexp
-          value =~ condition
+          condition
+        when BSON::Regexp::Raw
+          condition.compile
         when String
-          value =~ Regexp.new(condition)
+          Regexp.new(condition)
         else
           raise Errors::InvalidQuery, "$regex requires a regular expression or a string argument: #{Errors::InvalidQuery.truncate_expr(condition)}"
         end
+
+        case value
+        when Array
+          value.any? do |v|
+            v =~ condition
+          end
+        when String
+          value =~ condition
+        else
+          false
+        end
       end
 
       module_function def matches_array_or_scalar?(value, condition)

spec/integration/matcher_operator_data/all.yml

@@ -103,3 +103,27 @@
       $all:
         ceo
   error: true
+
+- name: field value is null
+  document:
+    products: ~
+  query:
+    products:
+      $all: [1, 2]
+  matches: false
+
+- name: field value is numeric
+  document:
+    products: 42
+  query:
+    products:
+      $all: [42]
+  matches: true
+
+- name: field value is null and query is for null value
+  document:
+    products: ~
+  query:
+    products:
+      $all: [~]
+  matches: true

spec/integration/matcher_operator_data/and.yml

@@ -81,3 +81,13 @@
     $and:
       foo: bar
   error: true
+
+- name: field value is null
+  document:
+    products: ~
+  query:
+    $and:
+      -
+        products:
+          $ne: a
+  matches: true

spec/integration/matcher_operator_data/elem_match.yml

@@ -274,3 +274,42 @@
     positions:
       $elemMatch: []
   error: true
+
+- name: field value is a number
+  document:
+    tags: 12
+  query:
+    tags:
+      $elemMatch:
+        $eq: 12
+  matches: false
+
+- name: field value is an empty array
+  document:
+    tags: []
+  query:
+    tags:
+      $elemMatch:
+        $not:
+          $eq: y
+  matches: false
+
+- name: field value is an empty hash
+  document:
+    tags: {}
+  query:
+    tags:
+      $elemMatch:
+        $not:
+          $eq: y
+  matches: false
+
+- name: field value is null
+  document:
+    tags: ~
+  query:
+    tags:
+      $elemMatch:
+        $not:
+          $eq: y
+  matches: false

spec/integration/matcher_operator_data/eq.yml

@@ -181,3 +181,11 @@
     positions:
       $eq: ~
   matches: false
+
+- name: null field value vs nil argument
+  document:
+    positions: ~
+  query:
+    positions:
+      $eq: ~
+  matches: true

spec/integration/matcher_operator_data/gt.yml

@@ -109,3 +109,11 @@
     count:
       $gt: []
   matches: false
+
+- name: field value is an empty hash
+  document:
+    counts: {}
+  query:
+    counts:
+      $gt: 11
+  matches: false

spec/integration/matcher_operator_data/gte.yml

@@ -109,3 +109,11 @@
     count:
       $gte: []
   matches: false
+
+- name: field value is an empty hash
+  document:
+    counts: {}
+  query:
+    counts:
+      $gte: 11
+  matches: false

spec/integration/matcher_operator_data/lt.yml

@@ -109,3 +109,11 @@
     count:
       $lt: []
   matches: false
+
+- name: field value is an empty hash
+  document:
+    counts: {}
+  query:
+    counts:
+      $lt: 11
+  matches: false

spec/integration/matcher_operator_data/lte.yml

@@ -109,3 +109,11 @@
     count:
       $lte: []
   matches: false
+
+- name: field value is an empty hash
+  document:
+    counts: {}
+  query:
+    counts:
+      $lte: 11
+  matches: false

spec/integration/matcher_operator_data/nor.yml

@@ -114,3 +114,13 @@
     $nor:
       foo: bar
   error: true
+
+- name: field value is null
+  document:
+    products: ~
+  query:
+    $nor:
+      -
+        products:
+          $eq: a
+  matches: true

spec/integration/matcher_operator_data/or.yml

@@ -125,3 +125,13 @@
     $or:
       foo: bar
   error: true
+
+- name: field value is null
+  document:
+    products: ~
+  query:
+    $or:
+      -
+        products:
+          $ne: a
+  matches: true

spec/integration/matcher_operator_data/regex.yml

@@ -83,3 +83,65 @@
     position:
       $regex: 42
   error: true
+
+- name: numeric field value - matches if stringified
+  document:
+    title: 42
+  query:
+    title:
+      $regex:
+        '42'
+  matches: false
+
+- name: array field value - matches an element
+  document:
+    title:
+      - foo
+  query:
+    title:
+      $regex: foo
+  matches: true
+
+- name: array field value - does not match an element
+  document:
+    title:
+      - foo
+  query:
+    title:
+      $regex: bar
+  matches: false
+
+- name: empty array field value
+  document:
+    title: []
+  query:
+    title:
+      $regex: bar
+  matches: false
+
+- name: true field value
+  document:
+    title: true
+  query:
+    title:
+      $regex:
+        'true'
+  matches: false
+
+- name: false field value
+  document:
+    title: false
+  query:
+    title:
+      $regex:
+        'false'
+  matches: false
+
+- name: nil field value
+  document:
+    title: ~
+  query:
+    title:
+      $regex:
+        ''
+  matches: false