From d6447e0e9ac3ce65c63063e164ece1352331da16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= <alejandro@dialelo.com>
Date: Wed, 29 Jun 2016 17:07:40 +0200
Subject: [PATCH] Take into account that commit authors may be null

Some users don't properly configure their git email to be the same as
their GitHub email, thus GitHub can't figure out which author (on
GitHub) a commit has. I've modified Commit and its decoder to take this
into account adding `Option` around the fields that can be null.
---
 src/main/scala/github4s/Decoders.scala        |  6 +--
 .../scala/github4s/free/domain/Commit.scala   |  8 +--
 .../scala/github4s/utils/FakeResponses.scala  | 52 +++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/github4s/Decoders.scala b/src/main/scala/github4s/Decoders.scala
index 3cd45c4e5..766d7d3e8 100644
--- a/src/main/scala/github4s/Decoders.scala
+++ b/src/main/scala/github4s/Decoders.scala
@@ -13,9 +13,9 @@ object Decoders {
       message ← c.downField("commit").downField("message").as[String]
       date ← c.downField("commit").downField("author").downField("date").as[String]
       url ← c.downField("html_url").as[String]
-      login ← c.downField("author").downField("login").as[String]
-      avatar_url ← c.downField("author").downField("avatar_url").as[String]
-      author_url ← c.downField("author").downField("html_url").as[String]
+      login ← c.downField("author").downField("login").as[Option[String]]
+      avatar_url ← c.downField("author").downField("avatar_url").as[Option[String]]
+      author_url ← c.downField("author").downField("html_url").as[Option[String]]
     } yield Commit(sha, message, date, url, login, avatar_url, author_url)
   }
 
diff --git a/src/main/scala/github4s/free/domain/Commit.scala b/src/main/scala/github4s/free/domain/Commit.scala
index a8e025543..9c6db95e5 100644
--- a/src/main/scala/github4s/free/domain/Commit.scala
+++ b/src/main/scala/github4s/free/domain/Commit.scala
@@ -5,7 +5,7 @@ case class Commit(
   message: String,
   date: String,
   url: String,
-  login: String,
-  avatar_url: String,
-  author_url: String
-)
\ No newline at end of file
+  login: Option[String],
+  avatar_url: Option[String],
+  author_url: Option[String]
+)
diff --git a/src/test/scala/github4s/utils/FakeResponses.scala b/src/test/scala/github4s/utils/FakeResponses.scala
index 557194cac..57c760e9a 100644
--- a/src/test/scala/github4s/utils/FakeResponses.scala
+++ b/src/test/scala/github4s/utils/FakeResponses.scala
@@ -290,6 +290,58 @@ trait FakeResponses {
       |        "html_url": "https://github.com/47deg/github4s/commit/e23072c0637e7ecc2ef6d9a6d090288dc63f6beb"
       |      }
       |    ]
+      |  },
+      |  {
+      |    "sha": "5f919723674b46a8ade67e6a62348953d2bf4350",
+      |    "commit": {
+      |      "author": {
+      |        "name": "Rafa Paradela",
+      |        "email": "rafa.p@47deg.com",
+      |        "date": "2016-05-23T14:00:25Z"
+      |      },
+      |      "committer": {
+      |        "name": "Rafa Paradela",
+      |        "email": "rafa.p@47deg.com",
+      |        "date": "2016-05-23T14:00:25Z"
+      |      },
+      |      "message": "Moved/Renamed package to omit organization prefix",
+      |      "tree": {
+      |        "sha": "373377d6041f110396e5650c2a84b24745d677d0",
+      |        "url": "https://api.github.com/repos/47deg/github4s/git/trees/373377d6041f110396e5650c2a84b24745d677d0"
+      |      },
+      |      "url": "https://api.github.com/repos/47deg/github4s/git/commits/5f919723674b46a8ade67e6a62348953d2bf4350",
+      |      "comment_count": 0
+      |    },
+      |    "url": "https://api.github.com/repos/47deg/github4s/commits/5f919723674b46a8ade67e6a62348953d2bf4350",
+      |    "html_url": "https://github.com/47deg/github4s/commit/5f919723674b46a8ade67e6a62348953d2bf4350",
+      |    "comments_url": "https://api.github.com/repos/47deg/github4s/commits/5f919723674b46a8ade67e6a62348953d2bf4350/comments",
+      |    "author": null,
+      |    "committer": {
+      |      "login": "rafaparadela",
+      |      "id": 315070,
+      |      "avatar_url": "https://avatars.githubusercontent.com/u/315070?v=3",
+      |      "gravatar_id": "",
+      |      "url": "https://api.github.com/users/rafaparadela",
+      |      "html_url": "https://github.com/rafaparadela",
+      |      "followers_url": "https://api.github.com/users/rafaparadela/followers",
+      |      "following_url": "https://api.github.com/users/rafaparadela/following{/other_user}",
+      |      "gists_url": "https://api.github.com/users/rafaparadela/gists{/gist_id}",
+      |      "starred_url": "https://api.github.com/users/rafaparadela/starred{/owner}{/repo}",
+      |      "subscriptions_url": "https://api.github.com/users/rafaparadela/subscriptions",
+      |      "organizations_url": "https://api.github.com/users/rafaparadela/orgs",
+      |      "repos_url": "https://api.github.com/users/rafaparadela/repos",
+      |      "events_url": "https://api.github.com/users/rafaparadela/events{/privacy}",
+      |      "received_events_url": "https://api.github.com/users/rafaparadela/received_events",
+      |      "type": "User",
+      |      "site_admin": false
+      |    },
+      |    "parents": [
+      |      {
+      |        "sha": "e23072c0637e7ecc2ef6d9a6d090288dc63f6beb",
+      |        "url": "https://api.github.com/repos/47deg/github4s/commits/e23072c0637e7ecc2ef6d9a6d090288dc63f6beb",
+      |        "html_url": "https://github.com/47deg/github4s/commit/e23072c0637e7ecc2ef6d9a6d090288dc63f6beb"
+      |      }
+      |    ]
       |  }
       |]
     """.stripMargin