mongoid 3.1.6 → 4.0.2

data/spec/mongoid/extensions/object_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns self" do
-      object.__evolve_object_id__.should eq(object)
+      expect(object.__evolve_object_id__).to eq(object)
     end
   end
 
@@ -20,7 +20,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns self" do
-      object.__find_args__.should eq(object)
+      expect(object.__find_args__).to eq(object)
     end
   end
 
@@ -31,7 +31,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns self" do
-      object.__mongoize_object_id__.should eq(object)
+      expect(object.__mongoize_object_id__).to eq(object)
     end
   end
 
@@ -50,7 +50,7 @@ describe Mongoid::Extensions::Object do
       context "when provided an object id" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:fk) do
@@ -58,7 +58,7 @@ describe Mongoid::Extensions::Object do
         end
 
         it "returns the object id" do
-          fk.should eq(object_id)
+          expect(fk).to eq(object_id)
         end
       end
 
@@ -67,7 +67,7 @@ describe Mongoid::Extensions::Object do
         context "when the string is a legal object id" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:fk) do
@@ -75,7 +75,7 @@ describe Mongoid::Extensions::Object do
           end
 
           it "returns the object id" do
-            fk.should eq(object_id)
+            expect(fk).to eq(object_id)
           end
         end
 
@@ -90,7 +90,7 @@ describe Mongoid::Extensions::Object do
           end
 
           it "returns the string" do
-            fk.should eq(string)
+            expect(fk).to eq(string)
           end
         end
 
@@ -101,7 +101,7 @@ describe Mongoid::Extensions::Object do
           end
 
           it "returns nil" do
-            fk.should be_nil
+            expect(fk).to be_nil
           end
         end
       end
@@ -113,7 +113,7 @@ describe Mongoid::Extensions::Object do
         end
 
         it "returns nil" do
-          fk.should be_nil
+          expect(fk).to be_nil
         end
       end
 
@@ -124,7 +124,7 @@ describe Mongoid::Extensions::Object do
         end
 
         it "returns an empty array" do
-          fk.should eq([])
+          expect(fk).to eq([])
         end
       end
     end
@@ -137,7 +137,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns self" do
-      object.__mongoize_time__.should eq(object)
+      expect(object.__mongoize_time__).to eq(object)
     end
   end
 
@@ -148,7 +148,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns self" do
-      object.__sortable__.should eq(object)
+      expect(object.__sortable__).to eq(object)
     end
   end
 
@@ -159,7 +159,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns the provided object" do
-      Object.demongoize(object).should eq(object)
+      expect(Object.demongoize(object)).to eq(object)
     end
   end
 
@@ -172,7 +172,7 @@ describe Mongoid::Extensions::Object do
       end
 
       it "returns nil" do
-        result.should be_nil
+        expect(result).to be_nil
       end
     end
 
@@ -185,7 +185,7 @@ describe Mongoid::Extensions::Object do
         end
 
         it "returns the result of the method" do
-          result.should eq("Yoda,Luke")
+          expect(result).to eq("Yoda,Luke")
         end
       end
 
@@ -196,7 +196,7 @@ describe Mongoid::Extensions::Object do
         end
 
         it "returns the result of the method" do
-          result.should be_nil
+          expect(result).to be_nil
         end
       end
     end
@@ -209,7 +209,7 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns the provided object" do
-      Object.mongoize(object).should eq(object)
+      expect(Object.mongoize(object)).to eq(object)
     end
   end
 
@@ -220,14 +220,14 @@ describe Mongoid::Extensions::Object do
     end
 
     it "returns the object" do
-      object.mongoize.should eq(object)
+      expect(object.mongoize).to eq(object)
     end
   end
 
   describe "#resizable?" do
 
     it "returns false" do
-      Object.new.should_not be_resizable
+      expect(Object.new).to_not be_resizable
     end
   end
 
@@ -244,7 +244,7 @@ describe Mongoid::Extensions::Object do
       end
 
       it "returns nil" do
-        result.should be_nil
+        expect(result).to be_nil
       end
     end
   end
@@ -258,7 +258,7 @@ describe Mongoid::Extensions::Object do
       end
 
       before do
-        document.instance_variable_set(:@testing, "testing")
+        document.instance_variable_set(:@_testing, "testing")
       end
 
       let!(:removal) do
@@ -266,11 +266,11 @@ describe Mongoid::Extensions::Object do
       end
 
       it "removes the instance variable" do
-        document.instance_variable_defined?(:@testing).should be_false
+        expect(document.instance_variable_defined?(:@_testing)).to be false
       end
 
-      it "returns true" do
-        removal.should be_true
+      it "returns the value" do
+        expect(removal).to eq("testing")
       end
     end
 
@@ -285,7 +285,7 @@ describe Mongoid::Extensions::Object do
       end
 
       it "returns false" do
-        removal.should be_false
+        expect(removal).to be false
       end
     end
   end

data/spec/mongoid/extensions/range_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Extensions::Range do
     end
 
     it "returns the range as an array" do
-      range.__find_args__.should eq([ 1, 2, 3 ])
+      expect(range.__find_args__).to eq([ 1, 2, 3 ])
     end
   end
 
@@ -22,7 +22,18 @@ describe Mongoid::Extensions::Range do
       end
 
       it "returns an ascending range" do
-        Range.demongoize(hash).should eq(1..3)
+        expect(Range.demongoize(hash)).to eq(1..3)
+      end
+    end
+
+    context "when the range is ascending with exclude end" do
+
+      let(:hash) do
+        { "min" => 1, "max" => 3, "exclude_end" => true }
+      end
+
+      it "returns an ascending range" do
+        expect(Range.demongoize(hash)).to eq(1...3)
       end
     end
 
@@ -33,7 +44,18 @@ describe Mongoid::Extensions::Range do
       end
 
       it "returns an descending range" do
-        Range.demongoize(hash).should eq(5..1)
+        expect(Range.demongoize(hash)).to eq(5..1)
+      end
+    end
+
+    context "when the range is descending with exclude end" do
+
+      let(:hash) do
+        { "min" => 5, "max" => 1, "exclude_end" => true }
+      end
+
+      it "returns an descending range" do
+        expect(Range.demongoize(hash)).to eq(5...1)
       end
     end
 
@@ -44,7 +66,18 @@ describe Mongoid::Extensions::Range do
       end
 
       it "returns an alphabetic range" do
-        Range.demongoize(hash).should eq("a".."z")
+        expect(Range.demongoize(hash)).to eq("a".."z")
+      end
+    end
+
+    context "when the range is letters with exclude end" do
+
+      let(:hash) do
+        { "min" => "a", "max" => "z", "exclude_end" => true }
+      end
+
+      it "returns an alphabetic range" do
+        expect(Range.demongoize(hash)).to eq("a"..."z")
       end
     end
   end
@@ -54,22 +87,38 @@ describe Mongoid::Extensions::Range do
     context "when the value is not nil" do
 
       it "returns the object hash" do
-        Range.mongoize(1..3).should eq({ "min" => 1, "max" => 3 })
+        expect(Range.mongoize(1..3)).to eq({ "min" => 1, "max" => 3 })
+      end
+
+      it "returns the object hash when passed an inverse range" do
+        expect(Range.mongoize(5..1)).to eq({ "min" => 5, "max" => 1 })
+      end
+
+      it "returns the object hash when passed a letter range" do
+        expect(Range.mongoize("a".."z")).to eq({ "min" => "a", "max" => "z" })
+      end
+    end
+
+    context "when the value is not nil with exclude end" do
+
+      it "returns the object hash" do
+        expect(Range.mongoize(1...3)).to eq({ "min" => 1, "max" => 3, "exclude_end" => true })
       end
 
       it "returns the object hash when passed an inverse range" do
-        Range.mongoize(5..1).should eq({ "min" => 5, "max" => 1 })
+        expect(Range.mongoize(5...1)).to eq({ "min" => 5, "max" => 1, "exclude_end" => true })
       end
 
       it "returns the object hash when passed a letter range" do
-        Range.mongoize("a".."z").should eq({ "min" => "a", "max" => "z" })
+        expect(Range.mongoize("a"..."z")).to eq({ "min" => "a", "max" => "z", "exclude_end" => true })
       end
+
     end
 
     context "when the value is nil" do
 
       it "returns nil" do
-        Range.mongoize(nil).should be_nil
+        expect(Range.mongoize(nil)).to be_nil
       end
     end
   end
@@ -79,15 +128,15 @@ describe Mongoid::Extensions::Range do
     context "when the value is not nil" do
 
       it "returns the object hash" do
-        (1..3).mongoize.should eq({ "min" => 1, "max" => 3 })
+        expect((1..3).mongoize).to eq({ "min" => 1, "max" => 3 })
       end
 
       it "returns the object hash when passed an inverse range" do
-        (5..1).mongoize.should eq({ "min" => 5, "max" => 1 })
+        expect((5..1).mongoize).to eq({ "min" => 5, "max" => 1 })
       end
 
       it "returns the object hash when passed a letter range" do
-        ("a".."z").mongoize.should eq({ "min" => "a", "max" => "z" })
+        expect(("a".."z").mongoize).to eq({ "min" => "a", "max" => "z" })
       end
     end
   end
@@ -99,7 +148,7 @@ describe Mongoid::Extensions::Range do
     end
 
     it "returns true" do
-      range.should be_resizable
+      expect(range).to be_resizable
     end
   end
 end

data/spec/mongoid/extensions/regexp_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Extensions::Regexp do
     end
 
     it "returns the provided value" do
-      value.should eq(/[^abc]/)
+      expect(value).to eq(/[^abc]/)
     end
   end
 
@@ -22,7 +22,7 @@ describe Mongoid::Extensions::Regexp do
       end
 
       it "returns the provided value" do
-        value.should eq(/[^abc]/)
+        expect(value).to eq(/[^abc]/)
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Extensions::Regexp do
       end
 
       it "returns the provided value as a regex" do
-        value.should eq(/[^abc]/)
+        expect(value).to eq(/[^abc]/)
       end
     end
   end
@@ -41,7 +41,7 @@ describe Mongoid::Extensions::Regexp do
   describe "#mongoize" do
 
     it "returns self" do
-      /[^abc]/.mongoize.should eq(/[^abc]/)
+      expect(/[^abc]/.mongoize).to eq(/[^abc]/)
     end
   end
 end

data/spec/mongoid/extensions/set_spec.rb

@@ -5,18 +5,18 @@ describe Mongoid::Extensions::Set do
   describe "#demongoize" do
 
     it "returns the set if Array" do
-      Set.demongoize([ "test" ]).should eq(Set.new([ "test" ]))
+      expect(Set.demongoize([ "test" ])).to eq(Set.new([ "test" ]))
     end
   end
 
   describe ".mongoize" do
 
     it "returns an array" do
-      Set.mongoize([ "test" ]).should eq([ "test" ])
+      expect(Set.mongoize([ "test" ])).to eq([ "test" ])
     end
 
     it "returns an array even if the value is a set" do
-      Set.mongoize(Set.new([ "test" ])).should eq([ "test" ])
+      expect(Set.mongoize(Set.new([ "test" ]))).to eq([ "test" ])
     end
   end
 
@@ -27,7 +27,7 @@ describe Mongoid::Extensions::Set do
     end
 
     it "returns an array" do
-      set.mongoize.should eq([ "test" ])
+      expect(set.mongoize).to eq([ "test" ])
     end
   end
 end

data/spec/mongoid/extensions/string_spec.rb

@@ -7,18 +7,18 @@ describe Mongoid::Extensions::String do
     context "when the string is blank" do
 
       it "returns the empty string" do
-        "".__evolve_object_id__.should be_empty
+        expect("".__evolve_object_id__).to be_empty
       end
     end
 
     context "when the string is a legal object id" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       it "returns the object id" do
-        object_id.to_s.__evolve_object_id__.should eq(object_id)
+        expect(object_id.to_s.__evolve_object_id__).to eq(object_id)
       end
     end
 
@@ -29,7 +29,7 @@ describe Mongoid::Extensions::String do
       end
 
       it "returns the string" do
-        string.__evolve_object_id__.should eq(string)
+        expect(string.__evolve_object_id__).to eq(string)
       end
     end
   end
@@ -39,18 +39,18 @@ describe Mongoid::Extensions::String do
     context "when the string is blank" do
 
       it "returns nil" do
-        "".__mongoize_object_id__.should be_nil
+        expect("".__mongoize_object_id__).to be_nil
       end
     end
 
     context "when the string is a legal object id" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       it "returns the object id" do
-        object_id.to_s.__mongoize_object_id__.should eq(object_id)
+        expect(object_id.to_s.__mongoize_object_id__).to eq(object_id)
       end
     end
 
@@ -61,7 +61,7 @@ describe Mongoid::Extensions::String do
       end
 
       it "returns the string" do
-        string.__mongoize_object_id__.should eq(string)
+        expect(string.__mongoize_object_id__).to eq(string)
       end
     end
   end
@@ -90,11 +90,11 @@ describe Mongoid::Extensions::String do
         end
 
         it "converts to a time" do
-          time.should eq(Time.configured.parse(string))
+          expect(time).to eq(Time.configured.parse(string))
         end
 
         it "converts to the as time zone" do
-          time.zone.should eq("JST")
+          expect(time.zone).to eq("JST")
         end
       end
 
@@ -134,7 +134,7 @@ describe Mongoid::Extensions::String do
         end
 
         it "converts to a time" do
-          time.should eq(Time.parse(string))
+          expect(time).to eq(Time.parse(string))
         end
       end
 
@@ -164,14 +164,14 @@ describe Mongoid::Extensions::String do
       end
 
       it "returns an underscored tableized name" do
-        Medical::Patient.name.collectionize.should eq("medical_patients")
+        expect(Medical::Patient.name.collectionize).to eq("medical_patients")
       end
     end
 
     context "when class is not namespaced" do
 
       it "returns an underscored tableized name" do
-        MixedDrink.name.collectionize.should eq("mixed_drinks")
+        expect(MixedDrink.name.collectionize).to eq("mixed_drinks")
       end
     end
   end
@@ -181,14 +181,14 @@ describe Mongoid::Extensions::String do
     context "when the object is not a string" do
 
       it "returns the string" do
-        String.demongoize(:test).should eq("test")
+        expect(String.demongoize(:test)).to eq("test")
       end
     end
 
     context "when the object is nil" do
 
       it "returns nil" do
-        String.demongoize(nil).should be_nil
+        expect(String.demongoize(nil)).to be_nil
       end
     end
   end
@@ -198,28 +198,28 @@ describe Mongoid::Extensions::String do
     context "when the string is id" do
 
       it "returns true" do
-        "id".should be_mongoid_id
+        expect("id").to be_mongoid_id
       end
     end
 
     context "when the string is _id" do
 
       it "returns true" do
-        "_id".should be_mongoid_id
+        expect("_id").to be_mongoid_id
       end
     end
 
     context "when the string contains id" do
 
       it "returns false" do
-        "identity".should_not be_mongoid_id
+        expect("identity").to_not be_mongoid_id
       end
     end
 
     context "when the string contains _id" do
 
       it "returns false" do
-        "something_id".should_not be_mongoid_id
+        expect("something_id").to_not be_mongoid_id
       end
     end
   end
@@ -229,14 +229,14 @@ describe Mongoid::Extensions::String do
     context "when the object is not a string" do
 
       it "returns the string" do
-        String.mongoize(:test).should eq("test")
+        expect(String.mongoize(:test)).to eq("test")
       end
     end
 
     context "when the object is nil" do
 
       it "returns nil" do
-        String.mongoize(nil).should be_nil
+        expect(String.mongoize(nil)).to be_nil
       end
     end
   end
@@ -244,7 +244,7 @@ describe Mongoid::Extensions::String do
   describe "#mongoize" do
 
     it "returns self" do
-      "test".mongoize.should eq("test")
+      expect("test".mongoize).to eq("test")
     end
   end
 
@@ -253,21 +253,21 @@ describe Mongoid::Extensions::String do
     context "when string is a reader" do
 
       it "returns self" do
-        "attribute".reader.should eq("attribute")
+        expect("attribute".reader).to eq("attribute")
       end
     end
 
     context "when string is a writer" do
 
       it "returns the reader" do
-        "attribute=".reader.should eq("attribute")
+        expect("attribute=".reader).to eq("attribute")
       end
     end
 
     context "when the string is before_type_cast" do
 
       it "returns the reader" do
-        "attribute_before_type_cast".reader.should eq("attribute")
+        expect("attribute_before_type_cast".reader).to eq("attribute")
       end
     end
   end
@@ -277,28 +277,28 @@ describe Mongoid::Extensions::String do
     context "when the string is an integer" do
 
       it "returns true" do
-        "1234".should be_numeric
+        expect("1234").to be_numeric
       end
     end
 
     context "when string is a float" do
 
       it "returns true" do
-        "1234.123".should be_numeric
+        expect("1234.123").to be_numeric
       end
     end
 
     context "when the string is has exponents" do
 
       it "returns true" do
-        "1234.123123E4".should be_numeric
+        expect("1234.123123E4").to be_numeric
       end
     end
 
     context "when the string is non numeric" do
 
       it "returns false" do
-        "blah".should_not be_numeric
+        expect("blah").to_not be_numeric
       end
     end
   end
@@ -308,42 +308,31 @@ describe Mongoid::Extensions::String do
     context "when string is address" do
 
       it "returns address" do
-        "address".singularize.should eq("address")
+        expect("address".singularize).to eq("address")
       end
     end
 
     context "when string is address_profiles" do
 
       it "returns address_profile" do
-        "address_profiles".singularize.should eq("address_profile")
+        expect("address_profiles".singularize).to eq("address_profile")
       end
     end
   end
 
-  describe "#to_a" do
-
-    let(:value) do
-      "Disintegration is the best album ever!"
-    end
-
-    it "returns an array with the string in it" do
-      value.to_a.should eq([ value ])
-    end
-  end
-
   describe "#writer?" do
 
     context "when string is a reader" do
 
       it "returns false" do
-        "attribute".writer?.should be_false
+        expect("attribute".writer?).to be false
       end
     end
 
     context "when string is a writer" do
 
       it "returns true" do
-        "attribute=".writer?.should be_true
+        expect("attribute=".writer?).to be true
       end
     end
   end
@@ -353,14 +342,14 @@ describe Mongoid::Extensions::String do
     context "when string is a reader" do
 
       it "returns false" do
-        "attribute".before_type_cast?.should be_false
+        expect("attribute".before_type_cast?).to be false
       end
     end
 
     context "when string is before_type_cast" do
 
       it "returns true" do
-        "attribute_before_type_cast".before_type_cast?.should be_true
+        expect("attribute_before_type_cast".before_type_cast?).to be true
       end
     end
   end