Merge branch 'master' of https://github.com/code-check/github-api-scala into 30-UserEnv

Author: sukeshni

.editorconfig

@@ -0,0 +1,36 @@
+# EditorConfig (http://EditorConfig.org)
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+max_line_length = 80
+
+indent_style = space
+indent_size = 2
+
+
+[*.md]
+trim_trailing_whitespace = false
+
+[COMMIT_EDITMSG]
+max_line_length = 0
+
+[*.scala]
+max_line_length = 120
+
+[*.php]
+indent_size = 4
+
+[*.html]
+
+[*.css]
+
+[*.js]
+
+# Reactjs
+[*.jsx]

data/milestones.json

@@ -1,22 +1,47 @@
 [
   {
-    "title": "Sprint1",
-    "description": "From 2015/04/13 to 2015/04/26",
-    "due_on": "2015-04-26"
+    "title": "Sprint4",
+    "description": "2015/05/25 to 2015/06/07",
+    "due_on": "2015-06-07"
   },
   {
-    "title": "Sprint2",
-    "description": "2015/04/27 to 2015/05/10",
-    "due_on": "2015-05-10"
+    "title": "Sprint5",
+    "description": "2015/06/08 to 2015/06/21",
+    "due_on": "2015-06-21"
   },
   {
-    "title": "Sprint3",
-    "description": "From 2015/05/11 to 2015/05/24",
-    "due_on": "2015-05-24"
+    "title": "Sprint6",
+    "description": "2015/06/22 to 2015/07/05",
+    "due_on": "2015-07-05"
   },
   {
-    "title": "Sprint4",
-    "description": "2015/05/25 to 2015/06/07",
-    "due_on": "2015-06-07"
+    "title": "Sprint7",
+    "description": "2015/07/06 to 2015/07/19",
+    "due_on": "2015-07-19"
+  },
+  {
+    "title": "Sprint8",
+    "description": "2015/07/20 to 2015/08/02",
+    "due_on": "2015-08-02"
+  },
+  {
+    "title": "Sprint9",
+    "description": "2015/08/03 to 2015/08/16",
+    "due_on": "2015-08-16"
+  },
+  {
+    "title": "Sprint10",
+    "description": "2015/08/17 to 2015/08/30",
+    "due_on": "2015-08-30"
+  },
+  {
+    "title": "Sprint11",
+    "description": "2015/08/31 to 2015/09/13",
+    "due_on": "2015-09-13"
+  },
+  {
+    "title": "Sprint12",
+    "description": "2015/09/14 to 2015/09/27",
+    "due_on": "2015-09-27"
   }
 ]

src/main/scala/codecheck/github/api/GitHubAPI.scala

@@ -25,6 +25,7 @@ class GitHubAPI(token: String, client: AsyncHttpClient, tokenType: String = "tok
   with LabelOp
   with IssueOp
   with MilestoneOp
+  with WebhookOp
   with CollaboratorOp
 {
 

src/main/scala/codecheck/github/api/OAuthAPI.scala

@@ -11,6 +11,7 @@ import org.json4s.jackson.JsonMethods
 import org.json4s.DefaultFormats
 import java.util.UUID
 import codecheck.github.models.AccessToken
+import codecheck.github.exceptions.OAuthAPIException
 
 class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, client: AsyncHttpClient) {
   private implicit val format = DefaultFormats
@@ -48,7 +49,10 @@ class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, clie
     client.prepareRequest(builder.build).execute(new AsyncCompletionHandler[Response]() {
       def onCompleted(res: Response) = {
         val json = JsonMethods.parse(res.getResponseBody("utf-8"))
-        deferred.success(AccessToken(json))
+        (json \ "error").toOption match {
+          case Some(_) => deferred.failure(new OAuthAPIException(json))
+          case None => deferred.success(AccessToken(json))
+        }
         res
       }
       override def onThrowable(t: Throwable) {

src/main/scala/codecheck/github/exceptions/OAuthAPIException.scala

@@ -0,0 +1,11 @@
+package codecheck.github.exceptions
+
+import org.json4s.JValue
+import codecheck.github.models.OAuthErrorResponse
+
+class OAuthAPIException(body: JValue) extends Exception {
+  lazy val error = OAuthErrorResponse(body)
+
+  override def getMessage = error.toString
+
+}

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

@@ -4,6 +4,7 @@ import org.json4s.JValue
 import org.json4s.JNothing
 import org.json4s.JNull
 import org.json4s.JObject
+import org.json4s.JArray
 import org.json4s.Formats
 import org.json4s.DefaultFormats
 import org.json4s.jackson.JsonMethods
@@ -59,4 +60,16 @@ class AbstractJson(value: JValue) {
   }
 
   override def toString = JsonMethods.pretty(value)
+
+  def seqOpt[T](path: String): Seq[T] = {
+    path.split("\\.").foldLeft(value) { (v, s) =>
+      v \ s
+    } match {
+      case JNothing => Nil
+      case JNull => Nil
+      case v: JArray => v.values.map(_.asInstanceOf[T])
+    }
+  }
+
+  def seq(path: String): Seq[String] = seqOpt(path)
 }

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

@@ -0,0 +1,10 @@
+package codecheck.github.models
+
+import org.json4s.JValue
+
+case class OAuthErrorResponse(value: JValue) extends AbstractJson(value) {
+  def error = get("error")
+  def error_description = get("error_description")
+  def error_uri = get("error_uri")
+}
+

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

@@ -3,34 +3,66 @@ package codecheck.github.models
 import org.json4s.JValue
 import org.json4s.JsonDSL._
 
+/*
+## Github API response differently to organization requests depending on your involvement
+
+# listOwnOrganization and listUserOrganization returns only fields in the Organization class
+
+# updateOrganization will return all fields as you must be a member to update
+
+# getOrganization will return the fields in OrganizationDetail if you are a member
+If you are not a member of the organization, the following fields will NOT be returned
+- total_private_repos (int)
+- owned_private_repos (int)
+- private_gists (int)
+- disk_usage (long)
+- collaborators (int)
+- billing_email (string)
+- plan (object -> name, space, private_repos)
+
+## The following fields are optional (can be empty)
+- name (string)
+- email (string)
+- description (string)
+- location (string)
+- blog (string)
+- company (string)
+*/
+
+
 class Organization(value: JValue) extends AbstractJson(value) {
   def login = get("login")
   def id = get("id").toLong
   def url = get("url")
+  def repos_url = get("repos_url")
+  def events_url = get("events_url")
+  def members_url = get("members_url")
+  def public_members_url = get("public_members_url")
   def avatar_url = get("avatar_url")
   def description = get("description")
 }
 
 case class OrganizationDetail(value: JValue) extends Organization(value) {
   def name = get("name")
   def company = opt("company")
-  def email = get("email")
-  def billing_email = get("billing_email")
+  def blog = get("blog")
   def location = get("location")
+  def email = get("email")
   def public_repos = get("public_repos").toInt
   def public_gists = get("public_gists").toInt
+  def followers = get("followers").toInt
+  def following = get("following").toInt
+  def html_url = get("html_url")
+  def created_at = date("created_at")
+  def updated_at = date("updated_at")
+  def `type` = get("type")
 }
+
 case class OrganizationInput(
   name: Option[String] = None,
   company: Option[String] = None,
   description: Option[String] = None,
   location: Option[String] = None,
   email: Option[String] = None,
   billing_email: Option[String] = None
-) extends AbstractInput 
-
-/*
-object OrganizationInput {
-  import scala.language.implicitConversions
-  //implicit def fromString(s: String): Option[String] = Some(s)
-} */
+) extends AbstractInput 

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

@@ -0,0 +1,47 @@
+package codecheck.github.models
+
+import org.json4s.JValue
+
+class Webhook(value: JValue) extends AbstractJson(value) {
+  def id: Long = get("id").toLong
+  def url = get("url")
+  def test_url = get("test_url")
+  def ping_url = get("ping_url")
+  def name = get("name")
+  def events = seq("events")
+  def active = boolean("active")
+  def config = new WebhookConfig(get("config.url"), get("config.content_type"), get("config.secret"), get("config.insecure_ssl"));
+  def last_response = new WebhookResponse(value \ "last_response")
+  def updated_at = date("updated_at")
+  def created_at = date("created_at")
+}
+
+case class WebhookConfig(
+  url: String,
+  content_type: String = "json",
+  secret: String = "",
+  insecure_ssl: String = "0"
+  ) extends AbstractInput 
+
+case class WebhookCreateInput(
+  name: String,
+  config: WebhookConfig,
+  active: Boolean = true,
+  events: Seq[String] = Seq("push"),
+  add_events: Seq[String] = Nil,
+  remove_events: Seq[String] = Nil
+  ) extends AbstractInput
+
+case class WebhookUpdateInput(
+  config: Option[WebhookConfig] = None,
+  events: Option[Seq[String]] = None,
+  add_events: Option[Seq[String]] = None,
+  remove_events: Option[Seq[String]] = None,
+  active: Option[Boolean] = None
+  ) extends AbstractInput
+
+case class WebhookResponse(value: JValue) extends AbstractJson(value) {
+  def code = get("code")
+  def status = get("status")
+  def message = get("message")
+}

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

@@ -40,12 +40,9 @@ trait OrganizationOp {
     }
   }
 
-  def updateOrganization(org: String, input: OrganizationInput): Future[Option[OrganizationDetail]] = {
-    self.exec("PATCH", s"/orgs/${org}", input.value, true).map { res => 
-      res.statusCode match {
-        case 404 => None
-        case 200 => Some(new OrganizationDetail(res.body))
-      }
+  def updateOrganization(org: String, input: OrganizationInput): Future[OrganizationDetail] = {
+    self.exec("PATCH", s"/orgs/${org}", input.value).map { res => 
+      new OrganizationDetail(res.body)
     }
   }
 }