From 2b4e531368d85a09eec2ae8674fb273854986d22 Mon Sep 17 00:00:00 2001
From: Lin Gui <guileen@gmail.com>
Date: Fri, 2 Dec 2011 02:35:56 +0800
Subject: [PATCH] add SkinDb.toId, SkinCollection.id is deprecated

---
 lib/mongoskin/collection.js | 14 +++++++-------
 lib/mongoskin/db.js         |  8 ++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/mongoskin/collection.js b/lib/mongoskin/collection.js
index c4e9a5b..73478ab 100644
--- a/lib/mongoskin/collection.js
+++ b/lib/mongoskin/collection.js
@@ -174,11 +174,11 @@ SkinCollection.prototype.findEach = function() {
   this._find.apply(this, args);
 };
 
+/**
+ * @deprecated use SkinDb.id instead
+ */
 SkinCollection.prototype.id = function(hex) {
-  if(hex instanceof this.ObjectID) {
-    return hex;
-  }
-  return this.skinDb.db.bson_serializer.ObjectID.createFromHexString(hex);
+  return this.skinDb.toId(hex);
 };
 
 /**
@@ -191,7 +191,7 @@ SkinCollection.prototype.id = function(hex) {
  */
 SkinCollection.prototype.findById = function() {
   var args = __slice.call(arguments);
-  args[0] = {_id: this.id(args[0])};
+  args[0] = {_id: this.skinDb.toId(args[0])};
   this.findOne.apply(this, args);
 };
 
@@ -200,7 +200,7 @@ SkinCollection.prototype.findById = function() {
  */
 SkinCollection.prototype.updateById = function() {
   var args = __slice.call(arguments);
-  args[0] = {_id: this.id(args[0])};
+  args[0] = {_id: this.skinDb.toId(args[0])};
   this.update.apply(this, args);
 };
 
@@ -209,7 +209,7 @@ SkinCollection.prototype.updateById = function() {
  */
 SkinCollection.prototype.removeById = function() {
   var args = __slice.call(arguments);
-  args[0] = {_id: this.id(args[0])};
+  args[0] = {_id: this.skinDb.toId(args[0])};
   this.remove.apply(this, args);
 };
 
diff --git a/lib/mongoskin/db.js b/lib/mongoskin/db.js
index f7f5e1d..f009083 100644
--- a/lib/mongoskin/db.js
+++ b/lib/mongoskin/db.js
@@ -60,6 +60,14 @@ var SkinDb = exports.SkinDb = function(db, username, password) {
   this.ObjectID = db.bson_serializer.ObjectID;
 };
 
+SkinDb.prototype.toId = function(hex) {
+  if(hex instanceof this.ObjectID) {
+    return hex;
+  }
+  return this.ObjectID.createFromHexString(hex);
+};
+
+
 /**
  * retrieve native_db
  *