Adaptions to better match MongoDB csharp driver + New Query API + Additional unit tests

Ejdb.BSON/BSONArray.cs

@@ -14,238 +14,101 @@
 //   Boston, MA 02111-1307 USA.
 // ============================================================================================
 using System;
-using System.IO;
+using System.Collections;
+using System.Globalization;
 
 namespace Ejdb.BSON {
 
 	[Serializable]
-	public class BSONArray : BSONDocument {
-
-		public override BSONType BSONType {
-			get {
-				return BSONType.ARRAY;
-			}
-		}
-
-		public object this[int key] {
-			get {
-				return GetObjectValue(key.ToString());
-			}
-		}
-
-		public BSONArray() {
-		}
-
-		public BSONArray(BSONUndefined[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetUndefined(i);
-			}
-		}
-
-		public BSONArray(BSONull[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNull(i);
-			}
-		}
-
-		public BSONArray(ushort[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, (int) arr[i]);
-			}
-		}
-
-		public BSONArray(uint[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, (long) arr[i]);
-			}
-		}
-
-		public BSONArray(ulong[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, (long) arr[i]);
-			}
-		}
-
-		public BSONArray(short[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, (int) arr[i]);
-			}
-		}
-
-		public BSONArray(string[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetString(i, arr[i]);
-			}
-		}
-
-		public BSONArray(int[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, arr[i]);
-			}
-		}
-
-		public BSONArray(long[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, arr[i]);
-			}
-		}
-
-		public BSONArray(float[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, arr[i]);
-			}
-		}
-
-		public BSONArray(double[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetNumber(i, arr[i]);
-			}
-		}
-
-		public BSONArray(bool[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetBool(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONOid[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetOID(i, arr[i]);
-			}
-		}
-
-		public BSONArray(DateTime[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetDate(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONDocument[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetObject(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONArray[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetArray(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONRegexp[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetRegexp(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONTimestamp[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetTimestamp(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONCodeWScope[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetCodeWScope(i, arr[i]);
-			}
-		}
-
-		public BSONArray(BSONBinData[] arr) {
-			for (var i = 0; i < arr.Length; ++i) {
-				SetBinData(i, arr[i]);
-			}
-		}
-
-		public BSONDocument SetNull(int idx) {
-			return base.SetNull(idx.ToString());
-		}
-
-		public BSONDocument SetUndefined(int idx) {
-			return base.SetUndefined(idx.ToString());
-		}
-
-		public BSONDocument SetMaxKey(int idx) {
-			return base.SetMaxKey(idx.ToString());
-		}
-
-		public BSONDocument SetMinKey(int idx) {
-			return base.SetMinKey(idx.ToString());
-		}
-
-		public BSONDocument SetOID(int idx, string oid) {
-			return base.SetOID(idx.ToString(), oid);
-		}
-
-		public BSONDocument SetOID(int idx, BSONOid oid) {
-			return base.SetOID(idx.ToString(), oid); 
-		}
-
-		public BSONDocument SetBool(int idx, bool val) {
-			return base.SetBool(idx.ToString(), val);
-		}
-
-		public BSONDocument SetNumber(int idx, int val) {
-			return base.SetNumber(idx.ToString(), val);
-		}
-
-		public BSONDocument SetNumber(int idx, long val) {
-			return base.SetNumber(idx.ToString(), val);
-		}
-
-		public BSONDocument SetNumber(int idx, double val) {
-			return base.SetNumber(idx.ToString(), val); 
-		}
-
-		public BSONDocument SetNumber(int idx, float val) {
-			return base.SetNumber(idx.ToString(), val); 
-		}
-
-		public BSONDocument SetString(int idx, string val) {
-			return base.SetString(idx.ToString(), val); 
-		}
-
-		public BSONDocument SetCode(int idx, string val) {
-			return base.SetCode(idx.ToString(), val);
-		}
-
-		public BSONDocument SetSymbol(int idx, string val) {
-			return base.SetSymbol(idx.ToString(), val);
-		}
-
-		public BSONDocument SetDate(int idx, DateTime val) {
-			return base.SetDate(idx.ToString(), val);
-		}
-
-		public BSONDocument SetRegexp(int idx, BSONRegexp val) {
-			return base.SetRegexp(idx.ToString(), val);
-		}
-
-		public BSONDocument SetBinData(int idx, BSONBinData val) {
-			return base.SetBinData(idx.ToString(), val);
-		}
-
-		public BSONDocument SetObject(int idx, BSONDocument val) {
-			return base.SetDocument(idx.ToString(), val);
-		}
-
-		public BSONDocument SetArray(int idx, BSONArray val) {
-			return base.SetArray(idx.ToString(), val);
-		}
-
-		public BSONDocument SetTimestamp(int idx, BSONTimestamp val) {
-			return base.SetTimestamp(idx.ToString(), val);
-		}
-
-		public BSONDocument SetCodeWScope(int idx, BSONCodeWScope val) {
-			return base.SetCodeWScope(idx.ToString(), val);
-		}
-
-		protected override void CheckKey(string key) {
-			int idx;
-			if (key == null || !int.TryParse(key, out idx) || idx < 0) {
-				throw new InvalidBSONDataException(string.Format("Invalid array key: {0}", key));
-			}
-		}
+	public class BsonArray : BsonDocument {
+
+
+		public BsonArray() 
+        {
+		}
+
+        public BsonArray(BsonDocument document)
+        {
+            var iterator = new BsonIterator(document);
+            while (iterator.Next() != BsonType.EOO)
+                Add(iterator.CurrentKey, iterator.FetchCurrentValue());
+        }
+
+        public BsonArray(IEnumerable objects)
+        {
+            AddRange(objects);
+        }
+
+        public override BsonType BSONType
+        {
+            get
+            {
+                return BsonType.ARRAY;
+            }
+        }
+
+        public object this[int key]
+        {
+            get { return GetObjectValue(key.ToString()); }
+        }
+
+		public void SetMaxKey(int idx)
+		{
+		    Add(BsonValue.GetMaxKey());
+		}
+
+		public void SetMinKey(int idx)
+		{
+            Add(BsonValue.GetMinKey());
+		}
+
+        /// <summary>
+        /// Adds multiple elements to the array.
+        /// </summary>
+        /// <param name="values">A list of values to add to the array.</param>
+        /// <returns>The array (so method calls can be chained).</returns>
+        public BsonArray AddRange(IEnumerable values)
+        {
+            if (values != null)
+            {
+                foreach (var value in values)
+                    Add(BsonValue.ValueOf(value));
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Adds an element to the array.
+        /// </summary>
+        /// <param name="value">The value to add to the array.</param>
+        /// <returns>The array (so method calls can be chained).</returns>
+        public BsonArray Add(BsonValue value)
+        {
+            if (value != null)
+            {
+                var key = Keys.Count.ToString(CultureInfo.InvariantCulture);
+                Add(key, value);
+            }
+
+            return this;
+        }
+
+        public BsonArray Add(object value)
+        {
+            if (value != null)
+            {
+                var bsonValue = BsonValue.ValueOf(value);
+                return Add(bsonValue);
+            }
+
+            return this;
+        }
+
+	    public int Count
+        {
+            get { return KeysCount; }
+        }
 	}
 }
 

Ejdb.BSON/BSONBinData.cs

@@ -19,7 +19,7 @@
 namespace Ejdb.BSON {
 
 	[Serializable]
-	public sealed class BSONBinData {
+	public sealed class BsonBinData {
 		readonly byte _subtype;
 		readonly byte[] _data;
 
@@ -35,13 +35,13 @@ public byte[] Data {
 			}
 		}
 
-		public BSONBinData(byte subtype, byte[] data) {
+		public BsonBinData(byte subtype, byte[] data) {
 			_subtype = subtype;
 			_data = new byte[data.Length];
 			Array.Copy(data, _data, data.Length); 
 		}
 
-		internal BSONBinData(byte subtype, int len, BinaryReader input) {
+		internal BsonBinData(byte subtype, int len, BinaryReader input) {
 			_subtype = subtype;
 			_data = input.ReadBytes(len);
 		}