Add support for compacting named graphs where @container: @graph and @graphId. (reverted from commit 9de3c5b)

Author: gkellogg

lib/json/ld.rb

@@ -52,7 +52,6 @@ module LD
       @id
       @index
       @graph
-      @graphId
       @language
       @list
       @nest
@@ -107,7 +106,6 @@ class InvalidBaseIRI < JsonLdError; @code = "invalid base IRI"; end
       class InvalidContainerMapping < JsonLdError; @code = "invalid container mapping"; end
       class InvalidDefaultLanguage < JsonLdError; @code = "invalid default language"; end
       class InvalidIdValue < JsonLdError; @code = "invalid @id value"; end
-      class InvalidGraphIdMapping < JsonLdError; @code = "invalid @graphId mapping"; end
       class InvalidIndexValue < JsonLdError; @code = "invalid @index value"; end
       class InvalidVersionValue < JsonLdError; @code = "invalid @version value"; end
       class InvalidIRIMapping < JsonLdError; @code = "invalid IRI mapping"; end

lib/json/ld/compact.rb

@@ -163,11 +163,10 @@ def compact(element, property: nil)
 
             container = context.container(item_active_property)
             as_array = context.as_array?(item_active_property)
-            graph_id = context.graph_id(item_active_property)
 
             value = case
             when list?(expanded_item) then expanded_item['@list']
-            when graph?(expanded_item) then expanded_item['@graph']
+            when simple_graph?(expanded_item) then expanded_item['@graph']
             else expanded_item
             end
 
@@ -191,16 +190,11 @@ def compact(element, property: nil)
               end
             end
 
-            # handle @graph, not the value of a property with @content: @graph, or where graph_id does not match
-            if graph?(expanded_item) && (container != '@graph' || graph_id != expanded_item['@id'])
+            # handle simple @graph, not the value of a property with @content: @graph
+            if simple_graph?(expanded_item) && container != '@graph'
               compacted_item = [compacted_item] unless compacted_item.is_a?(Array)
               al = context.compact_iri('@graph', vocab: true, quiet: true)
               compacted_item = {al => compacted_item}
-              if expanded_item['@id']
-                al = context.compact_iri('@id', vocab: true, quiet: true)
-                # 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')
                 key = context.compact_iri('@index', vocab: true, quiet: true)
                 compacted_item[key] = expanded_item['@index']

lib/json/ld/context.rb

@@ -62,10 +62,6 @@ class TermDefinition
       # @return [Hash{String => Object}]
       attr_accessor :context
 
-      # Graph identifier, used with @container @graph
-      # @return [String]
-      attr_accessor :graph_id
-
       # This is a simple term definition, not an expanded term definition
       # @return [Boolean] simple
       def simple?; simple; end
@@ -96,7 +92,6 @@ def initialize(term,
                     nest: nil,
                     simple: false,
                     prefix: nil,
-                    graph_id: nil,
                     context: nil)
         @term                   = term
         @id                     = id.to_s           unless id.nil?
@@ -107,7 +102,6 @@ def initialize(term,
         @nest                   = nest              unless nest.nil?
         @simple                 = simple
         @prefix                 = prefix            unless prefix.nil?
-        @graph_i                = graph_id          unless graph_id.nil?
         @context                = context           unless context.nil?
       end
 
@@ -152,7 +146,6 @@ def to_context_definition(context)
           cm = [container_mapping, ('@set' if as_set?)].compact
           cm = cm.first if cm.length == 1
           defn['@container'] = cm unless cm.empty?
-          defn['@graphId'] = context.compact_iri(graph_id, vocab: true) if graph_id
           # Language set as false to be output as null
           defn['@language'] = (@language_mapping ? @language_mapping : nil) unless @language_mapping.nil?
           defn['@context'] = @context if @context
@@ -195,7 +188,6 @@ def inspect
         v << "nest=#{nest.inspect}" unless nest.nil?
         v << "simple=true" if @simple
         v << "prefix=#{@prefix.inspect}" unless @prefix.nil?
-        v << "graph_id=#{@graph_id.inspect}" unless @graph_id.nil?
         v << "has-context" unless context.nil?
         v.join(" ") + "]"
       end
@@ -593,7 +585,7 @@ def create_term_definition(local_context, term, defined)
 
         expected_keys = case processingMode
         when "json-ld-1.0", nil then %w(@container @id @language @reverse @type)
-        else  %w(@container @context @graphId @id @language @nest @prefix @reverse @type)
+        else  %w(@container @context @id @language @nest @prefix @reverse @type)
         end
 
         extra_keys = value.keys - expected_keys
@@ -724,28 +716,6 @@ def create_term_definition(local_context, term, defined)
           end
         end
 
-        if value.has_key?('@graphId')
-          graph_id = value['@graphId']
-          graph_id = case graph_id
-          when String
-            begin
-              expand_iri(graph_id, vocab: true, documentRelative: false, local_context: local_context, defined: defined)
-            rescue JsonLdError::InvalidIRIMapping
-              raise JsonLdError::InvalidGraphIdMapping, "invalid mapping for '@graphId': #{graph_id.inspect} on term #{term.inspect}"
-            end
-          else
-            :error
-          end
-          unless (graph_id.is_a?(RDF::URI) && graph_id.absolute?) || graph_id.is_a?(RDF::Node)
-            raise JsonLdError::InvalidGraphIdMapping, "unknown mapping for '@graphId': #{graph_id.inspect} on term #{term.inspect}"
-          end
-          unless definition.container_mapping == '@graph'
-            raise JsonLdError::InvalidGraphIdMapping, "'@graphId' only valid with @container: @graph: #{graph_id.inspect} on term #{term.inspect}"
-          end
-          #log_debug("") {"type_mapping: #{type.inspect}"}
-          definition.graph_id = graph_id.to_s
-        end
-
         term_definitions[term] = definition
         defined[term] = true
       else
@@ -923,13 +893,13 @@ def as_array?(term)
     end
 
     ##
-    # Retrieve graph_id of a term
+    # Retrieve content of a term
     #
     # @param [Term, #to_s] term in unexpanded form
-    # @return [String]
-    def graph_id(term)
+    # @return [Hash]
+    def content(term)
       term = find_definition(term)
-      term && term.graph_id
+      term && term.content
     end
 
     ##
@@ -1156,7 +1126,6 @@ def compact_iri(iri, value: nil, vocab: nil, reverse: false, quiet: false, **opt
           # TODO: "@graph@set"?
           containers << '@graph'
           containers << '@set'
-          graph_id = value['@id']
         else
           if value?(value)
             if value.has_key?('@language') && !index?(value)
@@ -1189,7 +1158,7 @@ def compact_iri(iri, value: nil, vocab: nil, reverse: false, quiet: false, **opt
           preferred_values.concat([tl_value, '@none'].compact)
         end
         #log_debug("") {"preferred_values: #{preferred_values.inspect}"} unless quiet
-        if p_term = select_term(iri, containers, tl, preferred_values, graph_id)
+        if p_term = select_term(iri, containers, tl, preferred_values)
           #log_debug("") {"=> term: #{p_term.inspect}"} unless quiet
           return p_term
         end
@@ -1588,10 +1557,8 @@ def inverse_context
     #   indicates whether to look for a term with a matching type mapping or language mapping
     # @param [Array<String>] preferred_values
     #   for the type mapping or language mapping
-    # @param [String] graph_id
-    #   @graphId required on term when container matches on @graph
     # @return [String]
-    def select_term(iri, containers, type_language, preferred_values, graph_id)
+    def select_term(iri, containers, type_language, preferred_values)
       #log_debug("select_term") {
       #  "iri: #{iri.inspect}, " +
       #  "containers: #{containers.inspect}, " +
@@ -1606,11 +1573,6 @@ def select_term(iri, containers, type_language, preferred_values, graph_id)
         value_map = tl_map[type_language]
         preferred_values.each do |item|
           next unless value_map.has_key?(item)
-          if container == '@graph'
-            # Graph names must not exist or exactly match
-            td = term_definitions[item]
-            next if td && td.graph_id != graph_id
-          end
           #log_debug("=>") {value_map[item].inspect}
           return value_map[item]
         end

lib/json/ld/expand.rb

@@ -435,14 +435,11 @@ def expand_object(input, active_property, context, output_object, ordered: false
           #log_debug(" => ") { "convert #{expanded_value.inspect} to list"}
           expanded_value = [expanded_value] unless expanded_value.is_a?(Array)
           expanded_value = {'@graph' => expanded_value}
-          # Add any associated graphId
-          graph_id = active_context.graph_id(key)
-          expanded_value['@id'] = context.expand_iri(graph_id, vocab: true).to_s if graph_id
         end
 
         # Otherwise, if the term definition associated to key indicates that it is a reverse property
         # Spec FIXME: this is not an otherwise.
-        if context.reverse?(key)
+        if (td = context.term_definitions[key]) && td.reverse_property
           # If result has no @reverse member, create one and initialize its value to an empty JSON object.
           reverse_map = output_object['@reverse'] ||= {}
           [expanded_value].flatten.each do |item|

spec/compact_spec.rb

@@ -813,36 +813,13 @@
             }
           })
         },
-        "Compacts named graph" => {
+        "Does not compacts graph with @id" => {
           input: %([{
             "http://example.org/input": [{
-              "@id": "http://example.org/gid",
               "@graph": [{
                 "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }]),
-          context: %({
-            "@vocab": "http://example.org/",
-            "input": {"@container": "@graph", "@graphId": "gid"}
-          }),
-          output: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "input": {"@container": "@graph", "@graphId": "gid"}
-            },
-            "input": {
-              "value": "x"
-            }
-          })
-        },
-        "Does not compact graph with @id without @graphId" => {
-          input: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
+              }],
+              "@id": "http://example.org/id"
             }]
           }]),
           context: %({
@@ -852,38 +829,12 @@
           output: %({
             "@context": {
               "@vocab": "http://example.org/",
-              "input": {"@container": "@graph"}
-            },
-            "input": {
-              "@id": "http://example.org/gid",
-              "@graph": [
-                {
-                  "value": "x"
-                }
-              ]
-            }
-          })
-        },
-        "Does not compacts graph with @id without matching @graphId" => {
-          input: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }]),
-          context: %({
-            "@vocab": "http://example.org/",
-            "input": {"@container": "@graph", "@graphId": "nomatch"}
-          }),
-          output: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "input": {"@container": "@graph", "@graphId": "nomatch"}
+              "input": {
+                "@container": "@graph"
+              }
             },
             "input": {
-              "@id": "http://example.org/gid",
+              "@id": "http://example.org/id",
               "@graph": [
                 {
                   "value": "x"
@@ -892,62 +843,6 @@
             }
           })
         },
-        "Compacts named graph" => {
-          input: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }]),
-          context: %({
-            "@vocab": "http://example.org/",
-            "input": {"@container": "@graph", "@graphId": "gid"}
-          }),
-          output: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "input": {"@container": "@graph", "@graphId": "gid"}
-            },
-            "input": {
-              "value": "x"
-            }
-          })
-        },
-        "Raises error when @graphId is an invalid IRI" => {
-          input: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }]),
-          context: %({
-            "input": {
-              "@id": "http://example.org/",
-              "@container": "@graph",
-              "@graphId": "gid"
-            }
-          }),
-          exception: JSON::LD::JsonLdError::InvalidGraphIdMapping
-        },
-        "Raises error when @graphId used without @container: @graph" => {
-          input: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }]),
-          context: %({
-            "@vocab": "http://example.org/",
-            "input": {"@container": "@set", "@graphId": "gid"}
-          }),
-          exception: JSON::LD::JsonLdError::InvalidGraphIdMapping
-        },
       }.each_pair do |title, params|
         it(title) {run_compact({processingMode: "json-ld-1.1"}.merge(params))}
       end

spec/expand_spec.rb

@@ -958,44 +958,6 @@
             }]
           }])
         },
-        "Creates a @graph container with an @graphId" => {
-          input: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "input": {"@container": "@graph", "@graphId": "gid"}
-            },
-            "input": {
-              "value": "x"
-            }
-          }),
-          output: %([{
-            "http://example.org/input": [{
-              "@id": "http://example.org/gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }])
-        },
-        "Creates a @graph container with an blank @graphId" => {
-          input: %({
-            "@context": {
-              "@vocab": "http://example.org/",
-              "input": {"@container": "@graph", "@graphId": "_:gid"}
-            },
-            "input": {
-              "value": "x"
-            }
-          }),
-          output: %([{
-            "http://example.org/input": [{
-              "@id": "_:gid",
-              "@graph": [{
-                "http://example.org/value": [{"@value": "x"}]
-              }]
-            }]
-          }])
-        },
       }.each do |title, params|
         it(title) {run_expand({processingMode: "json-ld-1.1"}.merge(params))}
       end