Merge pull request #12 from piprate/test-suite-update-dec-2018

Test suite update (Dec 2018)

Author: kazarena

README.md

@@ -16,9 +16,9 @@ The [original library](https://github.com/kazarena/json-gold) was written by Sta
 
 ## Testing & Compliance ##
 
-As of December 1, 2017:
+As of December 26, 2018:
 
-* all JSON-LD 1.0 tests from the [official JSON-LD test suite](https://github.com/json-ld/json-ld.org/tree/master/test-suite) pass
+* all JSON-LD 1.0 tests from the [official JSON-LD test suite](https://github.com/json-ld/json-ld.org/tree/master/test-suite) pass, with one exception: [framing test #tg010](https://github.com/melville-wiley/json-ld.org/blob/3461fd0005cd8e338cd3729c4714163e9217e619/test-suite/tests/frame-manifest.jsonld#L530). See the discussion [here](https://github.com/json-ld/json-ld.org/pull/663). It appears that while it's meant to be a 1.0 test, the fix in pyLD was implemented in the 1.1 section of the framing code. This needs further investigation.
 * all RDF Dataset Normalisation tests from the [current test suite](https://json-ld.github.io/normalization/tests/index.html) pass
 * JSON-LD 1.1 spec is not currenty supported
 

ld/context.go

@@ -167,6 +167,12 @@ func (c *Context) parse(localContext interface{}, remoteContexts []string) (*Con
 			} else if vocabString, isString := vocabValue.(string); isString {
 				if IsAbsoluteIri(vocabString) {
 					result.values["@vocab"] = vocabValue
+				} else if vocabString == "" {
+					if baseVal, hasBase := result.values["@base"]; hasBase {
+						result.values["@vocab"] = baseVal
+					} else {
+						return nil, NewJsonLdError(InvalidVocabMapping, "@vocab is empty but @base is not specified")
+					}
 				} else {
 					return nil, NewJsonLdError(InvalidVocabMapping, "@vocab must be an absolute IRI")
 				}
@@ -1012,22 +1018,27 @@ func (c *Context) ExpandValue(activeProperty string, value interface{}) (interfa
 	td := c.GetTermDefinition(activeProperty)
 	// 1)
 	if td != nil && td["@type"] == "@id" {
-		// TODO: i'm pretty sure value should be a string if the @type is
-		// @id
-		var err error
-		rval["@id"], err = c.ExpandIri(value.(string), true, false, nil, nil)
-		if err != nil {
-			return nil, err
+		if strVal, isString := value.(string); isString {
+			var err error
+			rval["@id"], err = c.ExpandIri(strVal, true, false, nil, nil)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			rval["@value"] = value
 		}
 		return rval, nil
 	}
 	// 2)
 	if td != nil && td["@type"] == "@vocab" {
-		// TODO: same as above
-		var err error
-		rval["@id"], err = c.ExpandIri(value.(string), true, true, nil, nil)
-		if err != nil {
-			return nil, err
+		if strVal, isString := value.(string); isString {
+			var err error
+			rval["@id"], err = c.ExpandIri(strVal, true, true, nil, nil)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			rval["@value"] = value
 		}
 		return rval, nil
 	}

ld/processor_test.go

@@ -244,9 +244,14 @@ func TestSuite(t *testing.T) {
 				expectedFileName = testMap["result"].(string)
 			}
 
+			testName := testId
+			if strings.HasPrefix(testName, "#") {
+				testName = manifestURI + testName
+			}
+
 			td := &TestDefinition{
 				Id:               testId,
-				Name:             manifestURI + testId,
+				Name:             testName,
 				Type:             testType,
 				EvaluationType:   testEvaluationType,
 				InputURL:         inputURL,
@@ -402,7 +407,7 @@ func TestSuite(t *testing.T) {
 				options.Algorithm = "URGNA2012"
 				result, opError = proc.Normalize(input, options)
 			case "rdfn:Urdna2015EvalTest":
-				log.Println("Running URDNA2015 test", td.Id, ":", td.Name)
+				log.Println("Running URDNA2015 test", td.Name)
 
 				inputBytes, err := ioutil.ReadFile(td.InputFileName)
 				assert.NoError(t, err)

ld/serialize_nquads.go

@@ -132,9 +132,47 @@ func escape(str string) string {
 }
 
 const (
-	wso      = "[ \\t]*"
-	iri      = "(?:<([^>]*)>)"
-	bnode    = "(_:(?:[A-Za-z][A-Za-z0-9]*))"
+	wso = "[ \\t]*"
+	iri = "(?:<([^:]+:[^>]*)>)"
+
+	// https://www.w3.org/TR/turtle/#grammar-production-BLANK_NODE_LABEL
+
+	pnCharsBase = "A-Z" + "a-z" +
+		"\u00C0-\u00D6" +
+		"\u00D8-\u00F6" +
+		"\u00F8-\u02FF" +
+		"\u0370-\u037D" +
+		"\u037F-\u1FFF" +
+		"\u200C-\u200D" +
+		"\u2070-\u218F" +
+		"\u2C00-\u2FEF" +
+		"\u3001-\uD7FF" +
+		"\uF900-\uFDCF" +
+		"\uFDF0-\uFFFD"
+		// TODO:
+		//"\u10000-\uEFFFF"
+
+	pnCharsU = pnCharsBase + "_"
+
+	pnChars = pnCharsU +
+		"0-9" +
+		"-" +
+		"\u00B7" +
+		"\u0300-\u036F" +
+		"\u203F-\u2040"
+
+	blankNodeLabel = "(_:" +
+		"(?:[" + pnCharsU + "0-9])" +
+		"(?:(?:[" + pnChars + ".])*(?:[" + pnChars + "]))?" +
+		")"
+
+		//   '(_:' +
+		//     '(?:[' + PN_CHARS_U + '0-9])' +
+		//     '(?:(?:[' + PN_CHARS + '.])*(?:[' + PN_CHARS + ']))?' +
+		//   ')';
+
+	bnode = blankNodeLabel
+
 	plain    = "\"([^\"\\\\]*(?:\\\\.[^\"\\\\]*)*)\""
 	datatype = "(?:\\^\\^" + iri + ")"
 	language = "(?:@([a-z]+(?:-[a-zA-Z0-9]+)*))"

ld/testdata/compact-0077-context.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  }
+}

ld/testdata/compact-0077-in.jsonld

@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}

ld/testdata/compact-0077-out.jsonld

@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {
+      "@id": "foo:input",
+      "@container": "@graph"
+    },
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}

ld/testdata/compact-0078-context.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": ["@graph", "@set"]},
+    "value": "foo:value"
+  }
+}

ld/testdata/compact-0078-in.jsonld

@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}

ld/testdata/compact-0078-out.jsonld

@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {
+      "@id": "foo:input",
+      "@container": ["@graph", "@set"]
+    },
+    "value": "foo:value"
+  },
+  "input": [{
+    "value": "x"
+  }]
+}