Add _from term_ to context processing from Compaction algorithm when _active property_ has a _local context_.

Add tests to be sure attempts to change a context with protected terms fail, unless from a scoped context used for a property.

Author: gkellogg

index.html

@@ -2403,8 +2403,9 @@ <h3>Algorithm</h3>
           <ol>
             <li>Set <var>active context</var> to the result of the
               <a href="#context-processing-algorithm">Context Processing algorithm</a>,
-              passing <var>active context</var> and the value of the
-              <var>active property</var>'s <a>local context</a> as <var>local context</var>.</li>
+              passing <var>active context</var>, the value of the
+              <var>active property</var>'s <a>local context</a> as <var>local context</var>,
+              <span class="changed">and <code>true</code> for <var>from term</var></span>.</li>
             <li>Set <var>inverse context</var> using the
               <a href="#inverse-context-creation">Inverse Context Creation algorithm</a>
               using <var>active context</var>.</li>

tests/compact-manifest.jsonld

@@ -1652,6 +1652,33 @@
       "input": "compact/pi06-in.jsonld",
       "context": "compact/pi06-context.jsonld",
       "expect": "compact/pi06-out.jsonld"
+    }, {
+      "@id": "#tpr01",
+      "@type": ["jld:NegativeEvaluationTest", "jld:CompactTest"],
+      "name": "Check illegal clearing of context with protected terms",
+      "purpose": "Check error when clearing a context with protected terms.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "compact/pr01-in.jsonld",
+      "context": "compact/pr01-context.jsonld",
+      "expect": "invalid context nullification"
+    }, {
+      "@id": "#tpr03",
+      "@type": ["jld:NegativeEvaluationTest", "jld:CompactTest"],
+      "name": "Check illegal overriding of protected term",
+      "purpose": "Check error when overriding a protected term.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "compact/pr02-in.jsonld",
+      "context": "compact/pr02-context.jsonld",
+      "expect": "protected term redefinition"
+    }, {
+      "@id": "#tpr04",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Check legal overriding of protected term from property-scoped context",
+      "purpose": "Check overriding a protected term from property-scoped context.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "compact/pr04-in.jsonld",
+      "context": "compact/pr04-context.jsonld",
+      "expect": "compact/pr04-out.jsonld"
     }, {
       "@id": "#tr001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

tests/compact/pr01-context.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": [{
+    "@vocab": "http://example.com/",
+    "@version": 1.1,
+    "protected": {"@protected": true}
+  }, null]
+}

tests/compact/pr01-in.jsonld

@@ -0,0 +1,3 @@
+[{
+ "http://example/a": [{"@id": "http://example.org/foo"}]
+}]

tests/compact/pr02-context.jsonld

@@ -0,0 +1,9 @@
+{
+  "@context": [{
+    "@vocab": "http://example.com/",
+    "@version": 1.1,
+    "protected": {"@protected": true}
+  }, {
+    "protected": "http://example.com/protected"
+  }]
+}

tests/compact/pr02-in.jsonld

@@ -0,0 +1,3 @@
+[{
+ "http://example/a": [{"@id": "http://example.org/foo"}]
+}]

tests/compact/pr03-context.jsonld

@@ -0,0 +1,8 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example.com/",
+    "protected": {"@protected": true},
+    "Type": {"@context": {"protected": {"@type": "@id"},}}
+  }
+}

tests/compact/pr03-in.jsonld

@@ -0,0 +1,7 @@
+[{
+  "http://example.com/protected": [{"@value": "p === http://example.com/protected"}],
+  "http://example.com/unprotected": [{
+    "@type": "http://example.com/Type",
+    "http://example.com/protected": [{"@value": "p === http://example.com/protected"}]
+  }]
+}]

tests/compact/pr04-context.jsonld

@@ -0,0 +1,8 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example.com/",
+    "protected": {"@protected": true},
+    "unprotected": {"@context": {"protected": {"@language": "en"}}}
+  }
+}

tests/compact/pr04-in.jsonld

@@ -0,0 +1,9 @@
+[{
+  "http://example.com/protected": [{"@value": "p === http://example.com/protected"}],
+  "http://example.com/unprotected": [{
+    "http://example.com/protected": [{
+        "@value": "p === http://example.com/protected",
+        "@language": "en"
+    }]
+  }]
+}]

tests/compact/pr04-out.jsonld

@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example.com/",
+    "protected": {"@protected": true},
+    "unprotected": {
+      "@context": {"protected": {"@language": "en"}}
+    }
+  },
+  "protected": "p === http://example.com/protected",
+  "unprotected": {
+    "protected": "p === http://example.com/protected"
+  }
+}