types/document -> types/embedded

Automattic · Sep 1, 2011 · 63c2dbb · 63c2dbb
1 parent 0f24c74
commit 63c2dbb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -6,7 +6,7 @@
 var SchemaType = require('../schematype')
   , ArrayType = require('./array')
   , MongooseDocumentArray = require('../types/documentarray')
-  , Subdocument = require('../types/document')
+  , Subdocument = require('../types/embedded')
   , CastError = SchemaType.CastError
   , Document = require('../document');
 

diff --git a/lib/types/array.js b/lib/types/array.js
@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var EmbeddedDocument = require('./document');
+var EmbeddedDocument = require('./embedded');
 var Document = require('../document');
 var ObjectId = require('./objectid');
 

diff --git a/lib/types/buffer.js b/lib/types/buffer.js
@@ -9,8 +9,6 @@ var driver = global.MONGOOSE_DRIVER_PATH || '../drivers/node-mongodb-native';
  * Module dependencies.
  */
 
-var EmbeddedDocument = require('./document');
-var ObjectId = require('./objectid');
 var Binary = require(driver + '/binary');
 
 /**

diff --git a/lib/types/document.js → lib/types/embedded.js b/lib/types/document.js → lib/types/embedded.js
diff --git a/lib/types/index.js b/lib/types/index.js
@@ -5,7 +5,10 @@
 
 exports.Array = require('./array');
 exports.Buffer = require('./buffer');
-exports.Document = require('./document');
+
+exports.Document = // @deprecate
+exports.Embedded = require('./embedded');
+
 exports.DocumentArray = require('./documentarray');
 exports.Number = require('./number');
 exports.ObjectId = require('./objectid');
diff --git a/test/model.test.js b/test/model.test.js
@@ -16,7 +16,7 @@ var start = require('./common')
   , ObjectId = Schema.ObjectId
   , DocumentObjectId = mongoose.Types.ObjectId
   , DocumentArray = mongoose.Types.DocumentArray
-  , EmbeddedDocument = mongoose.Types.Document
+  , EmbeddedDocument = mongoose.Types.Embedded
   , MongooseNumber = mongoose.Types.Number
   , MongooseArray = mongoose.Types.Array
   , MongooseError = mongoose.Error;

diff --git a/test/types.document.test.js b/test/types.document.test.js
@@ -6,7 +6,7 @@
 var should = require('should')
   , start = require('./common')
   , mongoose = start.mongoose
-  , EmbeddedDocument = require('../lib/types/document')
+  , EmbeddedDocument = require('../lib/types/embedded')
   , DocumentArray = require('../lib/types/documentarray')
   , Schema = mongoose.Schema
   , SchemaType = mongoose.SchemaType

diff --git a/test/types.documentarray.test.js b/test/types.documentarray.test.js
@@ -6,7 +6,7 @@
 var mongoose = require('./common').mongoose
   , MongooseArray = mongoose.Types.Array
   , MongooseDocumentArray = mongoose.Types.DocumentArray
-  , EmbeddedDocument = require('../lib/types/document')
+  , EmbeddedDocument = require('../lib/types/embedded')
   , DocumentArray = require('../lib/types/documentarray')
   , Schema = mongoose.Schema