mongoid 6.1.0 → 6.2.0

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,7 +67,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
     end
@@ -79,7 +79,7 @@ describe Mongoid::Matchable::Gt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gt" => '4.9')).to be false
+        expect(matcher._matches?("$gt" => '4.9')).to be false
       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,7 +65,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
     end
@@ -77,7 +77,7 @@ describe Mongoid::Matchable::Gte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$gte" => '4.9')).to be false
+        expect(matcher._matches?("$gte" => '4.9')).to be false
       end
     end
   end

data/spec/mongoid/matchable/in_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::In do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context 'when the attribute is not nil' do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::In do
       context "when the values include the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$in" => [/\Afir.*\z/, "second"])).to be true
+          expect(matcher._matches?("$in" => [/\Afir.*\z/, "second"])).to be true
         end
       end
 
       context "when the values don't include the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$in" => ["third"])).to be false
+          expect(matcher._matches?("$in" => ["third"])).to be false
         end
       end
     end
@@ -34,14 +34,14 @@ describe Mongoid::Matchable::In do
       context "when the values include the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$in" => [/\Afir.*\z/, nil])).to be true
+          expect(matcher._matches?("$in" => [/\Afir.*\z/, nil])).to be true
         end
       end
 
       context "when the values don't include the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$in" => ["third"])).to be false
+          expect(matcher._matches?("$in" => ["third"])).to be false
         end
       end
     end

data/spec/mongoid/matchable/lt_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Lt do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 3)).to be false
+        expect(matcher._matches?("$lt" => 3)).to be false
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 3)).to be false
+        expect(matcher._matches?("$lt" => 3)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lt" => 10)).to be true
+        expect(matcher._matches?("$lt" => 10)).to be true
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 5)).to be false
+        expect(matcher._matches?("$lt" => 5)).to be false
       end
     end
 
@@ -55,7 +55,7 @@ describe Mongoid::Matchable::Lt do
         end
 
         it "returns true" do
-          expect(matcher.matches?("$lt" => 5)).to be true
+          expect(matcher._matches?("$lt" => 5)).to be true
         end
       end
 
@@ -65,7 +65,7 @@ describe Mongoid::Matchable::Lt do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$lt" => 5)).to be false
+          expect(matcher._matches?("$lt" => 5)).to be false
         end
 
       end
@@ -78,7 +78,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => '5.1')).to be false
+        expect(matcher._matches?("$lt" => '5.1')).to be false
       end
     end
   end

data/spec/mongoid/matchable/lte_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Lte do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lte" => 3)).to be false
+        expect(matcher._matches?("$lte" => 3)).to be false
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lte" => 10)).to be true
+        expect(matcher._matches?("$lte" => 10)).to be true
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lte" => 5)).to be true
+        expect(matcher._matches?("$lte" => 5)).to be true
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lte" => 5)).to be false
+        expect(matcher._matches?("$lte" => 5)).to be false
       end
     end
 
@@ -56,7 +56,7 @@ describe Mongoid::Matchable::Lte do
         end
 
         it "returns true" do
-          expect(matcher.matches?("$lte" => 5)).to be true
+          expect(matcher._matches?("$lte" => 5)).to be true
         end
       end
 
@@ -66,7 +66,7 @@ describe Mongoid::Matchable::Lte do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$lte" => 5)).to be false
+          expect(matcher._matches?("$lte" => 5)).to be false
         end
       end
     end
@@ -78,7 +78,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lte" => '5.1')).to be false
+        expect(matcher._matches?("$lte" => '5.1')).to be false
       end
     end
   end

data/spec/mongoid/matchable/ne_spec.rb

@@ -6,19 +6,19 @@ describe Mongoid::Matchable::Ne do
     described_class.new("first")
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the values are not equal" do
 
       it "returns true" do
-        expect(matcher.matches?("$ne" => "second")).to be true
+        expect(matcher._matches?("$ne" => "second")).to be true
       end
     end
 
     context "when the values are equal" do
 
       it "returns false" do
-        expect(matcher.matches?("$ne" => "first")).to be false
+        expect(matcher._matches?("$ne" => "first")).to be false
       end
     end
 
@@ -31,14 +31,14 @@ describe Mongoid::Matchable::Ne do
       context "when the value is in the array" do
 
         it "returns false" do
-          expect(array_matcher.matches?("$ne" => "first")).to be false
+          expect(array_matcher._matches?("$ne" => "first")).to be false
         end
       end
 
       context "when the value is not in the array" do
 
         it "returns true" do
-          expect(array_matcher.matches?("$ne" => "second")).to be true
+          expect(array_matcher._matches?("$ne" => "second")).to be true
         end
       end
     end

data/spec/mongoid/matchable/nin_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Nin do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context 'when the attribute is not nil' do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::Nin do
       context "when the values do not contain the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$nin" => ["second", "third"])).to be true
+          expect(matcher._matches?("$nin" => ["second", "third"])).to be true
         end
       end
 
       context "when the values contain the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$nin" => ["first"])).to be false
+          expect(matcher._matches?("$nin" => ["first"])).to be false
         end
       end
     end
@@ -33,14 +33,14 @@ describe Mongoid::Matchable::Nin do
       context "when the values do not contain the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$nin" => ["third"])).to be true
+          expect(matcher._matches?("$nin" => ["third"])).to be true
         end
       end
 
       context "when the values contain the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$nin" => [/\Afir.*\z/, nil])).to be false
+          expect(matcher._matches?("$nin" => [/\Afir.*\z/, nil])).to be false
         end
       end
     end

data/spec/mongoid/matchable/or_spec.rb

@@ -10,14 +10,14 @@ describe Mongoid::Matchable::Or do
     described_class.new("value", person)
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when provided a simple expression" do
 
       context "when any of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [ { title: "Sir" }, { title: "King" } ]
           )
         end
@@ -34,14 +34,14 @@ describe Mongoid::Matchable::Or do
       context "when none of the values are equal" do
 
         it "returns false" do
-          expect(matcher.matches?([])).to be false
+          expect(matcher._matches?([])).to be false
         end
       end
 
       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
@@ -69,7 +69,7 @@ describe Mongoid::Matchable::Or do
       context "when any of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Sir", "Madam" ] } },
               { title: "King" }
@@ -89,7 +89,7 @@ describe Mongoid::Matchable::Or do
       context "when none of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Prince", "Madam" ] } },
               { title: "King" }
@@ -109,7 +109,7 @@ describe Mongoid::Matchable::Or do
       context "when expression contain multiple fields" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: "Sir", age: 23 },
               { title: "King", age: 100 }

data/spec/mongoid/matchable/regexp_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+describe Mongoid::Matchable::Regexp do
+
+  let(:matcher) do
+    described_class.new(attribute)
+  end
+
+  let(:attribute) do
+    'Emily'
+  end
+
+  describe '#_matches?' do
+
+    context 'when a BSON::Regexp::Raw object is passed' do
+
+      let(:regexp) do
+        BSON::Regexp::Raw.new('^Em')
+      end
+
+      it 'compiles the regexp object to a native regexp for the matching' do
+        expect(matcher._matches?(regexp)).to be(true)
+      end
+
+      context 'when the value does not match the attribute' do
+
+        let(:attribute) do
+          'ily'
+        end
+
+        it 'compiles the regexp object to a native regexp for the matching' do
+          expect(matcher._matches?(regexp)).to be(false)
+        end
+      end
+    end
+
+    context 'when a native Regexp object is passed' do
+
+      let(:regexp) do
+        /^Em/
+      end
+
+      it 'calls super with the native regexp' do
+        expect(matcher._matches?(regexp)).to be(true)
+      end
+
+      context 'when the value does not match the attribute' do
+
+        let(:attribute) do
+          'ily'
+        end
+
+        it 'compiles the regexp object to a native regexp for the matching' do
+          expect(matcher._matches?(regexp)).to be(false)
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/matchable/size_spec.rb

@@ -6,19 +6,19 @@ describe Mongoid::Matchable::Size do
     described_class.new(["first", "second"])
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the attribute is the same size" do
 
       it "returns true" do
-        expect(matcher.matches?("$size" => 2)).to be true
+        expect(matcher._matches?("$size" => 2)).to be true
       end
     end
 
     context "when the attribute is not the same size" do
 
       it "returns false" do
-        expect(matcher.matches?("$size" => 5)).to be false
+        expect(matcher._matches?("$size" => 5)).to be false
       end
     end
   end