json-ld 2.1.7 → 2.2.0

data/lib/json/ld/expand.rb

@@ -23,7 +23,7 @@ module JSON::LD
       result = case input
       when Array
         # If element is an array,
-        is_list = context.container(active_property) == '@list'
+        is_list = context.container(active_property) == %w(@list)
         value = input.each_with_object([]) do |v, memo|
           # Initialize expanded item to the result of using this algorithm recursively, passing active context, active property, and item as element.
           v = expand(v, active_property, context, ordered: ordered)
@@ -175,7 +175,7 @@ module JSON::LD
             when Array
               # Framing allows an array of IRIs, and always puts values in an array
               raise JsonLdError::InvalidIdValue,
-                    "value of @id must be a string, array of string or hash if framing: #{value.inspect}" unless framing
+                    "value of @id must be a string unless framing: #{value.inspect}" unless framing
               context.expand_iri(value, documentRelative: true, quiet: true).to_s
               value.map do |v|
                 raise JsonLdError::InvalidTypeValue,
@@ -187,7 +187,7 @@ module JSON::LD
                     "value of @id must be a string unless framing: #{value.inspect}" unless framing
               raise JsonLdError::InvalidTypeValue,
                     "value of @id must be a an empty object for framing: #{value.inspect}" unless
-                    value.empty? && framing
+                    value.empty?
               [{}]
             else
               raise JsonLdError::InvalidIdValue,
@@ -352,7 +352,7 @@ module JSON::LD
         term_context = context.term_definitions[key].context if context.term_definitions[key]
         active_context = term_context ? context.parse(term_context) : context
         container = active_context.container(key)
-        expanded_value = if container == '@language' && value.is_a?(Hash)
+        expanded_value = if container == %w(@language) && value.is_a?(Hash)
           # Otherwise, if key's container mapping in active context is @language and value is a JSON object then value is expanded from a language map as follows:
           
           # Set multilingual array to an empty array.
@@ -375,17 +375,17 @@ module JSON::LD
           end
 
           ary
-        elsif CONTAINER_MAPPING_INDEX_ID_TYPE.include?(container) && value.is_a?(Hash)
-          # Otherwise, if key's container mapping in active context is @index, @id, @type, an IRI or Blank Node and value is a JSON object then value is expanded from an index map as follows:
+        elsif !(CONTAINER_MAPPING_INDEX_ID_TYPE & container).empty? && value.is_a?(Hash)
+          # Otherwise, if key's container mapping in active context contains @index, @id, @type and value is a JSON object then value is expanded from an index map as follows:
           
           # Set ary to an empty array.
-          container, ary = container.to_s, []
+          ary = []
 
           # For each key-value in the object:
           keys = ordered ? value.keys.sort : value.keys
           keys.each do |k|
-            # If container mapping in the active context is @type, and k is a term in the active context having a local context, use that context when expanding values
-            map_context = active_context.term_definitions[k].context if container == '@type' && active_context.term_definitions[k]
+            # If container mapping in the active context includes @type, and k is a term in the active context having a local context, use that context when expanding values
+            map_context = active_context.term_definitions[k].context if container.include?('@type') && active_context.term_definitions[k]
             map_context = active_context.parse(map_context) if map_context
             map_context ||= active_context
             
@@ -393,15 +393,25 @@ module JSON::LD
             index_value = expand([value[k]].flatten, key, map_context, ordered: ordered)
             index_value.each do |item|
               case container
-              when '@index' then item[container] ||= k
-              when '@id'
+              when %w(@index) then item['@index'] ||= k
+              when %w(@id)
                 # Expand k document relative
                 expanded_k = active_context.expand_iri(k, documentRelative: true, quiet: true).to_s
-                item[container] ||= expanded_k
-              when '@type'
+                item['@id'] ||= expanded_k
+              when %w(@type)
                 # Expand k vocabulary relative
                 expanded_k = active_context.expand_iri(k, vocab: true, documentRelative: true, quiet: true).to_s
-                item[container] = [expanded_k].concat(Array(item[container]))
+                item['@type'] = [expanded_k].concat(Array(item['@type']))
+              when %w(@graph @index), %w(@graph @id)
+                # Indexed graph by graph name
+                if !graph?(item)
+                  item = [item] unless expanded_value.is_a?(Array)
+                  item = {'@graph' => item}
+                end
+                expanded_k = container.include?('@index') ? k :
+                  active_context.expand_iri(k, documentRelative: true, quiet: true).to_s
+                # Expand k document relative
+                item[container.include?('@index') ? '@index' : '@id'] ||= k
               end
 
               # Append item to expanded value.
@@ -422,12 +432,21 @@ module JSON::LD
         #log_debug {" => #{expanded_value.inspect}"}
 
         # If the container mapping associated to key in active context is @list and expanded value is not already a list object, convert expanded value to a list object by first setting it to an array containing only expanded value if it is not already an array, and then by setting it to a JSON object containing the key-value pair @list-expanded value.
-        if active_context.container(key) == '@list' && !list?(expanded_value)
+        if active_context.container(key) == %w(@list) && !list?(expanded_value)
           #log_debug(" => ") { "convert #{expanded_value.inspect} to list"}
-          expanded_value = {'@list' => [expanded_value].flatten}
+          expanded_value = [expanded_value] unless expanded_value.is_a?(Array)
+          expanded_value = {'@list' => expanded_value}
         end
         #log_debug {" => #{expanded_value.inspect}"}
 
+        # convert expanded value to @graph if container specifies it
+        # FIXME value may be a named graph, as well as a simple graph.
+        if active_context.container(key) == %w(@graph) && !graph?(expanded_value)
+          #log_debug(" => ") { "convert #{expanded_value.inspect} to list"}
+          expanded_value = [expanded_value] unless expanded_value.is_a?(Array)
+          expanded_value = {'@graph' => expanded_value}
+        end
+
         # Otherwise, if the term definition associated to key indicates that it is a reverse property
         # Spec FIXME: this is not an otherwise.
         if (td = context.term_definitions[key]) && td.reverse_property

data/lib/json/ld/utils.rb

@@ -46,6 +46,27 @@ module JSON::LD
       end
     end
 
+    ##
+    # Is value an expaned @graph?
+    #
+    # Note: A value is a simple graph if all of these hold true:
+    # 1. It is an object.
+    # 2. It has an `@graph` key.
+    # 3. It may have '@context', '@id' or '@index'
+    #
+    # @param [Object] value
+    # @return [Boolean]
+    def graph?(value)
+      value.is_a?(Hash) && (value.keys - UTIL_GRAPH_KEYS) == ['@graph']
+    end
+    ##
+    # Is value a simple @graph (lacking @id)?
+    # @param [Object] value
+    # @return [Boolean]
+    def simple_graph?(value)
+      graph?(value) && !value.has_key?('@id')
+    end
+    
     ##
     # Is value an expaned @list?
     #
@@ -184,6 +205,7 @@ module JSON::LD
     end
 
     private
+    UTIL_GRAPH_KEYS = %w(@context @id @index).freeze
 
     # Merge the last value into an array based for the specified key if hash is not null and value is not already in that array
     def merge_value(hash, key, value)

data/spec/api_spec.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}

data/spec/compact_spec.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
@@ -744,6 +743,301 @@ describe JSON::LD::API do
       end
     end
 
+    context "@container: @graph" do
+      {
+        "Compacts simple graph" => {
+          input: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }]
+            }]
+          }]),
+          context: %({
+            "@vocab": "http://example.org/",
+            "input": {"@container": "@graph"}
+          }),
+          output: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": "@graph"}
+            },
+            "input": {
+              "value": "x"
+            }
+          })
+        },
+        "Compacts simple graph with @set" => {
+          input: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }]
+            }]
+          }]),
+          context: %({
+            "@vocab": "http://example.org/",
+            "input": {"@container": ["@graph", "@set"]}
+          }),
+          output: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@set"]}
+            },
+            "input": [{
+              "value": "x"
+            }]
+          })
+        },
+        "Compacts simple graph with @index" => {
+          input: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }],
+              "@index": "ndx"
+            }]
+          }]),
+          context: %({
+            "@vocab": "http://example.org/",
+            "input": {"@container": "@graph"}
+          }),
+          output: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": "@graph"}
+            },
+            "input": {
+              "value": "x"
+            }
+          })
+        },
+        "Does not compact graph with @id" => {
+          input: %([{
+            "http://example.org/input": [{
+              "@graph": [{
+                "http://example.org/value": [{"@value": "x"}]
+              }],
+              "@id": "http://example.org/id"
+            }]
+          }]),
+          context: %({
+            "@vocab": "http://example.org/",
+            "input": {"@container": "@graph"}
+          }),
+          output: %({
+            "@context": {
+              "@vocab": "http://example.org/",
+              "input": {"@container": "@graph"}
+            },
+            "input": {
+              "@id": "http://example.org/id",
+              "@graph": [{"value": "x"}]
+            }
+          })
+        },
+      }.each_pair do |title, params|
+        it(title) {run_compact({processingMode: "json-ld-1.1"}.merge(params))}
+      end
+
+      context "+ @index" do
+        {
+          "Compacts simple graph" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@index": "g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@index"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index"]}
+              },
+              "input": {
+                "g1": {"value": "x"}
+              }
+            })
+          },
+          "Compacts simple graph with @set" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@index": "g1",
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@index", "@set"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index", "@set"]}
+              },
+              "input": {
+                "g1": [{"value": "x"}]
+              }
+            })
+          },
+          "Does not compact graph with @id" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }],
+                "@index": "g1",
+                "@id": "http://example.org/id"
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@index"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@index"]}
+              },
+              "input": {
+                "@id": "http://example.org/id",
+                "@index": "g1",
+                "@graph": [{"value": "x"}]
+              }
+            })
+          },
+        }.each_pair do |title, params|
+          it(title) {run_compact({processingMode: "json-ld-1.1"}.merge(params))}
+        end
+      end
+
+      context "+ @id" do
+        {
+          "Compacts simple graph" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@id"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id"]}
+              },
+              "input": {
+                "_:b0": {"value": "x"}
+              }
+            })
+          },
+          "Compacts simple graph with @set" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }]
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@id", "@set"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id", "@set"]}
+              },
+              "input": {"_:b0": [{"value": "x"}]}
+            })
+          },
+          "Compacts simple graph with @index" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }],
+                "@index": "ndx"
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@id"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id"]}
+              },
+              "input": {
+                "_:b0": {"value": "x"}
+              }
+            })
+          },
+          "Compacts graph with @id" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }],
+                "@id": "http://example.org/id"
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@id"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id"]}
+              },
+              "input": {
+                "http://example.org/id" : {"value": "x"}
+              }
+            })
+          },
+          "Compacts graph with @id and @set" => {
+            input: %([{
+              "http://example.org/input": [{
+                "@graph": [{
+                  "http://example.org/value": [{"@value": "x"}]
+                }],
+                "@id": "http://example.org/id"
+              }]
+            }]),
+            context: %({
+              "@vocab": "http://example.org/",
+              "input": {"@container": ["@graph", "@id", "@set"]}
+            }),
+            output: %({
+              "@context": {
+                "@vocab": "http://example.org/",
+                "input": {"@container": ["@graph", "@id", "@set"]}
+              },
+              "input": {
+                "http://example.org/id" : [{"value": "x"}]
+              }
+            })
+          },
+        }.each_pair do |title, params|
+          it(title) {run_compact({processingMode: "json-ld-1.1"}.merge(params))}
+        end
+      end
+    end
+
     context "@nest" do
       {
         "Indexes to @nest for property with @container: @nest" => {