added factory-methods and extensions for nullables

pulla2908 · Dec 1, 2016 · 8a4d685 · 8a4d685
1 parent b298b2d
commit 8a4d685
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/fluentOptionals.Tests/OptionalTests.cs b/fluentOptionals.Tests/OptionalTests.cs
@@ -82,6 +82,18 @@ public void ToOptional_WhenPredicateForNullIsGiven_ThenNoneGetsReturned()
             ((string) null).ToOptional(x => x.Length == 10).ShouldBeNone();
         }
 
+        [Test]
+        public void ToOptional_WhenNullableWithoutValueIsGiven_ThenNoneGetsReturned()
+        {
+            new int?().ToOptional().ShouldBeNone();
+        }
+
+        [Test]
+        public void ToOptional_WhenNullableWithValueIsGiven_ThenSomeGetsReturned()
+        {
+            new int?(10).ToOptional().ShouldBeSome();
+        }
+
         #endregion
     }
 

diff --git a/fluentOptionals/Optional.cs b/fluentOptionals/Optional.cs
@@ -29,9 +29,14 @@ public static Optional<T> From<T>(T value, Func<T, bool> condition)
 
             return condition(value) ? Some(value) : None<T>();
         }
+
+        public static Optional<T> From<T>(T? nullable) where T : struct
+        {
+            return nullable?.ToSome() ?? None<T>();
+        }
     }
 
-    #endregion 
+    #endregion
 
     public struct Optional<T> :
         IComparable<Optional<T>>,

diff --git a/fluentOptionals/OptionalCreateExtensions.cs b/fluentOptionals/OptionalCreateExtensions.cs
@@ -25,5 +25,10 @@ public static Optional<T> ToOptional<T>(this T value, Func<T, bool> condition)
         {
             return Optional.From(value, condition);
         }
+
+        public static Optional<T> ToOptional<T>(T? nullable) where T : struct
+        {
+            return Optional.From(nullable);
+        }
     }
 }