json-ld 1.1.6 → 1.1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe1ae3742a83e43c9d36afb4aa6c1538a7eab4d
-  data.tar.gz: d78e142b4f1576090ada71c7ecb7e6e002834251
+  metadata.gz: 7fee10018378978dc0a87102e4c783208b1613cf
+  data.tar.gz: 9cde4a421857ee6a66cd9e0978ec168046d2675b
 SHA512:
-  metadata.gz: 18cab81a39bdb983a404cd67e98bc26fb8d447300a9a0d7c971e068c3246bb243cbf5943e5965b3806a015c0c71c1ac489606a6beb62ee7f366d56618bf53282
-  data.tar.gz: 383e350f9300be24e6a6ad5e21e3c41253de440628207de0190aba959524da3d28d672965c96b5a7b03c5ec44657886229fe2c43eec1d6da9b64ef4c617f3f1d
+  metadata.gz: a85611f4cd46ca52b6a75bdb2cddb6185e603848c3bea5caf1719936f9f96d32ee05fbd5bf4c55c1b41fdebef51d9fad450797a64f8bc73a37b47097a2ee341f
+  data.tar.gz: df6233a9715ce191085f38a4b21f158dc0fdc36efca5db1fd3eee9049925d5117101ed96717c93cfab1544d058ce99f2df284a9b37d903d62e387c958d944e08

data/VERSION

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

data/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

data/spec/context_spec.rb

@@ -1021,7 +1021,7 @@ describe JSON::LD::Context do
       "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}],
@@ -1029,7 +1029,7 @@ describe JSON::LD::Context do
       "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)|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.6.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf