Merge branch 'master' into answers

Conflicts:
	src/main/scala/com/rea/typesafety/OptionExercises.scala

Author: Chris Myers

src/main/scala/com/rea/typesafety/OptionExercises.scala

@@ -2,12 +2,6 @@ package com.rea.typesafety
 
 
 object OptionalExercises1 {
-  def main(args: Array[String]) {
-    println("The host name is: " + getFromConfig("host").getOrElse("Not Found"))
-    println("The length of host name is: " + lengthOfHost().getOrElse(0))
-    println("The port plus 1000 is: " + portPlus1000().getOrElse(0) + " (expecting 9080)")
-  }
-
   val config = Map[String, String]("host" -> "rea.com", "port" -> "8080")
 
   def getFromConfig(key: String): Option[String] = config.get(key)

src/test/scala/com/rea/typesafety/OptionalExercises1Spec.scala

@@ -1,7 +1,29 @@
 package com.rea.typesafety
 
 import org.specs2.mutable.Specification
+import OptionalExercises1._
 
 class OptionalExercises1Spec extends Specification {
 
+  "getting Host Name from config" should {
+    "be rea.com for host" in {
+      getFromConfig("host") should beSome("rea.com")
+    }
+    "be none for other" in {
+      getFromConfig("other") should beNone
+    }
+
+  }
+
+  "The length of host name" should {
+    "be 7" in {
+      lengthOfHost() should beSome(7)
+    }
+  }
+
+  "The port plus 1000" in {
+    portPlus1000() should beSome(9080)
+  }
+
+
 }