Enable construction of MongoRegex from Regex.

ensecoz · Jun 1, 2010 · 5ae43be · 5ae43be
1 parent 3af0514
commit 5ae43be
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/source/MongoDB.Tests/UnitTests/TestMongoRegex.cs b/source/MongoDB.Tests/UnitTests/TestMongoRegex.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Text.RegularExpressions;
 using System.Xml.Serialization;
 using NUnit.Framework;
 
@@ -32,6 +33,18 @@ public void CanBeConstructedWithOption()
             Assert.AreEqual("options",regex.RawOptions);
         }
 
+        [Test]
+        public void CanBeConstructedFromRegex()
+        {
+            const RegexOptions options = RegexOptions.IgnoreCase |
+                                         RegexOptions.IgnorePatternWhitespace |
+                                         RegexOptions.Multiline;
+
+            var regex = new MongoRegex(new Regex("expression", options));
+            Assert.AreEqual("expression", regex.Expression);
+            Assert.AreEqual("img", regex.RawOptions);
+        }
+
         [Test]
         public void CanBeConstructedWithMongoRegexOption()
         {

diff --git a/source/MongoDB/MongoRegex.cs b/source/MongoDB/MongoRegex.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
@@ -37,6 +38,22 @@ public MongoRegex(string expression,MongoRegexOption options)
             Options = options;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MongoRegex"/> class.
+        /// </summary>
+        /// <param name="regex">The regex.</param>
+        public MongoRegex(Regex regex)
+        {
+            if(regex == null)
+                throw new ArgumentNullException("regex");
+
+            Expression = regex.ToString();
+
+            ToggleOption("i", (regex.Options & RegexOptions.IgnoreCase) != 0);
+            ToggleOption("m", (regex.Options & RegexOptions.Multiline) != 0);
+            ToggleOption("g", (regex.Options & RegexOptions.IgnorePatternWhitespace) != 0);
+        }
+
         /// <summary>
         ///   Initializes a new instance of the <see cref = "MongoRegex" /> class.
         /// </summary>