From a16db600d83f4a246e67363417e9b65e97ef96ab Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 19 Aug 2022 12:46:12 -0700 Subject: [PATCH 1/4] Update Gemfile and version of Ruby used for tests. --- .github/workflows/ci.yml | 2 +- Gemfile | 1 - Gemfile.lock | 300 ++++++++++++++++++++------------------- Rakefile | 2 +- 4 files changed, 158 insertions(+), 147 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d1aa07..8d261bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.1 - name: Install dependencies run: bundle install diff --git a/Gemfile b/Gemfile index 7b92332..d390680 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" gem 'json-ld', github: 'ruby-rdf/json-ld', branch: 'develop' gem 'nokogiri' -gem 'nokogumbo' gem 'linkeddata' gem 'colorize' gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 9a35a19..299091c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,192 +1,205 @@ GIT remote: https://github.com/ruby-rdf/json-ld.git - revision: 97d0daa4ff8f9497de683bd4cee902f9e5cf2131 + revision: 85174af7539c681df0df283512747aea1f107fba branch: develop specs: - json-ld (3.1.9) + json-ld (3.2.3) htmlentities (~> 4.3) - json-canonicalization (~> 0.2) + json-canonicalization (~> 0.3) link_header (~> 0.0, >= 0.0.8) - multi_json (~> 1.14) - rack (~> 2.0) - rdf (~> 3.1) + multi_json (~> 1.15) + rack (~> 2.2) + rdf (~> 3.2, >= 3.2.9) GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - amazing_print (1.3.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + amazing_print (1.4.0) bcp47 (0.3.3) i18n builder (3.2.4) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) - ebnf (2.1.3) - amazing_print (~> 1.2) + ebnf (2.3.1) + amazing_print (~> 1.4) htmlentities (~> 4.3) - rdf (~> 3.1) + rdf (~> 3.2) scanf (~> 1.0) - sxp (~> 1.1) - unicode-types (~> 1.6) - equivalent-xml (0.6.0) - nokogiri (>= 1.4.3) + sxp (~> 1.2) + unicode-types (~> 1.7) haml (5.2.2) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) htmlentities (4.3.4) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) - json-canonicalization (0.2.1) - json-ld-preloaded (3.1.6) - json-ld (~> 3.1) - rdf (~> 3.1) - ld-patch (3.1.3) - ebnf (~> 2.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - sparql (~> 3.1) - sxp (~> 1.1) + json-canonicalization (0.3.0) + json-ld-preloaded (3.2.0) + json-ld (~> 3.2) + rdf (~> 3.2) + ld-patch (3.2.0) + ebnf (~> 2.2) + rdf (~> 3.2) + rdf-xsd (~> 3.2) + sparql (~> 3.2) + sxp (~> 1.2) link_header (0.0.8) - linkeddata (3.1.5) - equivalent-xml (~> 0.6) - json-ld (~> 3.1, >= 3.1.9) - json-ld-preloaded (~> 3.1, >= 3.1.5) - ld-patch (~> 3.1, >= 3.1.3) - nokogiri (~> 1.10) - nokogumbo (~> 2.0) - rdf (~> 3.1, >= 3.1.13) - rdf-aggregate-repo (~> 3.1) - rdf-isomorphic (~> 3.1, >= 3.1.1) - rdf-json (~> 3.1) - rdf-microdata (~> 3.1, >= 3.1.2) - rdf-n3 (~> 3.1, >= 3.1.2) - rdf-normalize (~> 0.4) - rdf-ordered-repo (~> 3.1, >= 3.1.1) - rdf-rdfa (~> 3.1, >= 3.1.3) - rdf-rdfxml (~> 3.1, >= 3.1.1) - rdf-reasoner (~> 0.7, >= 0.7.2) - rdf-tabular (~> 3.1, >= 3.1.1) - rdf-trig (~> 3.1, >= 3.1.2) - rdf-trix (~> 3.1) - rdf-turtle (~> 3.1, >= 3.1.3) - rdf-vocab (~> 3.1, >= 3.1.12) - rdf-xsd (~> 3.1) - shacl (~> 0.1, >= 0.1.1) - shex (~> 0.6, >= 0.6.1) - sparql (~> 3.1, >= 3.1.5) - sparql-client (~> 3.1, >= 3.1.2) + linkeddata (3.2.1) + json-ld (~> 3.2, >= 3.2.3) + json-ld-preloaded (~> 3.2) + ld-patch (~> 3.2) + nokogiri (~> 1.13, >= 1.13.8) + rdf (~> 3.2, >= 3.2.9) + rdf-aggregate-repo (~> 3.2, >= 3.2.1) + rdf-hamster-repo (~> 3.2) + rdf-isomorphic (~> 3.2, >= 3.2.1) + rdf-json (~> 3.2) + rdf-microdata (~> 3.2, >= 3.2.1) + rdf-n3 (~> 3.2, >= 3.2.1) + rdf-normalize (~> 0.5) + rdf-ordered-repo (~> 3.2, >= 3.2.1) + rdf-rdfa (~> 3.2) + rdf-rdfxml (~> 3.2) + rdf-reasoner (~> 0.8) + rdf-tabular (~> 3.2, >= 3.2.1) + rdf-trig (~> 3.2) + rdf-trix (~> 3.2) + rdf-turtle (~> 3.2, >= 3.2.1) + rdf-vocab (~> 3.2, >= 3.2.1) + rdf-xsd (~> 3.2, >= 3.2.1) + shacl (~> 0.2, >= 0.2.1) + shex (~> 0.7, >= 0.7.1) + sparql (~> 3.2, >= 3.2.4) + sparql-client (~> 3.2, >= 3.2.1) + yaml-ld (~> 0.0) + logger (1.5.1) + matrix (0.4.2) multi_json (1.15.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - nokogiri (1.13.6-x86_64-darwin) + nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.6-x86_64-linux) + nokogiri (1.13.8-x86_64-darwin) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) - public_suffix (4.0.6) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) + psych (4.0.4) + stringio + public_suffix (5.0.0) racc (1.6.0) - rack (2.2.3.1) + rack (2.2.4) rake (13.0.6) - rdf (3.1.15) - hamster (~> 3.0) + rdf (3.2.9) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (3.1.0) - rdf (~> 3.1) - rdf-isomorphic (3.1.1) - rdf (~> 3.1) - rdf-json (3.1.0) - rdf (~> 3.1) - rdf-microdata (3.1.3) + rdf-aggregate-repo (3.2.1) + rdf (~> 3.2) + rdf-hamster-repo (3.2.1) + hamster (~> 3.0) + rdf (~> 3.2, >= 3.2.1) + rdf-isomorphic (3.2.1) + rdf (~> 3.2) + rdf-json (3.2.0) + rdf (~> 3.2) + rdf-microdata (3.2.1) htmlentities (~> 4.3) - nokogiri (~> 1.10) - rdf (~> 3.1, >= 3.1.13) - rdf-rdfa (~> 3.1, >= 3.1.3) - rdf-xsd (~> 3.1) - rdf-n3 (3.1.2) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.8) - sparql (~> 3.1, >= 3.1.4) - sxp (~> 1.1) - rdf-normalize (0.4.0) - rdf (~> 3.1) - rdf-ordered-repo (3.1.1) - rdf (~> 3.1) - rdf-rdfa (3.1.3) + nokogiri (~> 1.13) + rdf (~> 3.2) + rdf-rdfa (~> 3.2) + rdf-xsd (~> 3.2) + rdf-n3 (3.2.1) + ebnf (~> 2.2) + rdf (~> 3.2) + sparql (~> 3.2) + sxp (~> 1.2) + rdf-normalize (0.5.0) + rdf (~> 3.2) + rdf-ordered-repo (3.2.1) + rdf (~> 3.2, >= 3.2.1) + rdf-rdfa (3.2.0) haml (~> 5.2) htmlentities (~> 4.3) - rdf (~> 3.1, >= 3.1.13) - rdf-aggregate-repo (~> 3.1) - rdf-vocab (~> 3.1, >= 3.1.11) - rdf-xsd (~> 3.1) - rdf-rdfxml (3.1.1) + rdf (~> 3.2) + rdf-aggregate-repo (~> 3.2) + rdf-vocab (~> 3.2) + rdf-xsd (~> 3.2) + rdf-rdfxml (3.2.0) htmlentities (~> 4.3) - rdf (~> 3.1) - rdf-rdfa (~> 3.1) - rdf-xsd (~> 3.1) - rdf-reasoner (0.7.2) - rdf (~> 3.1, >= 3.1.12) - rdf-xsd (~> 3.1) - rdf-tabular (3.1.1) - addressable (~> 2.3) + rdf (~> 3.2) + rdf-rdfa (~> 3.2) + rdf-xsd (~> 3.2) + rdf-reasoner (0.8.0) + rdf (~> 3.2) + rdf-xsd (~> 3.2) + rdf-tabular (3.2.1) + addressable (~> 2.8) bcp47 (~> 0.3, >= 0.3.3) - json-ld (~> 3.1) - rdf (~> 3.1) - rdf-vocab (~> 3.1) - rdf-xsd (~> 3.1) - rdf-trig (3.1.2) - ebnf (~> 2.1) - rdf (~> 3.1) - rdf-turtle (~> 3.1) - rdf-trix (3.1.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - rdf-turtle (3.1.3) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.8) - rdf-vocab (3.1.14) - rdf (~> 3.1, >= 3.1.12) - rdf-xsd (3.1.1) - rdf (~> 3.1) + json-ld (~> 3.2) + rdf (~> 3.2, >= 3.2.7) + rdf-vocab (~> 3.2) + rdf-xsd (~> 3.2) + rdf-trig (3.2.0) + ebnf (~> 2.2) + rdf (~> 3.2) + rdf-turtle (~> 3.2) + rdf-trix (3.2.0) + rdf (~> 3.2) + rdf-xsd (~> 3.2) + rdf-turtle (3.2.1) + ebnf (~> 2.3) + rdf (~> 3.2) + rdf-vocab (3.2.1) + rdf (~> 3.2, >= 3.2.4) + rdf-xsd (3.2.1) + rdf (~> 3.2) rexml (~> 3.2) redcarpet (3.5.1) rexml (3.2.5) scanf (1.0.0) - shacl (0.1.1) - json-ld (~> 3.1, >= 3.1.7) - rdf (~> 3.1, >= 3.1.8) - sparql (~> 3.1) - sxp (~> 1.1) - shex (0.6.1) - ebnf (~> 2.0) - json-ld (~> 3.1) - json-ld-preloaded (~> 3.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - sparql (~> 3.1) - sxp (~> 1.1) - sparql (3.1.7) + shacl (0.3.0) + json-ld (~> 3.2) + rdf (~> 3.2, >= 3.2.8) + sparql (~> 3.2, >= 3.2.4) + sxp (~> 1.2) + shex (0.7.1) + ebnf (~> 2.2) + htmlentities (~> 4.3) + json-ld (~> 3.2) + json-ld-preloaded (~> 3.2) + rdf (~> 3.2) + rdf-xsd (~> 3.2) + sparql (~> 3.2) + sxp (~> 1.2) + sparql (3.2.4) builder (~> 3.2) - ebnf (~> 2.1) - rdf (~> 3.1, >= 3.1.14) - rdf-aggregate-repo (~> 3.1) - rdf-xsd (~> 3.1) - sparql-client (~> 3.1, >= 3.1.2) - sxp (~> 1.1) - sparql-client (3.1.2) + ebnf (~> 2.2, >= 2.3.1) + logger (~> 1.5) + rdf (~> 3.2, >= 3.2.8) + rdf-aggregate-repo (~> 3.2) + rdf-xsd (~> 3.2) + sparql-client (~> 3.2, >= 3.2.1) + sxp (~> 1.2, >= 1.2.2) + sparql-client (3.2.1) net-http-persistent (~> 4.0, >= 4.0.1) - rdf (~> 3.1) - sxp (1.1.0) - rdf (~> 3.1) + rdf (~> 3.2, >= 3.2.6) + stringio (3.0.2) + sxp (1.2.2) + matrix + rdf (~> 3.2) temple (0.8.2) - tilt (2.0.10) - unicode-types (1.6.0) + tilt (2.0.11) + unicode-types (1.7.0) + yaml-ld (0.0.1) + json-ld (~> 3.2, >= 3.2.2) + psych (~> 4.0) + rdf (~> 3.2) PLATFORMS + arm64-darwin-21 x86_64-darwin-20 x86_64-linux @@ -196,9 +209,8 @@ DEPENDENCIES json-ld! linkeddata nokogiri - nokogumbo rake redcarpet BUNDLED WITH - 2.2.3 + 2.3.9 diff --git a/Rakefile b/Rakefile index 94d4d38..5f3851f 100644 --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ end desc "Check HTML" task :check_html do - require 'nokogumbo' + require 'nokogiri' doc = ::Nokogiri::HTML5(File.open("index.html"), max_parse_errors: 1000) unless doc.errors.empty? STDERR.puts "Errors found parsing index.html:" From 9a4fdfdcd245f91713ed7226fc10ca62ff84d68d Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 19 Aug 2022 13:07:30 -0700 Subject: [PATCH 2/4] Update IANA Considerations for the description of the required profile parameter. Fixes #132. --- index.html | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 39214e0..5ed8b9c 100644 --- a/index.html +++ b/index.html @@ -2974,9 +2974,6 @@

application/ld+json

Subtype name:
ld+json
Required parameters:
-
None
-
Optional parameters:
-
profile
@@ -2986,13 +2983,17 @@

application/ld+json

and without knowledge of a profiled resource can safely use the same representation.

-
http://www.w3.org/ns/json-ld#framed
-
To specify a JSON-LD Frame.
+
http://www.w3.org/ns/json-ld#frame
+
To request or specify a JSON-LD Frame document.
-

The http://www.w3.org/ns/json-ld#framed SHOULD - be used when serving and requesting a JSON-LD frame document.

+

The http://www.w3.org/ns/json-ld#frame `profile` parameter SHOULD + be used when serving and requesting a + JSON-LD Frame document.

+
Optional parameters:
+
+
None
Encoding considerations:
See RFC 8259, section 11.
@@ -3169,6 +3170,14 @@

Changes since Proposed Recommendation Release of 7 May 2020

Changes since Recommendation of 16 July 2020

From d1ad1230451d50ad3ca819d18c1ff3435d736be0 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 19 Aug 2022 13:29:44 -0700 Subject: [PATCH 3/4] Fix some ReSpec reported errors. --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 5ed8b9c..3e6d785 100644 --- a/index.html +++ b/index.html @@ -501,7 +501,7 @@

Features

Framing

-

Framing is used to shape the data in a JSON-LD document, +

Framing is used to shape the data in a JSON-LD document, using an example frame document which is used to both match the flattened data and show an example of how the resulting data should be shaped. @@ -1853,7 +1853,7 @@

Omit graph flag

The result is the same as the original Flattened library objects example, but a `@graph` at the top-level. - Example 5 shows the results + Example 5 shows the results with the omit graph flag set to `true`, which is the default value when the processing mode is set to the default `json-ld-1.1`. The top-level object can be enclosed within `@graph` by setting the processing mode to `json-ld-1.0`, From 72d8a93c49269c142b9f51eb16c9efba1a7106d1 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 19 Aug 2022 13:54:38 -0700 Subject: [PATCH 4/4] Fix double `dd` tag. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3e6d785..809bc18 100644 --- a/index.html +++ b/index.html @@ -2993,7 +2993,7 @@

application/ld+json

Optional parameters:
-
None
+ None.
Encoding considerations:
See RFC 8259, section 11.