json-ld 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2509fe2ee3a0766a3e332d062f11ad05d02bf7a3c00e423dfe4ac8eec23f9746
-  data.tar.gz: 277416c70b52a06ec85d89394fe18ccbe9eacb53538a6c65432ed390728b93ca
+  metadata.gz: b9345f0853c9ee6d7e1bb91817ca7d9effc1ce5d591f98fa92a11c396c1f0fbb
+  data.tar.gz: 7a84d8f7b4dd0fe379dd8b915d6e899f610807959d9ea4ef66c0ab4c22657807
 SHA512:
-  metadata.gz: 20db323ff35ccd493d9fbd0b6f73f4c5fc517678363aff6fbf21f114ce33e2e491f4717e87c3ad3f2a19c31beb728c627b00cb7f8bff268575c6655cc29e6ff2
-  data.tar.gz: da506865a8f17c2fc304159bfb61411d11c433b656ea58bf1b19371618a2c0f02c08274f8a5a6ca97f1f9087a7d797b9be087314fd0cd41e154fe53721fcb6d8
+  metadata.gz: d2ff1429edeea61f1655e445862140b5477dfa978cfaeaa3a417417fff24adfc17b6adea77cb24041c8c3daafaf7661d05023a3f1e2e4c161194be7dc4c96dd7
+  data.tar.gz: e04b64a78d9bfdc88d808219440b758540a3e6bd2f7dae4ee73831b093ab8ada77641acfc2c4c079b413f17b0d88a0149058fa3959c2fbdd6e0d421c8885fa5a

data/VERSION

@@ -1 +1 @@
-3.1.6
+3.1.7

data/lib/json/ld/compact.rb

@@ -98,8 +98,15 @@ module JSON::LD
           log_debug("", depth: log_depth.to_i) {"#{expanded_property}: #{expanded_value.inspect}"}
 
           if expanded_property == '@id'
-            compacted_value = Array(expanded_value).map do |expanded_id|
-              context.compact_iri(expanded_id, base: @options[:base])
+            compacted_value = as_array(expanded_value).map do |expanded_id|
+              if node?(expanded_id) && @options[:rdfstar]
+                # This can only really happen for valid RDF*
+                compact(expanded_id, base: base,
+                        property: '@id',
+                        log_depth: log_depth.to_i + 1)
+              else
+                context.compact_iri(expanded_id, base: @options[:base])
+              end
             end
 
             kw_alias = context.compact_iri('@id', vocab: true)

data/lib/json/ld/context.rb

@@ -1038,7 +1038,7 @@ module JSON::LD
     # @param [Term, #to_s] term in unexpanded form
     # @return [Array<'@index', '@language', '@index', '@set', '@type', '@id', '@graph'>]
     def container(term)
-      return [term] if term == '@list'
+      return Set[term] if term == '@list'
       term = find_definition(term)
       term ? term.container_mapping : Set.new
     end

data/spec/compact_spec.rb

@@ -3113,6 +3113,210 @@ describe JSON::LD::API do
     end
   end
 
+  context "JSON-LD*" do
+    {
+      "subject-iii": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+         "@context": {"ex": "http://example/"},
+         "@id": {
+           "@id": "ex:s1",
+           "ex:p1": {"@id": "ex:o1"}
+         },
+         "ex:p": {"@id": "ex:o"}
+       })
+      },
+      "subject-iib": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@id": "_:o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-iil": {
+        input: %([{
+          "@id": {
+            "@id": "http://example/s1",
+            "http://example/p1": [{"@value": "o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bii": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bib": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@id": "_:o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bil": {
+        input: %([{
+          "@id": {
+            "@id": "_:s1",
+            "http://example/p1": [{"@value": "o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "object-iii":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@id": "http://example/o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "ex:o1"}
+            }
+          }
+        })
+      },
+      "object-iib":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@id": "_:o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "_:o1"}
+            }
+          }
+        })
+      },
+      "object-iil":  {
+        input: %([{
+          "@id": "http://example/s",
+          "http://example/p": [{
+            "@id": {
+              "@id": "http://example/s1",
+              "http://example/p1": [{"@value": "o1"}]
+            }
+          }]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": "o1"
+            }
+          }
+        })
+      },
+      "recursive-subject": {
+        input: %([{
+          "@id": {
+            "@id": {
+              "@id": "http://example/s2",
+              "http://example/p2": [{"@id": "http://example/o2"}]
+            },
+            "http://example/p1": [{"@id": "http://example/o1"}]
+          },
+          "http://example/p": [{"@id": "http://example/o"}]
+        }]),
+        context: %({"ex": "http://example/"}),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": {
+              "@id": "ex:s2",
+              "ex:p2": {"@id": "ex:o2"}
+            },
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+    }.each do |name, params|
+      it(name) {run_compact(params.merge(rdfstar: true))}
+    end
+  end
 
   context "problem cases" do
     {
@@ -3200,8 +3404,8 @@ describe JSON::LD::API do
       expect(jld).to produce_jsonld(output, logger)
 
       # Compare expanded jld/output too to make sure list values remain ordered
-      exp_jld = JSON::LD::API.expand(jld, processingMode: 'json-ld-1.1')
-      exp_output = JSON::LD::API.expand(output, processingMode: 'json-ld-1.1')
+      exp_jld = JSON::LD::API.expand(jld, processingMode: 'json-ld-1.1', rdfstar: params[:rdfstar])
+      exp_output = JSON::LD::API.expand(output, processingMode: 'json-ld-1.1', rdfstar: params[:rdfstar])
       expect(exp_jld).to produce_jsonld(exp_output, logger)
     end
   end

data/spec/writer_spec.rb

@@ -189,6 +189,199 @@ describe JSON::LD::Writer do
     end
   end
 
+  context "RDF*" do
+    {
+      "subject-iii": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::URI('http://example/o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+         "@context": {"ex": "http://example/"},
+         "@id": {
+           "@id": "ex:s1",
+           "ex:p1": {"@id": "ex:o1"}
+         },
+         "ex:p": {"@id": "ex:o"}
+       })
+      },
+      "subject-iib": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Node.new('o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-iil": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Literal('o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "ex:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bii": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::Node('s1'),
+            RDF::URI('http://example/p1'),
+            RDF::URI('http://example/o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bib": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::Node('s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Node.new('o1')),
+          RDF::URI('http://example/p'), RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": {"@id": "_:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "subject-bil": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::Node('s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Literal('o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": "_:s1",
+            "ex:p1": "o1"
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+      "object-iii":  {
+        input: RDF::Statement(
+          RDF::URI('http://example/s'),
+          RDF::URI('http://example/p'),
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::URI('http://example/o1'))),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "ex:o1"}
+            }
+          }
+        })
+      },
+      "object-iib":  {
+        input: RDF::Statement(
+          RDF::URI('http://example/s'),
+          RDF::URI('http://example/p'),
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Node.new('o1'))),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": {"@id": "_:o1"}
+            }
+          }
+        })
+      },
+      "object-iil":  {
+        input: RDF::Statement(
+          RDF::URI('http://example/s'),
+          RDF::URI('http://example/p'),
+          RDF::Statement(
+            RDF::URI('http://example/s1'),
+            RDF::URI('http://example/p1'),
+            RDF::Literal('o1'))),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": "ex:s",
+          "ex:p": {
+            "@id": {
+              "@id": "ex:s1",
+              "ex:p1": "o1"
+            }
+          }
+        })
+      },
+      "recursive-subject": {
+        input: RDF::Statement(
+          RDF::Statement(
+            RDF::Statement(
+              RDF::URI('http://example/s2'),
+              RDF::URI('http://example/p2'),
+              RDF::URI('http://example/o2')),
+            RDF::URI('http://example/p1'),
+            RDF::URI('http://example/o1')),
+          RDF::URI('http://example/p'),
+          RDF::URI('http://example/o')),
+        output: %({
+          "@context": {"ex": "http://example/"},
+          "@id": {
+            "@id": {
+              "@id": "ex:s2",
+              "ex:p2": {"@id": "ex:o2"}
+            },
+            "ex:p1": {"@id": "ex:o1"}
+          },
+          "ex:p": {"@id": "ex:o"}
+        })
+      },
+    }.each do |name, params|
+      it name do
+        graph = RDF::Graph.new {|g| g << params[:input]}
+        expect(
+          serialize(graph, rdfstar: true, prefixes: {ex: 'http://example/'})
+        ).to produce_jsonld(JSON.parse(params[:output]), logger)
+      end
+    end
+  end
+
   context "Writes fromRdf tests to isomorphic graph" do
     require 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}fromRdf-manifest.jsonld")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -426,85 +426,85 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.1.4
 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/compact_spec.rb
-- spec/conneg_spec.rb
+- spec/suite_from_rdf_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/matchers.rb
+- spec/suite_helper.rb
 - spec/reader_spec.rb
-- spec/resource_spec.rb
-- spec/spec_helper.rb
-- spec/streaming_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/suite_compact_spec.rb
+- spec/expand_spec.rb
 - spec/suite_expand_spec.rb
 - spec/suite_flatten_spec.rb
-- spec/suite_frame_spec.rb
-- spec/suite_from_rdf_spec.rb
-- spec/suite_helper.rb
-- spec/suite_html_spec.rb
+- spec/compact_spec.rb
 - spec/suite_http_spec.rb
-- spec/suite_remote_doc_spec.rb
-- spec/suite_to_rdf_spec.rb
-- spec/support/extensions.rb
-- spec/to_rdf_spec.rb
+- spec/streaming_reader_spec.rb
 - spec/writer_spec.rb
-- 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-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-2-rdf.ttl
 - spec/test-files/test-4-compacted.json
-- spec/test-files/test-4-context.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-normalized.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-4-context.json
 - spec/test-files/test-4-input.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-5-input.json
+- spec/test-files/test-3-context.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-1-expanded.json
+- spec/test-files/test-9-input.json
+- spec/test-files/test-8-framed.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-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-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-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-6-rdf.ttl
+- 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-9-context.json
-- spec/test-files/test-9-expanded.json
-- spec/test-files/test-9-input.json