Merge pull request #53 from code-check/email-to-option

Email to option

Author: Takayuki Oda

src/main/scala/codecheck/github/models/User.scala

@@ -7,12 +7,12 @@ import org.json4s.JsonDSL._
 case class User(value: JValue) extends AbstractJson(value) {
   def login: String = get("login")
   def id: Long = get("id").toLong
-  def email: String = get("email")
-  def name: String = get("name")
-  def blog: String = get("blog")
-  def company: String = get("company")
-  def location: String = get("location")
-  def hireable: Boolean = boolean("hireable")
+  def email: Option[String] = opt("email")
+  def name: Option[String] = opt("name")
+  def blog: Option[String] = opt("blog")
+  def company: Option[String] = opt("company")
+  def location: Option[String] = opt("location")
+  def hireable: Boolean = booleanOpt("hireable").getOrElse(false)
   def bio: Option[String] = opt("bio")
 }
 
@@ -25,4 +25,4 @@ case class UserInput (
 	location: Option[String] = None,
 	hireable: Option[Boolean] = None,
 	bio: Option[String] = None
-) extends AbstractInput
+) extends AbstractInput

src/main/scala/codecheck/github/operations/MilestoneOp.scala

@@ -16,12 +16,12 @@ trait MilestoneOp {
   self: GitHubAPI =>
 
   def listMilestones(
-    owner: String, 
-    repo: String, 
+    owner: String,
+    repo: String,
     option: MilestoneListOption = MilestoneListOption()
   ): Future[List[Milestone]] = {
     val path = s"/repos/$owner/$repo/milestones?state=${option.state}&sort=${option.sort}&direction=${option.direction}"
-    exec("GET", path).map( 
+    exec("GET", path).map(
       _.body match {
         case JArray(arr) => arr.map(v => Milestone(v))
         case _ => throw new IllegalStateException()

src/test/scala/UserOpSpec.scala

@@ -8,24 +8,23 @@ import scala.concurrent.Await
 import scala.concurrent.ExecutionContext.Implicits.global
 import codecheck.github.models.UserInput
 
-class UserOpSpec extends FunSpec 
-  with Constants 
+class UserOpSpec extends FunSpec
+  with Constants
   with BeforeAndAfterAll
 {
   val origin = Await.result(api.getAuthenticatedUser, TIMEOUT)
 
   override def afterAll() {
     val input = UserInput(
-      Some(origin.name),
-      Some(origin.email),
-      Some(origin.blog),
-      Some(origin.company),
-      Some(origin.location),
+      origin.name.orElse(Some("")),
+      origin.email.orElse(Some("")),
+      origin.blog.orElse(Some("")),
+      origin.company.orElse(Some("")),
+      origin.location.orElse(Some("")),
       Some(origin.hireable),
-      origin.bio
+      origin.bio.orElse(Some(""))
     )
     val user = Await.result(api.updateAuthenticatedUser(input), TIMEOUT)
-    println("AFTER: " + user)
   }
   describe("getUser") {
     it("with valid username should succeed") {
@@ -52,12 +51,11 @@ class UserOpSpec extends FunSpec
         Some("bio")
       )
       val res = Await.result(api.updateAuthenticatedUser(input), TIMEOUT)
-      println("TEST: " + res)
-      assert(res.name == input.name.get)
-      assert(res.email == input.email.get)
-      assert(res.blog == input.blog.get)
-      assert(res.company == input.company.get)
-      assert(res.location == input.location.get)
+      assert(res.name.get == input.name.get)
+      assert(res.email.getOrElse("") == input.email.get)
+      assert(res.blog.get == input.blog.get)
+      assert(res.company.get == input.company.get)
+      assert(res.location.get == input.location.get)
       assert(res.bio.get == input.bio.get)
     }
   }
@@ -77,4 +75,4 @@ class UserOpSpec extends FunSpec
       assert((res{0}.id).toLong == userOpGet.id)
     }
   }
-}
+}