Merge pull request #24 from queryverse/new-mime-type

Add support for "application/vnd.dataresource+json" MIME type

Author: davidanthoff

NEWS.md

@@ -1,3 +1,6 @@
+# QueryOperators.jl v0.7.0 Release Notes
+* Add support for "application/vnd.dataresource+json" MIME showing
+
 # QueryOperators.jl v0.6.0 Release Notes
 * Add unique command
 

src/enumerable/show.jl

@@ -1,7 +1,7 @@
 function printsequence(io::IO, source::Enumerable)
     T = eltype(source)
     rows = Base.IteratorSize(source) == Base.HasLength() ? length(source) : "?"
-    
+
     print(io, "$(rows)-element query result")
 
     max_element_to_show = 10
@@ -18,7 +18,7 @@ function printsequence(io::IO, source::Enumerable)
             else
                 extra_rows = length(source) - max_element_to_show
                 print(io, "$extra_rows more $(extra_rows==1 ? "element" : "elements")")
-            end            
+            end
             break
         else
             print(io, " ")
@@ -43,9 +43,21 @@ function Base.show(io::IO, ::MIME"text/html", source::Enumerable)
         TableShowUtils.printHTMLtable(io, source)
     else
         error("Cannot write this Enumerable as text/html.")
-    end    
+    end
 end
 
 function Base.Multimedia.showable(::MIME"text/html", source::Enumerable)
     return eltype(source) <: NamedTuple
 end
+
+function Base.show(io::IO, ::MIME"application/vnd.dataresource+json", source::Enumerable)
+    if eltype(source) <: NamedTuple
+        TableShowUtils.printdataresource(io, source)
+    else
+        error("Cannot write this Enumerable as 'application/vnd.dataresource+json'.")
+    end
+end
+
+function Base.Multimedia.showable(::MIME"application/vnd.dataresource+json", source::Enumerable)
+    return eltype(source) <: NamedTuple
+end

test/runtests.jl

@@ -66,7 +66,7 @@ end
 
 # ensure that the default value must be of the same type
 errored = false
-try 
+try
     QueryOperators.@default_if_empty(source_1, "string")
 catch
     errored = true
@@ -147,6 +147,9 @@ a │ b │ c
 @test sprint((stream,data)->show(stream, "text/html", data), ntups) ==
     "<table><thead><tr><th>a</th><th>b</th><th>c</th></tr></thead><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></tbody></table>"
 
+@test sprint((stream,data)->show(stream, "application/vnd.dataresource+json", data), ntups) ==
+    "{\"schema\":{\"fields\":[{\"name\":\"a\",\"type\":\"integer\"},{\"name\":\"b\",\"type\":\"integer\"},{\"name\":\"c\",\"type\":\"integer\"}]},\"data\":[{\"a\":1,\"b\":2,\"c\":3},{\"a\":4,\"b\":5,\"c\":6}]}"
+
 end
 
 include("test_enumerable_unique.jl")