Merge branch 'master' of https://github.com/json-ld/json-ld.org
authorFrançois Daoust <francois@joshfire.com>
Thu, 01 Nov 2012 11:34:38 +0100
changeset 947 73c9e08b9a62
parent 946 cd7cb8493e54 (current diff)
parent 929 5e62e7046df5 (diff)
child 948 e71423c7504e
Merge branch 'master' of https://github.com/json-ld/json-ld.org
spec/latest/json-ld-syntax/index.html
--- a/index.html	Sat Oct 27 23:12:49 2012 +0200
+++ b/index.html	Thu Nov 01 11:34:38 2012 +0100
@@ -108,6 +108,15 @@
                </ul>
             </div>
 
+            <div id="issues">
+               <h1>Community Feedback</h1>
+               <p>The JSON-LD specifications are undergoing standardization at the World Wide Web Consortium. Comments from the public are being tracked via the JSON-LD issue tracker. These issues can be viewed below:</p>
+               <ul>
+                  <li><a href="https://github.com/json-ld/json-ld.org/issues?milestone=2&page=1&sort=created&state=open">Open JSON-LD 1.0 Syntax issues</a></li>
+                  <li><a href="https://github.com/json-ld/json-ld.org/issues?milestone=1&page=1&sort=created&state=open">Open JSON-LD 1.0 API issues</a></li>
+               </ul>
+            </div>
+
             <div id="impl">
                <h1>Implementations</h1>
                <ul>
--- a/spec/latest/json-ld-syntax/index.html	Sat Oct 27 23:12:49 2012 +0200
+++ b/spec/latest/json-ld-syntax/index.html	Thu Nov 01 11:34:38 2012 +0100
@@ -395,7 +395,7 @@
  <dd>No extra
  processors or software libraries should be necessary to use JSON-LD in its most
  basic form. The language will provide developers with a very easy
- learning curve. Developers need only know JSON and two
+ learning curve. Developers only need to know JSON and two
  <tref title="keyword">keywords</tref> (<code>@context</code>
  and <code>@id</code>) to use the basic functionality in JSON-LD.</dd>
  <dt>Compatibility</dt>
@@ -1547,8 +1547,8 @@
   {
     "title":
     {
-      "@id": "http://purl.org/dc/terms/title"
-      "@container": "@language"
+      "@id": "http://purl.org/dc/terms/title",
+      ****"@container": "@language"****
     }
   },
 ...
@@ -2280,14 +2280,14 @@
   <!--
   {
     "@context": {
-      "asOf": "http://purl.org/net/provenance/ns#accessedResource",
+      "generatedAt": "http://www.w3.org/ns/prov#generatedAtTime",
       "Person": "http://xmlns.com/foaf/0.1/Person",
       "name": "http://xmlns.com/foaf/0.1/name",
       "knows": "http://xmlns.com/foaf/0.1/knows",
       "xsd": "http://www.w3.org/2001/XMLSchema#"
     },
     ****"@id": "http://example.org/graphs/73",
-    "asOf": { "@value": "2012-04-09", "@type": "xsd:date" },
+    "generatedAt": { "@value": "2012-04-09", "@type": "xsd:date" },
     "@graph":****
     [
       {
@@ -2311,8 +2311,8 @@
     that is identified by the <tref>IRI</tref>
     <code>http://example.org/graphs/73</code>. That graph is composed of the
     statements about Manu and Gregg. Metadata about the graph itself is also
-    expressed via the <code>asOf</code> property, which specifies when the
-    information was retrieved from the Web. An alternative view of the
+    expressed via the <code>generatedAt</code> property, which specifies when
+    the graph was generated. An alternative view of the
     information above is represented in table form below:</p>
 
   <table class="example">
@@ -2327,7 +2327,7 @@
   <tr>
     <td>http://example.org/graphs/73</td>
     <td>http://example.org/graphs/73</td>
-    <td>http://purl.org/net/provenance/ns#accessedResource</td>
+    <td>http://www.w3.org/ns/prov#generatedAtTime</td>
     <td>2012-04-09</td>
     <td>http://www.w3.org/2001/XMLSchema#date</td>
   </tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/expand-0033-in.jsonld	Thu Nov 01 11:34:38 2012 +0100
@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@vocab": "http://example.com/vocab#",
+    "homepage": {
+      "@type": "@id"
+    },
+    "created_at": {
+      "@type": "http://www.w3.org/2001/XMLSchema#date"
+    }
+  },
+  "name": "Markus Lanthaler",
+  "homepage": "http://www.markus-lanthaler.com/",
+  "created_at": "2012-10-28"
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/expand-0033-out.jsonld	Thu Nov 01 11:34:38 2012 +0100
@@ -0,0 +1,12 @@
+[{
+   "http://example.com/vocab#name": [{
+      "@value": "Markus Lanthaler"
+   }],
+   "http://example.com/vocab#homepage": [{
+      "@id": "http://www.markus-lanthaler.com/"
+   }],
+   "http://example.com/vocab#created_at": [{
+      "@value": "2012-10-28",
+      "@type": "http://www.w3.org/2001/XMLSchema#date"
+   }]
+}]
--- a/test-suite/tests/expand-manifest.jsonld	Sat Oct 27 23:12:49 2012 +0200
+++ b/test-suite/tests/expand-manifest.jsonld	Thu Nov 01 11:34:38 2012 +0100
@@ -166,6 +166,11 @@
       "name": "setting @id to null has no effect when @vocab is used",
       "input": "expand-0032-in.jsonld",
       "expect": "expand-0032-out.jsonld"
+    }, {
+      "@type": ["test:TestCase", "jld:ExpandTest"],
+      "name": "Using @vocab with with type-coercion",
+      "input": "expand-0033-in.jsonld",
+      "expect": "expand-0033-out.jsonld"
     }
   ]
 }