json-ld 3.1.7 → 3.2.0

data/spec/spec_helper.rb

@@ -15,10 +15,16 @@ require_relative 'matchers'
 require 'yaml'
 begin
   require 'simplecov'
-  require 'coveralls' unless ENV['NOCOVERALLS']
+  require 'simplecov-lcov'
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    #Coveralls is coverage by default/lcov. Send info results
+    config.report_with_single_file = true
+    config.single_report_path = 'coverage/lcov.info'
+  end
+
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
-    (Coveralls::SimpleCov::Formatter unless ENV['NOCOVERALLS'])
+    SimpleCov::Formatter::LcovFormatter
   ])
   SimpleCov.start do
     add_filter "/spec/"
@@ -67,6 +73,38 @@ def detect_format(stream)
   end
 end
 
+# Creates a bijection between the two objects and replaces nodes in actual from expected.
+def remap_bnodes(actual, expected)
+  # Transform each to RDF and perform a blank node bijection.
+  # Replace the blank nodes in action with the mapping from bijection.
+  ds_actual = RDF::Repository.new << JSON::LD::API.toRdf(actual, rdfstar: true, rename_bnodes: false)
+  ds_expected = RDF::Repository.new << JSON::LD::API.toRdf(expected, rdfstar: true, rename_bnodes: false)
+  if bijection = ds_actual.bijection_to(ds_expected)
+    bijection = bijection.inject({}) {|memo, (k, v)| memo.merge(k.to_s => v.to_s)}
+
+    # Recursively replace blank nodes in actual with the bijection
+    replace_nodes(actual, bijection)
+  else
+    actual
+  end
+end
+
+def replace_nodes(object, bijection)
+  case object
+  when Array
+    object.map {|o| replace_nodes(o, bijection)}
+  when Hash
+    object.inject({}) do |memo, (k, v)|
+      memo.merge(bijection.fetch(k, k) => replace_nodes(v, bijection))
+    end
+  when String
+    bijection.fetch(object, object)
+  else
+    object
+  end
+end
+
+
 LIBRARY_INPUT = JSON.parse(%([
   {
     "@id": "http://example.org/library",

data/spec/suite_flatten_spec.rb

@@ -7,6 +7,8 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}flatten-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
+        t.options[:remap_bnodes] = %w(#t0045).include?(t.property('@id'))
+
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
           if %w(#t0005).include?(t.property('@id'))
@@ -16,6 +18,8 @@ describe JSON::LD do
           end
         end
 
+        # Skip ordered tests when remapping bnodes
+        next if t.options[:remap_bnodes]
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
           if %w(#t0005).include?(t.property('@id'))

data/spec/suite_frame_spec.rb

@@ -7,13 +7,20 @@ describe JSON::LD do
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::FRAME_SUITE}frame-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
+        t.options[:remap_bnodes] = %w(#t0021 #tp021).include?(t.property('@id'))
+
         specify "#{t.property('@id')}: #{t.name} unordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = false
           expect {t.run self}.not_to write.to(:error)
         end
 
+        # Skip ordered tests when remapping bnodes
+        next if t.options[:remap_bnodes]
         specify "#{t.property('@id')}: #{t.name} ordered#{' (negative test)' unless t.positiveTest?}" do
           t.options[:ordered] = true
+          if %w(#tp021).include?(t.property('@id'))
+            pending("changes due to blank node reordering")
+          end
           expect {t.run self}.not_to write.to(:error)
         end
       end

data/spec/suite_helper.rb

@@ -7,6 +7,7 @@ module RDF::Util
       "https://w3c.github.io/json-ld-api/tests/" => ::File.expand_path("../json-ld-api/tests", __FILE__) + '/',
       "https://w3c.github.io/json-ld-framing/tests/" => ::File.expand_path("../json-ld-framing/tests", __FILE__) + '/',
       "https://w3c.github.io/json-ld-streaming/tests/" => ::File.expand_path("../json-ld-streaming/tests", __FILE__) + '/',
+      "https://json-ld.github.io/json-ld-star/tests/" => ::File.expand_path("../json-ld-star/tests", __FILE__) + '/',
       "file:" => ""
     }
 
@@ -76,6 +77,7 @@ module Fixtures
     SUITE = RDF::URI("https://w3c.github.io/json-ld-api/tests/")
     FRAME_SUITE = RDF::URI("https://w3c.github.io/json-ld-framing/tests/")
     STREAM_SUITE = RDF::URI("https://w3c.github.io/json-ld-streaming/tests/")
+    STAR_SUITE = RDF::URI("https://json-ld.github.io/json-ld-star/tests/")
 
     class Manifest < JSON::LD::Resource
       attr_accessor :manifest_url
@@ -201,8 +203,8 @@ module Fixtures
         logger.info "frame: #{frame}" if frame_loc
 
         options = self.options
-        unless options[:specVersion] == "json-ld-1.1"
-          skip "not a 1.1 test" 
+        if options[:specVersion] == "json-ld-1.0"
+          skip "1.0 test" 
           return
         end
 
@@ -223,7 +225,7 @@ module Fixtures
               JSON::LD::API.frame(input_loc, frame_loc, logger: logger, **options)
             when "jld:FromRDFTest"
               # Use an array, to preserve input order
-              repo = RDF::NQuads::Reader.open(input_loc) do |reader|
+              repo = RDF::NQuads::Reader.open(input_loc, rdfstar: options[:rdfstar]) do |reader|
                 reader.each_statement.to_a
               end.to_a.uniq.extend(RDF::Enumerable)
               logger.info "repo: #{repo.dump(self.id == '#t0012' ? :nquads : :trig)}"
@@ -235,7 +237,7 @@ module Fixtures
                   repo << statement
                 end
               else
-                JSON::LD::API.toRdf(input_loc, logger: logger, **options) do |statement|
+                JSON::LD::API.toRdf(input_loc, rename_bnodes: false, logger: logger, **options) do |statement|
                   repo << statement
                 end
               end
@@ -256,12 +258,16 @@ module Fixtures
             end
             if evaluationTest?
               if testType == "jld:ToRDFTest"
-                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect, logger: [])
+                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect, rdfstar: options[:rdfstar], logger: [])
                 rspec_example.instance_eval {
                   expect(result).to be_equivalent_graph(expected, logger)
                 }
               else
                 expected = JSON.load(expect)
+
+                # If called for, remap bnodes
+                result = remap_bnodes(result, expected) if options[:remap_bnodes]
+
                 if options[:ordered]
                   # Compare without transformation
                   rspec_example.instance_eval {
@@ -308,7 +314,7 @@ module Fixtures
                 when "jld:FrameTest"
                   JSON::LD::API.frame(t.input_loc, t.frame_loc, logger: logger, **options)
                 when "jld:FromRDFTest"
-                  repo = RDF::Repository.load(t.input_loc)
+                  repo = RDF::Repository.load(t.input_loc, rdfstar: options[:rdfstar])
                   logger.info "repo: #{repo.dump(t.id == '#t0012' ? :nquads : :trig)}"
                   JSON::LD::API.fromRdf(repo, logger: logger, **options)
                 when "jld:HttpTest"
@@ -325,7 +331,7 @@ module Fixtures
                   if t.manifest_url.to_s.include?('stream')
                     JSON::LD::Reader.open(t.input_loc, stream: true, logger: logger, **options).each_statement {}
                   else
-                    JSON::LD::API.toRdf(t.input_loc, logger: logger, **options) {}
+                    JSON::LD::API.toRdf(t.input_loc, rename_bnodes: false, logger: logger, **options) {}
                   end
                 else
                   success("Unknown test type: #{testType}")

data/spec/suite_to_rdf_spec.rb

@@ -9,7 +9,7 @@ describe JSON::LD do
       m.entries.each do |t|
         specify "#{t.property('@id')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
           pending "Generalized RDF" if t.options[:produceGeneralizedRdf]
-          pending "RDF*" if t.property('@id') == '#te122'
+          pending "RDF-star" if t.property('@id') == '#te122'
           if %w(#t0118).include?(t.property('@id'))
             expect {t.run self}.to write(/Statement .* is invalid/).to(:error)
           elsif %w(#te075).include?(t.property('@id'))

data/spec/to_rdf_spec.rb

@@ -1175,7 +1175,7 @@ describe JSON::LD::API do
       end
     end
 
-    context "JSON-LD*" do
+    context "JSON-LD-star" do
       {
         "node with embedded subject without rdfstar option": {
           input: %({
@@ -1528,7 +1528,7 @@ describe JSON::LD::API do
   def parse(input, **options)
     graph = options[:graph] || RDF::Graph.new
     options = {logger: logger, validate: true, canonicalize: false}.merge(options)
-    JSON::LD::API.toRdf(StringIO.new(input), **options) {|st| graph << st}
+    JSON::LD::API.toRdf(StringIO.new(input), rename_bnodes: false, **options) {|st| graph << st}
     graph
   end
 
@@ -1541,9 +1541,9 @@ describe JSON::LD::API do
       expect {JSON::LD::API.toRdf(input, **params)}.to raise_error(params[:exception])
     else
       if params[:write]
-        expect{JSON::LD::API.toRdf(input, base: params[:base], logger: logger, **params) {|st| graph << st}}.to write(params[:write]).to(:error)
+        expect{JSON::LD::API.toRdf(input, base: params[:base], logger: logger, rename_bnodes: false, **params) {|st| graph << st}}.to write(params[:write]).to(:error)
       else
-        expect{JSON::LD::API.toRdf(input, base: params[:base], logger: logger, **params) {|st| graph << st}}.not_to write.to(:error)
+        expect{JSON::LD::API.toRdf(input, base: params[:base], logger: logger, rename_bnodes: false, **params) {|st| graph << st}}.not_to write.to(:error)
       end
       expect(graph).to be_equivalent_graph(output, logger: logger, inputDocument: input)
     end

data/spec/writer_spec.rb

@@ -189,7 +189,7 @@ describe JSON::LD::Writer do
     end
   end
 
-  context "RDF*" do
+  context "RDF-star" do
     {
       "subject-iii": {
         input: RDF::Statement(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sinatra-linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -176,98 +176,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-trig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +297,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: JSON::LD parses and serializes JSON-LD into RDF and implements expansion,
-  compaction and framing API interfaces.
+  compaction and framing API interfaces for the Ruby RDF.rb library suite.
 email: public-linked-json@w3.org
 executables:
 - jsonld
@@ -340,6 +340,7 @@ files:
 - spec/frame_spec.rb
 - spec/from_rdf_spec.rb
 - spec/matchers.rb
+- spec/rdfstar_spec.rb
 - spec/reader_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
@@ -419,92 +420,93 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
-- spec/spec_helper.rb
-- spec/matchers.rb
 - spec/api_spec.rb
-- spec/suite_from_rdf_spec.rb
+- spec/compact_spec.rb
+- spec/conneg_spec.rb
 - spec/context_spec.rb
+- spec/expand_spec.rb
+- spec/flatten_spec.rb
+- spec/format_spec.rb
+- spec/frame_spec.rb
 - spec/from_rdf_spec.rb
-- spec/suite_helper.rb
+- spec/matchers.rb
+- spec/rdfstar_spec.rb
 - spec/reader_spec.rb
-- spec/streaming_writer_spec.rb
 - spec/resource_spec.rb
-- spec/suite_to_rdf_spec.rb
-- spec/suite_remote_doc_spec.rb
-- spec/format_spec.rb
-- spec/frame_spec.rb
-- spec/to_rdf_spec.rb
-- spec/conneg_spec.rb
-- spec/support/extensions.rb
-- spec/suite_html_spec.rb
-- spec/flatten_spec.rb
-- spec/suite_frame_spec.rb
+- spec/spec_helper.rb
+- spec/streaming_reader_spec.rb
+- spec/streaming_writer_spec.rb
 - spec/suite_compact_spec.rb
-- spec/expand_spec.rb
 - spec/suite_expand_spec.rb
 - spec/suite_flatten_spec.rb
-- spec/compact_spec.rb
+- spec/suite_frame_spec.rb
+- spec/suite_from_rdf_spec.rb
+- spec/suite_helper.rb
+- spec/suite_html_spec.rb
 - spec/suite_http_spec.rb
-- spec/streaming_reader_spec.rb
+- spec/suite_remote_doc_spec.rb
+- spec/suite_to_rdf_spec.rb
+- spec/support/extensions.rb
+- spec/to_rdf_spec.rb
 - spec/writer_spec.rb
-- spec/test-files/test-3-compacted.json
-- spec/test-files/test-2-rdf.ttl
-- spec/test-files/test-4-compacted.json
-- spec/test-files/test-5-input.json
-- spec/test-files/test-3-rdf.ttl
-- spec/test-files/test-5-compacted.json
-- spec/test-files/test-9-expanded.json
-- spec/test-files/test-8-input.json
-- spec/test-files/test-2-compacted.json
-- spec/test-files/test-8-compacted.json
-- spec/test-files/test-7-expanded.json
-- spec/test-files/test-1-rdf.ttl
-- spec/test-files/test-7-context.json
-- spec/test-files/test-3-expanded.json
-- spec/test-files/test-8-rdf.ttl
+- spec/test-files/test-1-compacted.json
+- spec/test-files/test-1-context.json
+- spec/test-files/test-1-expanded.json
+- spec/test-files/test-1-input.json
 - spec/test-files/test-1-normalized.json
+- spec/test-files/test-1-rdf.ttl
+- spec/test-files/test-2-compacted.json
+- spec/test-files/test-2-context.json
+- spec/test-files/test-2-expanded.json
 - spec/test-files/test-2-input.json
-- spec/test-files/test-7-compacted.json
-- spec/test-files/test-1-context.json
-- spec/test-files/test-6-context.json
-- spec/test-files/test-6-compacted.json
-- spec/test-files/test-7-input.json
-- spec/test-files/test-1-compacted.json
-- spec/test-files/test-4-expanded.json
-- spec/test-files/test-9-compacted.json
+- spec/test-files/test-2-normalized.json
+- spec/test-files/test-2-rdf.ttl
+- spec/test-files/test-3-compacted.json
+- spec/test-files/test-3-context.json
+- spec/test-files/test-3-expanded.json
+- spec/test-files/test-3-input.json
+- spec/test-files/test-3-normalized.json
+- spec/test-files/test-3-rdf.ttl
+- spec/test-files/test-4-compacted.json
 - spec/test-files/test-4-context.json
+- spec/test-files/test-4-expanded.json
 - spec/test-files/test-4-input.json
-- spec/test-files/test-3-context.json
-- spec/test-files/test-5-rdf.ttl
-- spec/test-files/test-1-expanded.json
-- spec/test-files/test-9-input.json
-- spec/test-files/test-8-framed.json
+- spec/test-files/test-4-rdf.ttl
+- spec/test-files/test-5-compacted.json
+- spec/test-files/test-5-context.json
 - spec/test-files/test-5-expanded.json
-- spec/test-files/test-3-normalized.json
-- spec/test-files/test-2-expanded.json
+- spec/test-files/test-5-input.json
+- spec/test-files/test-5-rdf.ttl
+- spec/test-files/test-6-compacted.json
+- spec/test-files/test-6-context.json
 - spec/test-files/test-6-expanded.json
-- spec/test-files/test-2-context.json
-- spec/test-files/test-5-context.json
-- spec/test-files/test-1-input.json
-- spec/test-files/test-4-rdf.ttl
-- spec/test-files/test-8-frame.json
 - spec/test-files/test-6-input.json
-- spec/test-files/test-8-context.json
-- spec/test-files/test-8-expanded.json
 - spec/test-files/test-6-rdf.ttl
+- spec/test-files/test-7-compacted.json
+- spec/test-files/test-7-context.json
+- spec/test-files/test-7-expanded.json
+- spec/test-files/test-7-input.json
 - spec/test-files/test-7-rdf.ttl
-- spec/test-files/test-3-input.json
-- spec/test-files/test-2-normalized.json
+- spec/test-files/test-8-compacted.json
+- spec/test-files/test-8-context.json
+- spec/test-files/test-8-expanded.json
+- spec/test-files/test-8-frame.json
+- spec/test-files/test-8-framed.json
+- spec/test-files/test-8-input.json
+- spec/test-files/test-8-rdf.ttl
+- spec/test-files/test-9-compacted.json
 - spec/test-files/test-9-context.json
+- spec/test-files/test-9-expanded.json
+- spec/test-files/test-9-input.json