sparql 3.0.0 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0bff4a7c42287bdfe66a68fe8b9749ba03a28c79
-  data.tar.gz: 1922e7c06a6387ec9dd8b4797fb262f8d8b2b70d
+SHA256:
+  metadata.gz: f623228f6e6d10b6b8221219ba1b7b6fcfdf8410db716cb400ed50b5e59f7d25
+  data.tar.gz: 8678296e2d0744c5d8dbbc0ac424c7c8b0e2540fa730a03960e961b9c2f08b33
 SHA512:
-  metadata.gz: 12f7636ac3e765bebe48ffff2de8255bdc8465279576a4a7ceeea7c196412ee0410b115418646bcc329b9a187e204469438b2d0f01676d0c7e9332bae9797b9c
-  data.tar.gz: 0f7cba620c3a2548d1e7645b25713f1071135290f34ba583a2c70054700a9e0c1b5ea7d0176d3fc049f0e7dfc2c0e334108893fd2d491f5354c01a03821408d8
+  metadata.gz: f2b53c1cbf504ac9818d2a6ee0b03b9703e447698c5d2edcef697d49a4a7eaca63f563511440ec8e15e2bf64b8a91290b15eaf5aac2261c5fdd59a88a779fa66
+  data.tar.gz: 19a3844b38131cbc1cfa63a8109602fe07c98b58af4c8eef77cbb3bc668a055872582aa529e8b06ab27e873aacbc2b882abb435ab61148294f28fe4391024cdc

data/README.md

@@ -2,15 +2,15 @@
 
 This is a [Ruby][] implementation of [SPARQL][] for [RDF.rb][].
 
-[![Gem Version](https://badge.fury.io/rb/sparql.png)](http://badge.fury.io/rb/sparql)
+[![Gem Version](https://badge.fury.io/rb/sparql.png)](https://badge.fury.io/rb/sparql)
 
-[![Build Status](https://travis-ci.org/ruby-rdf/sparql.png?branch=master)](http://travis-ci.org/ruby-rdf/sparql)
+[![Build Status](https://travis-ci.org/ruby-rdf/sparql.png?branch=master)](https://travis-ci.org/ruby-rdf/sparql)
 
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/sparql/badge.svg)](https://coveralls.io/r/ruby-rdf/sparql)
 
 ## Features
 
-* 100% free and unencumbered [public domain](http://unlicense.org/) software.
+* 100% free and unencumbered [public domain](https://unlicense.org/) software.
 * Complete [SPARQL 1.1 Query][] parsing and execution
 * SPARQL results as [XML][SPARQL XML], [JSON][SPARQL JSON],
   [CSV][SPARQL 1.1 Query Results CSV and TSV Formats],
@@ -27,6 +27,7 @@ This is a [Ruby][] implementation of [SPARQL][] for [RDF.rb][].
 * Compatible with Ruby >= 2.2.2.
 * Compatible with older Ruby versions with the help of the [Backports][] gem.
 * Supports Unicode query strings both on all versions of Ruby.
+* Provisional support for [SPARQL*][].
 
 ## Description
 
@@ -45,20 +46,20 @@ The {SPARQL} gem uses the [SPARQL 1.1 Query][] {file:etc/sparql11.html EBNF gram
 
 The SPARQL gem now implements the following [SPARQL 1.1 Query][] operations:
 
-* [Functions](http://www.w3.org/TR/sparql11-query/#SparqlOps)
-* [BIND](http://www.w3.org/TR/sparql11-query/#bind)
-* [GROUP BY](http://www.w3.org/TR/sparql11-query/#groupby)
-* [Aggregates](http://www.w3.org/TR/sparql11-query/#aggregates)
-* [Subqueries](http://www.w3.org/TR/sparql11-query/#subqueries)
-* [Inline Data](http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data)
-* [Inline Data](http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data)
-* [Exists](http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#func-filter-exists)
-* [Negation](http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#negation)
-* [Property Paths](http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#propertypaths)
+* [Functions](https://www.w3.org/TR/sparql11-query/#SparqlOps)
+* [BIND](https://www.w3.org/TR/sparql11-query/#bind)
+* [GROUP BY](https://www.w3.org/TR/sparql11-query/#groupby)
+* [Aggregates](https://www.w3.org/TR/sparql11-query/#aggregates)
+* [Subqueries](https://www.w3.org/TR/sparql11-query/#subqueries)
+* [Inline Data](https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data)
+* [Inline Data](https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data)
+* [Exists](https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#func-filter-exists)
+* [Negation](https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#negation)
+* [Property Paths](https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#propertypaths)
 
 The gem also includes the following [SPARQL 1.1 Update][] operations:
-* [Graph Update](http://www.w3.org/TR/sparql11-update/#graphUpdate)
-* [Graph Management](http://www.w3.org/TR/sparql11-update/#graphManagement)
+* [Graph Update](https://www.w3.org/TR/sparql11-update/#graphUpdate)
+* [Graph Management](https://www.w3.org/TR/sparql11-update/#graphManagement)
 
 Not supported:
 
@@ -70,15 +71,15 @@ Not supported:
 either in this, or related gems.
 
 ### Updates for RDF 1.1
-Starting with version 1.1.2, the SPARQL gem uses the 1.1 version of the [RDF.rb][], which adheres to [RDF 1.1 Concepts](http://www.w3.org/TR/rdf11-concepts/) rather than [RDF 1.0](http://www.w3.org/TR/rdf-concepts/). The main difference is that there is now no difference between a _Simple Literal_ (a literal with no datatype or language) and a Literal with datatype _xsd:string_; this causes some minor differences in the way in which queries are understood, and when expecting different results.
+Starting with version 1.1.2, the SPARQL gem uses the 1.1 version of the [RDF.rb][], which adheres to [RDF 1.1 Concepts](https://www.w3.org/TR/rdf11-concepts/) rather than [RDF 1.0](https://www.w3.org/TR/rdf-concepts/). The main difference is that there is now no difference between a _Simple Literal_ (a literal with no datatype or language) and a Literal with datatype _xsd:string_; this causes some minor differences in the way in which queries are understood, and when expecting different results.
 
 Additionally, queries now take a block, or return an `Enumerator`; this is in keeping with much of the behavior of [RDF.rb][] methods, including `Queryable#query`, and with version 1.1 or [RDF.rb][], Query#execute. As a consequence, all queries which used to be of the form `query.execute(repository)` may equally be called as `repository.query(query)`. Previously, results were returned as a concrete class implementing `RDF::Queryable` or `RDF::Query::Solutions`, these are now `Enumerators`.
 
 ### SPARQL Extension Functions
 Extension functions may be defined, which will be invoked during query evaluation. For example:
 
-    # Register a function using the IRI <http://rubygems.org/gems/sparql#crypt>
-    crypt_iri = RDF::URI("http://rubygems.org/gems/sparql#crypt")
+    # Register a function using the IRI <https://rubygems#crypt>
+    crypt_iri = RDF::URI("https://rubygems#crypt")
     SPARQL::Algebra::Expression.register_extension(crypt_iri) do |literal|
       raise TypeError, "argument must be a literal" unless literal.literal?
       RDF::Literal(literal.to_s.crypt)
@@ -86,7 +87,7 @@ Extension functions may be defined, which will be invoked during query evaluatio
 
 Then, use the function in a query:
 
-    PREFIX rsp: <http://rubygems.org/gems/sparql#>
+    PREFIX rsp: <https://rubygems#>
     PREFIX schema: <http://schema.org/>
     SELECT ?crypted
     {
@@ -96,6 +97,117 @@ Then, use the function in a query:
 
 See {SPARQL::Algebra::Expression.register_extension} for details.
 
+### SPARQLStar (SPARQL*)
+
+The gem supports [SPARQL*][] where patterns may include sub-patterns recursively, for a kind of Reification.
+
+For example, the following Turtle* file uses a statement as the subject of another statement:
+
+    @prefix : <http://bigdata.com/> .
+    @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+    @prefix ex:  <http://example.org/> .
+
+    :bob foaf:name "Bob" .
+    <<:bob foaf:age 23>> ex:certainty 0.9 .
+
+This can be queried using the following query:
+
+    PREFIX : <http://bigdata.com/>
+    PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+    PREFIX ex:  <http://example.org/>
+
+    SELECT ?age ?c WHERE {
+       ?bob foaf:name "Bob" .
+       <<?bob foaf:age ?age>> ex:certainty ?c .
+    }
+
+This treats `<<:bob foaf:age 23>>` as a subject resource, and the pattern `<<?bob foaf:age ?age>>` to match that resource and bind the associated variables.
+
+**Note: This feature is subject to change or elimination as the standards process progresses.**
+
+#### BIND
+
+There is an alternate syntax using the `BIND` operator:
+
+    PREFIX : <http://bigdata.com>
+    PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+    PREFIX dct:  <http://purl.org/dc/elements/1.1/>
+
+    SELECT ?a ?b ?c WHERE {
+       ?bob foaf:name "Bob" .
+       BIND( <<?bob foaf:age ?age>> AS ?a ) .
+       ?t ?b ?c .
+    }
+
+When binding, the triple can be either in Property Graph (`:PG`) or Separate Assertions (`:SA`) mode, as the query matches based on the pattern matching as a subject (or object) and does not need to be specifically asserted in the graph. When parsing in Property Graph mode, such triples will also be added to the enclosing graph. Thus, querying for `<<?bob foaf:age ?age>>` and `?bob foaf:age ?age` may not represent the same results.
+
+When binding an embedded triple to a variable, it is the matched triples which are bound, not the pattern. Thus, the example above with `SELECT ?a ?b ?c` would end up binding `?a` to `:bob foaf:name 23`.
+
+#### Construct
+
+As well as a `CONSTRUCT`:
+
+    PREFIX : <http://bigdata.com>
+    PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+    PREFIX dct:  <http://purl.org/dc/elements/1.1/>
+
+    CONSTRUCT {
+      ?bob foaf:name "Bob" .
+      <<?bob foaf:age ?age>> ?b ?c .
+    }
+    WHERE {
+      ?bob foaf:name "Bob" .
+      <<?bob foaf:age ?age>> ?b ?c .
+    }
+
+Note that results can be serialized only when the format supports [RDF*][].
+
+#### SPARQL results
+
+The SPARQL results formats are extended to serialize embedded triples as described for [RDF4J](https://rdf4j.org/documentation/programming/rdfstar/):
+
+    {
+      "head" : {
+        "vars" : [
+          "a",
+          "b",
+          "c"
+        ]
+      },
+      "results" : {
+        "bindings": [
+          { "a" : {
+              "type" : "triple",
+              "value" : {
+                "s" : {
+                  "type" : "uri",
+                  "value" : "http://example.org/bob"
+                },
+                "p" : {
+                  "type" : "uri",
+                  "value" : "http://xmlns.com/foaf/0.1/name"
+                },
+                "o" : {
+                  "datatype" : "http://www.w3.org/2001/XMLSchema#integer",
+                  "type" : "literal",
+                  "value" : "23"
+                }
+              }
+            },
+            "b": { 
+              "type": "uri",
+              "value": "http://example.org/certainty"
+            },
+            "c" : {
+              "datatype" : "http://www.w3.org/2001/XMLSchema#decimal",
+              "type" : "literal",
+              "value" : "0.9"
+            }
+          }
+        ]
+      }
+    }
+
 ### Middleware
 
 {Rack::SPARQL} is a superset of [Rack::LinkedData][] to allow content negotiated results
@@ -150,12 +262,12 @@ a full set of RDF formats.
       result.inspect
     end
 
-### Updating a respository
+### Updating a repository
 
     queryable = RDF::Repository.load("etc/doap.ttl")
     sse = SPARQL.parse(%(
       PREFIX doap: <http://usefulinc.com/ns/doap#>
-      INSERT DATA { <http://rubygems.org/gems/sparql> doap:implements <http://www.w3.org/TR/sparql11-update/>}
+      INSERT DATA { <https://rubygems> doap:implements <http://www.w3.org/TR/sparql11-update/>}
     ), update: true)
     sse.execute(queryable)
 
@@ -257,14 +369,14 @@ Full documentation available on [Rubydoc.info][SPARQL doc]
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
+* [Ruby](https://ruby-lang.org/) (>= 2.2.2)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.0)
 * [SPARQL::Client](https://rubygems.org/gems/sparql-client) (~> 3.0)
 * [SXP](https://rubygems.org/gems/sxp) (~> 1.0)
 * [Builder](https://rubygems.org/gems/builder) (>= 3.0.0)
 * [JSON](https://rubygems.org/gems/json) (>= 1.8.2)
 * Soft dependency on [Linked Data][] (>= 3.0)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7)
+* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.7)
   Falls back to REXML for XML parsing Builder for XML serializing. Nokogiri is much more efficient
 * Soft dependency on [Equivalent XML](https://rubygems.org/gems/equivalent-xml) (>= 0.3.0)
   Equivalent XML performs more efficient comparisons of XML Literals when Nokogiri is included
@@ -273,7 +385,7 @@ Full documentation available on [Rubydoc.info][SPARQL doc]
 
 ## Installation
 
-The recommended installation method is via [RubyGems](http://rubygems.org/).
+The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of the `SPARQL` gem, do:
 
     % [sudo] gem install sparql
@@ -286,13 +398,13 @@ To get a local working copy of the development repository, do:
 
 ## Mailing List
 
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 ## Authors
 
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
-* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
-* [Pius Uzamere](http://github.com/pius) - <http://pius.me/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
+* [Arto Bendiken](https://github.com/artob) - <https://ar.to/>
+* [Pius Uzamere](https://github.com/pius) - <https://pius.me/>
 
 ## Contributing
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -312,49 +424,51 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 ## License
 
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
-A copy of the [SPARQL EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
+A copy of the [SPARQL EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](https://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
 
 A copy of the [SPARQL 1.0 tests][] and [SPARQL 1.1 tests][] are also included in the repository, which are not covered under the UNLICENSE; see the references for test copyright information.
 
-[Ruby]:             http://ruby-lang.org/
-[RDF]:              http://www.w3.org/RDF/
-[RDF::DO]:          http://rubygems.org/gems/rdf-do
-[RDF::Mongo]:       http://rubygems.org/gems/rdf-mongo
-[Rack::LinkedData]: http://rubygems.org/gems/rack-linkeddata
-[YARD]:             http://yardoc.org/
-[YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[SPARQL]:           http://en.wikipedia.org/wiki/SPARQL
-[SPARQL 1.0]:       http://www.w3.org/TR/sparql11-query/
-[SPARQL 1.0 tests]:http://www.w3.org/2001/sw/DataAccess/tests/
-[SPARQL 1.1 tests]: http://www.w3.org/2009/sparql/docs/tests/
-[SSE]:              http://openjena.org/wiki/SSE
-[SXP]:              http://www.rubydoc.info/github/bendiken/sxp-ruby
-[grammar]:          http://www.w3.org/TR/sparql11-query/#grammar
-[RDF 1.1]:          http://www.w3.org/TR/rdf11-concepts
-[RDF.rb]:           http://rubydoc.info/github/ruby-rdf/rdf
-[Backports]:        http://rubygems.org/gems/backports
-[Linked Data]:      http://rubygems.org/gems/linkeddata
-[SPARQL doc]:       http://rubydoc.info/github/ruby-rdf/sparql/frames
-[SPARQL XML]:       http://www.w3.org/TR/rdf-sparql-XMLres/
-[SPARQL JSON]:      http://www.w3.org/TR/rdf-sparql-json-res/
-[SPARQL EBNF]:      http://www.w3.org/TR/sparql11-query/#sparqlGrammar
-
-[SSD]:              http://www.w3.org/TR/sparql11-service-description/
-[Rack]:             http://rack.github.io
-[Sinatra]:          http://www.sinatrarb.com/
-[conneg]:           http://en.wikipedia.org/wiki/Content_negotiation
-
-[SPARQL 1.1 Query]:                             http://www.w3.org/TR/sparql11-query/
-[SPARQL 1.1 Update]:                            http://www.w3.org/TR/sparql11-update/
-[SPARQL 1.1 Service Description]:               http://www.w3.org/TR/sparql11-service-description/
-[SPARQL 1.1 Federated Query]:                   http://www.w3.org/TR/sparql11-federated-query/
-[SPARQL 1.1 Query Results JSON Format]:         http://www.w3.org/TR/sparql11-results-json/
-[SPARQL 1.1 Query Results CSV and TSV Formats]: http://www.w3.org/TR/sparql11-results-csv-tsv/
-[SPARQL Query Results XML Format]:              http://www.w3.org/TR/rdf-sparql-XMLres/
-[SPARQL 1.1 Entailment Regimes]:                http://www.w3.org/TR/sparql11-entailment/
-[SPARQL 1.1 Protocol]:                          http://www.w3.org/TR/sparql11-protocol/
-[SPARQL 1.1 Graph Store HTTP Protocol]:         http://www.w3.org/TR/sparql11-http-rdf-update/
+[Ruby]:             https://ruby-lang.org/
+[RDF]:              https://www.w3.org/RDF/
+[RDF::DO]:          https://rubygems.org/gems/rdf-do
+[RDF::Mongo]:       https://rubygems.org/gems/rdf-mongo
+[Rack::LinkedData]: https://rubygems.org/gems/rack-linkeddata
+[YARD]:             https://yardoc.org/
+[YARD-GS]:          https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:              https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[SPARQL]:           https://en.wikipedia.org/wiki/SPARQL
+[SPARQL 1.0]:       https://www.w3.org/TR/sparql11-query/
+[SPARQL 1.0 tests]:https://www.w3.org/2001/sw/DataAccess/tests/
+[SPARQL 1.1 tests]: https://www.w3.org/2009/sparql/docs/tests/
+[SSE]:              https://jena.apache.org/documentation/notes/sse.html
+[SXP]:              https://www.rubydoc.info/github/dryruby/sxp
+[grammar]:          https://www.w3.org/TR/sparql11-query/#grammar
+[RDF 1.1]:          https://www.w3.org/TR/rdf11-concepts
+[RDF.rb]:           https://rubydoc.info/github/ruby-rdf/rdf
+[RDF*]:             https://lists.w3.org/Archives/Public/public-rdf-star/
+[SPARQL*]:          https://arxiv.org/pdf/1406.3399.pdf
+[Backports]:        https://rubygems.org/gems/backports
+[Linked Data]:      https://rubygems.org/gems/linkeddata
+[SPARQL doc]:       https://rubydoc.info/github/ruby-rdf/sparql/frames
+[SPARQL XML]:       https://www.w3.org/TR/rdf-sparql-XMLres/
+[SPARQL JSON]:      https://www.w3.org/TR/rdf-sparql-json-res/
+[SPARQL EBNF]:      https://www.w3.org/TR/sparql11-query/#sparqlGrammar
+
+[SSD]:              https://www.w3.org/TR/sparql11-service-description/
+[Rack]:             https://rack.github.io
+[Sinatra]:          https://www.sinatrarb.com/
+[conneg]:           https://en.wikipedia.org/wiki/Content_negotiation
+
+[SPARQL 1.1 Query]:                             https://www.w3.org/TR/sparql11-query/
+[SPARQL 1.1 Update]:                            https://www.w3.org/TR/sparql11-update/
+[SPARQL 1.1 Service Description]:               https://www.w3.org/TR/sparql11-service-description/
+[SPARQL 1.1 Federated Query]:                   https://www.w3.org/TR/sparql11-federated-query/
+[SPARQL 1.1 Query Results JSON Format]:         https://www.w3.org/TR/sparql11-results-json/
+[SPARQL 1.1 Query Results CSV and TSV Formats]: https://www.w3.org/TR/sparql11-results-csv-tsv/
+[SPARQL Query Results XML Format]:              https://www.w3.org/TR/rdf-sparql-XMLres/
+[SPARQL 1.1 Entailment Regimes]:                https://www.w3.org/TR/sparql11-entailment/
+[SPARQL 1.1 Protocol]:                          https://www.w3.org/TR/sparql11-protocol/
+[SPARQL 1.1 Graph Store HTTP Protocol]:         https://www.w3.org/TR/sparql11-http-rdf-update/
 

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.3

data/bin/sparql

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
+$:.unshift("../../lib", __FILE__)
 require 'sparql'
 begin
   require 'linkeddata'
@@ -9,16 +9,24 @@ rescue LoadError
 end
 require 'getoptlong'
 
-def display_results(res, options)
+def display_results(res, **options)
   puts res.inspect if options[:verbose]
   puts case res
-  when RDF::Graph   then res.dump(:ttl, base_uri: query.base_uri, prefixes: query.prefixes, standard_prefixes: true)
+  when RDF::Graph   then res.dump(options.fetch(:format, :ttl), base_uri: query.base_uri, prefixes: query.prefixes, standard_prefixes: true)
   when RDF::Literal then res.inspect
-  else                   res.map {|s| s.bindings.map {|k,v| "#{k}: #{v}"}}.join("\n")
+  else
+    case options[:format]
+    when :json then res.to_json
+    when :html  then res.to_html
+    when :xml  then res.to_xml
+    when :csv  then res.to_csv
+    when :tsv  then res.to_tsv
+    else            res.map {|s| s.bindings.map {|k,v| "#{k}: #{v}"}}.join("\n")
+    end
   end
 end
 
-def run(input, options = {})
+def run(input, **options)
   if options[:debug]
     puts "input graph:\n#{options[:dataset].dump(:trig, standard_prefixes: true)}\n" if options[:dataset]
     puts "query:\n#{input}\n"
@@ -30,17 +38,17 @@ def run(input, options = {})
   end
 
   query = if options[:sse]
-    SPARQL::Algebra.parse(input, {debug: options[:debug], update: options[:update]})
+    SPARQL::Algebra.parse(input, debug: options[:debug], update: options[:update])
   else
     # Only do grammar debugging if we're generating SSE
-    SPARQL::Grammar.parse(input, options)
+    SPARQL::Grammar.parse(input, **options)
   end
 
   puts ("\nSSE:\n" + query.to_sse) if options[:debug] || options[:to_sse]
 
   unless options[:to_sse]
     res = query.execute(options[:dataset], debug: options[:debug])
-    display_results(res, options)
+    display_results(res, **options)
   end
 end
 
@@ -54,7 +62,7 @@ def server(options)
 
     get '/' do
       if params["query"]
-        query = params["query"].to_s.match(/^http:/) ? RDF::Util::File.open_file(params["query"]) : ::URI.decode(params["query"].to_s)
+        query = params["query"].to_s.match(/^http:/) ? RDF::Util::File.open_file(params["query"]) : ::CGI.unescape(params["query"].to_s)
         SPARQL.execute(query, settings.repository)
       else
         settings.sparql_options.replace(standard_prefixes: true)
@@ -81,12 +89,13 @@ def usage
   puts "       #{$0} query [options] end-point query-file Run the query against a remote end-point"
   puts "       #{$0} server [options] dataset-file        Start a server initialized from the specified dataset"
   puts "Options:"
-  puts "      --execute,-e:         Use option argument as the SPARQL input if no query-file given"
   puts "      --dataset:            File containing RDF graph or dataset"
   puts "      --debug:              Display detailed debug output"
+  puts "      --debug:              Display detailed debug output"
+  puts "      --execute,-e:         Use option argument as the SPARQL input if no query-file given"
+  puts "      --format:             Output format for results"
   puts "      --port,-p             Port on which to run server; defaults to 9292"
   puts "      --sse:                Query input is in SSE format"
-  puts "      --debug:              Display detailed debug output"
   puts "      --update:             Process query as a SPARQL Update"
   puts "      --verbose:            Display details of processing"
   puts "      --help,-?:            This message"
@@ -98,11 +107,12 @@ cmd, input = ARGV.shift, nil
 opts = GetoptLong.new(
   ["--dataset", GetoptLong::REQUIRED_ARGUMENT],
   ["--debug", GetoptLong::NO_ARGUMENT],
+  ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT],
+  ["--format", GetoptLong::REQUIRED_ARGUMENT],
   ["--port", "-p", GetoptLong::REQUIRED_ARGUMENT],
-  ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--sse", GetoptLong::NO_ARGUMENT],
   ["--update", GetoptLong::NO_ARGUMENT],
-  ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT],
+  ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--help", "-?", GetoptLong::NO_ARGUMENT]
 )
 
@@ -112,11 +122,12 @@ options = {
 
 opts.each do |opt, arg|
   case opt
-  when '--dataset'       then options[:dataset].load(arg)
+  when '--dataset'       then options[:dataset].load(arg, rdfstar: :PG)
+  when '--debug'         then options[:debug] = true
   when '--execute'       then input = arg
+  when '--format'        then options[:format] = arg.to_sym
   when '--port'          then options[:port] = arg.to_i
   when '--sse'           then options[:sse] = true
-  when '--debug'         then options[:debug] = true
   when '--update'        then options[:update] = true
   when '--verbose'       then options[:verbose] = true
   when "--help"          then usage
@@ -132,7 +143,7 @@ case cmd
 when 'execute', 'parse'
   options[:to_sse] = true if cmd == 'parse'
   input ||= ARGV.empty? ? $stdin.read : RDF::Util::File.open_file(ARGV.first).read
-  run(input, options)
+  run(input, **options)
 when 'query'
   endpoint = ARGV.shift
   unless endpoint
@@ -142,7 +153,7 @@ when 'query'
   input ||= ARGV.empty? ? $stdin.read : RDF::Util::File.open_file(ARGV.first).read
   SPARQL::Client.new(endpoint) do |client|
     res = client.query(input)
-    display_results(res, options)
+    display_results(res, **options)
   end
 when 'server'
   if data_file = ARGV.shift