Add UPickle integration

lloydmeta · Aug 4, 2016 · abd4b5e · abd4b5e
1 parent 0137458
commit abd4b5e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/enumeratum-upickle/compat/src/main/scala-2.11/enumeratum/values/UPickleValueEnum.scala b/enumeratum-upickle/compat/src/main/scala-2.11/enumeratum/values/UPickleValueEnum.scala
@@ -10,7 +10,7 @@ import UPickler._
  * Copyright 2016
  */
 
-sealed trait UPickleValueEnum[ValueType <: AnyVal, EntryType <: ValueEnumEntry[ValueType]] { this: ValueEnum[ValueType, EntryType] =>
+sealed trait UPickleValueEnum[ValueType, EntryType <: ValueEnumEntry[ValueType]] { this: ValueEnum[ValueType, EntryType] =>
 
   /**
    * Implicit UPickle ReadWriter
@@ -39,3 +39,10 @@ trait LongUPickleEnum[EntryType <: LongEnumEntry] extends UPickleValueEnum[Long,
 trait ShortUPickleEnum[EntryType <: ShortEnumEntry] extends UPickleValueEnum[Short, EntryType] { this: ValueEnum[Short, EntryType] =>
   implicit val uPickleReadWriter: RW[EntryType] = ReadWriter(writer(this).write, reader(this).read)
 }
+
+/**
+ * Enum implementation for String enum members that contains an implicit UPickle ReadWriter
+ */
+trait StringUPickleEnum[EntryType <: StringEnumEntry] extends UPickleValueEnum[String, EntryType] { this: ValueEnum[String, EntryType] =>
+  implicit val uPickleReadWriter: RW[EntryType] = ReadWriter(writer(this).write, reader(this).read)
+}
diff --git a/enumeratum-upickle/compat/src/main/scala-2.11/enumeratum/values/UPickler.scala b/enumeratum-upickle/compat/src/main/scala-2.11/enumeratum/values/UPickler.scala
@@ -13,7 +13,7 @@ object UPickler {
   /**
    * Returns a Reader for the given ValueEnum
    */
-  def reader[ValueType <: AnyVal: Reader, EntryType <: ValueEnumEntry[ValueType]](enum: ValueEnum[ValueType, EntryType]): Reader[EntryType] = {
+  def reader[ValueType: Reader, EntryType <: ValueEnumEntry[ValueType]](enum: ValueEnum[ValueType, EntryType]): Reader[EntryType] = {
     val valueReader = implicitly[Reader[ValueType]]
     Reader[EntryType] {
       valueReader.read.andThenPartial { case v if enum.withValueOpt(v).isDefined => enum.withValue(v) }
@@ -23,7 +23,7 @@ object UPickler {
   /**
    * Returns a Writer for the given ValueEnum
    */
-  def writer[ValueType <: AnyVal: Writer, EntryType <: ValueEnumEntry[ValueType]](enum: ValueEnum[ValueType, EntryType]): Writer[EntryType] = {
+  def writer[ValueType: Writer, EntryType <: ValueEnumEntry[ValueType]](enum: ValueEnum[ValueType, EntryType]): Writer[EntryType] = {
     val valueWriter = implicitly[Writer[ValueType]]
     Writer[EntryType] {
       case member => valueWriter.write(member.value)

diff --git a/enumeratum-upickle/compat/src/test/scala-2.11/enumeratum/values/UPicklerSpec.scala b/enumeratum-upickle/compat/src/test/scala-2.11/enumeratum/values/UPicklerSpec.scala
@@ -14,12 +14,13 @@ class UPicklerSpec extends FunSpec with Matchers {
   testPickling("LongUPickleEnum", UPickleContentType)
   testPickling("ShortUPickleEnum", UPickleDrinks)
   testPickling("IntUPickleEnum", UPickleLibraryItem)
+  testPickling("StringUPickleEnum", UPickleOperatingSystem)
   testPickling("IntUPickleEnum with values declared as members", UPickleMovieGenre)
 
   /**
    * Given an enum, tests its JSON reading and writing behaviour, grouping the test results under the given enumKind descriptor
    */
-  private def testPickling[ValueType <: AnyVal: Writer: Numeric, EntryType <: ValueEnumEntry[ValueType]: Reader: Writer](enumKind: String, enum: UPickleValueEnum[ValueType, EntryType] with ValueEnum[ValueType, EntryType]) = {
+  private def testPickling[ValueType: Writer, EntryType <: ValueEnumEntry[ValueType]: Reader: Writer](enumKind: String, enum: UPickleValueEnum[ValueType, EntryType] with ValueEnum[ValueType, EntryType]) = {
     describe(enumKind) {
       describe("Reader") {
 
@@ -44,7 +45,6 @@ class UPicklerSpec extends FunSpec with Matchers {
       describe("Writer") {
 
         it("should write enum values to JS") {
-          val numeric = implicitly[Numeric[ValueType]]
           val valueTypeWriter = implicitly[Writer[ValueType]]
           enum.values.foreach { entry =>
             writeJs(entry) shouldBe valueTypeWriter.write(entry.value)
@@ -99,6 +99,19 @@ case object UPickleLibraryItem extends IntEnum[UPickleLibraryItem] with IntUPick
 
 }
 
+sealed abstract class UPickleOperatingSystem(val value: String) extends StringEnumEntry
+
+case object UPickleOperatingSystem extends StringEnum[UPickleOperatingSystem] with StringUPickleEnum[UPickleOperatingSystem] {
+
+  case object Linux extends UPickleOperatingSystem("linux")
+  case object OSX extends UPickleOperatingSystem("osx")
+  case object Windows extends UPickleOperatingSystem("windows")
+  case object Android extends UPickleOperatingSystem("android")
+
+  val values = findValues
+
+}
+
 sealed abstract class UPickleMovieGenre extends IntEnumEntry
 
 case object UPickleMovieGenre extends IntEnum[UPickleMovieGenre] with IntUPickleEnum[UPickleMovieGenre] {