Release v0.3.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.0 (2016-03-24)
+
+* Updated to sangria-marshalling-api v0.2.0
+
 ## v0.2.0 (2016-02-28)
 
 * Added support for `EncodeJson`/`DecodeJson`. This provides `ToInput` and `FromInput` instances for arbitrary tuples, case classes, etc. as long

README.md

@@ -5,7 +5,7 @@
 SBT Configuration:
 
 ```scala
-libraryDependencies += "org.sangria-graphql" %% "sangria-argonaut" % "0.2.0"
+libraryDependencies += "org.sangria-graphql" %% "sangria-argonaut" % "0.3.0"
 ```
 
 ## License

build.sbt

@@ -1,19 +1,19 @@
 name := "sangria-argonaut"
 organization := "org.sangria-graphql"
-version := "0.3.0-SNAPSHOT"
+version := "0.3.0"
 
 description := "Sangria argonaut marshalling"
 homepage := Some(url("http://sangria-graphql.org"))
 licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
 scalacOptions ++= Seq("-deprecation", "-feature")
 
 libraryDependencies ++= Seq(
-  "org.sangria-graphql" %% "sangria-marshalling-api" % "0.1.1",
+  "org.sangria-graphql" %% "sangria-marshalling-api" % "0.2.0",
   "io.argonaut" %% "argonaut" % "6.1",
 
-  "org.sangria-graphql" %% "sangria-marshalling-testkit" % "0.1.2" % "test",
+  "org.sangria-graphql" %% "sangria-marshalling-testkit" % "0.2.0" % "test",
   "org.scalatest" %% "scalatest" % "2.2.6" % "test"
 )
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11

src/main/scala/sangria/marshalling/argonaut.scala

@@ -8,10 +8,13 @@ import scala.util.{Success, Failure}
 object argonaut {
   implicit object ArgonautResultMarshaller extends ResultMarshaller {
     type Node = Json
+    type MapBuilder = ArrayMapBuilder[Node]
 
-    def emptyMapNode = Json.obj()
+    def emptyMapNode(keys: Seq[String]) = new ArrayMapBuilder[Node](keys)
+    def addMapNodeElem(builder: MapBuilder, key: String, value: Node, optional: Boolean) = builder.add(key, value)
+
+    def mapNode(builder: MapBuilder) = Json.obj(builder.toSeq: _*)
     def mapNode(keyValues: Seq[(String, Json)]) = Json.obj(keyValues: _*)
-    def addMapNodeElem(node: Json, key: String, value: Json, optional: Boolean) = node.withObject(_ + (key, value))
 
     def arrayNode(values: Vector[Json]) = Json.array(values: _*)
     def optionalArrayNodeValue(value: Option[Json]) = value match {