Renamed package to xyz, New formatting, authorize directive supporting multiple permissions

8 files changed, 76 insertions, 76 deletions

diff --git a/src/test/scala/com/drivergrp/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index 42f9155..fef3eda 100644
--- a/src/test/scala/com/drivergrp/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -1,6 +1,5 @@
-package com.drivergrp.core
+package xyz.driver.core
 
-import com.drivergrp.core.auth._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import akka.http.scaladsl.server._
 import Directives._
@@ -8,6 +7,7 @@ import akka.http.scaladsl.model.headers.{HttpChallenges, RawHeader}
 import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected
 import org.scalatest.mock.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.auth._
 
 import scala.concurrent.Future
 import scalaz.OptionT
@@ -28,14 +28,14 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
   "'authorize' directive" should "throw error is auth token is not in the request" in {
 
     Get("/naive/attempt") ~>
-    authorize(CanSignOutReport) {
-      case (authToken, user) =>
-        complete("Never going to be here")
-    } ~>
-    check {
-      handled shouldBe false
-      rejections should contain(MissingHeaderRejection("WWW-Authenticate"))
-    }
+      authorize(CanSignOutReport) {
+        case (authToken, user) =>
+          complete("Never going to be here")
+      } ~>
+      check {
+        handled shouldBe false
+        rejections should contain(MissingHeaderRejection("WWW-Authenticate"))
+      }
   }
 
   it should "throw error is authorized user is not having the requested permission" in {
@@ -43,19 +43,19 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
     val referenceAuthToken = AuthToken(Base64("I am a pathologist's token"))
 
     Post("/administration/attempt").addHeader(
-        RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value)
+      RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value)
     ) ~>
-    authorize(CanAssignRoles) {
-      case (authToken, user) =>
-        complete("Never going to get here")
-    } ~>
-    check {
-      handled shouldBe false
-      rejections should contain(
+      authorize(CanAssignRoles) {
+        case (authToken, user) =>
+          complete("Never going to get here")
+      } ~>
+      check {
+        handled shouldBe false
+        rejections should contain(
           AuthenticationFailedRejection(
-              CredentialsRejected,
-              HttpChallenges.basic("User does not have the required permission CanAssignRoles")))
-    }
+            CredentialsRejected,
+            HttpChallenges.basic("User does not have the required permissions: CanAssignRoles")))
+      }
   }
 
   it should "pass and retrieve the token to client code, if token is in request and user has permission" in {
@@ -63,15 +63,15 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
     val referenceAuthToken = AuthToken(Base64("I am token"))
 
     Get("/valid/attempt/?a=2&b=5").addHeader(
-        RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value)
+      RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value)
     ) ~>
-    authorize(CanSignOutReport) {
-      case (authToken, user) =>
-        complete("Alright, \"" + authToken.value.value + "\" is handled")
-    } ~>
-    check {
-      handled shouldBe true
-      responseAs[String] shouldBe "Alright, \"I am token\" is handled"
-    }
+      authorize(CanSignOutReport) {
+        case (authToken, user) =>
+          complete("Alright, \"" + authToken.value.value + "\" is handled")
+      } ~>
+      check {
+        handled shouldBe true
+        responseAs[String] shouldBe "Alright, \"I am token\" is handled"
+      }
   }
 }
diff --git a/src/test/scala/com/drivergrp/core/CoreTest.scala b/src/test/scala/xyz/driver/core/CoreTest.scala
index 19e685c..f9a1aab 100644
--- a/src/test/scala/com/drivergrp/core/CoreTest.scala
+++ b/src/test/scala/xyz/driver/core/CoreTest.scala
@@ -1,11 +1,11 @@
-package com.drivergrp.core
+package xyz.driver.core
 
 import java.io.ByteArrayOutputStream
 
-import com.drivergrp.core.revision.Revision
+import org.mockito.Mockito._
 import org.scalatest.mock.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
-import org.mockito.Mockito._
+import xyz.driver.core.revision.Revision
 
 class CoreTest extends FlatSpec with Matchers with MockitoSugar {
 
diff --git a/src/test/scala/com/drivergrp/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala
index 2c9c2c9..aba79f7 100644
--- a/src/test/scala/com/drivergrp/core/FileTest.scala
+++ b/src/test/scala/xyz/driver/core/FileTest.scala
@@ -1,15 +1,15 @@
-package com.drivergrp.core
+package xyz.driver.core
 
 import java.io.File
 import java.nio.file.Paths
 
 import com.amazonaws.services.s3.AmazonS3
 import com.amazonaws.services.s3.model._
-import com.drivergrp.core.file.{FileSystemStorage, S3Storage}
+import org.mockito.Matchers._
+import org.mockito.Mockito._
 import org.scalatest.mock.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
-import org.mockito.Mockito._
-import org.mockito.Matchers._
+import xyz.driver.core.file.{FileSystemStorage, S3Storage}
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -44,9 +44,9 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar {
                                                false, // after file is uploaded it contains this one file (one page)
                                                false) // after file is deleted it is empty (zero pages) again
     when(s3ResultsMock.getObjectSummaries).thenReturn(
-        // before file created it is empty, `getObjectSummaries` is never called
-        List[S3ObjectSummary](s3ObjectSummaryMock).asJava, // after file is uploaded it contains this one file
-        List.empty[S3ObjectSummary].asJava) // after file is deleted it is empty again
+      // before file created it is empty, `getObjectSummaries` is never called
+      List[S3ObjectSummary](s3ObjectSummaryMock).asJava, // after file is uploaded it contains this one file
+      List.empty[S3ObjectSummary].asJava) // after file is deleted it is empty again
 
     val s3ObjectMetadataMock = mock[ObjectMetadata]
     val amazonS3Mock         = mock[AmazonS3]
diff --git a/src/test/scala/com/drivergrp/core/GeneratorsTest.scala b/src/test/scala/xyz/driver/core/GeneratorsTest.scala
index 631149e..0432b2a 100644
--- a/src/test/scala/com/drivergrp/core/GeneratorsTest.scala
+++ b/src/test/scala/xyz/driver/core/GeneratorsTest.scala
@@ -1,4 +1,4 @@
-package com.drivergrp.core
+package xyz.driver.core
 
 import org.scalatest.{Assertions, FlatSpec, Matchers}
 
@@ -86,7 +86,7 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
     generatedPair._2.length should be > 0
 
     nextPair(nextId[Int](), nextName[Int]()) should not be
-    nextPair(nextId[Int](), nextName[Int]())
+      nextPair(nextId[Int](), nextName[Int]())
   }
 
   it should "be able to generate a triad of two generated values" in {
@@ -103,7 +103,7 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
     generatedTriad._3 should be >= BigDecimal(0.00)
 
     nextTriad(nextId[Int](), nextName[Int](), nextBigDecimal()) should not be
-    nextTriad(nextId[Int](), nextName[Int](), nextBigDecimal())
+      nextTriad(nextId[Int](), nextName[Int](), nextBigDecimal())
   }
 
   it should "be able to generate a time value" in {
diff --git a/src/test/scala/com/drivergrp/core/JsonTest.scala b/src/test/scala/xyz/driver/core/JsonTest.scala
index 125e97c..bcdcd5d 100644
--- a/src/test/scala/com/drivergrp/core/JsonTest.scala
+++ b/src/test/scala/xyz/driver/core/JsonTest.scala
@@ -1,9 +1,9 @@
-package com.drivergrp.core
+package xyz.driver.core
 
-import com.drivergrp.core.json.{EnumJsonFormat, ValueClassFormat}
-import com.drivergrp.core.revision.Revision
-import com.drivergrp.core.time.provider.SystemTimeProvider
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.json.{EnumJsonFormat, ValueClassFormat}
+import xyz.driver.core.revision.Revision
+import xyz.driver.core.time.provider.SystemTimeProvider
 
 class JsonTest extends FlatSpec with Matchers {
 
@@ -11,10 +11,10 @@ class JsonTest extends FlatSpec with Matchers {
 
     val referenceId = Id[String](1312L)
 
-    val writtenJson = com.drivergrp.core.json.idFormat.write(referenceId)
+    val writtenJson = json.idFormat.write(referenceId)
     writtenJson.prettyPrint should be("1312")
 
-    val parsedId = com.drivergrp.core.json.idFormat.read(writtenJson)
+    val parsedId = json.idFormat.read(writtenJson)
     parsedId should be(referenceId)
   }
 
@@ -22,10 +22,10 @@ class JsonTest extends FlatSpec with Matchers {
 
     val referenceName = Name[String]("Homer")
 
-    val writtenJson = com.drivergrp.core.json.nameFormat.write(referenceName)
+    val writtenJson = json.nameFormat.write(referenceName)
     writtenJson.prettyPrint should be("\"Homer\"")
 
-    val parsedName = com.drivergrp.core.json.nameFormat.read(writtenJson)
+    val parsedName = json.nameFormat.read(writtenJson)
     parsedName should be(referenceName)
   }
 
@@ -33,10 +33,10 @@ class JsonTest extends FlatSpec with Matchers {
 
     val referenceTime = new SystemTimeProvider().currentTime()
 
-    val writtenJson = com.drivergrp.core.json.timeFormat.write(referenceTime)
+    val writtenJson = json.timeFormat.write(referenceTime)
     writtenJson.prettyPrint should be("{\n  \"timestamp\": " + referenceTime.millis + "\n}")
 
-    val parsedTime = com.drivergrp.core.json.timeFormat.read(writtenJson)
+    val parsedTime = json.timeFormat.read(writtenJson)
     parsedTime should be(referenceTime)
   }
 
@@ -44,10 +44,10 @@ class JsonTest extends FlatSpec with Matchers {
 
     val referenceRevision = Revision[String]("037e2ec0-8901-44ac-8e53-6d39f6479db4")
 
-    val writtenJson = com.drivergrp.core.json.revisionFormat.write(referenceRevision)
+    val writtenJson = json.revisionFormat.write(referenceRevision)
     writtenJson.prettyPrint should be("\"" + referenceRevision.id + "\"")
 
-    val parsedRevision = com.drivergrp.core.json.revisionFormat.read(writtenJson)
+    val parsedRevision = json.revisionFormat.read(writtenJson)
     parsedRevision should be(referenceRevision)
   }
 
diff --git a/src/test/scala/com/drivergrp/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala
index 21fe30a..dc44ee1 100644
--- a/src/test/scala/com/drivergrp/core/MessagesTest.scala
+++ b/src/test/scala/xyz/driver/core/MessagesTest.scala
@@ -1,13 +1,13 @@
-package com.drivergrp.core
+package xyz.driver.core
 
 import java.util.Locale
 
-import com.drivergrp.core.logging.Logger
-import com.drivergrp.core.messages.Messages
 import com.typesafe.config.{ConfigException, ConfigFactory}
 import org.mockito.Mockito._
 import org.scalatest.mock.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.logging.Logger
+import xyz.driver.core.messages.Messages
 
 import scala.collection.JavaConversions._
 
@@ -33,11 +33,11 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
     val log = mock[Logger]
 
     val messagesConfig = ConfigFactory.parseMap(
-        englishLocaleMessages ++ Map(
-            "zh.hello"            -> "你好，世界!",
-            "zh.greeting"         -> "你好，{0}!",
-            "zh.greetingFullName" -> "你好，{0} {1} {2}!"
-        ))
+      englishLocaleMessages ++ Map(
+        "zh.hello"            -> "你好，世界!",
+        "zh.greeting"         -> "你好，{0}!",
+        "zh.greetingFullName" -> "你好，{0} {1} {2}!"
+      ))
 
     val englishMessages    = Messages.messages(messagesConfig, log, Locale.US)
     val englishMessagesToo = Messages.messages(messagesConfig, log, Locale.ENGLISH)
@@ -50,7 +50,7 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
     englishMessagesToo("hello") should be(englishMessages("hello"))
     englishMessagesToo("greeting", "Homer") should be(englishMessages("greeting", "Homer"))
     englishMessagesToo("greetingFullName", "Homer", "J", "Simpson") should be(
-        englishMessages("greetingFullName", "Homer", "J", "Simpson"))
+      englishMessages("greetingFullName", "Homer", "J", "Simpson"))
 
     chineseMessages("hello") should be("你好，世界!")
     chineseMessages("greeting", "Homer") should be("你好，Homer!")
@@ -63,7 +63,7 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
     val messagesConfig = ConfigFactory.parseMap(englishLocaleMessages)
 
     an[ConfigException.Missing] should be thrownBy
-    Messages.messages(messagesConfig, log, Locale.GERMAN)
+      Messages.messages(messagesConfig, log, Locale.GERMAN)
   }
 
   it should "log a problem, when there is no message for key" in {
diff --git a/src/test/scala/com/drivergrp/core/StatsTest.scala b/src/test/scala/xyz/driver/core/StatsTest.scala
index c4f449b..27ea1bd 100644
--- a/src/test/scala/com/drivergrp/core/StatsTest.scala
+++ b/src/test/scala/xyz/driver/core/StatsTest.scala
@@ -1,11 +1,11 @@
-package com.drivergrp.core
+package xyz.driver.core
 
-import com.drivergrp.core.logging.Logger
-import com.drivergrp.core.stats.LogStats
-import com.drivergrp.core.time.{Time, TimeRange}
+import org.mockito.Mockito._
 import org.scalatest.mock.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
-import org.mockito.Mockito._
+import xyz.driver.core.logging.Logger
+import xyz.driver.core.stats.LogStats
+import xyz.driver.core.time.{Time, TimeRange}
 
 class StatsTest extends FlatSpec with Matchers with MockitoSugar {
 
diff --git a/src/test/scala/com/drivergrp/core/TimeTest.scala b/src/test/scala/xyz/driver/core/TimeTest.scala
index b928413..76ef42c 100644
--- a/src/test/scala/com/drivergrp/core/TimeTest.scala
+++ b/src/test/scala/xyz/driver/core/TimeTest.scala
@@ -1,13 +1,13 @@
-package com.drivergrp.core
+package xyz.driver.core
 
 import java.util.TimeZone
 
-import com.drivergrp.core.time.{Time, _}
-import org.scalacheck.{Arbitrary, Gen}
-import org.scalatest.{FlatSpec, Matchers}
-import org.scalatest.prop.Checkers
 import org.scalacheck.Arbitrary._
 import org.scalacheck.Prop.BooleanOperators
+import org.scalacheck.{Arbitrary, Gen}
+import org.scalatest.prop.Checkers
+import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.time.{Time, _}
 
 import scala.concurrent.duration._
 
@@ -56,7 +56,7 @@ class TimeTest extends FlatSpec with Matchers with Checkers {
   it should "have ordering defined correctly" in {
 
     Seq(Time(321L), Time(123L), Time(231L)).sorted should
-    contain theSameElementsInOrderAs Seq(Time(123L), Time(231L), Time(321L))
+      contain theSameElementsInOrderAs Seq(Time(123L), Time(231L), Time(321L))
 
     check { times: List[Time] =>
       times.sorted.sliding(2).filter(_.size == 2).forall {