Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

@graph container support #549

Merged
merged 17 commits into from
Dec 7, 2017
Merged

@graph container support #549

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5ea3e71
Add @graph container tests.
davidlehn Nov 16, 2017
8c9882e
A couple of more graph expansion and compaction tests for corner cases.
gkellogg Nov 18, 2017
29d9902
Add tests for expanding and compacting named graphs where term defini…
gkellogg Nov 19, 2017
d4d52bd
Expand and compact `@container: @index` where value is a graph.
gkellogg Nov 19, 2017
669c2ca
Disable highlight.js, and update our use of the "highlight" class to …
gkellogg Nov 26, 2017
5fa85db
Sort many definition lists automatically using `@data-sort`.
gkellogg Nov 26, 2017
68fb312
Add @version to context definitions in examples using 1.1 features.
gkellogg Nov 26, 2017
a9d56f0
Syntax updates to describe Graph Containers.
gkellogg Nov 26, 2017
61eec96
Add keyword definition for `@graphId`.
gkellogg Dec 2, 2017
414ce0c
Add `@graphId` usage example.
gkellogg Dec 2, 2017
a3fe84f
Revert spec language tests using `@graphId`.
gkellogg Dec 2, 2017
dc19c08
Revert `@index` container support where value is a graph.
gkellogg Dec 2, 2017
eed08cd
Revert tests using `@graphId`.
gkellogg Dec 2, 2017
8c3826f
Add inline ednotes for places that are affected by issue #480.
gkellogg Dec 3, 2017
106aebe
Add compaction and expansion tests for `@graph` with `@index` and `@id`.
gkellogg Dec 5, 2017
147670f
Add syntax for graph maps and API algorithms for all graph containers.
gkellogg Dec 6, 2017
99b4615
Merge remote-tracking branch 'origin/master' into graph-container
gkellogg Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/latest/common/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function updateExample(doc, content) {
// perform transformations to make it render and prettier
content = unComment(doc, content);
content = _esc(content);
content = content.replace(/\*\*\*\*([^*]*)\*\*\*\*/g, '<span class="highlight">$1</span>');
content = content.replace(/\*\*\*\*([^*]*)\*\*\*\*/g, '<span class="hl-bold">$1</span>');
content = content.replace(/####([^#]*)####/g, '<span class="comment">$1</span>');
return content ;
}
Expand Down
25 changes: 20 additions & 5 deletions spec/latest/common/terms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1>General Terminology</h1>
<p>This document uses the following terms as defined in JSON [[!RFC7159]]. Refer
to the <a data-cite="RFC7159#section-2">JSON Grammar section</a> in [[!RFC7159]] for formal definitions.</p>

<dl class="termlist">
<dl class="termlist" data-sort>
<dt><dfn data-lt="arrays">array</dfn></dt><dd>
In the JSON serialization, an array structure is represented as square brackets surrounding zero
or more values. Values are separated by commas.
Expand Down Expand Up @@ -59,7 +59,7 @@ <h1>General Terminology</h1>

<p>Furthermore, the following terminology is used throughout this document:</p>

<dl class="termlist">
<dl class="termlist" data-sort>
<dt><dfn data-lt="absolute IRIs">absolute IRI</dfn></dt><dd>
An <a data-cite="RFC3987#section-1.3" class="externalDFN">absolute IRI</a> is defined in [[!RFC3987]] containing a <em>scheme</em> along with a <em>path</em> and
optional <em>query</em> and fragment segments.</dd>
Expand Down Expand Up @@ -94,7 +94,9 @@ <h1>General Terminology</h1>
if a <a>named graph</a> is not specified.</dd>
<dt><dfn>default language</dfn></dt><dd>
The default language is set in the <a>context</a> using the <code>@language</code> key whose
value MUST be a <a>string</a> representing a [[!BCP47]] language code or <code>null</code>.</dd>
value MUST be a <a>string</a> representing a [[!BCP47]] language code or <code>null</code>.
<span class="ednote">From <a href="#issue-480">Issue 480</a>
the language tag <code>@none</code> represents no language.</span></dd>
<dt><dfn>default object</dfn></dt><dd>
A <a>default object</a> is a <a>JSON object</a> that has a <code>@default</code> member.</dd>
<dt><dfn data-lt="edges">edge</dfn></dt><dd>
Expand Down Expand Up @@ -122,6 +124,16 @@ <h1>General Terminology</h1>
of the associated <a>node object</a>; value MUST be a <a>node object</a>.
If the value contains a property expanding to <code>@id</code>, it's value MUST
be equivalent to the referencing key.</dd>
<dt class="changed"><dfn data-lt="graph objects">graph object</dfn></dt><dd class="changed">
A <a>graph object</a> represents a <a>named graph</a> represented as the
value of a <a>property</a> within a <a>node object</a>. When expanded, a
graph object MUST have an <code>@graph</code> member, and may also have
<code>@context</code>, <code>@id</code>, and <code>@index</code> members.
A <dfn class="preserve" data-lt="simple graph objects">simple graph object</dfn> is a
<a>graph object</a> which does not have an <code>@id</code> member. Note
that <a>node objects</a> may have a <code>@graph</code> member, but are
not considered <a>graph objects</a> if they include any other properties.
A top-level object consisting of <code>@graph</code> is also not a <a>graph object</a>.</dd>
<dt><dfn data-lt="index maps">index map</dfn></dt><dd>
An <a>index map</a> is a <a>JSON object</a> value of a <a>term</a> defined with
<code>@container</code> set to <code>@index</code>, whose values MUST be any of the following types:
Expand Down Expand Up @@ -186,7 +198,10 @@ <h1>General Terminology</h1>
A <a>context</a> that is specified within a <a>JSON object</a>,
specified via the <code>@context</code> <a>keyword</a>.</dd>
<dt><dfn data-lt="named graphs">named graph</dfn></dt><dd>
A <a data-cite="RDF11-CONCEPTS#dfn-named-graph" class="externalDFN">named graph</a> is a <a>linked data graph</a> that is identified by an <a>IRI</a> or <a>blank node</a>
A <a data-cite="RDF11-CONCEPTS#dfn-named-graph" class="externalDFN">named graph</a> is a <a>linked data graph</a> that is identified by an <a>IRI</a> or <a>blank node</a>.</dd>
<dt><dfn data-lt="implicitly named graphs">implicitly named graph</dfn></dt><dd>
A <a>named graph</a> created from the value of a property having an
<a>expanded term definition</a> where <code>@container</code> is set to <code>@graph</code>.</dd>
<dt><dfn data-lt="nested properties">nested property</dfn></dt><dd>
A <a>nested property</a> is a <a>property</a> which is contained within an object referenced by
a semantically meaningless <em>nesting property</em>.
Expand Down Expand Up @@ -283,7 +298,7 @@ <h1>Algorithm Terms</h1>

<p>The Following terms are used within specific algorithms.</p>

<dl class="termlist">
<dl class="termlist" data-sort>
<dt><dfn>active context</dfn></dt><dd>
A <a>context</a> that is used to resolve <a>terms</a> while the processing
algorithm is running.</dd>
Expand Down
Loading