Finish 3.1.0

ruby-rdf · Dec 16, 2019 · 5be94d4 · 5be94d4
2 parents c870275 + 5e9d746
commit 5be94d4
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 117 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,17 @@
 language: ruby
 bundler_args: --without debug
 script: "bundle exec rspec spec"
-before_install:
-  - 'gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)'
-  - 'gem update bundler --conservative'
 env:
   - CI=true
 rvm:
-  - 2.2
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
-  - jruby-9
-  - rbx-3
+  - 2.7
+  - jruby
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: jruby-9
-    - rvm: rbx-3
+    - rvm: jruby
 dist: trusty
diff --git a/README.md b/README.md
@@ -49,33 +49,9 @@ Contexts are taken from https://github.com/json-ld/json-ld.org/wiki/existing-con
 * [CSVW Namespace Vocabulary Terms](https://www.w3.org/TR/tabular-data-model/)
  * https://www.w3.org/ns/csvw
 
-## Examples
-
-    require 'rubygems'
-    require 'json/ld/preloaded'
-    require 'rdf/turtle'
-    require 'rdf/vocab'
-
-    input = JSON.parse %({
-      "@context": "https://schema.org/",
-      "@id": "https://github.com/ruby-rdf/json-ld-preloaded",
-      "@type": "SoftwareApplication",
-      "name": "JSON-LD Preloaded",
-      "description": "A meta-release of the json-ld gem including preloaded vocabularies.",
-      "author": {
-        "@id": "https://greggkellogg.net/foaf#me",
-        "@type": "Person",
-        "name": "Gregg Kellogg"
-      }
-    })
-
-    RDF::Turtle::Writer.new(STDOUT, standard_prefixes: true) do |w|
-      w << JSON::LD::API.toRdf(input)
-    end
-
 ## Dependencies
-* [Ruby](https://ruby-lang.org/) (>= 2.2.2)
-* [JSON::LD](https://rubygems.org/gems/json-ld) (>= 2.2)
+* [Ruby](https://ruby-lang.org/) (>= 2.4)
+* [JSON::LD](https://rubygems.org/gems/json-ld) (>= 3.1)
 
 ## Mailing List
 * <https://lists.w3.org/Archives/Public/public-rdf-ruby/>

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.6
+3.1.0
diff --git a/json-ld-preloaded.gemspec b/json-ld-preloaded.gemspec
@@ -21,13 +21,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.2.2'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '~> 3.0'
-  gem.add_runtime_dependency     'json-ld',         '~> 3.0' #, '>= 3.0.3'
-  gem.add_runtime_dependency     'multi_json',      '~> 1.12'
-  gem.add_development_dependency 'oj',              '~> 2.18'  unless RUBY_ENGINE == "jruby"
-  gem.add_development_dependency 'rdf-turtle',      '~> 3.0'
-  gem.add_development_dependency 'rspec',           '~> 3.7'
-  gem.add_development_dependency 'yard' ,           '~> 0.9.12'
+  gem.add_runtime_dependency     'rdf',             '~> 3.1'
+  gem.add_runtime_dependency     'json-ld',         '~> 3.1'
+  gem.add_development_dependency 'rspec',           '~> 3.9'
+  gem.add_development_dependency 'yard' ,           '~> 0.9.20'
 
   gem.post_install_message  = nil
 end
diff --git a/lib/json/ld/preloaded/linkedart.rb b/lib/json/ld/preloaded/linkedart.rb
diff --git a/lib/json/ld/preloaded/lov.rb b/lib/json/ld/preloaded/lov.rb
@@ -6,6 +6,7 @@ class JSON::LD::Context
   add_preloaded("http://lov.okfn.org/dataset/lov/context") do
     new(term_definitions: {
       "SAN" => TermDefinition.new("SAN", id: "http://www.irit.fr/recherches/MELODI/ontologies/SAN#", simple: true, prefix: true),
+      "a-loc" => TermDefinition.new("a-loc", id: "https://w3id.org/arco/ontology/location/", simple: true, prefix: true),
       "acco" => TermDefinition.new("acco", id: "http://purl.org/acco/ns#", simple: true, prefix: true),
       "acl" => TermDefinition.new("acl", id: "http://www.w3.org/ns/auth/acl#", simple: true, prefix: true),
       "acm" => TermDefinition.new("acm", id: "http://acm.rkbexplorer.com/ontologies/acm#", simple: true, prefix: true),
@@ -72,11 +73,13 @@ 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),
+      "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),
       "ceo" => TermDefinition.new("ceo", id: "http://www.ebusiness-unibw.org/ontologies/consumerelectronics/v1#", simple: true, prefix: true),
       "cerif" => TermDefinition.new("cerif", id: "http://www.eurocris.org/ontologies/cerif/1.3#", simple: true, prefix: true),
       "cert" => TermDefinition.new("cert", id: "http://www.w3.org/ns/auth/cert#", simple: true, prefix: true),
+      "cevent" => TermDefinition.new("cevent", id: "https://w3id.org/arco/ontology/cultural-event/", simple: true, prefix: true),
       "cff" => TermDefinition.new("cff", id: "http://purl.oclc.org/NET/ssnx/cf/cf-feature#", simple: true, prefix: true),
       "cfp" => TermDefinition.new("cfp", id: "http://purl.oclc.org/NET/ssnx/cf/cf-property#", simple: true, prefix: true),
       "cfrl" => TermDefinition.new("cfrl", id: "http://linkeddata.finki.ukim.mk/lod/ontology/cfrl#", simple: true, prefix: true),
@@ -96,6 +99,7 @@ class JSON::LD::Context
       "cold" => TermDefinition.new("cold", id: "http://purl.org/configurationontology#", simple: true, prefix: true),
       "coll" => TermDefinition.new("coll", id: "http://purl.org/co/", simple: true, prefix: true),
       "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),
       "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),
@@ -109,6 +113,7 @@ class JSON::LD::Context
       "csvw" => TermDefinition.new("csvw", id: "http://www.w3.org/ns/csvw#", simple: true, prefix: true),
       "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),
       "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),
@@ -134,6 +139,7 @@ class JSON::LD::Context
       "dcndl" => TermDefinition.new("dcndl", id: "http://ndl.go.jp/dcndl/terms/", simple: true, prefix: true),
       "dcterms" => TermDefinition.new("dcterms", id: "http://purl.org/dc/terms/", simple: true, prefix: true),
       "dctype" => TermDefinition.new("dctype", id: "http://purl.org/dc/dcmitype/", simple: true, prefix: true),
+      "ddesc" => TermDefinition.new("ddesc", id: "https://w3id.org/arco/ontology/denotative-description/", simple: true, prefix: true),
       "decision" => TermDefinition.new("decision", id: "https://decision-ontology.googlecode.com/svn/trunk/decision.owl#", simple: true, prefix: true),
       "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),
@@ -158,6 +164,7 @@ class JSON::LD::Context
       "dqm" => TermDefinition.new("dqm", id: "http://purl.org/dqm-vocabulary/v1/dqm#", simple: true, prefix: true),
       "dqv" => TermDefinition.new("dqv", id: "http://www.w3.org/ns/dqv#", simple: true, prefix: true),
       "dr" => TermDefinition.new("dr", id: "http://purl.org/swan/2.0/discourse-relationships/", simple: true, prefix: true),
+      "drama" => TermDefinition.new("drama", id: "http://www.purl.org/drammar#", simple: true, prefix: true),
       "drm" => TermDefinition.new("drm", id: "http://vocab.data.gov/def/drm#", simple: true, prefix: true),
       "ds" => TermDefinition.new("ds", id: "http://purl.org/ctic/dcat#", simple: true, prefix: true),
       "dsn" => TermDefinition.new("dsn", id: "http://purl.org/dsnotify/vocab/eventset/", simple: true, prefix: true),
@@ -198,6 +205,7 @@ class JSON::LD::Context
       "fabio" => TermDefinition.new("fabio", id: "http://purl.org/spar/fabio/", simple: true, prefix: true),
       "faldo" => TermDefinition.new("faldo", id: "http://biohackathon.org/resource/faldo#", simple: true, prefix: true),
       "fea" => TermDefinition.new("fea", id: "http://vocab.data.gov/def/fea#", simple: true, prefix: true),
+      "fel" => TermDefinition.new("fel", id: "http://w3id.org/vcb/fel#", simple: true, prefix: true),
       "fiesta-iot" => TermDefinition.new("fiesta-iot", id: "http://purl.org/iot/ontology/fiesta-iot#", simple: true, prefix: true),
       "foaf" => TermDefinition.new("foaf", id: "http://xmlns.com/foaf/0.1/", simple: true, prefix: true),
       "fog" => TermDefinition.new("fog", id: "https://w3id.org/fog#", simple: true, prefix: true),
@@ -240,6 +248,7 @@ class JSON::LD::Context
       "gn" => TermDefinition.new("gn", id: "http://www.geonames.org/ontology#", simple: true, prefix: true),
       "gndo" => TermDefinition.new("gndo", id: "http://d-nb.info/standards/elementset/gnd#", simple: true, prefix: true),
       "gold" => TermDefinition.new("gold", id: "http://purl.org/linguistics/gold/", simple: true, prefix: true),
+      "gom" => TermDefinition.new("gom", id: "https://w3id.org/gom#", simple: true, prefix: true),
       "gov" => TermDefinition.new("gov", id: "http://gov.genealogy.net/ontology.owl#", simple: true, prefix: true),
       "gr" => TermDefinition.new("gr", id: "http://purl.org/goodrelations/v1#", simple: true, prefix: true),
       "grddl" => TermDefinition.new("grddl", id: "http://www.w3.org/2003/g/data-view#", simple: true, prefix: true),
@@ -488,6 +497,7 @@ class JSON::LD::Context
       "qb4o" => TermDefinition.new("qb4o", id: "http://purl.org/qb4olap/cubes#", simple: true, prefix: true),
       "qu" => TermDefinition.new("qu", id: "http://purl.oclc.org/NET/ssnx/qu/qu#", simple: true, prefix: true),
       "qudt" => TermDefinition.new("qudt", id: "http://qudt.org/schema/qudt#", simple: true, prefix: true),
+      "r-arco" => TermDefinition.new("r-arco", id: "https://w3id.org/arco/ontology/arco/", simple: true, prefix: true),
       "r4r" => TermDefinition.new("r4r", id: "http://guava.iis.sinica.edu.tw/r4r/", simple: true, prefix: true),
       "radion" => TermDefinition.new("radion", id: "http://www.w3.org/ns/radion#", simple: true, prefix: true),
       "rami" => TermDefinition.new("rami", id: "http://iais.fraunhofer.de/vocabs/rami#", simple: true, prefix: true),
@@ -663,6 +673,7 @@ class JSON::LD::Context
       "voag" => TermDefinition.new("voag", id: "http://voag.linkedmodel.org/voag#", simple: true, prefix: true),
       "vocals" => TermDefinition.new("vocals", id: "http://w3id.org/rsp/vocals#", simple: true, prefix: true),
       "void" => TermDefinition.new("void", id: "http://rdfs.org/ns/void#", simple: true, prefix: true),
+      "voidext" => TermDefinition.new("voidext", id: "http://purl.org/query/voidext#", simple: true, prefix: true),
       "voidwh" => TermDefinition.new("voidwh", id: "http://www.ics.forth.gr/isl/VoIDWarehouse/VoID_Extension_Schema.owl", simple: true),
       "vra" => TermDefinition.new("vra", id: "http://simile.mit.edu/2003/10/ontologies/vraCore3#", simple: true, prefix: true),
       "vrank" => TermDefinition.new("vrank", id: "http://purl.org/voc/vrank#", simple: true, prefix: true),