mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/extensions/array_spec.rb

@@ -204,14 +204,10 @@ describe Mongoid::Extensions::Array do
 
     context "when the related model uses object ids" do
 
-      let(:metadata) do
+      let(:association) do
         Person.relations["preferences"]
       end
 
-      let(:constraint) do
-        metadata.constraint
-      end
-
       context "when provided an object id" do
 
         let(:object_id) do
@@ -219,7 +215,7 @@ describe Mongoid::Extensions::Array do
         end
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, object_id)
+          Array.__mongoize_fk__(association, object_id)
         end
 
         it "returns the object id as an array" do
@@ -234,7 +230,7 @@ describe Mongoid::Extensions::Array do
         end
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, [ object_id ])
+          Array.__mongoize_fk__(association, [ object_id ])
         end
 
         it "returns the object ids" do
@@ -251,7 +247,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, object_id.to_s)
+            Array.__mongoize_fk__(association, object_id.to_s)
           end
 
           it "returns the object id in an array" do
@@ -266,7 +262,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, string)
+            Array.__mongoize_fk__(association, string)
           end
 
           it "returns the string in an array" do
@@ -277,7 +273,7 @@ describe Mongoid::Extensions::Array do
         context "when the string is blank" do
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, "")
+            Array.__mongoize_fk__(association, "")
           end
 
           it "returns an empty array" do
@@ -289,7 +285,7 @@ describe Mongoid::Extensions::Array do
       context "when provided nil" do
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, nil)
+          Array.__mongoize_fk__(association, nil)
         end
 
         it "returns an empty array" do
@@ -306,7 +302,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ object_id.to_s ])
+            Array.__mongoize_fk__(association, [ object_id.to_s ])
           end
 
           it "returns the object id in an array" do
@@ -321,7 +317,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ string ])
+            Array.__mongoize_fk__(association, [ string ])
           end
 
           it "returns the string in an array" do
@@ -332,7 +328,7 @@ describe Mongoid::Extensions::Array do
         context "when the strings are blank" do
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ "", "" ])
+            Array.__mongoize_fk__(association, [ "", "" ])
           end
 
           it "returns an empty array" do
@@ -344,7 +340,7 @@ describe Mongoid::Extensions::Array do
       context "when provided nils" do
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, [ nil, nil, nil ])
+          Array.__mongoize_fk__(association, [ nil, nil, nil ])
         end
 
         it "returns an empty array" do

data/spec/mongoid/extensions/big_decimal_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Extensions::BigDecimal do
 
   let(:big_decimal) do
-    BigDecimal("123456.789")
+    BigDecimal.new("123456.789")
   end
 
   describe ".demongoize" do
@@ -26,7 +26,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
       end
     end
 
@@ -37,7 +37,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
       end
     end
 
@@ -48,7 +48,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
       end
     end
 
@@ -184,7 +184,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is the BigDecimal zero" do
 
       let(:big_decimal) do
-        BigDecimal("0.0")
+        BigDecimal.new("0.0")
       end
 
       it "returns a BigDecimal" do
@@ -195,7 +195,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is the BigDecimal negative zero" do
 
       let(:big_decimal) do
-        BigDecimal("-0.0")
+        BigDecimal.new("-0.0")
       end
 
       it "returns a BigDecimal" do
@@ -326,7 +326,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal NaN" do
 
       let(:nan) do
-        BigDecimal("NaN")
+        BigDecimal.new("NaN")
       end
 
       it "returns a String" do
@@ -337,7 +337,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal Infinity" do
 
       let(:infinity) do
-        BigDecimal("Infinity")
+        BigDecimal.new("Infinity")
       end
 
       it "returns a String" do
@@ -348,7 +348,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal negative Infinity" do
 
       let(:neg_infinity) do
-        BigDecimal("-Infinity")
+        BigDecimal.new("-Infinity")
       end
 
       it "returns a String" do

data/spec/mongoid/extensions/object_spec.rb

@@ -39,14 +39,10 @@ describe Mongoid::Extensions::Object do
 
     context "when the related model uses object ids" do
 
-      let(:metadata) do
+      let(:association) do
         Game.relations["person"]
       end
 
-      let(:constraint) do
-        metadata.constraint
-      end
-
       context "when provided an object id" do
 
         let(:object_id) do
@@ -54,7 +50,7 @@ describe Mongoid::Extensions::Object do
         end
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, object_id)
+          Object.__mongoize_fk__(association, object_id)
         end
 
         it "returns the object id" do
@@ -71,7 +67,7 @@ describe Mongoid::Extensions::Object do
           end
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, object_id.to_s)
+            Object.__mongoize_fk__(association, object_id.to_s)
           end
 
           it "returns the object id" do
@@ -86,7 +82,7 @@ describe Mongoid::Extensions::Object do
           end
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, string)
+            Object.__mongoize_fk__(association, string)
           end
 
           it "returns the string" do
@@ -97,7 +93,7 @@ describe Mongoid::Extensions::Object do
         context "when the string is blank" do
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, "")
+            Object.__mongoize_fk__(association, "")
           end
 
           it "returns nil" do
@@ -109,7 +105,7 @@ describe Mongoid::Extensions::Object do
       context "when provided nil" do
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, nil)
+          Object.__mongoize_fk__(association, nil)
         end
 
         it "returns nil" do
@@ -120,7 +116,7 @@ describe Mongoid::Extensions::Object do
       context "when provided an empty array" do
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, [])
+          Object.__mongoize_fk__(association, [])
         end
 
         it "returns an empty array" do

data/spec/mongoid/extensions/range_spec.rb

@@ -139,6 +139,13 @@ describe Mongoid::Extensions::Range do
         expect(("a".."z").mongoize).to eq({ "min" => "a", "max" => "z" })
       end
     end
+
+    context 'when the value is a string' do
+
+      it 'returns a string' do
+        expect(Range.mongoize('3')).to eq('3')
+      end
+    end
   end
 
   describe "#resizable?" do

data/spec/mongoid/extensions/regexp_spec.rb

@@ -35,29 +35,6 @@ describe Mongoid::Extensions::Regexp do
       it "returns the provided value as a regex" do
         expect(value).to eq(/[^abc]/)
       end
-
-
-      context "when the string is empty" do
-
-        let(:value) do
-          Regexp.mongoize("")
-        end
-
-        it "returns an empty regex" do
-          expect(value).to eq(//)
-        end
-      end
-    end
-
-    context "when the value is nil" do
-
-      let(:value) do
-        Regexp.mongoize(nil)
-      end
-
-      it "returns the nil" do
-        expect(value).to be_nil
-      end
     end
   end
 

data/spec/mongoid/extensions/string_spec.rb

@@ -277,77 +277,49 @@ describe Mongoid::Extensions::String do
     context "when the string is an integer" do
 
       it "returns true" do
-        expect("1234".numeric?).to eq(true)
+        expect("1234").to be_numeric
       end
     end
 
     context "when string is a float" do
 
       it "returns true" do
-        expect("1234.123".numeric?).to eq(true)
+        expect("1234.123").to be_numeric
       end
     end
 
     context "when the string is has exponents" do
 
       it "returns true" do
-        expect("1234.123123E4".numeric?).to eq(true)
+        expect("1234.123123E4").to be_numeric
       end
     end
 
     context "when the string is non numeric" do
 
       it "returns false" do
-        expect("blah".numeric?).to eq(false)
+        expect("blah").to_not be_numeric
       end
     end
 
     context "when the string is NaN" do
 
       it "returns true" do
-        expect("NaN".numeric?).to eq(true)
-      end
-    end
-
-    context "when the string is NaN and junk in front" do
-
-      it "returns false" do
-        expect("a\nNaN".numeric?).to eq(false)
-      end
-    end
-
-    context "when the string is NaN and whitespace at end" do
-
-      it "returns false" do
-        expect("NaN\n".numeric?).to eq(false)
+        expect("NaN").to be_numeric
       end
     end
 
     context "when the string is Infinity" do
 
       it "returns true" do
-        expect("Infinity".numeric?).to eq(true)
-      end
-    end
-
-    context "when the string contains Infinity and junk in front" do
-
-      it "returns false" do
-        expect("a\nInfinity".numeric?).to eq(false)
-      end
-    end
-
-    context "when the string contains Infinity and whitespace at end" do
-
-      it "returns false" do
-        expect("Infinity\n".numeric?).to eq(false)
+        expect("Infinity").to be_numeric
       end
     end
 
     context "when the string is -Infinity" do
 
       it "returns true" do
-        expect("-Infinity".numeric?).to eq(true)
+        expect("-Infinity").to be_numeric
       end
     end
   end

data/spec/mongoid/factory_spec.rb

@@ -88,17 +88,6 @@ describe Mongoid::Factory do
         expect(person.title).to eq("Sir")
       end
     end
-
-    context "when the type is a symbol" do
-
-      let(:person) do
-        described_class.build(Person, {:_type => "Doctor"})
-      end
-
-      it "instantiates the subclass" do
-        expect(person.class).to eq(Doctor)
-      end
-    end
   end
 
   describe ".from_db" do
@@ -192,5 +181,23 @@ describe Mongoid::Factory do
         expect(document.title).to eq("Sir")
       end
     end
+
+    context 'when type does not correspond to a Class name' do
+
+      let(:attributes) do
+        { "title" => "Sir", "_type" => "invalid_class_name" }
+      end
+
+      let(:person) do
+        described_class.from_db(Person, attributes)
+      end
+
+      it 'raises a exception' do
+        expect {
+          person
+        }.to raise_exception(Mongoid::Errors::UnknownModel)
+      end
+
+    end
   end
 end

data/spec/mongoid/fields/foreign_key_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["preferences"],
+        association: Person.relations["preferences"],
         type: Array,
         default: [],
         identity: true
@@ -68,7 +68,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["posts"],
+        association: Person.relations["posts"],
         type: Array,
         default: default,
         identity: true
@@ -89,7 +89,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["posts"],
+        association: Person.relations["posts"],
         type: Array,
         default: [],
         identity: true
@@ -103,14 +103,14 @@ describe Mongoid::Fields::ForeignKey do
 
   describe "#evolve" do
 
-    let(:metadata) do
+    let(:association) do
       Person.reflect_on_association(:preferences)
     end
 
     context "when provided a document" do
 
       let(:field) do
-        described_class.new(:person_id, type: Object, metadata: metadata)
+        described_class.new(:person_id, type: Object, association: association)
       end
 
       let(:game) do
@@ -129,7 +129,7 @@ describe Mongoid::Fields::ForeignKey do
     context "when the type is an array" do
 
       let(:field) do
-        described_class.new(:preference_ids, type: Array, default: [], metadata: metadata)
+        described_class.new(:preference_ids, type: Array, default: [], association: association)
       end
 
       context "when providing a single value" do
@@ -197,12 +197,12 @@ describe Mongoid::Fields::ForeignKey do
 
           context "when the relation stores ids as strings" do
 
-            let!(:metadata) do
+            let!(:association) do
               Agent.reflect_on_association(:accounts)
             end
 
             let!(:field) do
-              described_class.new(:account_ids, type: Array, default: [], metadata: metadata)
+              described_class.new(:account_ids, type: Array, default: [], association: association)
             end
 
             let(:id_one) do
@@ -260,12 +260,12 @@ describe Mongoid::Fields::ForeignKey do
 
     context "when the type is an object" do
 
-      let(:metadata) do
+      let(:association) do
         Game.reflect_on_association(:person)
       end
 
       let(:field) do
-        described_class.new(:person_id, type: Object, metadata: metadata)
+        described_class.new(:person_id, type: Object, association: association)
       end
 
       context "when providing a single value" do
@@ -312,12 +312,12 @@ describe Mongoid::Fields::ForeignKey do
 
         context "when the relation stores string ids" do
 
-          let(:metadata) do
+          let(:association) do
             Comment.reflect_on_association(:account)
           end
 
           let(:field) do
-            described_class.new(:person_id, type: Object, metadata: metadata)
+            described_class.new(:person_id, type: Object, association: association)
           end
 
           context "when the value is an id string" do
@@ -384,12 +384,12 @@ describe Mongoid::Fields::ForeignKey do
 
           context "when the relation stores ids as strings" do
 
-            let(:metadata) do
+            let(:association) do
               Comment.reflect_on_association(:account)
             end
 
             let(:field) do
-              described_class.new(:person_id, type: Object, metadata: metadata)
+              described_class.new(:person_id, type: Object, association: association)
             end
 
             let(:id_one) do
@@ -445,14 +445,14 @@ describe Mongoid::Fields::ForeignKey do
       end
     end
 
-    context "when the metadata is polymoprhic" do
+    context "when the association is polymoprhic" do
 
-      let(:metadata) do
+      let(:association) do
         Agent.reflect_on_association(:names)
       end
 
       let(:field) do
-        described_class.new(:nameable_id, type: Object, metadata: metadata)
+        described_class.new(:nameable_id, type: Object, association: association)
       end
 
       let(:value) do
@@ -464,7 +464,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "does not change the foreign key" do
-        expect(evolved).to be(value)
+        expect(evolved).to eq(BSON::ObjectId.from_string(value))
       end
     end
   end
@@ -500,12 +500,8 @@ describe Mongoid::Fields::ForeignKey do
 
       context "when the array is object ids" do
 
-        let(:metadata) do
-          Mongoid::Relations::Metadata.new(
-            inverse_class_name: "Game",
-            name: :person,
-            relation: Mongoid::Relations::Referenced::In
-          )
+        let(:association) do
+          Game.relations["person"]
         end
 
         let(:field) do
@@ -514,7 +510,7 @@ describe Mongoid::Fields::ForeignKey do
             type: Array,
             default: [],
             identity: true,
-            metadata: metadata,
+            association: association,
             overwrite: true
           )
         end
@@ -589,12 +585,8 @@ describe Mongoid::Fields::ForeignKey do
 
       context "when the array is object ids" do
 
-        let(:metadata) do
-          Mongoid::Relations::Metadata.new(
-            inverse_class_name: "Game",
-            name: :person,
-            relation: Mongoid::Relations::Referenced::In
-          )
+        let(:association) do
+          Game.relations['person']
         end
 
         let(:field) do
@@ -603,7 +595,7 @@ describe Mongoid::Fields::ForeignKey do
             type: Object,
             default: nil,
             identity: true,
-            metadata: metadata,
+            association: association,
             overwrite: true
           )
         end