Finish 3.3.0

ruby-rdf · Sep 1, 2023 · b5143fc · b5143fc
2 parents ebaae8b + 7f98a3f
commit b5143fc
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby]
+        ruby: ['3.0', 3.1, 3.2, ruby-head, jruby]
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -33,7 +33,7 @@ jobs:
         run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
       - name: Coveralls GitHub Action
         uses: coverallsapp/github-action@v2
-        if: "matrix.ruby == '3.0'"
+        if: "matrix.ruby == '3.2'"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.7
+3.3.0
diff --git a/lib/rdf/vocab.rb b/lib/rdf/vocab.rb
@@ -61,14 +61,24 @@ module Vocab
         uri: "http://dbpedia.org/ontology/",
         skip: true # as of 2023-07-23, not available for download at previous location
       },
-      dc:     {uri: "http://purl.org/dc/terms/"},
-      dc11:   {uri: "http://purl.org/dc/elements/1.1/"},
+      dc:     {
+        # https://www.dublincore.org/schemas/rdfs/
+        uri: "http://purl.org/dc/terms/",
+        source: 'https://www.dublincore.org/specifications/dublin-core/dcmi-terms/dublin_core_terms.nt'
+      },
+      dc11:   {
+        # https://www.dublincore.org/schemas/rdfs/
+        uri: "http://purl.org/dc/elements/1.1/",
+        source: 'https://www.dublincore.org/specifications/dublin-core/dcmi-terms/dublin_core_elements.nt'
+      },
       dcat:   {
         uri: "http://www.w3.org/ns/dcat#"
       },
       dcmitype: {
-          uri: "http://purl.org/dc/dcmitype/",
-          class_name: "DCMIType"
+        # https://www.dublincore.org/schemas/rdfs/
+        uri: "http://purl.org/dc/dcmitype/",
+        source: 'https://www.dublincore.org/specifications/dublin-core/dcmi-terms/dublin_core_type.nt',
+        class_name: "DCMIType"
       },
       disco: {
         uri: "http://rdf-vocabulary.ddialliance.org/discovery#",
@@ -231,7 +241,11 @@ module Vocab
           } .
         }
       },
-      lrmi:   {uri: "http://purl.org/dcx/lrmi-terms/", strict: false},
+      lrmi:   {
+        # https://www.dublincore.org/schemas/rdfs/
+        uri: "http://purl.org/dcx/lrmi-terms/",
+        strict: false
+      },
       ma:     {uri: "http://www.w3.org/ns/ma-ont#", source: "http://www.w3.org/ns/ma-ont.rdf", strict: false},
       mads: {
         uri: "http://www.loc.gov/mads/rdf/v1#",

diff --git a/lib/rdf/vocab/xhtml.rb b/lib/rdf/vocab/xhtml.rb
@@ -9,6 +9,7 @@ module RDF::Vocab
 
     # Ontology definition
     ontology :"http://www.w3.org/1999/xhtml#",
+      "http://www.w3.org/1999/xhtml/vocab#stylesheet": "http://www.w3.org/StyleSheets/TR/base",
       "http://www.w3.org/2003/g/data-view#namespaceTransformation": "http://www.w3.org/2008/07/rdfa-xslt"
   end
 end
diff --git a/rdf-vocab.gemspec b/rdf-vocab.gemspec
@@ -25,26 +25,26 @@ Gem::Specification.new do |gem|
   gem.test_files    = Dir.glob('spec/*.rb')
   gem.require_paths = %w(lib)
 
-  gem.required_ruby_version      = '>= 2.6'
+  gem.required_ruby_version      = '>= 3.0'
 
-  gem.add_runtime_dependency     'rdf',              '~> 3.2', '>= 3.2.4'
+  gem.add_runtime_dependency     'rdf',              '~> 3.3'
 
   # Either of these are required for HTML vocabulary generation
-  gem.add_development_dependency 'haml',             '>= 5.2', "< 7"
+  gem.add_development_dependency 'haml',             '~> 6.1'
   gem.add_development_dependency 'erubis',           '~> 2.7'
 
-  gem.add_development_dependency 'json-ld',          '~> 3.2'
-  gem.add_development_dependency 'json-schema',      '~> 2.8'
+  gem.add_development_dependency 'json-ld',          '~> 3.3'
+  gem.add_development_dependency 'json-schema',      '~> 4.0'
   gem.add_development_dependency 'jsonpath',         '~> 1.1'
-  gem.add_development_dependency 'ld-patch',         '~> 3.2'
-  gem.add_development_dependency 'nokogiri',         '~> 1.13', '>= 1.13.8'
+  gem.add_development_dependency 'ld-patch',         '~> 3.3'
+  gem.add_development_dependency 'nokogiri',         '~> 1.15', '>= 1.15.4'
   gem.add_development_dependency 'rake',             '~> 13.0'
-  gem.add_development_dependency 'rdf-ordered-repo', '~> 3.2'
-  gem.add_development_dependency 'rdf-rdfa',         '~> 3.2'
-  gem.add_development_dependency 'rdf-rdfxml',       '~> 3.2'
-  gem.add_development_dependency 'rdf-reasoner',     '~> 0.7'
-  gem.add_development_dependency 'rdf-turtle',       '~> 3.2'
-  gem.add_development_dependency 'rspec',            '~> 3.10'
+  gem.add_development_dependency 'rdf-ordered-repo', '~> 3.3'
+  gem.add_development_dependency 'rdf-rdfa',         '~> 3.3'
+  gem.add_development_dependency 'rdf-rdfxml',       '~> 3.3'
+  gem.add_development_dependency 'rdf-reasoner',     '~> 0.8'
+  gem.add_development_dependency 'rdf-turtle',       '~> 3.3'
+  gem.add_development_dependency 'rspec',            '~> 3.12'
   gem.add_development_dependency 'rspec-its',        '~> 1.3'
   gem.add_development_dependency 'uuidtools',        '~> 2.2' # needed by json-schema
   gem.add_development_dependency 'yard',             '~> 0.9'