Finish 3.1.5

Author: gkellogg

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
           - ruby-head
           - jruby
     steps:

Gemfile

@@ -9,7 +9,7 @@ group 'development' do
   gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic",  branch: "develop"
   gem 'rdf-vocab',      github: "ruby-rdf/rdf-vocab",       branch: "develop"
   gem 'sxp',            github: "dryruby/sxp.rb",           branch: "develop"
-  gem 'nokogiri',       '~> 1.8'
+  gem 'nokogiri',       '~> 1.10'
 end
 
 group :debug do

README.md

@@ -3,7 +3,7 @@ JSON-LD with preloaded contexts.
 
 [![Gem Version](https://badge.fury.io/rb/json-ld-preloaded.png)](https://badge.fury.io/rb/json-ld-preloaded)
 [![Build Status](https://github.com/ruby-rdf/json-ld-preloaded/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/json-ld-preloaded/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/json-ld-preloaded/badge.svg)](https://coveralls.io/github/ruby-rdf/json-ld-preloaded)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/json-ld-preloaded/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/json-ld-preloaded?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Features

Rakefile

@@ -41,10 +41,10 @@ CONTEXTS = {
   rdfa:             ["http://www.w3.org/2013/json-ld-context/rdfa11", "https://www.w3.org/2013/json-ld-context/rdfa11"].freeze,
   research:         ["https://w3id.org/bundle/context", "https://w3id.org/bundle/context"].freeze,
   schema:           [
-    "http://schema.org/",
     "https://schema.org/",
+    "https://schema.org",
+    "http://schema.org/",
     "http://schema.org",
-    "https://schema.org"
   ].freeze,
   vc:               ["http://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/v1"].freeze,
   vcard:            ["http://www.w3.org/2006/vcard/ns", "https://www.w3.org/2006/vcard/ns"].freeze,

VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

etc/doap.ttl

@@ -8,19 +8,19 @@
 @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 
 <> a doap:Project;
+   doap:name "JSON::LD::Preloaded"^^xsd:string;
+   doap:shortdesc "JSON-LD with preloaded contexts for RDF.rb."@en;
+   doap:description "A meta-release of the json-ld gem including preloaded vocabularies for the Ruby RDF.rb library suite."@en;
    dc:creator <https://greggkellogg.net/foaf#me>;
    doap:blog <https://greggkellogg.net/>;
    doap:bug-database <https://github.com/ruby-rdf/json-ld-preloaded/issues>;
    doap:created "2018-06-20"^^xsd:date;
-   doap:description "A meta-release of the json-ld gem including preloaded vocabularies."@en;
    doap:developer <https://greggkellogg.net/foaf#me>;
    doap:documenter <https://greggkellogg.net/foaf#me>;
    doap:homepage <https://github.com/ruby-rdf/json-ld-preloaded/>;
    doap:license <https://unlicense.org/1.0/>;
    doap:maintainer <https://greggkellogg.net/foaf#me>;
-   doap:name "JSON::LD::Preloaded"^^xsd:string;
    doap:programming-language "Ruby";
-   doap:shortdesc "JSON-LD with preloaded contexts."@en;
    foaf:maker <https://greggkellogg.net/foaf#me> .
 
 <https://greggkellogg.net/foaf#me> a foaf:Person;

json-ld-preloaded.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.name                  = "json-ld-preloaded"
   gem.homepage              = "https://github.com/ruby-rdf/json-ld-preloaded"
   gem.license               = 'Unlicense'
-  gem.summary               = "JSON-LD with preloaded contexts."
-  gem.description           = "A meta-release of the json-ld gem including preloaded vocabularies."
+  gem.summary               = "JSON-LD with preloaded contexts for RDF.rb."
+  gem.description           = "A meta-release of the json-ld gem including preloaded vocabularies for the Ruby RDF.rb library suite."
 
   gem.authors               = ['Gregg Kellogg']
   gem.email                 = 'public-linked-json@w3.org'

lib/json/ld/preloaded/lov.rb

@@ -67,6 +67,7 @@ class JSON::LD::Context
       "cal" => TermDefinition.new("cal", id: "http://www.w3.org/2002/12/cal/ical#", simple: true, prefix: true),
       "caresses" => TermDefinition.new("caresses", id: "http://caressesrobot.org/ontology#", simple: true, prefix: true),
       "cart" => TermDefinition.new("cart", id: "http://purl.org/net/cartCoord#", simple: true, prefix: true),
+      "caso" => TermDefinition.new("caso", id: "http://www.w3id.org/def/caso#", simple: true, prefix: true),
       "cbo" => TermDefinition.new("cbo", id: "http://comicmeta.org/cbo/", simple: true, prefix: true),
       "cbs" => TermDefinition.new("cbs", id: "http://betalinkeddata.cbs.nl/def/cbs#", simple: true, prefix: true),
       "cc" => TermDefinition.new("cc", id: "http://creativecommons.org/ns#", simple: true, prefix: true),
@@ -75,6 +76,7 @@ class JSON::LD::Context
       "ccp" => TermDefinition.new("ccp", id: "http://cookingbigdata.com/linkeddata/ccpricing#", simple: true, prefix: true),
       "ccr" => TermDefinition.new("ccr", id: "http://cookingbigdata.com/linkeddata/ccregions#", simple: true, prefix: true),
       "ccsla" => TermDefinition.new("ccsla", id: "http://cookingbigdata.com/linkeddata/ccsla#", simple: true, prefix: true),
+      "cdc" => TermDefinition.new("cdc", id: "https://w3id.org/cdc#", simple: true, prefix: true),
       "cdesc" => TermDefinition.new("cdesc", id: "https://w3id.org/arco/ontology/context-description/", simple: true, prefix: true),
       "cdm" => TermDefinition.new("cdm", id: "http://purl.org/twc/ontology/cdm.owl#", simple: true, prefix: true),
       "cdtype" => TermDefinition.new("cdtype", id: "http://purl.org/cld/cdtype/", simple: true, prefix: true),
@@ -104,6 +106,7 @@ class JSON::LD::Context
       "comm" => TermDefinition.new("comm", id: "http://vocab.resc.info/communication#", simple: true, prefix: true),
       "common" => TermDefinition.new("common", id: "http://www.w3.org/2007/uwa/context/common.owl#", simple: true, prefix: true),
       "con" => TermDefinition.new("con", id: "http://www.w3.org/2000/10/swap/pim/contact#", simple: true, prefix: true),
+      "contax" => TermDefinition.new("contax", id: "https://w3id.org/con-tax#", simple: true, prefix: true),
       "conversion" => TermDefinition.new("conversion", id: "http://purl.org/twc/vocab/conversion/", simple: true, prefix: true),
       "coo" => TermDefinition.new("coo", id: "http://purl.org/coo/ns#", simple: true, prefix: true),
       "core" => TermDefinition.new("core", id: "https://w3id.org/mdo/core/", simple: true, prefix: true),
@@ -118,6 +121,7 @@ class JSON::LD::Context
       "ct" => TermDefinition.new("ct", id: "http://www.tele.pw.edu.pl/~sims-onto/ConnectivityType.owl#", simple: true, prefix: true),
       "ctag" => TermDefinition.new("ctag", id: "http://commontag.org/ns#", simple: true, prefix: true),
       "ctlog" => TermDefinition.new("ctlog", id: "https://w3id.org/arco/ontology/catalogue/", simple: true, prefix: true),
+      "cto" => TermDefinition.new("cto", id: "https://w3id.org/cto#", simple: true, prefix: true),
       "ctorg" => TermDefinition.new("ctorg", id: "http://purl.org/ctic/infraestructuras/organizacion#", simple: true, prefix: true),
       "ctrl" => TermDefinition.new("ctrl", id: "https://w3id.org/ibp/CTRLont#", simple: true, prefix: true),
       "ctxdesc" => TermDefinition.new("ctxdesc", id: "http://www.demcare.eu/ontologies/contextdescriptor.owl#", simple: true, prefix: true),
@@ -148,8 +152,10 @@ class JSON::LD::Context
       "demlab" => TermDefinition.new("demlab", id: "http://www.demcare.eu/ontologies/demlab.owl#", simple: true, prefix: true),
       "deo" => TermDefinition.new("deo", id: "http://purl.org/spar/deo/", simple: true, prefix: true),
       "deps" => TermDefinition.new("deps", id: "http://ontologi.es/doap-deps#", simple: true, prefix: true),
-      "dfc" => TermDefinition.new("dfc", id: "http://datafoodconsortium.org/ontologies/DFC_FullModel.owl#", simple: true, prefix: true),
-      "dfcb" => TermDefinition.new("dfcb", id: "http://datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#", simple: true, prefix: true),
+      "dfc" => TermDefinition.new("dfc", id: "http://static.datafoodconsortium.org/ontologies/DFC_FullModel.owl#", simple: true, prefix: true),
+      "dfc-b" => TermDefinition.new("dfc-b", id: "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#", simple: true, prefix: true),
+      "dfc-p" => TermDefinition.new("dfc-p", id: "http://static.datafoodconsortium.org/ontologies/DFC_ProductGlossary.owl#", simple: true, prefix: true),
+      "dfc-t" => TermDefinition.new("dfc-t", id: "http://static.datafoodconsortium.org/ontologies/DFC_TechnicalOntology.owl#", simple: true, prefix: true),
       "dg" => TermDefinition.new("dg", id: "https://w3id.org/dingo#", simple: true, prefix: true),
       "dicom" => TermDefinition.new("dicom", id: "http://purl.org/healthcarevocab/v1#", simple: true, prefix: true),
       "dio" => TermDefinition.new("dio", id: "https://w3id.org/dio#", simple: true, prefix: true),
@@ -184,6 +190,7 @@ class JSON::LD::Context
       "eac-cpf" => TermDefinition.new("eac-cpf", id: "http://archivi.ibc.regione.emilia-romagna.it/ontology/eac-cpf/", simple: true, prefix: true),
       "earl" => TermDefinition.new("earl", id: "http://www.w3.org/ns/earl#", simple: true, prefix: true),
       "earth" => TermDefinition.new("earth", id: "http://linked.earth/ontology#", simple: true, prefix: true),
+      "ebg" => TermDefinition.new("ebg", id: "http://data.businessgraph.io/ontology#", simple: true, prefix: true),
       "ebucore" => TermDefinition.new("ebucore", id: "http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#", simple: true, prefix: true),
       "eccrev" => TermDefinition.new("eccrev", id: "https://vocab.eccenca.com/revision/", simple: true, prefix: true),
       "eclap" => TermDefinition.new("eclap", id: "http://www.eclap.eu/schema/eclap/", simple: true, prefix: true),
@@ -365,6 +372,9 @@ class JSON::LD::Context
       "maso" => TermDefinition.new("maso", id: "http://securitytoolbox.appspot.com/MASO#", simple: true, prefix: true),
       "md" => TermDefinition.new("md", id: "http://def.seegrid.csiro.au/isotc211/iso19115/2003/metadata#", simple: true, prefix: true),
       "mdi" => TermDefinition.new("mdi", id: "https://w3id.org/multidimensional-interface/ontology#", simple: true, prefix: true),
+      "mdo" => TermDefinition.new("mdo", id: "https://w3id.org/mdo/full/", simple: true, prefix: true),
+      "mdo-calc" => TermDefinition.new("mdo-calc", id: "https://w3id.org/mdo/calculation/", simple: true, prefix: true),
+      "mdo-struc" => TermDefinition.new("mdo-struc", id: "https://w3id.org/mdo/structure/", simple: true, prefix: true),
       "mdoprov" => TermDefinition.new("mdoprov", id: "https://w3id.org/mdo/provenance/", simple: true, prefix: true),
       "mdr" => TermDefinition.new("mdr", id: "http://semanticturkey.uniroma2.it/ns/mdr#", simple: true, prefix: true),
       "meb" => TermDefinition.new("meb", id: "http://rdf.myexperiment.org/ontologies/base/", simple: true, prefix: true),
@@ -560,16 +570,23 @@ class JSON::LD::Context
       "ru" => TermDefinition.new("ru", id: "http://purl.org/imbi/ru-meta.owl#", simple: true, prefix: true),
       "ruto" => TermDefinition.new("ruto", id: "http://rdfunit.aksw.org/ns/core#", simple: true, prefix: true),
       "s4ac" => TermDefinition.new("s4ac", id: "http://ns.inria.fr/s4ac/v2#", simple: true, prefix: true),
-      "s4bldg" => TermDefinition.new("s4bldg", id: "https://w3id.org/def/saref4bldg#", simple: true, prefix: true),
-      "s4ee" => TermDefinition.new("s4ee", id: "https://w3id.org/saref4ee#", simple: true, prefix: true),
+      "s4agri" => TermDefinition.new("s4agri", id: "https://saref.etsi.org/saref4agri/", simple: true, prefix: true),
+      "s4bldg" => TermDefinition.new("s4bldg", id: "https://saref.etsi.org/saref4bldg/", simple: true, prefix: true),
+      "s4city" => TermDefinition.new("s4city", id: "https://saref.etsi.org/saref4city/", simple: true, prefix: true),
+      "s4ehaw" => TermDefinition.new("s4ehaw", id: "https://saref.etsi.org/saref4ehaw/", simple: true, prefix: true),
+      "s4ener" => TermDefinition.new("s4ener", id: "https://saref.etsi.org/saref4ener/", simple: true, prefix: true),
+      "s4envi" => TermDefinition.new("s4envi", id: "https://saref.etsi.org/saref4envi/", simple: true, prefix: true),
+      "s4inma" => TermDefinition.new("s4inma", id: "https://saref.etsi.org/saref4inma/", simple: true, prefix: true),
+      "s4syst" => TermDefinition.new("s4syst", id: "https://saref.etsi.org/saref4syst/", simple: true, prefix: true),
+      "s4watr" => TermDefinition.new("s4watr", id: "https://saref.etsi.org/saref4watr/", simple: true, prefix: true),
       "s4wear" => TermDefinition.new("s4wear", id: "https://saref.etsi.org/saref4wear/", simple: true, prefix: true),
       "sam" => TermDefinition.new("sam", id: "http://def.seegrid.csiro.au/isotc211/iso19156/2011/sampling#", simple: true, prefix: true),
       "samfl" => TermDefinition.new("samfl", id: "http://def.seegrid.csiro.au/ontology/om/sam-lite#", simple: true, prefix: true),
       "san-lod" => TermDefinition.new("san-lod", id: "http://dati.san.beniculturali.it/SAN/", simple: true, prefix: true),
       "sao" => TermDefinition.new("sao", id: "http://salt.semanticauthoring.org/ontologies/sao#", simple: true, prefix: true),
-      "saref" => TermDefinition.new("saref", id: "https://w3id.org/saref#", simple: true, prefix: true),
-      "saref4agri" => TermDefinition.new("saref4agri", id: "https://w3id.org/def/saref4agri#", simple: true, prefix: true),
+      "saref" => TermDefinition.new("saref", id: "https://saref.etsi.org/core/", simple: true, prefix: true),
       "saws" => TermDefinition.new("saws", id: "http://purl.org/saws/ontology#", simple: true, prefix: true),
+      "sbeo" => TermDefinition.new("sbeo", id: "https://w3id.org/sbeo#", simple: true, prefix: true),
       "schema" => TermDefinition.new("schema", id: "http://schema.org/", simple: true, prefix: true),
       "scip" => TermDefinition.new("scip", id: "http://lod.taxonconcept.org/ontology/sci_people.owl#", simple: true, prefix: true),
       "scoro" => TermDefinition.new("scoro", id: "http://purl.org/spar/scoro/", simple: true, prefix: true),