json-ld 1.1.7 → 1.1.8

data/spec/to_rdf_spec.rb

@@ -35,7 +35,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -52,7 +52,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
       
@@ -82,7 +82,7 @@ describe JSON::LD::API do
         }.each do |title, (js, ttl)|
           it title do
             ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-            expect(parse(js, :base => "http://example.org/")).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+            expect(parse(js, base: "http://example.org/")).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
           end
         end
       end
@@ -111,7 +111,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -145,7 +145,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -194,7 +194,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -216,7 +216,7 @@ describe JSON::LD::API do
       }.each_pair do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -238,7 +238,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -277,7 +277,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -299,7 +299,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -360,7 +360,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end
@@ -483,7 +483,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :base => "http://example/", :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, base: "http://example/", trace: @debug, inputDocument: js)
         end
       end
       
@@ -536,7 +536,7 @@ describe JSON::LD::API do
           }.each do |title, (js, ttl)|
             it title do
               ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-              expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+              expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
             end
           end
         end
@@ -572,7 +572,7 @@ describe JSON::LD::API do
           }.each do |title, (js, ttl)|
             it title do
               ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-              expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+              expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
             end
           end
         end
@@ -583,12 +583,12 @@ describe JSON::LD::API do
       subject {%q({"@id": "http://example/subj", "_:foo": "bar"})}
 
       it "outputs statements with blank node predicates if :produceGeneralizedRdf is true" do
-        graph = parse(subject, :produceGeneralizedRdf => true)
+        graph = parse(subject, produceGeneralizedRdf: true)
         expect(graph.count).to eq 1
       end
 
       it "rejects statements with blank node predicates if :produceGeneralizedRdf is false" do
-        graph = parse(subject, :produceGeneralizedRdf => false)
+        graph = parse(subject, produceGeneralizedRdf: false)
         expect(graph.count).to eq 0
       end
     end
@@ -654,7 +654,7 @@ describe JSON::LD::API do
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
-          expect(parse(js)).to be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
+          expect(parse(js)).to be_equivalent_graph(ttl, trace: @debug, inputDocument: js)
         end
       end
     end

data/spec/writer_spec.rb

@@ -14,10 +14,10 @@ describe JSON::LD::Writer do
     formats = [
       :jsonld,
       "etc/doap.jsonld",
-      {:file_name      => 'etc/doap.jsonld'},
-      {:file_extension => 'jsonld'},
-      {:content_type   => 'application/ld+json'},
-      {:content_type   => 'application/x-ld+json'},
+      {file_name:      'etc/doap.jsonld'},
+      {file_extension: 'jsonld'},
+      {content_type:   'application/ld+json'},
+      {content_type:   'application/x-ld+json'},
     ].each do |arg|
       it "discovers with #{arg.inspect}" do
         expect(RDF::Reader.for(arg)).to eq JSON::LD::Reader
@@ -36,7 +36,7 @@ describe JSON::LD::Writer do
 
     it "should use qname URIs with standard prefix" do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
-      expect(serialize(input, :standard_prefixes => true)).to produce({
+      expect(serialize(input, standard_prefixes: true)).to produce({
         '@context' => {
           "foaf"  => "http://xmlns.com/foaf/0.1/",
         },
@@ -52,10 +52,10 @@ describe JSON::LD::Writer do
         <https://senet.org/gm> <https://senet.org/ns#unofficialTitle> "Rhythm Tengoku"@en .
         <https://senet.org/gm> <https://senet.org/ns#urlkey> "rhythm-tengoku" .
       )
-      expect(serialize(input, :prefixes => {
-        :dc    => "http://purl.org/dc/terms/",
-        :frbr  => "http://vocab.org/frbr/core#",
-        :senet => "https://senet.org/ns#",
+      expect(serialize(input, prefixes: {
+        dc:    "http://purl.org/dc/terms/",
+        frbr:  "http://vocab.org/frbr/core#",
+        senet: "https://senet.org/ns#",
       })).to produce({
         '@context' => {
           "dc" => "http://purl.org/dc/terms/",
@@ -73,7 +73,7 @@ describe JSON::LD::Writer do
     it "should use CURIEs with empty prefix" do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
       begin
-        expect(serialize(input, :prefixes => { "" => RDF::FOAF})).
+        expect(serialize(input, prefixes: { "" => RDF::FOAF})).
         to produce({
           "@context" => {
             "" => "http://xmlns.com/foaf/0.1/"
@@ -90,7 +90,7 @@ describe JSON::LD::Writer do
     
     it "should not use terms if no suffix" do
       input = %(<http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> .)
-      expect(serialize(input, :standard_prefixes => true)).
+      expect(serialize(input, standard_prefixes: true)).
       not_to produce({
         "@context" => {"foaf" => "http://xmlns.com/foaf/0.1/"},
         '@id'   => "foaf",
@@ -105,7 +105,7 @@ describe JSON::LD::Writer do
         db:Michael_Jackson dbo:artistOf <http://dbpedia.org/resource/%28I_Can%27t_Make_It%29_Another_Day> .
       )
 
-      expect(serialize(input, :prefixes => {
+      expect(serialize(input, prefixes: {
           "db" => RDF::URI("http://dbpedia.org/resource/"),
           "dbo" => RDF::URI("http://dbpedia.org/ontology/")})).
       to produce({
@@ -131,7 +131,7 @@ describe JSON::LD::Writer do
         <http://example.com/test-cases/0001> a :TestCase .
         <http://example.com/test-cases/0002> a :TestCase .
       )
-      expect(serialize(input, :prefixes => {"" => "http://www.w3.org/2006/03/test-description#"})).
+      expect(serialize(input, prefixes: {"" => "http://www.w3.org/2006/03/test-description#"})).
       to produce({
         '@context'     => {
           "" => "http://www.w3.org/2006/03/test-description#",
@@ -158,10 +158,10 @@ describe JSON::LD::Writer do
            owl:onClass <http://data.wikia.com/terms#Element>;
            owl:onProperty <http://data.wikia.com/terms#characterIn> .
       )
-      expect(serialize(input, :rename_bnodes => false, :prefixes => {
-        :owl  => "http://www.w3.org/2002/07/owl#",
-        :rdfs => "http://www.w3.org/2000/01/rdf-schema#",
-        :xsd  => "http://www.w3.org/2001/XMLSchema#"
+      expect(serialize(input, rename_bnodes: false, prefixes: {
+        owl:  "http://www.w3.org/2002/07/owl#",
+        rdfs: "http://www.w3.org/2000/01/rdf-schema#",
+        xsd:  "http://www.w3.org/2001/XMLSchema#"
       })).
       to produce({
         '@context'     => {
@@ -187,16 +187,39 @@ describe JSON::LD::Writer do
       }, @debug)
     end
   end
-  
+
+  context "Writes fromRdf tests to isomorphic graph", skip: ENV['CI'] do
+    require 'suite_helper'
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
+    describe m.name do
+      m.entries.each do |t|
+        next unless t.positiveTest? && !t.property('input').include?('0016')
+        t.debug = ["test: #{t.inspect}", "source: #{t.input}"]
+        specify "#{t.property('input')}: #{t.name}" do
+          repo = RDF::Repository.load(t.input_loc, format: :nquads)
+          jsonld = JSON::LD::Writer.buffer(debug: t.debug) do |writer|
+            writer << repo
+          end
+
+          # And then, re-generate jsonld as RDF
+          
+          expect(parse(jsonld, format: :jsonld)).to be_equivalent_graph(repo, t)
+        end
+      end
+    end
+  end
+
   def parse(input, options = {})
-    RDF::Graph.new << RDF::Turtle::Reader.new(input, options)
+    format = options.fetch(:format, :trig)
+    reader = RDF::Reader.for(format)
+    RDF::Repository.new << reader.new(input, options)
   end
 
   # Serialize ntstr to a string and compare against regexps
   def serialize(ntstr, options = {})
     g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
     @debug = [] << g.dump(:ttl)
-    result = JSON::LD::Writer.buffer(options.merge(:debug => @debug)) do |writer|
+    result = JSON::LD::Writer.buffer(options.merge(debug: @debug)) do |writer|
       writer << g
     end
     if $verbose

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -19,7 +19,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,41 +29,63 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
-  name: open-uri-cached
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rest-client-components
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +209,7 @@ files:
 - lib/json/ld/from_rdf.rb
 - lib/json/ld/reader.rb
 - lib/json/ld/resource.rb
+- lib/json/ld/streaming_writer.rb
 - lib/json/ld/to_rdf.rb
 - lib/json/ld/utils.rb
 - lib/json/ld/version.rb
@@ -203,6 +226,7 @@ files:
 - spec/reader_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
+- spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
 - spec/suite_error_spec.rb
 - spec/suite_expand_spec.rb
@@ -291,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json-ld
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
@@ -308,6 +332,7 @@ test_files:
 - spec/reader_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
+- spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
 - spec/suite_error_spec.rb
 - spec/suite_expand_spec.rb