added the rest of the typed builders.

Author: craiggwilson

Driver/Builders/FieldsBuilder.cs

@@ -16,12 +16,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-
+using System.Linq.Expressions;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
-using MongoDB.Driver;
+using MongoDB.Driver.Linq.Utils;
 
 namespace MongoDB.Driver.Builders
 {
@@ -177,4 +176,189 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
             ((IBsonSerializable)_document).Serialize(bsonWriter, nominalType, options);
         }
     }
+
+    /// <summary>
+    /// A builder for specifying which fields of a document the server should return.
+    /// </summary>
+    /// <typeparam name="TDocument">The type of the document.</typeparam>
+    public static class Fields<TDocument>
+    {
+        // public static properties
+        /// <summary>
+        /// Gets a null value with a type of IMongoFields.
+        /// </summary>
+        public static IMongoFields Null
+        {
+            get { return null; }
+        }
+
+        // public static methods
+        /// <summary>
+        /// Adds one or more field names to be excluded from the results.
+        /// </summary>
+        /// <param name="memberExpressions">One or more field names.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public static FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument, object>>[] memberExpressions)
+        {
+            return new FieldsBuilder<TDocument>().Exclude(memberExpressions);
+        }
+
+        /// <summary>
+        /// Adds one or more field names to be included in the results.
+        /// </summary>
+        /// <param name="memberExpressions">The member expressions.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public static FieldsBuilder<TDocument> Include(params Expression<Func<TDocument, object>>[] memberExpressions)
+        {
+            return new FieldsBuilder<TDocument>().Include(memberExpressions);
+        }
+
+        /// <summary>
+        /// Adds a slice to be included in the results.
+        /// </summary>
+        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="size">The size of the slice (negative sizes are taken from the end).</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public static FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int size)
+        {
+            return new FieldsBuilder<TDocument>().Slice(memberExpression, size);
+        }
+
+        /// <summary>
+        /// Adds a slice to be included in the results.
+        /// </summary>
+        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="skip">The number of values to skip.</param>
+        /// <param name="limit">The number of values to extract.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public static FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int skip, int limit)
+        {
+            return new FieldsBuilder<TDocument>().Slice(memberExpression, skip, limit);
+        }
+    }
+
+    /// <summary>
+    /// A builder for specifying which fields of a document the server should return.
+    /// </summary>
+    /// <typeparam name="TDocument">The type of the document.</typeparam>
+    [Serializable]
+    public class FieldsBuilder<TDocument> : BuilderBase, IMongoFields
+    {
+        private readonly BsonSerializationInfoHelper _serializationHelper;
+        private FieldsBuilder _fieldsBuilder;
+
+        // constructors
+        /// <summary>
+        /// Initializes a new instance of the FieldsBuilder class.
+        /// </summary>
+        public FieldsBuilder()
+        {
+            _serializationHelper = new BsonSerializationInfoHelper();
+            _fieldsBuilder = new FieldsBuilder();
+        }
+
+        // public methods
+        /// <summary>
+        /// Adds one or more field names to be excluded from the results.
+        /// </summary>
+        /// <param name="memberExpressions">The member expressions.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument, object>>[] memberExpressions)
+        {
+            var elementNames = GetElementNames(memberExpressions);
+
+            _fieldsBuilder = _fieldsBuilder.Exclude(elementNames.ToArray());
+            return this;
+        }
+
+        /// <summary>
+        /// Adds one or more field names to be included in the results.
+        /// </summary>
+        /// <param name="memberExpressions">The member expressions.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public FieldsBuilder<TDocument> Include(params Expression<Func<TDocument, object>>[] memberExpressions)
+        {
+            var elementNames = GetElementNames(memberExpressions);
+
+            _fieldsBuilder = _fieldsBuilder.Include(elementNames.ToArray());
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a slice to be included in the results.
+        /// </summary>
+        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="size">The size of the slice (negative sizes are taken from the end).</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int size)
+        {
+            var info = _serializationHelper.GetSerializationInfo(memberExpression);
+            _fieldsBuilder = _fieldsBuilder.Slice(info.ElementName, size);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a slice to be included in the results.
+        /// </summary>
+        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="skip">The number of values to skip.</param>
+        /// <param name="limit">The number of values to extract.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int skip, int limit)
+        {
+            var info = _serializationHelper.GetSerializationInfo(memberExpression);
+            _fieldsBuilder = _fieldsBuilder.Slice(info.ElementName, skip, limit);
+            return this;
+        }
+
+        /// <summary>
+        /// Converts this object to a BsonDocument.
+        /// </summary>
+        /// <returns>
+        /// A BsonDocument.
+        /// </returns>
+        public override BsonDocument ToBsonDocument()
+        {
+            return _fieldsBuilder.ToBsonDocument();
+        }
+
+        /// <summary>
+        /// Serializes the result of the builder to a BsonWriter.
+        /// </summary>
+        /// <param name="bsonWriter">The writer.</param>
+        /// <param name="nominalType">The nominal type.</param>
+        /// <param name="options">The serialization options.</param>
+        protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBsonSerializationOptions options)
+        {
+            ((IBsonSerializable)_fieldsBuilder).Serialize(bsonWriter, nominalType, options);
+        }
+
+        private IEnumerable<string> GetElementNames(IEnumerable<Expression<Func<TDocument, object>>> memberExpressions)
+        {
+            var elementNames = memberExpressions
+                .Select(x => _serializationHelper.GetSerializationInfo(x))
+                .Select(x => x.ElementName);
+            return elementNames;
+        }
+    }
 }

Driver/Builders/GeoHaystackSearchOptionsBuilder.cs

@@ -14,14 +14,11 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+using System.Linq.Expressions;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
-using MongoDB.Driver;
+using MongoDB.Driver.Linq.Utils;
 
 namespace MongoDB.Driver.Builders
 {
@@ -146,4 +143,138 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
             ((IBsonSerializable)_document).Serialize(bsonWriter, nominalType, options);
         }
     }
-}
+
+    /// <summary>
+    /// A builder for the options of the GeoHaystackSearch command.
+    /// </summary>
+    /// <typeparam name="TDocument">The type of the document.</typeparam>
+    public static class GeoHaystackSearchOptions<TDocument>
+    {
+        // public static properties
+        /// <summary>
+        /// Gets a null value with a type of IMongoGeoHaystackSearchOptions.
+        /// </summary>
+        public static IMongoGeoHaystackSearchOptions Null
+        {
+            get { return null; }
+        }
+
+        // public static methods
+        /// <summary>
+        /// Sets the maximum number of results to return.
+        /// </summary>
+        /// <param name="value">The maximum number of results to return.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static GeoHaystackSearchOptionsBuilder<TDocument> SetLimit(int value)
+        {
+            return new GeoHaystackSearchOptionsBuilder<TDocument>().SetLimit(value);
+        }
+
+        /// <summary>
+        /// Sets the max distance.
+        /// </summary>
+        /// <param name="value">The max distance.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static GeoHaystackSearchOptionsBuilder<TDocument> SetMaxDistance(double value)
+        {
+            return new GeoHaystackSearchOptionsBuilder<TDocument>().SetMaxDistance(value);
+        }
+
+        /// <summary>
+        /// Sets the query on the optional additional field.
+        /// </summary>
+        /// <typeparam name="TMember">The member type.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="value">The value fo the additional field.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public static GeoHaystackSearchOptionsBuilder<TDocument> SetQuery<TMember>(Expression<Func<TDocument, TMember>> memberExpression, TMember value)
+        {
+            return new GeoHaystackSearchOptionsBuilder<TDocument>().SetQuery(memberExpression, value);
+        }
+    }
+
+    /// <summary>
+    /// A builder for the options of the GeoHaystackSearch command.
+    /// </summary>
+    /// <typeparam name="TDocument">The type of the document.</typeparam>
+    [Serializable]
+    public class GeoHaystackSearchOptionsBuilder<TDocument> : BuilderBase, IMongoGeoHaystackSearchOptions
+    {
+        private readonly BsonSerializationInfoHelper _serializationHelper;
+        private GeoHaystackSearchOptionsBuilder _geoHaystackBuilder;
+
+        // constructors
+        /// <summary>
+        /// Initializes a new instance of the GeoHaystackSearchOptionsBuilder class.
+        /// </summary>
+        public GeoHaystackSearchOptionsBuilder()
+        {
+            _serializationHelper = new BsonSerializationInfoHelper();
+            _geoHaystackBuilder = new GeoHaystackSearchOptionsBuilder();
+        }
+
+        // public methods
+        /// <summary>
+        /// Sets the maximum number of results to return.
+        /// </summary>
+        /// <param name="value">The maximum number of results to return.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public GeoHaystackSearchOptionsBuilder<TDocument> SetLimit(int value)
+        {
+            _geoHaystackBuilder = _geoHaystackBuilder.SetLimit(value);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the max distance.
+        /// </summary>
+        /// <param name="value">The max distance.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public GeoHaystackSearchOptionsBuilder<TDocument> SetMaxDistance(double value)
+        {
+            _geoHaystackBuilder = _geoHaystackBuilder.SetMaxDistance(value);
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the query on the optional additional field.
+        /// </summary>
+        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="value">The value fo the additional field.</param>
+        /// <returns>
+        /// The builder (so method calls can be chained).
+        /// </returns>
+        public GeoHaystackSearchOptionsBuilder<TDocument> SetQuery<TMember>(Expression<Func<TDocument, TMember>> memberExpression, TMember value)
+        {
+            var info = _serializationHelper.GetSerializationInfo(memberExpression);
+            var serializedValue = _serializationHelper.SerializeValue(info, value);
+            _geoHaystackBuilder = _geoHaystackBuilder.SetQuery(info.ElementName, serializedValue);
+            return this;
+        }
+
+        /// <summary>
+        /// Converts this object to a BsonDocument.
+        /// </summary>
+        /// <returns>
+        /// A BsonDocument.
+        /// </returns>
+        public override BsonDocument ToBsonDocument()
+        {
+            return _geoHaystackBuilder.ToBsonDocument();
+        }
+
+        /// <summary>
+        /// Serializes the result of the builder to a BsonWriter.
+        /// </summary>
+        /// <param name="bsonWriter">The writer.</param>
+        /// <param name="nominalType">The nominal type.</param>
+        /// <param name="options">The serialization options.</param>
+        protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBsonSerializationOptions options)
+        {
+            ((IBsonSerializable)_geoHaystackBuilder).Serialize(bsonWriter, nominalType, options);
+        }
+    }
+}