Skip to content

Describe included blocks. #208

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

Merged
merged 12 commits into from
Aug 2, 2019
Merged

Describe included blocks. #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
978e69e
Describe included blocks.
gkellogg Jul 30, 2019
0e32939
Apply suggestions from code review
gkellogg Jul 31, 2019
4f89e3e
Apply suggestions from code review
gkellogg Jul 31, 2019
02aaff5
Update Gemfile
gkellogg Jul 31, 2019
4068a74
Simplify included example per @iherman's request.
gkellogg Jul 31, 2019
cb8f4df
Added the example for bushes
iherman Aug 1, 2019
14f48cc
Update index.html
iherman Aug 1, 2019
24af402
Update index.html
iherman Aug 1, 2019
0884f48
Update index.html
iherman Aug 1, 2019
120cc4c
Update and fix examples.
gkellogg Aug 1, 2019
71ff472
Add note in named graphs on the use of `@included` in preference to `…
gkellogg Aug 1, 2019
809409a
Deemphasize the use of `@included` for describing bushes.
gkellogg Aug 2, 2019
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
11 changes: 6 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
GIT
remote: https://github.com/ruby-rdf/json-ld.git
revision: 74095b73cdb722b681f34d0f165599c9cb48d844
revision: 172e0c960c9771fa9f963eca55d28fb63bce56b0
branch: develop
specs:
json-ld (3.0.2)
htmlentities (~> 4.3)
json-canonicalization (~> 0.1)
link_header (~> 0.0, >= 0.0.8)
multi_json (~> 1.13)
Expand Down Expand Up @@ -36,7 +37,7 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
json-canonicalization (0.1.0)
json-ld-preloaded (3.0.2)
json-ld-preloaded (3.0.3)
json-ld (~> 3.0)
multi_json (~> 1.12)
rdf (~> 3.0)
Expand Down Expand Up @@ -74,15 +75,15 @@ GEM
sparql-client (~> 3.0)
mini_portile2 (2.4.0)
multi_json (1.13.1)
net-http-persistent (3.0.1)
net-http-persistent (3.1.0)
connection_pool (~> 2.2)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
public_suffix (3.1.1)
rack (2.0.7)
rake (12.3.2)
rake (12.3.3)
rdf (3.0.12)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
Expand Down Expand Up @@ -134,7 +135,7 @@ GEM
rdf-turtle (3.0.6)
ebnf (~> 1.1)
rdf (~> 3.0)
rdf-vocab (3.0.7)
rdf-vocab (3.0.8)
rdf (~> 3.0, >= 3.0.11)
rdf-xsd (3.0.1)
rdf (~> 3.0)
Expand Down
13 changes: 13 additions & 0 deletions common/jsonld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ const jsonld = {
status: 'unofficial',
date: 'January 2014'
},
"JSON.API": {
title: "JSON API",
href: "https://jsonapi.org/format/",
authors: [
'Steve Klabnik',
'Yehuda Katz',
'Dan Gebhardt',
'Tyler Kellen',
'Ethan Resnick'
],
status: 'unofficial',
date: '29 May 2015'
},
"JCS": {
title: "JSON Canonicalization Scheme (JCS)",
href: 'https://tools.ietf.org/html/draft-rundgren-json-canonicalization-scheme-05',
Expand Down
5 changes: 4 additions & 1 deletion common/terms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@
A <a>named graph</a> created from the value of a <a>map entry</a>
having an <a>expanded term definition</a>
where <code>@container</code> is set to <code>@graph</code>.</dd>
<dt class="changed"><dfn data-cite="JSON-LD11#dfn-included-block">included block</dfn></dt><dd class="changed">
An <a>included block</a> is an <a>entry</a> in a <a>node object</a> where the key is either `@included` or an alias of `@included`
and the value is one ore more <a>node objects</a>.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-index-map">index map</dfn></dt><dd>
An <a>index map</a> is a <a>map</a> value of a <a>term</a>
defined with <code>@container</code> set to <code>@index</code>,
Expand Down Expand Up @@ -349,4 +352,4 @@
The vocabulary mapping is set in the <a>context</a> using the <code>@vocab</code> key
whose value MUST be an <a>IRI</a> or <code>null</code>.</dd>
</dl>
</section>
</section>
Loading