Expand and compact @container: @index where value is a graph. (reverted from commit 133bc3d)

Author: gkellogg

lib/json/ld/compact.rb

@@ -201,7 +201,7 @@ def compact(element, property: nil)
                 # Do not compact using vocabulary-relative, which is not valid for @id
                 compacted_item[al] = context.compact_iri(expanded_item['@id'], vocab: false, quiet: true).to_s
               end
-              if expanded_item.has_key?('@index') && container != '@index'
+              if expanded_item.has_key?('@index')
                 key = context.compact_iri('@index', vocab: true, quiet: true)
                 compacted_item[key] = expanded_item['@index']
               end

spec/compact_spec.rb

@@ -495,37 +495,6 @@
 
     context "@container: @index" do
       {
-        "named graph": {
-          input: %([
-            {
-              "@id": "http://example.com/graphTest",
-              "http://example.org/container": [{
-                "@graph": [{"http://example.org/input": [{"@value": "de"}]}],
-                "@index": "de"
-              }, {
-                "@graph": [{"http://example.org/input": [{"@value": "en"}]}],
-                "@index": "en"
-              }]
-            }
-          ]),
-          context: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "container": {"@container": "@index"}
-            }
-          }),
-          output: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "container": {"@container": "@index"}
-            },
-            "@id": "http://example.com/graphTest",
-            "container": {
-              "en": {"@graph": [{"input": "en"}]},
-              "de": {"@graph": [{"input": "de"}]}
-            }
-          })
-        },
         "compact-0029" => {
           input: %([{
              "@id": "http://example.com/article",
@@ -1673,7 +1642,6 @@ def run_compact(params)
     input = ::JSON.parse(input) if input.is_a?(String)
     output = ::JSON.parse(output) if output.is_a?(String)
     context = ::JSON.parse(context) if context.is_a?(String)
-    context = context['@context'] if context.has_key?('@context')
     pending params.fetch(:pending, "test implementation") unless input
     if params[:exception]
       expect {JSON::LD::API.compact(input, context, params.merge(logger: logger))}.to raise_error(params[:exception])

spec/expand_spec.rb

@@ -483,31 +483,6 @@
             }
           ]
         },
-        "graph" => {
-          input: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "container": {"@container": "@index"}
-            },
-            "@id": "http://example.com/graphTest",
-            "container": {
-              "en": {"@graph": {"input": "en"}},
-              "de": {"@graph": {"input": "de"}}
-            }
-          }),
-          output: %([
-            {
-              "@id": "http://example.com/graphTest",
-              "http://example.org/container": [{
-                "@graph": [{"http://example.org/input": [{"@value": "de"}]}],
-                "@index": "de"
-              }, {
-                "@graph": [{"http://example.org/input": [{"@value": "en"}]}],
-                "@index": "en"
-              }]
-            }
-          ])
-        },
       }.each do |title, params|
         it(title) {run_expand params}
       end