adjusted version, enhanced testcase using companion objects

Author: toggm

README.md

@@ -33,7 +33,7 @@ Add the following to `build.sbt`:
 
     resolvers += "Tegonal releases" at "https://github.com/tegonal/tegonal-mvn/raw/master/releases/"
 
-    libraryDependencies += "com.tegonal" %% "play-json-typedid" % "1.0.0"
+    libraryDependencies += "com.tegonal" %% "play-json-typedid" % "1.0.1"
 
 ## Usage
 

app/com/tegonal/play/json/TypedIdFormat.scala

@@ -1,4 +1,4 @@
-/* __ __ *\
+/* ____ *\
 * / /____ ___ ____ ___ ___ _/ / generic-id *
 * / __/ -_) _ `/ _ \/ _ \/ _ `/ / contributed by tegonal *
 * \__/\__/\_, /\___/_//_/\_,_/_/ http://tegonal.com/ *
@@ -31,8 +31,8 @@ object TypedId {
   implicit def fromJson(json: Json.type) = TypedId
 
   //extended format function
-  def idformat[I <: StringBaseId](fact: Factory[String, I]) = new StringTypedIdFormat[I](fact)
-  def idformat[I <: NumberBaseId](fact: Factory[BigDecimal, I]) = new NumberTypedIdFormat[I](fact)
+  def idformat[I <: StringBaseId](implicit fact: Factory[String, I]) = new StringTypedIdFormat[I]
+  def idformat[I <: NumberBaseId](implicit fact: Factory[BigDecimal, I]) = new NumberTypedIdFormat[I]
 
   trait BaseId[V] {
     val value: V
@@ -46,24 +46,21 @@ object TypedId {
   case class StringId[T](value: String) extends BaseId[String]
   case class NumberId[T](value: BigDecimal) extends BaseId[BigDecimal]
 
-  implicit class StringTypedIdFormat[I <: BaseId[String]](fact: Factory[String, I]) extends Format[I] {
+  class StringTypedIdFormat[I <: BaseId[String]](implicit fact: Factory[String, I]) extends Format[I] {
     def reads(json: JsValue): JsResult[I] = json match {
+
       case JsString(value) => JsSuccess(fact(value))
       case _ => JsError(s"Unexpected JSON value $json")
     }
 
     def writes(id: I): JsValue = JsString(id.value)
   }
-  implicit class NumberTypedIdFormat[I <: BaseId[BigDecimal]](fact: Factory[BigDecimal, I]) extends Format[I] {
+  class NumberTypedIdFormat[I <: BaseId[BigDecimal]](implicit fact: Factory[BigDecimal, I]) extends Format[I] {
     def reads(json: JsValue): JsResult[I] = json match {
       case JsNumber(value) => JsSuccess(fact(value))
       case _ => JsError(s"Unexpected JSON value $json")
     }
 
     def writes(id: I): JsValue = JsNumber(id.value)
   }
-
-  //provide formats for id classes
-  implicit def stringIdFormat[T]: Format[StringId[T]] = new StringTypedIdFormat[StringId[T]](StringId.apply _)
-  implicit def numberIdFormat[T]: Format[NumberId[T]] = new NumberTypedIdFormat[NumberId[T]](NumberId.apply _)
 }

build.sbt

@@ -2,7 +2,7 @@ name := "play-json-typedid"
 
 organization := "com.tegonal"
 
-version := "1.0.0"
+version := "1.0.1"
 
 scalaVersion := "2.11.1"
 

test/com/tegonal/play/json/TypedIdFormatSpec.scala

@@ -35,21 +35,28 @@ object TypedIdFormatSpec extends PlaySpecification {
   case class TestId2(value: BigDecimal) extends NumberBaseId
 
   //provide formats for id classes
-  implicit val testId1Format: Format[TestId1] = Json.idformat[TestId1](TestId1.apply _)
-  implicit val testId2Format: Format[TestId2] = Json.idformat[TestId2](TestId2.apply _)
+  object TestId1 {
+    implicit val testId1Format: Format[TestId1] = Json.idformat[TestId1](TestId1.apply _)
+  }
+  object TestId2 {
+    implicit val testId2Format: Format[TestId2] = Json.idformat[TestId2](TestId2.apply _)
+  }
 
   case class Test1(id: TestId1)
   case class Test2(id: TestId2)
   case class Test3(id: TestId1, foreigId: TestId2)
 
-  case class Test4(id: StringId[Test4])
-  case class Test5(id: NumberId[Test5])
-  case class Test6(id: StringId[Test6], foreigKey: NumberId[Test5])
+  //provide formats for container classes in companion objects
+  object Test1 {
+    implicit val test1Format: Format[Test1] = Json.format[Test1]
+  }
 
-  //provide formats for container classes
-  implicit val test1Format: Format[Test1] = Json.format[Test1]
-  implicit val test2Format: Format[Test2] = Json.format[Test2]
-  implicit val test3Format: Format[Test3] = Json.format[Test3]
+  object Test2 {
+    implicit val test2Format: Format[Test2] = Json.format[Test2]
+  }
+  object Test3 {
+    implicit val test3Format: Format[Test3] = Json.format[Test3]
+  }
 
   //test data
   val test1: JsValue = Json.parse("""