Merge branch 'master' into answers

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

Author: Chris Myers

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

@@ -5,16 +5,7 @@ import scalaz._, Scalaz._
 object ValidationExercises {
   type VE[+A] = ValidationNel[ErrorCode, A]
 
-  val allBad = Map[String, String]()
-  val goodInput = Map("firstName" -> "Vladimir", "lastName" -> "Putin", "password" -> "crimea14")
-  val passwordIsTooShort = goodInput + ("password" -> "crim3a")
-  val passwordNoNumbers = goodInput + ("password" -> "crimeaasd")
-  val passwordNoNumbersAndTooShort = goodInput + ("password" -> "crime")
-  val noFirstName = goodInput - "firstName"
-  val noLastName = goodInput - "lastName"
-
-  def validateKey(input: Map[String, String], key: String): ValidationNel[ErrorCode, String] =
-    input.get(key).toSuccess(keyNotFound(key)).toValidationNel
+   def validateKey(key: String, input: Map[String, String]): ValidationNel[ErrorCode, String] = ???
 
   def nameValidation(name: String, label: String): ValidationNel[ErrorCode, String] =
     if (!name.isEmpty) name.successNel else nameIsEmpty(label).failNel
@@ -25,32 +16,9 @@ object ValidationExercises {
   def passwordLengthValidation(password: String): ValidationNel[ErrorCode, String] =
     if (password.length >= 8) password.successNel else passwordTooShort.failNel
 
-  def validateInput(input: Map[String, String]): ValidationNel[ErrorCode, Person] = {
-    val vKey = validateKey(input, _: String)
-    def vName(name: String) = vKey(name).flatMap(nameValidation(_, name))
-
-    val firstName = vName("firstName")
-    val lastName = vName("lastName")
-
-
-    val password = vKey("password").flatMap(
-      password => passwordLengthValidation(password) <* passwordStrengthValidation(password)
-    )
-
-    Apply[VE].apply3(firstName, lastName, password)(Person)
-
-  }
-
-  def main(args: Array[String]) {
-    println("Good input = " + validateInput(goodInput))
-    println("All Bad input =" + validateInput(allBad))
-    println("password too short = " + validateInput(passwordIsTooShort))
-    println("password too weak = " + validateInput(passwordNoNumbers))
-    println("password too short and too weak = " + validateInput(passwordNoNumbersAndTooShort))
-    println("no first name = " + validateInput(noFirstName))
-    println("no last name = " + validateInput(noLastName))
-  }
+  def validateInput(input: Map[String, String]): ValidationNel[ErrorCode, Person] = ???
 
+ 
 
 }
 

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

@@ -0,0 +1,44 @@
+package com.rea.typesafety
+
+import org.specs2.mutable.Specification
+import ValidationExercises._
+import scalaz.{Failure, Success}
+
+class ValidationExercisesSpec extends Specification {
+
+  val allBad = Map[String, String]()
+  val goodInput = Map("firstName" -> "Vladimir", "lastName" -> "Putin", "password" -> "crimea14")
+  val passwordIsTooShort = goodInput + ("password" -> "crim3a")
+  val passwordNoNumbers = goodInput + ("password" -> "crimeaasd")
+  val passwordNoNumbersAndTooShort = goodInput + ("password" -> "crime")
+  val noFirstName = goodInput - "firstName"
+  val noLastName = goodInput - "lastName"
+
+  
+  "Good input" in {
+    validateInput(goodInput) === Success(Person("Vladimir", "Putin", "crimea14"))
+  }
+
+  "All Bad input" in {
+    validateInput(allBad) === Failure(List())
+  }
+
+  "password too short" in {
+    validateInput(passwordIsTooShort) === Failure(List())
+  }
+
+  "password too weak" in {
+    validateInput(passwordNoNumbers)
+  }
+  "password too short and too weak" in {
+    validateInput(passwordNoNumbersAndTooShort)
+  }
+  "no first name" in {
+    validateInput(noFirstName)
+  }
+  "no last name" in {
+    validateInput(noLastName)
+  }
+
+
+}