Finish 3.2.0

ruby-rdf · Dec 29, 2021 · bdd7735 · bdd7735
2 parents d56a736 + 0cc0369
commit bdd7735
Show file tree

Hide file tree

Showing 22 changed files with 2,221 additions and 317 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,17 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CI: true
+      ALLOW_FAILURES: ${{ endsWith(matrix.ruby, 'head') }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 2.4
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
           - ruby-head
-          #- jruby # Nokogumbo
+          - jruby
     steps:
       - name: Clone repository
         uses: actions/checkout@v2
@@ -36,5 +36,10 @@ jobs:
       - name: Install dependencies
         run: bundle install --jobs 4 --retry 3
       - name: Run tests
-        run: bundle exec rspec spec
-
+        run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/[email protected]
+        if: "matrix.ruby == '3.0'"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/Gemfile b/Gemfile
@@ -11,25 +11,25 @@ gem 'rdf',
     branch: 'develop'
 
 group :development, :test do
-  gem 'ruby-prof',          platform: :mri
   gem 'ebnf',               git: 'https://github.com/dryruby/ebnf.git',                 branch: 'develop'
   gem 'json-ld',            git: 'https://github.com/ruby-rdf/json-ld.git',             branch: 'develop'
-  #gem 'linkeddata',         git: 'https://github.com/ruby-rdf/linkeddata.git',          branch: 'develop'
   gem 'rdf-aggregate-repo', git: 'https://github.com/ruby-rdf/rdf-aggregate-repo.git',  branch: 'develop'
   gem 'rdf-isomorphic',     git: 'https://github.com/ruby-rdf/rdf-isomorphic.git',      branch: 'develop'
+  gem 'rdf-ordered-repo',   git: 'https://github.com/ruby-rdf/rdf-ordered-repo.git',    branch: 'develop'
   gem 'rdf-rdfa',           git: 'https://github.com/ruby-rdf/rdf-rdfa.git',            branch: 'develop'
   gem 'rdf-rdfxml',         git: 'https://github.com/ruby-rdf/rdf-rdfxml.git',          branch: 'develop'
   gem 'rdf-reasoner',       git: 'https://github.com/ruby-rdf/rdf-reasoner.git',        branch: 'develop'
   gem 'rdf-spec',           git: 'https://github.com/ruby-rdf/rdf-spec.git',            branch: 'develop'
   gem 'rdf-turtle',         git: 'https://github.com/ruby-rdf/rdf-turtle.git',          branch: 'develop'
   gem 'rdf-xsd',            git: 'https://github.com/ruby-rdf/rdf-xsd.git',             branch: 'develop'
+  gem 'ruby-prof',          platform: :mri
   gem 'sparql',             git: 'https://github.com/ruby-rdf/sparql.git',              branch: 'develop'
   gem 'sparql-client',      git: 'https://github.com/ruby-rdf/sparql-client.git',       branch: 'develop'
   gem 'sxp',                git: 'https://github.com/dryruby/sxp.rb.git',               branch: 'develop'
-  gem 'nokogumbo',          '~> 2.0', platform: :mri
+  #gem 'linkeddata',         git: 'https://github.com/ruby-rdf/linkeddata.git',          branch: 'develop'
 
-  gem 'simplecov',          platforms: :mri
-  gem 'coveralls',          '~> 0.8', platforms: :mri
+  gem 'simplecov',          '~> 0.21',  platforms: :mri
+  gem 'simplecov-lcov',     '~> 0.8',  platforms: :mri
 end
 
 group :debug do

diff --git a/README.md b/README.md
@@ -117,7 +117,7 @@ then
 
 This will load all the vocabulary classes in the library.
 
-Also adds the `gen-vocab` command to the `rdf` command-line executable to generate specifically generated output in Turtle, JSON-LD, and HTML+RDFa for either built-in or arbitrary vocabularies.
+Also adds the `gen-vocab` command to the `rdf` command-line executable to generate specifically generated output in Turtle, JSON-LD, and HTML+RDFa for either built-in or arbitrary vocabularies. Other output serialization formats are also supported as generic RDF Writers and may lack the vocabulary-specific formatting of Turtle, JSON-LD, and HTML+RDFa.
 
 ## Adding new vocabularies
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.14
+3.2.0
diff --git a/lib/rdf/vocab.rb b/lib/rdf/vocab.rb
@@ -304,7 +304,10 @@ module Vocab
         uri: "http://pcdm.org/models#",
         source: "https://raw.githubusercontent.com/duraspace/pcdm/master/models.rdf"
       },
-      pplan:  {uri: "http://purl.org/net/p-plan#"},
+      pplan:  {
+        uri: "http://purl.org/net/p-plan#",
+        source: "https://www.opmw.org/p-plan.owl"
+      },
       premis: {
         uri: "http://www.loc.gov/premis/rdf/v1#",
         source: "http://www.loc.gov/premis/rdf/v1.rdf"
@@ -367,7 +370,7 @@ module Vocab
       v:      {uri: "http://rdf.data-vocabulary.org/#", source: "etc/rdf.data-vocab.ttl"},
       vmd:    {uri: "http://data-vocabulary.org/", source: "etc/data-vocab.ttl"},
       vcard:  {uri: "http://www.w3.org/2006/vcard/ns#"},
-      void:   {uri: "http://rdfs.org/ns/void#", source: "http://vocab.deri.ie/void.rdf"},
+      void:   {uri: "http://rdfs.org/ns/void#", source: "https://lov.linkeddata.es/dataset/lov/vocabs/void/versions/2011-03-06.n3"},
       vs:     {uri: "http://www.w3.org/2003/06/sw-vocab-status/ns#"},
       wdrs:   {uri: "http://www.w3.org/2007/05/powder-s#"},
       wot:    {uri: "http://xmlns.com/wot/0.1/", source: "http://xmlns.com/wot/0.1/index.rdf"},

diff --git a/lib/rdf/vocab/as.rb b/lib/rdf/vocab/as.rb
@@ -183,7 +183,20 @@ module RDF::Vocab
       comment: "A variation of Collection in which items are strictly ordered".freeze,
       label: "OrderedCollection".freeze,
       subClassOf: term(
-          intersectionOf: list("https://www.w3.org/ns/activitystreams#Collection".freeze, "_:g14420".freeze),
+          intersectionOf: list("https://www.w3.org/ns/activitystreams#Collection".freeze, term(
+            allValuesFrom: term(
+              intersectionOf: list("https://www.w3.org/ns/activitystreams#OrderedItems".freeze, term(
+                "http://www.w3.org/2002/07/owl#complementOf": term(
+                  type: "http://www.w3.org/2002/07/owl#Class".freeze,
+                  unionOf: list("https://www.w3.org/ns/activitystreams#Object".freeze, "https://www.w3.org/ns/activitystreams#Link".freeze)
+                ).freeze,
+                type: "http://www.w3.org/2002/07/owl#Class".freeze
+              )),
+              type: "http://www.w3.org/2002/07/owl#Class".freeze
+            ).freeze,
+            onProperty: "https://www.w3.org/ns/activitystreams#items".freeze,
+            type: "http://www.w3.org/2002/07/owl#Restriction".freeze
+          )),
           type: "http://www.w3.org/2002/07/owl#Class".freeze
         ),
       type: "http://www.w3.org/2002/07/owl#Class".freeze
@@ -196,7 +209,18 @@ module RDF::Vocab
       comment: "A rdf:List variant for Objects and Links".freeze,
       label: "OrderedItems".freeze,
       subClassOf: term(
-          intersectionOf: list("http://www.w3.org/1999/02/22-rdf-syntax-ns#List".freeze, "_:g16060".freeze, "_:g16100".freeze),
+          intersectionOf: list("http://www.w3.org/1999/02/22-rdf-syntax-ns#List".freeze, term(
+            allValuesFrom: term(
+              type: "http://www.w3.org/2002/07/owl#Class".freeze,
+              unionOf: list("https://www.w3.org/ns/activitystreams#Object".freeze, "https://www.w3.org/ns/activitystreams#Link".freeze)
+            ).freeze,
+            onProperty: "http://www.w3.org/1999/02/22-rdf-syntax-ns#first".freeze,
+            type: "http://www.w3.org/2002/07/owl#Restriction".freeze
+          ), term(
+            allValuesFrom: "https://www.w3.org/ns/activitystreams#OrderedItems".freeze,
+            onProperty: "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest".freeze,
+            type: "http://www.w3.org/2002/07/owl#Restriction".freeze
+          )),
           type: "http://www.w3.org/2002/07/owl#Class".freeze
         ),
       type: "http://www.w3.org/2002/07/owl#Class".freeze
@@ -303,7 +327,9 @@ module RDF::Vocab
       label: "accuracy".freeze,
       range: term(
           "http://www.w3.org/2002/07/owl#onDatatype": "http://www.w3.org/2001/XMLSchema#float".freeze,
-          "http://www.w3.org/2002/07/owl#withRestrictions": list("_:g15580".freeze),
+          "http://www.w3.org/2002/07/owl#withRestrictions": list(term(
+            "http://www.w3.org/2001/XMLSchema#minInclusive": "0.0".freeze
+          )),
           type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
         ),
       type: ["http://www.w3.org/2002/07/owl#DatatypeProperty".freeze, "http://www.w3.org/2002/07/owl#FunctionalProperty".freeze]
@@ -409,7 +435,9 @@ module RDF::Vocab
       label: "content".freeze,
       range: term(
           type: "http://www.w3.org/2002/07/owl#Class".freeze,
-          unionOf: list("_:g15980".freeze, "http://www.w3.org/2001/XMLSchema#string".freeze)
+          unionOf: list(term(
+            type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
+          ), "http://www.w3.org/2001/XMLSchema#string".freeze)
         ),
       type: "http://www.w3.org/2002/07/owl#DatatypeProperty".freeze
     property :context,
@@ -544,7 +572,10 @@ module RDF::Vocab
       label: "items".freeze,
       range: term(
           type: "http://www.w3.org/2002/07/owl#Class".freeze,
-          unionOf: list("_:g15260".freeze, "https://www.w3.org/ns/activitystreams#OrderedItems".freeze)
+          unionOf: list(term(
+            type: "http://www.w3.org/2002/07/owl#Class".freeze,
+            unionOf: list("https://www.w3.org/ns/activitystreams#Object".freeze, "https://www.w3.org/ns/activitystreams#Link".freeze)
+          ), "https://www.w3.org/ns/activitystreams#OrderedItems".freeze)
         ),
       type: "http://www.w3.org/2002/07/owl#ObjectProperty".freeze
     property :last,
@@ -593,7 +624,9 @@ module RDF::Vocab
       label: "name".freeze,
       range: term(
           type: "http://www.w3.org/2002/07/owl#Class".freeze,
-          unionOf: list("_:g15160".freeze, "http://www.w3.org/2001/XMLSchema#string".freeze)
+          unionOf: list(term(
+            type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
+          ), "http://www.w3.org/2001/XMLSchema#string".freeze)
         ),
       type: "http://www.w3.org/2002/07/owl#DatatypeProperty".freeze
     property :next,
@@ -685,7 +718,9 @@ module RDF::Vocab
       label: "radius".freeze,
       range: term(
           "http://www.w3.org/2002/07/owl#onDatatype": "http://www.w3.org/2001/XMLSchema#float".freeze,
-          "http://www.w3.org/2002/07/owl#withRestrictions": list("_:g14720".freeze),
+          "http://www.w3.org/2002/07/owl#withRestrictions": list(term(
+            "http://www.w3.org/2001/XMLSchema#minInclusive": "0.0".freeze
+          )),
           type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
         ),
       type: ["http://www.w3.org/2002/07/owl#DatatypeProperty".freeze, "http://www.w3.org/2002/07/owl#FunctionalProperty".freeze]
@@ -695,7 +730,11 @@ module RDF::Vocab
       label: "rating".freeze,
       range: term(
           "http://www.w3.org/2002/07/owl#onDatatype": "http://www.w3.org/2001/XMLSchema#float".freeze,
-          "http://www.w3.org/2002/07/owl#withRestrictions": list("_:g14140".freeze, "_:g14180".freeze),
+          "http://www.w3.org/2002/07/owl#withRestrictions": list(term(
+            "http://www.w3.org/2001/XMLSchema#minInclusive": "0.0".freeze
+          ), term(
+            "http://www.w3.org/2001/XMLSchema#maxInclusive": "5.0".freeze
+          )),
           type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
         ),
       type: ["http://www.w3.org/2002/07/owl#DatatypeProperty".freeze, "http://www.w3.org/2002/07/owl#DeprecatedProperty".freeze, "http://www.w3.org/2002/07/owl#FunctionalProperty".freeze]
@@ -753,7 +792,9 @@ module RDF::Vocab
       label: "summary".freeze,
       range: term(
           type: "http://www.w3.org/2002/07/owl#Class".freeze,
-          unionOf: list("_:g15000".freeze, "http://www.w3.org/2001/XMLSchema#string".freeze)
+          unionOf: list(term(
+            type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
+          ), "http://www.w3.org/2001/XMLSchema#string".freeze)
         ),
       type: "http://www.w3.org/2002/07/owl#DatatypeProperty".freeze
     property :tag,
@@ -801,7 +842,10 @@ module RDF::Vocab
       label: "units".freeze,
       range: term(
           type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze,
-          unionOf: list("_:g14600".freeze, "http://www.w3.org/2001/XMLSchema#anyURI".freeze)
+          unionOf: list(term(
+            "http://www.w3.org/2002/07/owl#oneOf": list("inches".freeze, "feet".freeze, "miles".freeze, "cm".freeze, "m".freeze, "km".freeze),
+            type: "http://www.w3.org/2000/01/rdf-schema#Datatype".freeze
+          ), "http://www.w3.org/2001/XMLSchema#anyURI".freeze)
         ),
       type: ["http://www.w3.org/2002/07/owl#DatatypeProperty".freeze, "http://www.w3.org/2002/07/owl#FunctionalProperty".freeze]
     property :updated,

diff --git a/lib/rdf/vocab/bibo.rb b/lib/rdf/vocab/bibo.rb
@@ -113,7 +113,10 @@ module RDF::Vocab
       isDefinedBy: "http://purl.org/ontology/bibo/".freeze,
       label: "Collection".freeze,
       subClassOf: term(
-          allValuesFrom: "_:g13460".freeze,
+          allValuesFrom: term(
+            type: "http://www.w3.org/2002/07/owl#Class".freeze,
+            unionOf: list("http://purl.org/ontology/bibo/Collection".freeze, "http://purl.org/ontology/bibo/Document".freeze)
+          ).freeze,
           onProperty: "http://purl.org/dc/terms/hasPart".freeze,
           type: "http://www.w3.org/2002/07/owl#Restriction".freeze
         ),

diff --git a/lib/rdf/vocab/dbo.rb b/lib/rdf/vocab/dbo.rb