Merge pull request #164 from mattinbits/master

Added method for sorted print

3 files changed, 13 insertions, 1 deletions

diff --git a/src/main/scala/spray/json/JsValue.scala b/src/main/scala/spray/json/JsValue.scala
index e71b68e..08a673b 100644
--- a/src/main/scala/spray/json/JsValue.scala
+++ b/src/main/scala/spray/json/JsValue.scala
@@ -28,6 +28,7 @@ sealed abstract class JsValue {
   def toString(printer: (JsValue => String)) = printer(this)
   def compactPrint = CompactPrinter(this)
   def prettyPrint = PrettyPrinter(this)
+  def sortedPrint = SortedPrinter(this)
   def convertTo[T :JsonReader]: T = jsonReader[T].read(this)
 
   /**
diff --git a/src/main/scala/spray/json/PrettyPrinter.scala b/src/main/scala/spray/json/PrettyPrinter.scala
index 57cf35e..6af5443 100644
--- a/src/main/scala/spray/json/PrettyPrinter.scala
+++ b/src/main/scala/spray/json/PrettyPrinter.scala
@@ -37,9 +37,11 @@ trait PrettyPrinter extends JsonPrinter {
     }
   }
 
+  protected def organiseMembers(members: Map[String, JsValue]): Seq[(String, JsValue)] = members.toSeq
+
   protected def printObject(members: Map[String, JsValue], sb: StringBuilder, indent: Int) {
     sb.append("{\n")    
-    printSeq(members, sb.append(",\n")) { m =>
+    printSeq(organiseMembers(members), sb.append(",\n")) { m =>
       printIndent(sb, indent + Indent)
       printString(m._1, sb)
       sb.append(": ")
diff --git a/src/main/scala/spray/json/SortedPrinter.scala b/src/main/scala/spray/json/SortedPrinter.scala
new file mode 100644
index 0000000..070d36c
--- /dev/null
+++ b/src/main/scala/spray/json/SortedPrinter.scala
@@ -0,0 +1,9 @@
+package spray.json
+
+trait SortedPrinter extends PrettyPrinter {
+
+  override protected def organiseMembers(members: Map[String, JsValue]): Seq[(String, JsValue)] =
+    members.toSeq.sortBy(_._1)
+}
+
+object SortedPrinter extends SortedPrinter