mongoid 5.4.1 → 6.1.1

data/spec/mongoid/matchable/all_spec.rb

@@ -6,25 +6,25 @@ describe Mongoid::Matchable::All do
     described_class.new(["first", "second", "third"])
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the attribute includes all of the values" do
 
       it "returns true" do
-        expect(matcher.matches?("$all" => ["first", /\Asec.*\z/])).to be true
+        expect(matcher._matches?("$all" => ["first", /\Asec.*\z/])).to be true
       end
     end
 
     context "when the attributes doesn't include all of the values" do
 
       it "returns false" do
-        expect(matcher.matches?("$all" => ["second", "third", "fourth"])).to be false
+        expect(matcher._matches?("$all" => ["second", "third", "fourth"])).to be false
       end
     end
 
     context "when the value is empty" do
       it "returns false" do
-        expect(matcher.matches?("$all" => [])).to be false
+        expect(matcher._matches?("$all" => [])).to be false
       end
     end
   end

data/spec/mongoid/matchable/and_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Matchable::And do
     described_class.new("value", person)
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when provided a simple expression" do
 
@@ -19,7 +19,7 @@ describe Mongoid::Matchable::And do
         context "when the value matches" do
 
           let(:matches) do
-            matcher.matches?([ { title: "Sir" } ])
+            matcher._matches?([ { title: "Sir" } ])
           end
 
           before do
@@ -34,7 +34,7 @@ describe Mongoid::Matchable::And do
         context "when the expression is a $not" do
 
           let(:matches) do
-            matcher.matches?([ { title: {:$not => /Foobar/ } }])
+            matcher._matches?([ { title: {:$not => /Foobar/ } }])
           end
 
           context "when the value matches" do
@@ -59,7 +59,7 @@ describe Mongoid::Matchable::And do
         context "when the value does not match" do
 
           let(:matches) do
-            matcher.matches?([ { title: "Sir" } ])
+            matcher._matches?([ { title: "Sir" } ])
           end
 
           it "returns false" do
@@ -73,7 +73,7 @@ describe Mongoid::Matchable::And do
         context "when all of the values are equal" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [ { title: "Sir" }, { _id: person.id } ]
             )
           end
@@ -90,7 +90,7 @@ describe Mongoid::Matchable::And do
         context "when one of the values does not match" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [ { title: "Sir" }, { _id: BSON::ObjectId.new } ]
             )
           end
@@ -107,7 +107,7 @@ describe Mongoid::Matchable::And do
         context "when provided no expressions" do
 
           let(:matches) do
-            matcher.matches?([])
+            matcher._matches?([])
           end
 
           it "returns true" do
@@ -122,7 +122,7 @@ describe Mongoid::Matchable::And do
       context "when all of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Sir", "Madam" ] } },
               { _id: person.id }
@@ -142,7 +142,7 @@ describe Mongoid::Matchable::And do
       context "when one of the values does not match" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Prince", "Madam" ] } },
               { _id: BSON::ObjectId.new }
@@ -164,7 +164,7 @@ describe Mongoid::Matchable::And do
         context "when all the expressions match" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [
                 { title: "Sir", age: 23 },
                 { _id: person.id }

data/spec/mongoid/matchable/default_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Default do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when comparing strings" do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          expect(matcher.matches?("Testing")).to be true
+          expect(matcher._matches?("Testing")).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          expect(matcher.matches?("Other")).to be false
+          expect(matcher._matches?("Other")).to be false
         end
       end
     end
@@ -38,14 +38,14 @@ describe Mongoid::Matchable::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          expect(matcher.matches?(object_id)).to be true
+          expect(matcher._matches?(object_id)).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          expect(matcher.matches?(BSON::ObjectId.new)).to be false
+          expect(matcher._matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -61,14 +61,14 @@ describe Mongoid::Matchable::Default do
         context "when the value is a string" do
 
           it "returns true" do
-            expect(matcher.matches?("Test1")).to be true
+            expect(matcher._matches?("Test1")).to be true
           end
         end
 
         context "when the value is a regexp" do
 
           it "returns true" do
-            expect(matcher.matches?(/^Test[3-5]$/)).to be true
+            expect(matcher._matches?(/^Test[3-5]$/)).to be true
           end
         end
       end
@@ -76,7 +76,7 @@ describe Mongoid::Matchable::Default do
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?("Test4")).to be false
+          expect(matcher._matches?("Test4")).to be false
         end
       end
     end
@@ -94,14 +94,14 @@ describe Mongoid::Matchable::Default do
       context "when the attribute contains the value" do
 
         it "returns true" do
-          expect(matcher.matches?(object_id)).to be true
+          expect(matcher._matches?(object_id)).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?(BSON::ObjectId.new)).to be false
+          expect(matcher._matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -115,14 +115,14 @@ describe Mongoid::Matchable::Default do
       context "when the attribute contains the value" do
 
         it "returns true" do
-          expect(matcher.matches?(["Test1", "Test2", "Test3"])).to be true
+          expect(matcher._matches?(["Test1", "Test2", "Test3"])).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?(["Test1", "Test2"])).to be false
+          expect(matcher._matches?(["Test1", "Test2"])).to be false
         end
       end
     end

data/spec/mongoid/matchable/elem_match_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+
+describe Mongoid::Matchable::ElemMatch do
+
+  let(:attribute) {[{"a" => 1, "b" => 2}, {"a" => 2, "b" => 2}, {"a" => 3, "b" => 1}]}
+  let(:matcher) do
+    described_class.new(attribute)
+  end
+
+  describe "#_matches?" do
+
+    context "when the attribute is not an array" do
+
+      let(:attribute) {"string"}
+
+      it "returns false" do
+        expect(matcher._matches?("$elemMatch" => {"a" => 1})).to be false
+      end
+    end
+
+    context "when the $elemMatch is not a hash" do
+
+      let(:attribute) {"string"}
+
+      it "returns false" do
+        expect(matcher._matches?("$elemMatch" => [])).to be false
+      end
+    end
+
+    context "when there is a sub document that matches the criteria" do
+
+      it "returns true" do
+        expect(matcher._matches?("$elemMatch" => {"a" => 1})).to be true
+      end
+
+      context "when evaluating multiple fields of the subdocument" do
+
+        it "returns true" do
+          expect(matcher._matches?("$elemMatch" => {"a" => 1, "b" => 2})).to be true
+        end
+
+        context "when the $elemMatch document keys are out of order" do
+
+          it "returns true" do
+            expect(matcher._matches?("$elemMatch" => {"b" => 2, "a" => 1})).to be true
+          end
+        end
+      end
+
+      context "when using other operators that match" do
+
+        it "returns true" do
+          expect(matcher._matches?("$elemMatch" => {"a" => {"$in" => [1]}, "b" => {"$gt" => 1}})).to be true
+        end
+      end
+    end
+
+    context "when there is not a sub document that matches the criteria" do
+
+      it "returns false" do
+        expect(matcher._matches?("$elemMatch" => {"a" => 10})).to be false
+      end
+
+      context "when evaluating multiple fields of the subdocument" do
+
+        it "returns false" do
+          expect(matcher._matches?("$elemMatch" => {"a" => 1, "b" => 3})).to be false
+        end
+      end
+
+      context "when using other operators that do not match" do
+
+        it "returns true" do
+          expect(matcher._matches?("$elemMatch" => {"a" => {"$in" => [1]}, "b" => {"$gt" => 10}})).to be false
+        end
+      end
+    end
+
+    context "when using a criteria that matches partially but not a single sub document" do
+
+      it "returns false" do
+        expect(matcher._matches?("$elemMatch" => {"a" => 3, "b" => 2})).to be false
+      end
+    end
+  end
+end

data/spec/mongoid/matchable/exists_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Exists do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when checking for existence" do
 
@@ -13,7 +13,7 @@ describe Mongoid::Matchable::Exists do
         end
 
         it "returns true" do
-          expect(matcher.matches?("$exists" => true)).to be true
+          expect(matcher._matches?("$exists" => true)).to be true
         end
       end
 
@@ -24,7 +24,7 @@ describe Mongoid::Matchable::Exists do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$exists" => true)).to be false
+          expect(matcher._matches?("$exists" => true)).to be false
         end
       end
     end
@@ -38,7 +38,7 @@ describe Mongoid::Matchable::Exists do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$exists" => false)).to be false
+          expect(matcher._matches?("$exists" => false)).to be false
         end
       end
 
@@ -49,7 +49,7 @@ describe Mongoid::Matchable::Exists do
         end
 
         it "returns true" do
-          expect(matcher.matches?("$exists" => false)).to be true
+          expect(matcher._matches?("$exists" => false)).to be true
         end
       end
     end

data/spec/mongoid/matchable/gt_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Gt do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Gt do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$gt" => 3)).to be true
+        expect(matcher._matches?("$gt" => 3)).to be true
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Gt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gt" => 3)).to be false
+        expect(matcher._matches?("$gt" => 3)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Gt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gt" => 10)).to be false
+        expect(matcher._matches?("$gt" => 10)).to be false
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchable::Gt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gt" => 5)).to be false
+        expect(matcher._matches?("$gt" => 5)).to be false
       end
     end
 
@@ -56,7 +56,7 @@ describe Mongoid::Matchable::Gt do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$gt" => 5)).to be true
+          expect(matcher._matches?("$gt" => 5)).to be true
         end
       end
 
@@ -67,9 +67,20 @@ describe Mongoid::Matchable::Gt do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$gt" => 5)).to be false
+          expect(matcher._matches?("$gt" => 5)).to be false
         end
       end
     end
+
+    context "when the value is not numeric" do
+
+      let(:matcher) do
+        described_class.new(5)
+      end
+
+      it "returns false" do
+        expect(matcher._matches?("$gt" => '4.9')).to be false
+      end
+    end
   end
 end

data/spec/mongoid/matchable/gte_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Gte do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Gte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$gte" => 3)).to be true
+        expect(matcher._matches?("$gte" => 3)).to be true
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Gte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gte" => 10)).to be false
+        expect(matcher._matches?("$gte" => 10)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Gte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$gte" => 5)).to be true
+        expect(matcher._matches?("$gte" => 5)).to be true
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchable::Gte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gte" => 5)).to be false
+        expect(matcher._matches?("$gte" => 5)).to be false
       end
     end
 
@@ -55,7 +55,7 @@ describe Mongoid::Matchable::Gte do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$gte" => 5)).to be true
+          expect(matcher._matches?("$gte" => 5)).to be true
         end
       end
 
@@ -65,9 +65,19 @@ describe Mongoid::Matchable::Gte do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$gte" => 5)).to be false
+          expect(matcher._matches?("$gte" => 5)).to be false
         end
+      end
+    end
+
+    context "when the value is not numeric" do
+
+      let(:matcher) do
+        described_class.new(5)
+      end
 
+      it "returns false" do
+        expect(matcher._matches?("$gte" => '4.9')).to be false
       end
     end
   end