Andre changes

build.sbt

@@ -1,7 +1,7 @@
 
 lazy val buildSettings = Seq(
   organization := "io.github.finagle",
-  version := "0.5.0",
+  version := "0.6.0",
   scalaVersion := "2.12.4",
   crossScalaVersions := Seq("2.11.12","2.12.4"),
   fork in Test := true
@@ -10,8 +10,8 @@ lazy val buildSettings = Seq(
 val baseSettings = Seq(
   resolvers += Resolver.bintrayRepo("jeremyrsmith", "maven"),
   libraryDependencies ++= Seq(
-    "com.twitter" %% "finagle-core" % "17.11.0",
-    "com.twitter" %% "finagle-netty3" % "17.11.0",
+    "com.twitter" %% "finagle-core" % "18.1.0",
+    "com.twitter" %% "finagle-netty3" % "18.1.0",
     "org.scalatest" %% "scalatest" % "3.0.4" % "test,it",
     "org.scalacheck" %% "scalacheck" % "1.13.5" % "test,it",
     "org.scalamock" %% "scalamock-scalatest-support" % "3.4.2" % "test,it"
@@ -89,6 +89,8 @@ lazy val docs = project
 
 parallelExecution in Test := false
 
+javaOptions in Test += "-Duser.timezone=UTC"
+
 test in Test in `finagle-postgres` := {
   (test in Test in `finagle-postgres`).value
   (test in Test in `finagle-postgres-shapeless`).value

src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala

@@ -0,0 +1,4 @@
+package com.twitter.finagle.postgres.values
+
+case class JSONB(value: String) extends AnyVal
+

src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala

@@ -139,11 +139,11 @@ object ValueDecoder {
 
   implicit val javaBigDecimal: ValueDecoder[java.math.BigDecimal] = bigDecimal.map(_.bigDecimal)
 
-  val jsonb = instance(
-    s => Return(s),
+  implicit val jsonb: ValueDecoder[JSONB] = instance(
+    s => Return(JSONB(s)),
     (b, c) => Try {
       b.readByte()  //discard version number
-      new String(Array.fill(b.readableBytes())(b.readByte()), c)
+      JSONB(new String(Array.fill(b.readableBytes())(b.readByte()), c))
     }
   )
 

src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala

@@ -1,14 +1,14 @@
 package com.twitter.finagle.postgres.values
 
-import java.net.InetAddress
-import java.nio.charset.{Charset, StandardCharsets}
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
 import java.sql.Timestamp
 import java.time._
 import java.time.temporal.JulianFields
 import java.util.UUID
 
-import com.twitter.util.{Return, Throw, Try}
-import org.jboss.netty.buffer.{ChannelBuffer, ChannelBuffers}
+import org.jboss.netty.buffer.ChannelBuffer
+import org.jboss.netty.buffer.ChannelBuffers
 
 import scala.language.existentials
 
@@ -189,6 +189,17 @@ object ValueEncoder extends LowPriorityEncoder {
     m: Map[String, String] => m.mapValues(Option(_))
   }
 
+  implicit val jsonb: ValueEncoder[JSONB] = instance[JSONB](
+    "jsonb",
+    j => String.valueOf(j),
+    (j, c) => {
+      val cb: ChannelBuffer = ChannelBuffers.buffer(1 + j.value.getBytes.length)
+      cb.writeByte(1)
+      cb.writeBytes(j.value.getBytes)
+      Some(cb)
+    }
+  )
+
   @inline final implicit def option[T](implicit encodeT: ValueEncoder[T]): ValueEncoder[Option[T]] =
     new ValueEncoder[Option[T]] {
       val typeName = encodeT.typeName

src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala

@@ -1,12 +1,16 @@
 package com.twitter.finagle.postgres.integration
 
 import java.sql.Timestamp
-import java.time.{Instant, ZoneId, ZonedDateTime}
+import java.time.Instant
 
-import com.twitter.finagle.postgres.codec.ServerError
 import com.twitter.finagle.postgres._
-import com.twitter.finagle.{Postgres, Status}
-import com.twitter.util.{Await, Duration, Future, Promise}
+import com.twitter.finagle.postgres.codec.ServerError
+import com.twitter.finagle.Postgres
+import com.twitter.finagle.Status
+import com.twitter.util.Try
+import com.twitter.util.Await
+import com.twitter.util.Duration
+import com.twitter.util.Future
 
 object IntegrationSpec {
   val pgTestTable = "finagle_test"
@@ -78,6 +82,8 @@ class IntegrationSpec extends Spec {
       """.stripMargin.format(IntegrationSpec.pgTestTable))
       val response2 = Await.result(createTableQuery, queryTimeout)
       response2 must equal(OK(1))
+
+      Try(Await.result(client.execute("create extension hstore"))) // enable hstore type
     }
 
     def insertSampleData(client: PostgresClient): Unit = {

src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala

@@ -1,18 +1,21 @@
 package com.twitter.finagle.postgres.values
 
+import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
 import java.time._
-import java.time.temporal.{ChronoField, JulianFields}
+import java.time.temporal.ChronoField
 
-import com.twitter.finagle.postgres.{Generators, PostgresClient, ResultSet, Spec}
-import Generators._
 import com.twitter.finagle.Postgres
+import com.twitter.finagle.postgres.Generators._
+import com.twitter.finagle.postgres.PostgresClient
 import com.twitter.finagle.postgres.PostgresClient.TypeSpecifier
-import com.twitter.finagle.postgres.messages.{DataRow, Field}
+import com.twitter.finagle.postgres.ResultSet
+import com.twitter.finagle.postgres.Spec
+import com.twitter.finagle.postgres.messages.DataRow
+import com.twitter.finagle.postgres.messages.Field
 import com.twitter.util.Await
 import org.jboss.netty.buffer.ChannelBuffers
 import org.scalacheck.Arbitrary
-import Arbitrary.arbitrary
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
 
 class ValuesSpec extends Spec with GeneratorDrivenPropertyChecks {
@@ -138,6 +141,21 @@ class ValuesSpec extends Spec with GeneratorDrivenPropertyChecks {
       )
       "parse uuids" in test(ValueDecoder.uuid, ValueEncoder.uuid)("uuid_send", "uuid")
       "parse dates" in test(ValueDecoder.localDate, ValueEncoder.date)("date_send", "date")
+
+      "parse jsonb" in {
+        val json = "{\"a\":\"b\"}"
+        val createBuffer = () => {
+          ValueEncoder[JSONB].encodeBinary(JSONB(json), Charset.defaultCharset()).get
+        }
+        val buffer = createBuffer()
+        val version = buffer.readByte()
+        val encoded = Array.fill(buffer.readableBytes())(buffer.readByte())
+        version must equal(1)
+        encoded must equal(json.getBytes)
+
+        val decoded = ValueDecoder[JSONB].decodeBinary("", createBuffer(), Charset.defaultCharset()).get()
+        decoded.value must equal(json)
+      }
     }
   }
 }