json-ld 2.2.1 → 3.0.0

data/spec/suite_remote_doc_spec.rb

@@ -4,10 +4,10 @@ require_relative 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require_relative 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/remote-doc-manifest.jsonld")
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}remote-doc-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
           t.run self
         end
       end

data/spec/suite_to_rdf_spec.rb

@@ -4,12 +4,12 @@ require_relative 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require_relative 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/toRdf-manifest.jsonld")
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}toRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
-        specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
-          skip "Native value fidelity" if %w(toRdf-0035-in.jsonld).include?(t.property('input'))
-          pending "Generalized RDF" if %w(toRdf-0118-in.jsonld).include?(t.property('input'))
+        specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+          skip "Native value fidelity" if %w(toRdf/0035-in.jsonld).include?(t.property('input'))
+          pending "Generalized RDF" if %w(toRdf/0118-in.jsonld).include?(t.property('input'))
           t.run self
         end
       end

data/spec/to_rdf_spec.rb

@@ -356,6 +356,24 @@ describe JSON::LD::API do
             _:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
           )
         ],
+        "@list containing @list" => [
+          %q({
+            "@id": "http://example/A",
+            "http://example.com/foo": {"@list": [{"@list": ["baz"]}]}
+          }),
+          %q(
+            <http://example/A> <http://example.com/foo> (("baz")) .
+          )
+        ],
+        "@list containing empty @list" => [
+          %({
+            "@id": "http://example/A",
+            "http://example.com/foo": {"@list": [{"@list": []}]}
+          }),
+          %q(
+            <http://example/A> <http://example.com/foo> (()) .
+          )
+        ],
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
@@ -649,7 +667,7 @@ describe JSON::LD::API do
           %q(
             [<http://rdfs.org/sioc/ns#content> "foo"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral>] .
           )
-        ]
+        ],
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
@@ -657,6 +675,62 @@ describe JSON::LD::API do
         end
       end
     end
+
+    context "exceptions" do
+      {
+        "Invalid subject" => {
+          input: %({
+            "@id": "http://example.com/a b",
+            "http://example.com/foo": "bar"
+          }),
+          output: %()
+        },
+        "Invalid predicate" => {
+          input: %({
+            "@id": "http://example.com/foo",
+            "http://example.com/a b": "bar"
+          }),
+          output: %()
+        },
+        "Invalid object" => {
+          input: %({
+            "@id": "http://example.com/foo",
+            "http://example.com/bar": {"@id": "http://example.com/baz z"}
+          }),
+          output: %()
+        },
+        "Invalid type" => {
+          input: %({
+            "@id": "http://example.com/foo",
+            "@type": ["http://example.com/bar", "relative"]
+          }),
+          output: %(<http://example.com/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/bar> .)
+        },
+        "Invalid language" => {
+          input: %({
+            "@id": "http://example.com/foo",
+            "http://example.com/bar": {"@value": "bar", "@language": "a b"}
+          }),
+          output: %()
+        },
+        "Invalid datatype" => {
+          input: %({
+            "@id": "http://example.com/foo",
+            "http://example.com/bar": {"@value": "bar", "@type": "http://example.com/baz z"}
+          }),
+          output: %()
+        },
+        "Injected IRIs check" => {
+          input: %({
+            "@id": "http://foo/> <http://bar/> <http://baz> .\n<data:little> <data:bobby> <data:tables> .\n<data:in-ur-base",
+            "http://killin/#yer": "dudes"
+          }),
+          output: %()
+        },
+      }.each do |title, params|
+        it(title) {run_to_rdf params}
+      end
+    end
   end
 
   def parse(input, options = {})
@@ -665,4 +739,17 @@ describe JSON::LD::API do
     JSON::LD::API.toRdf(StringIO.new(input), options) {|st| graph << st}
     graph
   end
+
+  def run_to_rdf(params)
+    input, output, processingMode = params[:input], params[:output], params[:processingMode]
+    graph = params[:graph] || RDF::Graph.new
+    input = StringIO.new(input) if input.is_a?(String)
+    pending params.fetch(:pending, "test implementation") unless input
+    if params[:exception]
+      expect {JSON::LD::API.toRdf(input, {processingMode: processingMode}.merge(params))}.to raise_error(params[:exception])
+    else
+      JSON::LD::API.toRdf(input, base: params[:base], logger: logger, processingMode: processingMode) {|st| graph << st}
+      expect(graph).to be_equivalent_graph(output, logger: logger, inputDocument: input)
+    end
+  end
 end

data/spec/writer_spec.rb

@@ -191,11 +191,11 @@ describe JSON::LD::Writer do
 
   context "Writes fromRdf tests to isomorphic graph" do
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}fromRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
         next unless t.positiveTest? && !t.property('input').include?('0016')
-        specify "#{t.property('input')}: #{t.name}" do
+        specify "#{t.property('@id')}: #{t.name}" do
           logger.info "test: #{t.inspect}"
           logger.info "source: #{t.input}"
           t.logger = logger
@@ -213,17 +213,16 @@ describe JSON::LD::Writer do
     end
   end unless ENV['CI']
 
-  def parse(input, options = {})
-    format = options.fetch(:format, :trig)
+  def parse(input, format: :trig, **options)
     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 = {})
+  def serialize(ntstr, **options)
     g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
     #logger.info g.dump(:ttl)
-    result = JSON::LD::Writer.buffer(options.merge(logger: logger)) do |writer|
+    result = JSON::LD::Writer.buffer(logger: logger, **options) 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: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.12
 description: JSON::LD parses and serializes JSON-LD into RDF and implements expansion,
   compaction and framing API interfaces.
 email: public-linked-json@w3.org
@@ -291,7 +291,6 @@ files:
 - spec/spec_helper.rb
 - spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
-- spec/suite_error_spec.rb
 - spec/suite_expand_spec.rb
 - spec/suite_flatten_spec.rb
 - spec/suite_frame_spec.rb
@@ -371,13 +370,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
 - spec/spec_helper.rb
-- spec/suite_error_spec.rb
 - spec/api_spec.rb
 - spec/suite_from_rdf_spec.rb
 - spec/context_spec.rb

data/spec/suite_error_spec.rb

@@ -1,16 +0,0 @@
-# coding: utf-8
-require_relative 'spec_helper'
-
-describe JSON::LD do
-  describe "test suite" do
-    require_relative 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/error-manifest.jsonld")
-    describe m.name do
-      m.entries.each do |t|
-        specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
-          t.run self
-        end
-      end
-    end
-  end
-end unless ENV['CI']