Align upickle PR with project

jwt-scala · Jan 13, 2017 · d495685 · d495685
1 parent 4ca463c
commit d495685
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/docs/src/main/tut/jwt-circe-jwt-upickle.md → docs/src/main/tut/jwt-upickle-jwt-upickle.md b/docs/src/main/tut/jwt-circe-jwt-upickle.md → docs/src/main/tut/jwt-upickle-jwt-upickle.md
diff --git a/docs/src/site/samples/jwt-upickle/index.html b/docs/src/site/samples/jwt-upickle/index.html
@@ -0,0 +1,7 @@
+---
+layout: sample
+project: uPickle
+---
+
+{% capture jwtUpickle %}{% include tut/jwt-upickle-jwt-upickle.md %}{% endcapture %}
+{{ jwtUpickle | markdownify }}
diff --git a/json/upickle/src/main/scala/JwtUpickle.scala b/json/upickle/src/main/scala/JwtUpickle.scala
@@ -5,23 +5,24 @@ import upickle.json
 import upickle.default._
 
 /**
-  * Created by alonsodomin on 07/09/2016.
+  * Implementation of `JwtCore` using `Js.Value` from uPickle.
+  *
+  * To see a full list of samples, check the [[http://pauldijou.fr/jwt-scala/samples/jwt-upickle/ online documentation]].
   */
-object JwtUpickle extends JwtJsonCommon[Js.Value] with JwtUpickleImplicits {
-  override protected def parse(value: String): Js.Value = json.read(value)
+object JwtUpickle extends JwtJsonCommon[Js.Value] {
+  protected def parse(value: String): Js.Value = json.read(value)
 
-  override protected def stringify(value: Js.Value): String = json.write(value)
+  protected def stringify(value: Js.Value): String = json.write(value)
 
-  override protected def getAlgorithm(header: Js.Value): Option[JwtAlgorithm] = header match {
+  protected def getAlgorithm(header: Js.Value): Option[JwtAlgorithm] = header match {
     case obj: Js.Obj =>
       val fields = obj.value.toMap
       fields.get("alg").flatMap(alg => JwtAlgorithm.optionFromString(alg.str))
 
     case _ => None
   }
 
-  override protected def parseHeader(header: String): JwtHeader = read[JwtHeader](header)
-
-  override protected def parseClaim(claim: String): JwtClaim = read[JwtClaim](claim)
+  protected def parseHeader(header: String): JwtHeader = read[JwtHeader](header)
+  protected def parseClaim(claim: String): JwtClaim = read[JwtClaim](claim)
 
 }
diff --git a/json/upickle/src/main/scala/JwtUpickleImplicits.scala b/json/upickle/src/main/scala/JwtUpickleImplicits.scala
@@ -4,10 +4,7 @@ import upickle.Js
 import upickle.json
 import upickle.default._
 
-/**
-  * Created by alonsodomin on 07/09/2016.
-  */
-private[jwt] trait JwtUpickleImplicits {
+trait JwtUpickleImplicits {
 
   implicit def headerReader: Reader[JwtHeader] = Reader[JwtHeader] {
     case obj: Js.Obj =>

diff --git a/json/upickle/src/main/scala/package.scala b/json/upickle/src/main/scala/package.scala
@@ -0,0 +1,3 @@
+package pdi
+
+package object jwt extends JwtUpickleImplicits {}