Finish 3.0.0

.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 script: "bundle exec rspec spec"
+before_install: "gem update --system"
 env:
   - CI=true
 rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - jruby-9
   - rbx-3
 cache: bundler

Gemfile

@@ -11,9 +11,9 @@ gem 'rdf',
     branch: 'develop'
 
 group :development, :test do
-  gem 'ebnf',               git: 'https://github.com/gkellogg/ebnf.git',                branch: 'develop'
+  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 '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-reasoner',       git: 'https://github.com/ruby-rdf/rdf-reasoner.git',        branch: 'develop'

VERSION

@@ -1 +1 @@
-2.2.9
+3.0.0

lib/rdf/vocab.rb

@@ -105,7 +105,8 @@ module Vocab
       dwc: {
         uri: "http://rs.tdwg.org/dwc/terms/",
         source: "etc/dwcterms.rdf",
-        alt_source: "http://rs.tdwg.org/dwc/rdf/dwcterms.rdf"
+        alt_source: "http://rs.tdwg.org/dwc/rdf/dwcterms.rdf",
+        strict: false,
       },
       ebucore: {
         uri: "http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#",
@@ -158,7 +159,25 @@ module Vocab
       },
       geonames: {uri: "http://www.geonames.org/ontology#"},
       gr:     {uri: "http://purl.org/goodrelations/v1#", source: "http://www.heppnetz.de/ontologies/goodrelations/v1.owl"},
-      gs1:    {uri: "http://gs1.org/voc/", source: "https://www.gs1.org/docs/gs1-smartsearch/gs1voc.ttl"},
+      gs1:    {
+        uri: "http://gs1.org/voc/",
+        source: "https://www.gs1.org/docs/gs1-smartsearch/gs1voc.ttl",
+        patch: %{
+          @prefix gs1: <http://gs1.org/voc/> .
+          @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+          DeleteExisting {
+            gs1:MeasurementPrecisionCode-LESS_THAN a gs1:MeasurementPrecisionTypeCode .
+            gs1:PreservationTechniqueCode-COLD_SMOKE_CURING a gs1:PreservationTechniqueTypeCode .
+          } .
+          AddNew {
+            gs1:MeasurementPrecisionCode-LESS_THAN a gs1:MeasurementPrecisionCode .
+            gs1:PreservationTechniqueCode-COLD_SMOKE_CURING a gs1:PreservationTechniqueCode .
+            gs1:ReturnablePackageDepositDetails a rdfs:Class .
+            gs1:Place a rdfs:Class .
+            gs1:PackagingMaterialDetails a rdfs:Class .
+          } .
+        }
+      },
       ht:     {uri: "http://www.w3.org/2011/http#"},
       hydra:  {uri: "http://www.w3.org/ns/hydra/core#"},
       iana:   {uri: "http://www.iana.org/assignments/relation/", source: File.expand_path("../../../etc/iana.ttl", __FILE__)},

lib/rdf/vocab/acl.rb

@@ -10,16 +10,15 @@ module RDF::Vocab
   class ACL < RDF::StrictVocabulary("http://www.w3.org/ns/auth/acl#")
 
     # Ontology definition
-    ontology :"http://www.w3.org/ns/auth/acl",
+    ontology :"http://www.w3.org/ns/auth/acl#",
       comment: %(Defines the class Authorization and its essential properties,
     and also some classes of access such as read and write. ).freeze,
-      :"dc11:title" => %(Basic Access Control ontology).freeze
+      "dc11:title": "Basic Access Control ontology".freeze
 
     # Class definitions
     term :Access,
-      :"acl:label" => %(access).freeze,
+      "acl:label": "access".freeze,
       comment: %(Any kind of access to a resource. Don't use this, use R W and RW).freeze,
-      label: "Access".freeze,
       type: "rdfs:Class".freeze
     term :Append,
       comment: %(Append accesses are specific write access which only add information, and do not remove information.
@@ -54,6 +53,15 @@ class ACL < RDF::StrictVocabulary("http://www.w3.org/ns/auth/acl#")
       label: "control".freeze,
       subClassOf: "acl:Access".freeze,
       type: "rdfs:Class".freeze
+    term :Origin,
+      comment: %(An Origin is basically a web site
+        \(Note WITHOUT the trailing slash after the domain name and port in its URI\)
+        and is the basis for controlling access to data by web apps
+        in the Same Origin Model of web security.
+        All scripts from the same origin are given the same right.).freeze,
+      label: "Origin".freeze,
+      "rdfs:seeAlso": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin".freeze,
+      type: "rdfs:Class".freeze
     term :Read,
       comment: %(The class of read operations).freeze,
       label: "read".freeze,
@@ -67,7 +75,7 @@ class ACL < RDF::StrictVocabulary("http://www.w3.org/ns/auth/acl#")
     # Property definitions
     property :accessControl,
       comment: %(The Access Control file for this information resource.
-        This may of course be a virtual resorce implemented by the access control system.
+        This may of course be a virtual resource implemented by the access control system.
         Note also HTTP's header  Link:  foo.meta ;rel=meta can be used for this.).freeze,
       domain: "http://www.w3.org/2006/gen/ont#InformationResource".freeze,
       label: "access control".freeze,
@@ -127,6 +135,14 @@ class ACL < RDF::StrictVocabulary("http://www.w3.org/ns/auth/acl#")
       label: "access mode".freeze,
       range: "rdfs:Class".freeze,
       type: "rdf:Property".freeze
+    property :origin,
+      comment: %(A web application, identified by its Origin, such as
+        <https://scripts.example.com>, being given the right.).freeze,
+      domain: "acl:Authorization".freeze,
+      label: "origin".freeze,
+      range: "acl:Origin".freeze,
+      "rdfs:seeAlso": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin".freeze,
+      type: "rdf:Property".freeze
     property :owner,
       comment: %(The person or other agent which owns this.
     For example, the owner of a file in a filesystem.