Release 1.1.6.1.

* In jsonld executable, let API open input files, allowing documentLoader to be used.
* Use toRdf instead of reader interface in jsonld executable, so that a context found by Link header will be applied.

Author: gkellogg

VERSION

@@ -1 +1 @@
-1.1.6
+1.1.6.1

bin/jsonld

@@ -47,11 +47,11 @@ def run(input, options)
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Framed in #{secs} seconds." unless options[:quiet]
   else
-    r = reader_class.new(input, options[:parser_options])
-    g = RDF::Repository.new << r
+    options = options.merge(:expandContext => options.delete(:context)) if options.has_key?(:context)
+    g = JSON::LD::API.toRdf(input, options)
     secs = Time.new - start
     num = g.count
-    parser_options = options[:parser_options].merge(:prefixes => r.prefixes, :standard_prefixes => true)
+    parser_options = options[:parser_options].merge(:standard_prefixes => true)
     options[:output].puts g.dump(options[:output_format], parser_options)
     STDERR.puts "\nParsed #{num} statements in #{secs} seconds @ #{num/secs} statements/second." unless options[:quiet]
   end
@@ -136,7 +136,7 @@ if ARGV.empty?
   run(StringIO.new(s), options)
 else
   ARGV.each do |file|
-    run(Kernel.open(file), options)
+    run(file, options)
   end
 end
 puts

spec/context_spec.rb

@@ -1021,15 +1021,15 @@ def containers
       "native boolean" => ["foo", true,                           {"@value" => true}],
       "native integer" => ["foo", 1,                              {"@value" => 1}],
       "native double" =>  ["foo", 1.1e1,                          {"@value" => 1.1E1}],
-      "native date" =>    ["foo", Date.parse("2011-12-27Z"),      {"@value" => "2011-12-27Z", "@type" => RDF::XSD.date.to_s}],
+      "native date" =>    ["foo", Date.parse("2011-12-27"),       {"@value" => "2011-12-27", "@type" => RDF::XSD.date.to_s}],
       "native time" =>    ["foo", Time.parse("10:11:12Z"),        {"@value" => "10:11:12Z", "@type" => RDF::XSD.time.to_s}],
       "native dateTime" =>["foo", DateTime.parse("2011-12-27T10:11:12Z"), {"@value" => "2011-12-27T10:11:12Z", "@type" => RDF::XSD.dateTime.to_s}],
       "rdf boolean" =>    ["foo", RDF::Literal(true),             {"@value" => "true", "@type" => RDF::XSD.boolean.to_s}],
       "rdf integer" =>    ["foo", RDF::Literal(1),                {"@value" => "1", "@type" => RDF::XSD.integer.to_s}],
       "rdf decimal" =>    ["foo", RDF::Literal::Decimal.new(1.1), {"@value" => "1.1", "@type" => RDF::XSD.decimal.to_s}],
       "rdf double" =>     ["foo", RDF::Literal::Double.new(1.1),  {"@value" => "1.1E0", "@type" => RDF::XSD.double.to_s}],
       "rdf URI" =>        ["foo", RDF::URI("foo"),                {"@id" => "foo"}],
-      "rdf date " =>      ["foo", RDF::Literal(Date.parse("2011-12-27Z")), {"@value" => "2011-12-27Z", "@type" => RDF::XSD.date.to_s}],
+      "rdf date " =>      ["foo", RDF::Literal(Date.parse("2011-12-27")), {"@value" => "2011-12-27", "@type" => RDF::XSD.date.to_s}],
       "rdf nonNeg" =>     ["foo", RDF::Literal::NonNegativeInteger.new(1), {"@value" => "1", "@type" => RDF::XSD.nonNegativeInteger}],
       "rdf float" =>      ["foo", RDF::Literal::Float.new(1.0), {"@value" => "1.0", "@type" => RDF::XSD.float}],
     }.each do |title, (key, compacted, expanded)|