Minor adjustments to names - and updates to Oid generation

Author: Hugo Bonacci

MongoCollection.cs

@@ -208,7 +208,7 @@ private void _PerformUpdates() {
         //handles deleting records that need to be removed
         private void _PerformDeletes() {
             IEnumerable<MongoOid> ids = this._Deletes.Select(item => item.Id);
-            this.Database.Find(this.Name).In("_id", ids).Delete();
+            this.Database.From(this.Name).In("_id", ids).Delete();
         }
 
         #endregion

MongoConnection.cs

@@ -111,7 +111,6 @@ public bool Connected {
         /// </summary>
         public void Open() {
             if (this.Connected) { return; }
-            Console.WriteLine("opening...");
 
             //notify any event handlers this is opening
             if (this.BeforeConnectionOpened != null) { this.BeforeConnectionOpened(this); }
@@ -131,7 +130,6 @@ public void Open() {
         /// Handles disconnecting from the client
         /// </summary>
         public void Close() {
-            Console.WriteLine("closing...");
 
             //notify any event handlers
             if (this.BeforeConnectionClosed != null) { this.BeforeConnectionClosed(this); }

MongoDatabase.cs

@@ -171,14 +171,14 @@ public MongoCollection this[string collection] {
         /// <summary>
         /// Starts a new query for a collection
         /// </summary>
-        public MongoQuery Find(string collection) {
+        public MongoQuery From(string collection) {
             return this.GetCollection(collection).Find();
         }
 
         /// <summary>
         /// Starts a new query for a collection
         /// </summary>
-        public TQueryProvider Find<TQueryProvider>(string collection) where TQueryProvider : MongoQueryBase {
+        public TQueryProvider From<TQueryProvider>(string collection) where TQueryProvider : MongoQueryBase {
             return this.GetCollection(collection).Find<TQueryProvider>();
         }
 

MongoDocument.cs

@@ -92,8 +92,9 @@ public MongoDocument(bool generateId, object source)
         /// Creates an Oid for this document - MongoDB will 
         /// automatically create an Oid when needed
         /// </summary>
-        public void GenerateId() {
+        public MongoOid GenerateId() {
             this.Id = new MongoOid();
+            return this.Id;
         }
 
         #endregion
@@ -104,7 +105,7 @@ public void GenerateId() {
         /// The Oid for a document (if any)
         /// </summary>
         public MongoOid Id {
-            get { return this.Get<MongoOid>(Mongo.DocumentIdKey); }
+            get { return this.Get<MongoOid>(Mongo.DocumentIdKey, new MongoOid()); }
             set {
                 if (value != null && !(value is MongoOid)) {
                     throw new ArgumentException("You can only assign a MongoOid as the Id for a MongoDocument");
@@ -126,18 +127,16 @@ protected override IEnumerable<BsonFieldDetail> OnBeforeFinishBsonRender(IEnumer
             List<BsonFieldDetail> list = fields.ToList();
 
             //get all of the ids to use
-            IEnumerable<BsonFieldDetail> ids = list.Where(item => item.Type is MongoOidType);
+            IEnumerable<BsonFieldDetail> ids = fields.Where(item => item.Type is MongoOidType);
             list.RemoveAll(item => item.Type is MongoOidType);
 
-            //reorder the document now so the Ids are in the front
-            list.OrderBy(item => item.Length);
-            
             //because the items are shared in the same list
             //we have to insert these one at the time since
             //if we use AddRange an exception will be thrown
             //since the list is modified while enumerating
             //through the values. We're also going backwards
             //to make sure they retain their original order
+            list = list.OrderBy(item => item.Length).ToList();
             for (int index = ids.Count(); index-- > 0; ) {
                 list.Insert(0, ids.ElementAt(index));
             }

MongoOid.cs

@@ -6,6 +6,10 @@
 using CSMongo.Exceptions;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Net;
+using System.Diagnostics;
 
 namespace CSMongo {
 
@@ -29,15 +33,14 @@ public class MongoOid {
         /// Creates a new Oid and generates an Oid automatically
         /// </summary>
         public MongoOid() {
+            this.Value = MongoOid.Generate();
+        }
 
-            //generate a unique id
-            DynamicStream stream = new DynamicStream();
-            stream.Append(BitConverter.GetBytes(DateTime.Now.Ticks));
-            stream.Append(BitConverter.GetBytes(MongoOid._GetIdentifier()));
-
-            //build the new Oid
-            this.Value = stream.ToArray();
-
+        /// <summary>
+        /// Creates an ID using a string version of the Oid
+        /// </summary>
+        public MongoOid(string id) {
+            this.SetId(id);
         }
 
         /// <summary>
@@ -95,8 +98,8 @@ public void SetId(string value) {
 
             //parse every pair of bytes
             List<byte> bytes = new List<byte>();
-            for (int i = 0; i < value.Length / 2; i++) {
-                string pair = value.Substring((i * 2), 2);
+            for (int i = 0; i < value.Length; i += 2) {
+                string pair = value.Substring(i, 2);
                 byte parsed = byte.Parse(pair, NumberStyles.HexNumber);
                 bytes.Add(parsed);
             }
@@ -128,6 +131,28 @@ public override string ToString() {
 
         #endregion
 
+        #region Static Creation
+
+        /// <summary>
+        /// Generates the bytes for a new MongoOid
+        /// </summary>
+        public static byte[] Generate() {
+            List<byte> bytes = new List<byte>();
+
+            //generate the correct prefix (Suggestion from Sam Corder)
+            double span = (DateTime.UtcNow - Mongo.Epoch).TotalSeconds;
+            int floor = Convert.ToInt32(Math.Floor(span));
+            bytes.AddRange(BitConverter.GetBytes(floor).Reverse());
+
+            //use a semi-unique value - Not sure if this
+            //is supposed to be any paticular format
+            bytes.AddRange(Guid.NewGuid().ToByteArray().Skip(8));
+            return bytes.ToArray();
+
+        }
+
+        #endregion
+
     }
 
 }

Query/MongoQuery.cs

@@ -131,11 +131,30 @@ public MongoQuery EqualTo(string field, object value) {
 
         }
 
+        /// <summary>
+        /// Finds a record based on the Oid value
+        /// </summary>
+        public MongoQuery FindById(string id) {
+            return this.FindById(new MongoOid(id));
+        }
+
+        /// <summary>
+        /// Finds a record based on the Oid value
+        /// </summary>
+        public MongoQuery FindById(byte[] id) {
+            return this.FindById(new MongoOid(id));
+        }
+
         /// <summary>
         /// Finds a record based on the Oid value
         /// </summary>
         public MongoQuery FindById(MongoOid id) {
+
+            //use 'in' to find the id - There is an
+            //actual option to use for this which
+            //will be converted to later on
             return this.In(Mongo.DocumentIdKey, new MongoOid[] { id });
+
         }
 
         /// <summary>