json-ld 2.1.7 → 2.2.0

data/spec/context_spec.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/xsd'
 require 'rdf/spec/reader'
 
@@ -196,7 +195,7 @@ describe JSON::LD::Context do
         expect(subject.parse({
           "foo" => {"@id" => "http://example.com/", "@container" => "@list"}
         }).containers).to produce({
-          "foo" => '@list'
+          "foo" => %w(@list)
         }, logger)
       end
 
@@ -204,7 +203,7 @@ describe JSON::LD::Context do
         expect(subject.parse({
           "foo" => {"@id" => "http://example.com/", "@container" => "@type"}
         }).containers).to produce({
-          "foo" => "@type"
+          "foo" => %w(@type)
         }, logger)
       end
 
@@ -212,7 +211,7 @@ describe JSON::LD::Context do
         expect(subject.parse({
           "foo" => {"@id" => "http://example.com/", "@container" => "@id"}
         }).containers).to produce({
-          "foo" => "@id"
+          "foo" => %w(@id)
         }, logger)
       end
 
@@ -953,6 +952,7 @@ describe JSON::LD::Context do
           "setdouble" => {"@id" => "http://example.com/double", "@type" => "xsd:double", "@container" => "@set"},
           "setdate" => {"@id" => "http://example.com/date", "@type" => "xsd:date", "@container" => "@set"},
           "setid" => {"@id" => "http://example.com/id", "@type" => "@id", "@container" => "@set"},
+          'setgraph' => {'@id' => 'http://example.com/graph', '@container' => ['@graph', '@set']},
           "langmap" => {"@id" => "http://example.com/langmap", "@container" => "@language"},
         })
         logger.clear
@@ -960,9 +960,12 @@ describe JSON::LD::Context do
       end
 
       {
+        "plain" => [{"@value" => "foo"}],
         "langmap" => [{"@value" => "en", "@language" => "en"}],
-        #"plain" => [{"@value" => "foo"}],
-        #"setplain" => [{"@value" => "foo", "@language" => "pl"}]
+        "setbool" => [{"@value" => "true", "@type" => "http://www.w3.org/2001/XMLSchema#boolean"}],
+        "setinteger" => [{"@value" => "1", "@type" => "http://www.w3.org/2001/XMLSchema#integer"}],
+        "setid" => [{"@id" => "http://example.org/id"}],
+        "setgraph" => [{"@graph" => [{"@id" => "http://example.org/id"}]}],
       }.each do |prop, values|
         context "uses #{prop}" do
           values.each do |value|
@@ -1365,38 +1368,95 @@ describe JSON::LD::Context do
   describe "#container" do
     subject {
       ctx = context.parse({
-        "ex"       => "http://example.org/",
-        "list"     => {"@id" => "ex:list", "@container" => "@list"},
-        "set"      => {"@id" => "ex:set", "@container" => "@set"},
-        "language" => {"@id" => "ex:language", "@container" => "@language"},
-        "ndx"      => {"@id" => "ex:ndx", "@container" => "@index"},
-        "id"       => {"@id" => "ex:id", "@container" => "@id"},
-        "type"     => {"@id" => "ex:type", "@container" => "@type"}
+        "ex"          => "http://example.org/",
+        "graph"       => {"@id" => "ex:graph", "@container" => "@graph"},
+        "graphSet"    => {"@id" => "ex:graphSet", "@container" => ["@graph", "@set"]},
+        "graphId"     => {"@id" => "ex:graphSet", "@container" => ["@graph", "@id"]},
+        "graphIdSet"  => {"@id" => "ex:graphSet", "@container" => ["@graph", "@id", "@set"]},
+        "graphNdx"    => {"@id" => "ex:graphSet", "@container" => ["@graph", "@index"]},
+        "graphNdxSet" => {"@id" => "ex:graphSet", "@container" => ["@graph", "@index", "@set"]},
+        "id"          => {"@id" => "ex:idSet", "@container" => "@id"},
+        "idSet"       => {"@id" => "ex:id", "@container" => ["@id", "@set"]},
+        "language"    => {"@id" => "ex:language", "@container" => "@language"},
+        "langSet"     => {"@id" => "ex:languageSet", "@container" => ["@language", "@set"]},
+        "list"        => {"@id" => "ex:list", "@container" => "@list"},
+        "ndx"         => {"@id" => "ex:ndx", "@container" => "@index"},
+        "ndxSet"      => {"@id" => "ex:ndxSet", "@container" => ["@index", "@set"]},
+        "set"         => {"@id" => "ex:set", "@container" => "@set"},
+        "type"        => {"@id" => "ex:type", "@container" => "@type"},
+        "typeSet"     => {"@id" => "ex:typeSet", "@container" => ["@type", "@set"]},
       })
       logger.clear
       ctx
     }
+
     it "uses TermDefinition" do
       {
-        "ex"       => nil,
-        "list"     => "@list",
-        "language" => "@language",
-        "ndx"      => "@index",
-        "id"       => "@id",
-        "type"     => "@type",
+        "ex"          => [],
+        "graph"       => %w(@graph),
+        "graphSet"    => %w(@graph),
+        "graphId"     => %w(@graph @id),
+        "graphIdSet"  => %w(@graph @id),
+        "graphNdx"    => %w(@graph @index),
+        "graphNdxSet" => %w(@graph @index),
+        "id"          => %w(@id),
+        "idSet"       => %w(@id),
+        "language"    => %w(@language),
+        "langSet"     => %w(@language),
+        "list"        => %w(@list),
+        "ndx"         => %w(@index),
+        "ndxSet"      => %w(@index),
+        "set"         => [],
+        "type"        => %w(@type),
+        "typeSet"     => %w(@type),
       }.each do |defn, container|
         expect(subject.container(subject.term_definitions[defn])).to eq container
       end
     end
 
-    it "uses string" do
+    it "#as_array" do
       {
-        "ex"       => nil,
-        "list"     => "@list",
-        "language" => "@language",
-        "ndx"      => "@index",
-        "id"       => "@id",
-        "type"     => "@type",
+        "ex"          => false,
+        "graph"       => false,
+        "graphSet"    => true,
+        "graphId"     => false,
+        "graphIdSet"  => true,
+        "graphNdx"    => false,
+        "graphNdxSet" => true,
+        "id"          => false,
+        "idSet"       => true,
+        "language"    => false,
+        "langSet"     => true,
+        "list"        => true,
+        "ndx"         => false,
+        "ndxSet"      => true,
+        "set"         => true,
+        "type"        => false,
+        "typeSet"     => true,
+      }.each do |defn, as_array|
+        expect(subject.as_array?(subject.term_definitions[defn])).to eq as_array
+      end
+    end
+
+    it "uses array" do
+      {
+        "ex"          => [],
+        "graph"       => %w(@graph),
+        "graphSet"    => %w(@graph),
+        "graphId"     => %w(@graph @id),
+        "graphIdSet"  => %w(@graph @id),
+        "graphNdx"    => %w(@graph @index),
+        "graphNdxSet" => %w(@graph @index),
+        "id"          => %w(@id),
+        "idSet"       => %w(@id),
+        "language"    => %w(@language),
+        "langSet"     => %w(@language),
+        "list"        => %w(@list),
+        "ndx"         => %w(@index),
+        "ndxSet"      => %w(@index),
+        "set"         => [],
+        "type"        => %w(@type),
+        "typeSet"     => %w(@type),
       }.each do |defn, container|
         expect(subject.container(defn)).to eq container
       end
@@ -1525,12 +1585,24 @@ describe JSON::LD::Context do
       its(:to_rb) {is_expected.to eq %(TermDefinition.new("term", type_mapping: "http://example.org/type"))}
     end
 
-    context "with container_mapping" do
+    context "with container_mapping @set" do
       subject {described_class.new("term", container_mapping: "@set")}
-      its(:container_mapping) {is_expected.to be_nil}
+      its(:container_mapping) {is_expected.to be_empty}
       its(:to_rb) {is_expected.to eq %(TermDefinition.new("term", container_mapping: "@set"))}
     end
 
+    context "with container_mapping @id @set" do
+      subject {described_class.new("term", container_mapping: %w(@id @set))}
+      its(:container_mapping) {is_expected.to eq %w(@id)}
+      its(:to_rb) {is_expected.to eq %(TermDefinition.new("term", container_mapping: ["@id", "@set"]))}
+    end
+
+    context "with container_mapping @list" do
+      subject {described_class.new("term", container_mapping: "@list")}
+      its(:container_mapping) {is_expected.to eq %w(@list)}
+      its(:to_rb) {is_expected.to eq %(TermDefinition.new("term", container_mapping: "@list"))}
+    end
+
     context "with language_mapping" do
       subject {described_class.new("term", language_mapping: "en")}
       its(:language_mapping) {is_expected.to eq "en"}

data/spec/expand_spec.rb

@@ -1,97 +1,96 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
 
   describe ".expand" do
     {
-      "empty doc" => {
+      "empty doc": {
         input: {},
         output: []
       },
-      "@list coercion" => {
-        input: {
-          "@context" => {
-            "foo" => {"@id" => "http://example.com/foo", "@container" => "@list"}
+      "@list coercion": {
+        input: %({
+          "@context": {
+            "foo": {"@id": "http://example.com/foo", "@container": "@list"}
           },
-          "foo" => [{"@value" => "bar"}]
-        },
-        output: [{
-          "http://example.com/foo" => [{"@list" => [{"@value" => "bar"}]}]
-        }]
+          "foo": [{"@value": "bar"}]
+        }),
+        output: %([{
+          "http://example.com/foo": [{"@list": [{"@value": "bar"}]}]
+        }])
       },
-      "native values in list" => {
-        input: {
-          "http://example.com/foo" => {"@list" => [1, 2]}
-        },
-        output: [{
-          "http://example.com/foo" => [{"@list" => [{"@value" => 1}, {"@value" => 2}]}]
-        }]
+      "native values in list": {
+        input: %({
+          "http://example.com/foo": {"@list": [1, 2]}
+        }),
+        output: %([{
+          "http://example.com/foo": [{"@list": [{"@value": 1}, {"@value": 2}]}]
+        }])
       },
-      "@graph" => {
-        input: {
-          "@context" => {"ex" => "http://example.com/"},
-          "@graph" => [
-            {"ex:foo"  => {"@value" => "foo"}},
-            {"ex:bar" => {"@value" => "bar"}}
+      "@graph": {
+        input: %({
+          "@context": {"ex": "http://example.com/"},
+          "@graph": [
+            {"ex:foo": {"@value": "foo"}},
+            {"ex:bar": {"@value": "bar"}}
           ]
-        },
-        output: [
-          {"http://example.com/foo" => [{"@value" => "foo"}]},
-          {"http://example.com/bar" => [{"@value" => "bar"}]}
-        ]
+        }),
+        output: %([
+          {"http://example.com/foo": [{"@value": "foo"}]},
+          {"http://example.com/bar": [{"@value": "bar"}]}
+        ])
       },
-      "@graph value (expands to array form)" => {
-        input: {
-          "@context" => {"ex" => "http://example.com/"},
-          "ex:p" => {
-            "@id" => "ex:Sub1",
-            "@graph" => {
-              "ex:q" => "foo"
+      "@graph value (expands to array form)": {
+        input: %({
+          "@context": {"ex": "http://example.com/"},
+          "ex:p": {
+            "@id": "ex:Sub1",
+            "@graph": {
+              "ex:q": "foo"
             }
           }
-        },
-        output: [{
-          "http://example.com/p" => [{
-            "@id" => "http://example.com/Sub1",
-            "@graph" => [{
-              "http://example.com/q" => [{"@value" => "foo"}],
+        }),
+        output: %([{
+          "http://example.com/p": [{
+            "@id": "http://example.com/Sub1",
+            "@graph": [{
+              "http://example.com/q": [{"@value": "foo"}]
             }]
           }]
-        }]
+        }])
       },
-      "@type with CURIE" => {
-        input: {
-          "@context" => {"ex" => "http://example.com/"},
-          "@type" => "ex:type"
-        },
-        output: [
-          {"@type" => ["http://example.com/type"]}
-        ]
+      "@type with CURIE": {
+        input: %({
+          "@context": {"ex": "http://example.com/"},
+          "@type": "ex:type"
+        }),
+        output: %([
+          {"@type": ["http://example.com/type"]}
+        ])
       },
-      "@type with CURIE and muliple values" => {
-        input: {
-          "@context" => {"ex" => "http://example.com/"},
-          "@type" => ["ex:type1", "ex:type2"]
-        },
-        output: [
-          {"@type" => ["http://example.com/type1", "http://example.com/type2"]}
-        ]
+      "@type with CURIE and muliple values": {
+        input: %({
+          "@context": {"ex": "http://example.com/"},
+          "@type": ["ex:type1", "ex:type2"]
+        }),
+        output: %([
+          {"@type": ["http://example.com/type1", "http://example.com/type2"]}
+        ])
       },
-      "@value with false" => {
-        input: {"http://example.com/ex" => {"@value" => false}},
-        output: [{"http://example.com/ex" => [{"@value" => false}]}]
+      "@value with false": {
+        input: %({"http://example.com/ex": {"@value": false}}),
+        output: %([{"http://example.com/ex": [{"@value": false}]}])
       },
-      "compact IRI" => {
-        input: {
-          "@context" => {"ex" => "http://example.com/"},
-          "ex:p" => {"@id" => "ex:Sub1"}
-        },
-        output: [{
-          "http://example.com/p" => [{"@id" => "http://example.com/Sub1"}]
-        }]
+      "compact IRI": {
+        input: %({
+          "@context": {"ex": "http://example.com/"},
+          "ex:p": {"@id": "ex:Sub1"}
+        }),
+        output: %([{
+          "http://example.com/p": [{"@id": "http://example.com/Sub1"}]
+        }])
       },
     }.each_pair do |title, params|
       it(title) {run_expand params}
@@ -99,43 +98,43 @@ describe JSON::LD::API do
 
     context "with relative IRIs" do
       {
-        "base" => {
-          input: {
-            "@id" => "",
-            "@type" => "http://www.w3.org/2000/01/rdf-schema#Resource"
-          },
-          output: [{
-            "@id" => "http://example.org/",
-            "@type" => ["http://www.w3.org/2000/01/rdf-schema#Resource"]
-          }]
+        "base": {
+          input: %({
+            "@id": "",
+            "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+          }),
+          output: %([{
+            "@id": "http://example.org/",
+            "@type": ["http://www.w3.org/2000/01/rdf-schema#Resource"]
+          }])
         },
-        "relative" => {
-          input: {
-            "@id" => "a/b",
-            "@type" => "http://www.w3.org/2000/01/rdf-schema#Resource"
-          },
-          output: [{
-            "@id" => "http://example.org/a/b",
-            "@type" => ["http://www.w3.org/2000/01/rdf-schema#Resource"]
-          }]
+        "relative": {
+          input: %({
+            "@id": "a/b",
+            "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+          }),
+          output: %([{
+            "@id": "http://example.org/a/b",
+            "@type": ["http://www.w3.org/2000/01/rdf-schema#Resource"]
+          }])
         },
-        "hash" => {
-          input: {
-            "@id" => "#a",
-            "@type" => "http://www.w3.org/2000/01/rdf-schema#Resource"
-          },
-          output: [{
-            "@id" => "http://example.org/#a",
-            "@type" => ["http://www.w3.org/2000/01/rdf-schema#Resource"]
-          }]
+        "hash": {
+          input: %({
+            "@id": "#a",
+            "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+          }),
+          output: %([{
+            "@id": "http://example.org/#a",
+            "@type": ["http://www.w3.org/2000/01/rdf-schema#Resource"]
+          }])
         },
-        "unmapped @id" => {
-          input: {
-            "http://example.com/foo" => {"@id" => "bar"}
-          },
-          output: [{
-            "http://example.com/foo" => [{"@id" => "http://example.org/bar"}]
-          }]
+        "unmapped @id": {
+          input: %({
+            "http://example.com/foo": {"@id": "bar"}
+          }),
+          output: %([{
+            "http://example.com/foo": [{"@id": "http://example.org/bar"}]
+          }])
         },
       }.each do |title, params|
         it(title) {run_expand params.merge(base: "http://example.org/")}
@@ -144,54 +143,54 @@ describe JSON::LD::API do
 
     context "keyword aliasing" do
       {
-        "@id" => {
-          input: {
-            "@context" => {"id" => "@id"},
-            "id" => "",
-            "@type" => "http://www.w3.org/2000/01/rdf-schema#Resource"
-          },
-          output: [{
-            "@id" => "",
-            "@type" =>[ "http://www.w3.org/2000/01/rdf-schema#Resource"]
-          }]
+        "@id": {
+          input: %({
+            "@context": {"id": "@id"},
+            "id": "",
+            "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+          }),
+          output: %([{
+            "@id": "",
+            "@type":[ "http://www.w3.org/2000/01/rdf-schema#Resource"]
+          }])
         },
-        "@type" => {
-          input: {
-            "@context" => {"type" => "@type"},
-            "type" => "http://www.w3.org/2000/01/rdf-schema#Resource",
-            "http://example.com/foo" => {"@value" => "bar", "type" => "http://example.com/baz"}
-          },
-          output: [{
-            "@type" => ["http://www.w3.org/2000/01/rdf-schema#Resource"],
-            "http://example.com/foo" => [{"@value" => "bar", "@type" => "http://example.com/baz"}]
-          }]
+        "@type": {
+          input: %({
+            "@context": {"type": "@type"},
+            "type": "http://www.w3.org/2000/01/rdf-schema#Resource",
+            "http://example.com/foo": {"@value": "bar", "type": "http://example.com/baz"}
+          }),
+          output: %([{
+            "@type": ["http://www.w3.org/2000/01/rdf-schema#Resource"],
+            "http://example.com/foo": [{"@value": "bar", "@type": "http://example.com/baz"}]
+          }])
         },
-        "@language" => {
-          input: {
-            "@context" => {"language" => "@language"},
-            "http://example.com/foo" => {"@value" => "bar", "language" => "baz"}
-          },
-          output: [{
-            "http://example.com/foo" => [{"@value" => "bar", "@language" => "baz"}]
-          }]
+        "@language": {
+          input: %({
+            "@context": {"language": "@language"},
+            "http://example.com/foo": {"@value": "bar", "language": "baz"}
+          }),
+          output: %([{
+            "http://example.com/foo": [{"@value": "bar", "@language": "baz"}]
+          }])
         },
-        "@value" => {
-          input: {
-            "@context" => {"literal" => "@value"},
-            "http://example.com/foo" => {"literal" => "bar"}
-          },
-          output: [{
-            "http://example.com/foo" => [{"@value" => "bar"}]
-          }]
+        "@value": {
+          input: %({
+            "@context": {"literal": "@value"},
+            "http://example.com/foo": {"literal": "bar"}
+          }),
+          output: %([{
+            "http://example.com/foo": [{"@value": "bar"}]
+          }])
         },
-        "@list" => {
-          input: {
-            "@context" => {"list" => "@list"},
-            "http://example.com/foo" => {"list" => ["bar"]}
-          },
-          output: [{
-            "http://example.com/foo" => [{"@list" => [{"@value" => "bar"}]}]
-          }]
+        "@list": {
+          input: %({
+            "@context": {"list": "@list"},
+            "http://example.com/foo": {"list": ["bar"]}
+          }),
+          output: %([{
+            "http://example.com/foo": [{"@list": [{"@value": "bar"}]}]
+          }])
         },
       }.each do |title, params|
         it(title) {run_expand params}
@@ -200,54 +199,158 @@ describe JSON::LD::API do
 
     context "native types" do
       {
-        "true" => {
-          input: {
-            "@context" => {"e" => "http://example.org/vocab#"},
-            "e:bool" => true
-          },
-          output: [{
-            "http://example.org/vocab#bool" => [{"@value" => true}]
-          }]
+        "true": {
+          input: %({
+            "@context": {"e": "http://example.org/vocab#"},
+            "e:bool": true
+          }),
+          output: %([{
+            "http://example.org/vocab#bool": [{"@value": true}]
+          }])
         },
-        "false" => {
-          input: {
-            "@context" => {"e" => "http://example.org/vocab#"},
-            "e:bool" => false
-          },
-          output: [{
-            "http://example.org/vocab#bool" => [{"@value" => false}]
-          }]
+        "false": {
+          input: %({
+            "@context": {"e": "http://example.org/vocab#"},
+            "e:bool": false
+          }),
+          output: %([{
+            "http://example.org/vocab#bool": [{"@value": false}]
+          }])
         },
-        "double" => {
-          input: {
-            "@context" => {"e" => "http://example.org/vocab#"},
-            "e:double" => 1.23
-          },
-          output: [{
-            "http://example.org/vocab#double" => [{"@value" => 1.23}]
-          }]
+        "double": {
+          input: %({
+            "@context": {"e": "http://example.org/vocab#"},
+            "e:double": 1.23
+          }),
+          output: %([{
+            "http://example.org/vocab#double": [{"@value": 1.23}]
+          }])
         },
-        "double-zero" => {
-          input: {
-            "@context" => {"e" => "http://example.org/vocab#"},
-            "e:double-zero" => 0.0e0
-          },
-          output: [{
-            "http://example.org/vocab#double-zero" => [{"@value" => 0.0e0}]
-          }]
+        "double-zero": {
+          input: %({
+            "@context": {"e": "http://example.org/vocab#"},
+            "e:double-zero": 0.0e0
+          }),
+          output: %([{
+            "http://example.org/vocab#double-zero": [{"@value": 0.0e0}]
+          }])
         },
-        "integer" => {
-          input: {
-            "@context" => {"e" => "http://example.org/vocab#"},
-            "e:integer" => 123
-          },
-          output: [{
-            "http://example.org/vocab#integer" => [{"@value" => 123}]
-          }]
+        "integer": {
+          input: %({
+            "@context": {"e": "http://example.org/vocab#"},
+            "e:integer": 123
+          }),
+          output: %([{
+            "http://example.org/vocab#integer": [{"@value": 123}]
+          }])
         },
       }.each do |title, params|
         it(title) {run_expand params}
       end
+
+      context "with @type: @id" do
+        {
+          "true": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#bool", "@type": "@id"}},
+              "e": true
+            }),
+            output:%( [{
+              "http://example.org/vocab#bool": [{"@value": true}]
+            }])
+          },
+          "false": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#bool", "@type": "@id"}},
+              "e": false
+            }),
+            output: %([{
+              "http://example.org/vocab#bool": [{"@value": false}]
+            }])
+          },
+          "double": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#double", "@type": "@id"}},
+              "e": 1.23
+            }),
+            output: %([{
+              "http://example.org/vocab#double": [{"@value": 1.23}]
+            }])
+          },
+          "double-zero": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#double", "@type": "@id"}},
+              "e": 0.0e0
+            }),
+            output: %([{
+              "http://example.org/vocab#double": [{"@value": 0.0e0}]
+            }])
+          },
+          "integer": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#integer", "@type": "@id"}},
+              "e": 123
+            }),
+            output: %([{
+              "http://example.org/vocab#integer": [{"@value": 123}]
+            }])
+          },
+        }.each do |title, params|
+          it(title) {run_expand params}
+        end
+      end
+
+      context "with @type: @vocab" do
+        {
+          "true": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#bool", "@type": "@vocab"}},
+              "e": true
+            }),
+            output:%( [{
+              "http://example.org/vocab#bool": [{"@value": true}]
+            }])
+          },
+          "false": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#bool", "@type": "@vocab"}},
+              "e": false
+            }),
+            output: %([{
+              "http://example.org/vocab#bool": [{"@value": false}]
+            }])
+          },
+          "double": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#double", "@type": "@vocab"}},
+              "e": 1.23
+            }),
+            output: %([{
+              "http://example.org/vocab#double": [{"@value": 1.23}]
+            }])
+          },
+          "double-zero": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#double", "@type": "@vocab"}},
+              "e": 0.0e0
+            }),
+            output: %([{
+              "http://example.org/vocab#double": [{"@value": 0.0e0}]
+            }])
+          },
+          "integer": {
+            input: %({
+              "@context": {"e": {"@id": "http://example.org/vocab#integer", "@type": "@vocab"}},
+              "e": 123
+            }),
+            output: %([{
+              "http://example.org/vocab#integer": [{"@value": 123}]
+            }])
+          },
+        }.each do |title, params|
+          it(title) {run_expand params}
+        end
+      end
     end
 
     context "coerced typed values" do
@@ -900,6 +1003,205 @@ describe JSON::LD::API do
       end
     end
 
+    context "@container: @graph" do
+      {
+        "Creates a graph object given a value" => {
+          input: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": "@graph"}
+            },
+            "input": {
+              "value": "x"
+            }
+          }),
+          output: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }]
+            }]
+          }])
+        },
+        "Creates a graph object within an array given a value" => {
+          input: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@set"]}
+            },
+            "input": {
+              "value": "x"
+            }
+          }),
+          output: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }]
+            }]
+          }])
+        },
+        "Does not create an graph object if value is a graph" => {
+          input: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": "@graph"}
+            },
+            "input": {
+              "@graph": {
+                "value": "x"
+              }
+            }
+          }),
+          output: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }]
+            }]
+          }])
+        },
+      }.each do |title, params|
+        it(title) {run_expand({processingMode: "json-ld-1.1"}.merge(params))}
+      end
+
+      context "+ @index" do
+        {
+          "Creates a graph object given an indexed value" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index"]}
+              },
+              "input": {
+                "g1": {"value": "x"}
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@index": "g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+          "Creates a graph object given an indexed value with @set" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index", "@set"]}
+              },
+              "input": {
+                "g1": {"value": "x"}
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@index": "g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+          "Does not create a new graph object if indexed value is already a graph object" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index"]}
+              },
+              "input": {
+                "g1": {
+                  "@graph": {
+                    "value": "x"
+                  }
+                }
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@index": "g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+        }.each do |title, params|
+          it(title) {run_expand({processingMode: "json-ld-1.1"}.merge(params))}
+        end
+      end
+
+      context "+ @id" do
+        {
+          "Creates a graph object given an indexed value" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id"]}
+              },
+              "input": {
+                "http://example.com/g1": {"value": "x"}
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@id": "http://example.com/g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+          "Creates a graph object given an indexed value with @set" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id", "@set"]}
+              },
+              "input": {
+                "http://example.com/g1": {"value": "x"}
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@id": "http://example.com/g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+          "Does not create a new graph object if indexed value is already a graph object" => {
+            input: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id"]}
+              },
+              "input": {
+                "http://example.com/g1": {
+                  "@graph": {
+                    "value": "x"
+                  }
+                }
+              }
+            }),
+            output: %([{
+              "http://example.org/input": [{
+                "@id": "http://example.com/g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }])
+          },
+        }.each do |title, params|
+          it(title) {run_expand({processingMode: "json-ld-1.1"}.merge(params))}
+        end
+      end
+    end
+
     context "@nest" do
       {
         "Expands input using @nest" => {