diff options
author | Chris Rebert <code@rebertia.com> | 2014-06-24 12:38:57 +0400 |
---|---|---|
committer | Chris Rebert <code@rebertia.com> | 2014-06-24 12:38:57 +0400 |
commit | bbb678b839325628b96aaa7f74f0f76a0a2f8f64 (patch) | |
tree | 5c686444195985dc34c8be9a05e3e5caacc809a3 /src | |
parent | 465526fb524526e937b8f9d3d6f22fabbb11c43b (diff) |
simplify
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/com/getbootstrap/rorschach/server/GitHubPullRequestWebHooksDirectives.scala (renamed from src/main/scala/com/getbootstrap/rorschach/server/GitHubIssuesWebHooksDirectives.scala) | 0 | ||||
-rw-r--r-- | src/main/scala/com/getbootstrap/rorschach/server/Settings.scala | 8 | ||||
-rw-r--r-- | src/main/scala/com/getbootstrap/rorschach/util/package.scala | 19 |
3 files changed, 3 insertions, 24 deletions
diff --git a/src/main/scala/com/getbootstrap/rorschach/server/GitHubIssuesWebHooksDirectives.scala b/src/main/scala/com/getbootstrap/rorschach/server/GitHubPullRequestWebHooksDirectives.scala index f8ea9cb..f8ea9cb 100644 --- a/src/main/scala/com/getbootstrap/rorschach/server/GitHubIssuesWebHooksDirectives.scala +++ b/src/main/scala/com/getbootstrap/rorschach/server/GitHubPullRequestWebHooksDirectives.scala diff --git a/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala b/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala index 770f52e..1b47482 100644 --- a/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala +++ b/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala @@ -1,6 +1,5 @@ package com.getbootstrap.rorschach.server -import scala.collection.JavaConversions._ import com.typesafe.config.Config import akka.actor.ActorSystem import akka.actor.Extension @@ -11,10 +10,9 @@ import akka.util.ByteString import com.getbootstrap.rorschach.util.Utf8String class SettingsImpl(config: Config) extends Extension { - val RepoFullNames: Set[String] = config.getStringList("lmvtfy.github-repos-to-watch").toSet - val BotUsername: String = config.getString("lmvtfy.username") - val BotPassword: String = config.getString("lmvtfy.password") - val WebHookSecretKey: ByteString = ByteString(config.getString("lmvtfy.web-hook-secret-key").utf8Bytes) + val BotUsername: String = config.getString("rorschach.username") + val BotPassword: String = config.getString("rorschach.password") + val WebHookSecretKey: ByteString = ByteString(config.getString("rorschach.web-hook-secret-key").utf8Bytes) } object Settings extends ExtensionId[SettingsImpl] with ExtensionIdProvider { override def lookup() = Settings diff --git a/src/main/scala/com/getbootstrap/rorschach/util/package.scala b/src/main/scala/com/getbootstrap/rorschach/util/package.scala index 1271047..0768e9f 100644 --- a/src/main/scala/com/getbootstrap/rorschach/util/package.scala +++ b/src/main/scala/com/getbootstrap/rorschach/util/package.scala @@ -1,9 +1,7 @@ package com.getbootstrap.rorschach import java.nio.charset.Charset -import scala.collection.mutable import scala.util.Try -import spray.http.Uri package object util { private val utf8 = Charset.forName("UTF-8") @@ -15,21 +13,4 @@ package object util { implicit class Utf8ByteArray(bytes: Array[Byte]) { def utf8String: Try[String] = Try { new String(bytes, utf8) } } - - implicit class RichStack[T](stack: mutable.Stack[T]) { - def popOption(): Option[T] = Try{ stack.pop() }.toOption - def topOption: Option[T] = Try{ stack.top }.toOption - } - - implicit class RichUri(uri: Uri) { - import spray.http.Uri.NamedHost - import spray.http.Uri.Query.{Empty=>EmptyQuery} - - def isHttp = uri.scheme == "http" || uri.scheme == "https" - def lacksUserInfo = uri.authority.userinfo.isEmpty - def lacksNonDefaultPort = uri.authority.port <= 0 - def hasNamedHost = uri.authority.host.isInstanceOf[NamedHost] - def isSafe = uri.isHttp && uri.lacksUserInfo && uri.hasNamedHost && uri.lacksNonDefaultPort && uri.isAbsolute - def withoutQuery = uri.withQuery(EmptyQuery) - } } |