Merge branch 'master' of https://github.com/HydraCG/Specifications in…

…to issue/202_Clarify_when_resource_contains_more_than_just_itself
HydraCG · Jan 20, 2020 · 603b421 · 603b421
2 parents 54ff8fd + 4f1ebd0
commit 603b421
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/spec/latest/core/core.jsonld b/spec/latest/core/core.jsonld
@@ -77,7 +77,8 @@
     "subClassOf": { "@id": "rdfs:subClassOf", "@type": "@vocab" },
     "subPropertyOf": { "@id": "rdfs:subPropertyOf", "@type": "@vocab" },
     "seeAlso": { "@id": "rdfs:seeAlso", "@type": "@id" },
-    "domainIncludes": { "@id": "schema:domainIncludes", "@type": "@id" }
+    "domainIncludes": { "@id": "schema:domainIncludes", "@type": "@id" },
+    "rangeIncludes": { "@id": "schema:rangeIncludes", "@type": "@id" }
   },
   "@id": "http://www.w3.org/ns/hydra/core",
   "@type": "owl:Ontology",
@@ -218,7 +219,7 @@
       "label": "supported operation",
       "comment": "An operation supported by instances of the specific Hydra class or the target of the Hydra link",
       "range": "hydra:Operation",
-      "domainIncludes": ["hydra:Class", "hydra:Link"],
+      "domainIncludes": ["hydra:Class", "hydra:Link", "hydra:TemplatedLink"],
       "vs:term_status": "testing"
     },
     {
@@ -253,7 +254,8 @@
       "label": "expects",
       "comment": "The information expected by the Web API.",
       "domain": "hydra:Operation",
-      "range": "hydra:Class",
+      "range": "hydra:Resource",
+      "rangeIncludes": ["hydra:Resource", "hydra:Class"],
       "vs:term_status": "testing"
     },
     {
@@ -262,7 +264,8 @@
       "label": "returns",
       "comment": "The information returned by the Web API on success",
       "domain": "hydra:Operation",
-      "range": "hydra:Class",
+      "range": "hydra:Resource",
+      "rangeIncludes": ["hydra:Resource", "hydra:Class"],
       "vs:term_status": "testing"
     },
     {
@@ -295,7 +298,8 @@
         "hydra:Class",
         "hydra:SupportedProperty",
         "hydra:Operation",
-        "hydra:Link"],
+        "hydra:Link",
+        "hydra:TemplatedLink"],
       "vs:term_status": "testing"
     },
     {
@@ -311,7 +315,8 @@
         "hydra:Class",
         "hydra:SupportedProperty",
         "hydra:Operation",
-        "hydra:Link"],
+        "hydra:Link",
+        "hydra:TemplatedLink"],
       "vs:term_status": "testing"
     },
     {

diff --git a/spec/latest/core/index.html b/spec/latest/core/index.html
@@ -535,6 +535,11 @@ <h3>Documenting a Web API</h3>
       user has the permission to delete the resource. Otherwise, the link
       would simply be hidden in the representation.</p>
 
+    <p>Example shown below describes the operation's expected and returned
+      value as a dereferencable resource (an RDF resource of a given class),
+      but the vocabulary is not limited to only those originating
+      from RDF and is enabled to other types of resources.</p>
+
     <pre class="example nohighlight" data-transform="updateExample"
          title="Documenting the supported operations of link properties">
       <!--