json-ld 3.1.4 → 3.1.9

data/lib/json/ld/frame.rb

@@ -52,7 +52,7 @@ module JSON::LD
           state[:uniqueEmbeds][state[:graph]] ||= {}
         end
 
-        if flags[:embed] == '@link' && link.has_key?(id)
+        if flags[:embed] == '@link' && link.key?(id)
           # add existing linked subject
           add_frame_output(parent, property, link[id])
           next
@@ -66,7 +66,7 @@ module JSON::LD
           warn "[DEPRECATION] #{flags[:embed]}  is not a valid value of @embed in 1.1 mode.\n"
         end
 
-        if !state[:embedded] && state[:uniqueEmbeds][state[:graph]].has_key?(id)
+        if !state[:embedded] && state[:uniqueEmbeds][state[:graph]].key?(id)
           # Skip adding this node object to the top-level, as it was included in another node object
           next
         elsif state[:embedded] &&
@@ -76,7 +76,7 @@ module JSON::LD
           next
         elsif state[:embedded] &&
           %w(@first @once).include?(flags[:embed]) &&
-          state[:uniqueEmbeds][state[:graph]].has_key?(id)
+          state[:uniqueEmbeds][state[:graph]].key?(id)
 
           # if only the first match should be embedded
           # Embed unless already embedded
@@ -97,7 +97,7 @@ module JSON::LD
         state[:subjectStack] << {subject: subject, graph: state[:graph]}
 
         # Subject is also the name of a graph
-        if state[:graphMap].has_key?(id)
+        if state[:graphMap].key?(id)
           # check frame's "@graph" to see what to do next
           # 1. if it doesn't exist and state.graph === "@merged", don't recurse
           # 2. if it doesn't exist and state.graph !== "@merged", recurse
@@ -105,7 +105,7 @@ module JSON::LD
           # 4. if "@default" then don't recurse
           # 5. recurse
           recurse, subframe = false, nil
-          if !frame.has_key?('@graph')
+          if !frame.key?('@graph')
             recurse, subframe = (state[:graph] != '@merged'), {}
           else
             subframe = frame['@graph'].first
@@ -134,7 +134,7 @@ module JSON::LD
           end
 
           # explicit is on and property isn't in frame, skip processing
-          next if flags[:explicit] && !frame.has_key?(prop)
+          next if flags[:explicit] && !frame.key?(prop)
 
           # add objects
           objects.each do |o|
@@ -267,7 +267,7 @@ module JSON::LD
         # If, after replacement, an array contains only the value null remove the value, leaving an empty array.
         input.map {|o| cleanup_preserve(o)}
       when Hash
-        if input.has_key?('@preserve')
+        if input.key?('@preserve')
           # Replace with the content of `@preserve`
           cleanup_preserve(input['@preserve'].first)
         else
@@ -388,7 +388,7 @@ module JSON::LD
           is_empty = v.empty?
           if v = v.first
             validate_frame(v)
-            has_default = v.has_key?('@default')
+            has_default = v.key?('@default')
           end
 
           # No longer a wildcard pattern if frame has any non-keyword properties

data/lib/json/ld/from_rdf.rb

@@ -22,7 +22,6 @@ module JSON::LD
       referenced_once = {}
 
       value = nil
-      ec = @context
 
       # Create an entry for compound-literal node detection
       compound_literal_subjects = {}
@@ -33,7 +32,7 @@ module JSON::LD
       dataset.each do |statement|
         #log_debug("statement") { statement.to_nquads.chomp}
 
-        name = statement.graph_name ? ec.expand_iri(statement.graph_name, base: @options[:base]).to_s : '@default'
+        name = statement.graph_name ? @context.expand_iri(statement.graph_name, base: @options[:base]).to_s : '@default'
 
         # Create a graph entry as needed
         node_map = graph_map[name] ||= {}
@@ -41,17 +40,24 @@ module JSON::LD
 
         default_graph[name] ||= {'@id' => name} unless name == '@default'
 
-        subject = ec.expand_iri(statement.subject, as_string: true, base: @options[:base])
-        node = node_map[subject] ||= {'@id' => subject}
+        subject = statement.subject.statement? ?
+          resource_representation(statement.subject, useNativeTypes)['@id'].to_json_c14n :
+          statement.subject.to_s
+        node = node_map[subject] ||= resource_representation(statement.subject, useNativeTypes)
 
         # If predicate is rdf:datatype, note subject in compound literal subjects map
         if @options[:rdfDirection] == 'compound-literal' && statement.predicate == RDF.to_uri + 'direction'
           compound_literal_subjects[name][subject] ||= true
         end
 
-        # If object is an IRI or blank node identifier, and node map does not have an object member, create one and initialize its value to a new JSON object consisting of a single member @id whose value is set to object.
-        node_map[statement.object.to_s] ||= {'@id' => statement.object.to_s} unless
-          statement.object.literal?
+        # If object is an IRI, blank node identifier, or statement, and node map does not have an object member, create one and initialize its value to a new JSON object consisting of a single member @id whose value is set to object.
+        unless statement.object.literal?
+          object = statement.object.statement? ?
+            resource_representation(statement.object, useNativeTypes)['@id'].to_json_c14n :
+            statement.object.to_s
+          node_map[object] ||=
+            resource_representation(statement.object, useNativeTypes)
+        end
 
         # If predicate equals rdf:type, and object is an IRI or blank node identifier, append object to the value of the @type member of node. If no such member exists, create one and initialize it to an array whose only item is object. Finally, continue to the next RDF triple.
         if statement.predicate == RDF.type && statement.object.resource? && !useRdfType
@@ -60,11 +66,7 @@ module JSON::LD
         end
 
         # Set value to the result of using the RDF to Object Conversion algorithm, passing object, rdfDirection, and use native types.
-        value = ec.expand_value(nil,
-                                statement.object,
-                                rdfDirection: @options[:rdfDirection],
-                                useNativeTypes: useNativeTypes,
-                                base: @options[:base])
+        value = resource_representation(statement.object, useNativeTypes)
 
         merge_value(node, statement.predicate.to_s, value)
 
@@ -77,7 +79,7 @@ module JSON::LD
             property: statement.predicate.to_s,
             value:    value
           })
-        elsif referenced_once.has_key?(statement.object.to_s)
+        elsif referenced_once.key?(statement.object.to_s)
           referenced_once[statement.object.to_s] = false
         elsif statement.object.node?
           referenced_once[statement.object.to_s] = {
@@ -114,8 +116,7 @@ module JSON::LD
           end
         end
 
-        # Skip to next graph, unless this one has lists
-        next unless nil_var = graph_object[RDF.nil.to_s]
+        nil_var = graph_object.fetch(RDF.nil.to_s, {})
 
         # For each item usage in the usages member of nil, perform the following steps:
         nil_var.fetch(:usages, []).each do |usage|
@@ -143,12 +144,15 @@ module JSON::LD
           head['@list'] = list.reverse
           list_nodes.each {|node_id| graph_object.delete(node_id)}
         end
+
+        # Create annotations on graph object
+        create_annotations(graph_object)
       end
 
       result = []
       default_graph.keys.opt_sort(ordered: @options[:ordered]).each do |subject|
         node = default_graph[subject]
-        if graph_map.has_key?(subject)
+        if graph_map.key?(subject)
           node['@graph'] = []
           graph_map[subject].keys.opt_sort(ordered: @options[:ordered]).each do |s|
             n = graph_map[subject][s]
@@ -162,5 +166,31 @@ module JSON::LD
       #log_debug("fromRdf") {result.to_json(JSON_STATE) rescue 'malformed json'}
       result
     end
+
+    private
+    def resource_representation(resource, useNativeTypes)
+      case resource
+      when RDF::Statement
+        # Note, if either subject or object are a BNode which is used elsewhere,
+        # this might not work will with the BNode accounting from above.
+        rep = {'@id' => resource_representation(resource.subject, false)}
+        if resource.predicate == RDF.type
+          rep['@id'].merge!('@type' => resource.object.to_s)
+        else
+          rep['@id'].merge!(
+            resource.predicate.to_s =>
+            as_array(resource_representation(resource.object, useNativeTypes)))
+        end
+        rep
+      when RDF::Literal
+        @context.expand_value(nil,
+                              resource,
+                              rdfDirection: @options[:rdfDirection],
+                              useNativeTypes: useNativeTypes,
+                              base: @options[:base])
+      else
+        {'@id' => resource.to_s}
+      end
+    end
   end
 end

data/lib/json/ld/reader.rb

@@ -20,7 +20,7 @@ module JSON::LD
           control: :url2,
           datatype: RDF::URI,
           on: ["--expand-context CONTEXT"],
-          description: "Context to use when expanding.") {|arg| RDF::URI(arg)},
+          description: "Context to use when expanding.") {|arg| RDF::URI(arg).absolute? ? RDF::URI(arg) : StringIO.new(File.read(arg))},
         RDF::CLI::Option.new(
           symbol: :extractAllScripts,
           datatype: TrueClass,
@@ -68,6 +68,7 @@ module JSON::LD
     # @raise [RDF::ReaderError] if the JSON document cannot be loaded
     def initialize(input = $stdin, **options, &block)
       options[:base_uri] ||= options[:base]
+      options[:rename_bnodes] = false unless options.key?(:rename_bnodes)
       super do
         @options[:base] ||= base_uri.to_s if base_uri
         # Trim non-JSON stuff in script.

data/lib/json/ld/streaming_reader.rb

@@ -136,7 +136,7 @@ module JSON::LD
         when '@type'
           # Set the type-scoped context to the context on input, for use later
           raise JsonLdError::InvalidStreamingKeyOrder,
-                "found #{key} in state #{state}" unless [:await_context, :await_type].include?(state)
+                "found #{key} in state #{state}" unless %i(await_context await_type).include?(state)
 
           type_scoped_context = context
           as_array(value).sort.each do |term|
@@ -159,7 +159,7 @@ module JSON::LD
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if is_list_or_set
           raise JsonLdError::CollidingKeywords,
-                "found #{key} in state #{state}" unless [:await_context, :await_type, :await_id].include?(state)
+                "found #{key} in state #{state}" unless %i(await_context await_type await_id).include?(state)
 
           # Set our actual id, and use for replacing any provisional statements using our existing node_id, which is provisional
           raise JsonLdError::InvalidIdValue,
@@ -209,7 +209,7 @@ module JSON::LD
           # Expanded values must be node objects
           have_statements = false
           parse_object(value, active_property, context) do |st|
-            have_statements ||= st.has_subject?
+            have_statements ||= st.subject?
             block.call(st)
           end
           raise JsonLdError::InvalidIncludedValue, "values of @included must expand to node objects" unless have_statements
@@ -232,7 +232,7 @@ module JSON::LD
         when '@list'
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if
-            ![:await_context, :await_type, :await_id].include?(state)
+            !%i(await_context await_type await_id).include?(state)
           is_list_or_set = true
           if subject
             node_id = parse_list(value, active_property, context, &block)
@@ -277,7 +277,7 @@ module JSON::LD
         when '@set'
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if
-                ![:await_context, :await_type, :await_id].include?(state)
+                !%i(await_context await_type await_id).include?(state)
           is_list_or_set = true
           value = as_array(value).compact
           parse_object(value, active_property, context, subject: subject, predicate: predicate, &block)

data/lib/json/ld/streaming_writer.rb

@@ -64,8 +64,8 @@ module JSON::LD
           {"@value" => MultiJson.load(statement.object.to_s), "@type" => "@json"}
         else
           lit = {"@value" => statement.object.to_s}
-          lit["@type"] = statement.object.datatype.to_s if statement.object.has_datatype?
-          lit["@language"] = statement.object.language.to_s if statement.object.has_language?
+          lit["@type"] = statement.object.datatype.to_s if statement.object.datatype?
+          lit["@language"] = statement.object.language.to_s if statement.object.language?
           lit
         end
       end
@@ -91,7 +91,7 @@ module JSON::LD
     def start_graph(resource)
       #log_debug("start_graph") {"state: #{@state.inspect}, resource: #{resource}"}
       if resource
-        @output.puts(",") if [:wrote_node, :wrote_graph].include?(@state)
+        @output.puts(",") if %i(wrote_node wrote_graph).include?(@state)
         @output.puts %({"@id": "#{resource}", "@graph": [)
         @state = :in_graph
       end
@@ -109,7 +109,7 @@ module JSON::LD
 
     def end_node
       #log_debug("end_node") {"state: #{@state.inspect}, node: #{@current_node_def.to_json}"}
-      @output.puts(",") if [:wrote_node, :wrote_graph].include?(@state)
+      @output.puts(",") if %i(wrote_node wrote_graph).include?(@state)
       if @current_node_def
         node_def = if context
           compacted = JSON::LD::API.compact(@current_node_def, context, rename_bnodes: false, **@options)

data/lib/json/ld/to_rdf.rb

@@ -16,6 +16,8 @@ module JSON::LD
     # @return RDF::Resource the subject of this item
     def item_to_rdf(item, graph_name: nil, &block)
       # Just return value object as Term
+      return unless item
+
       if value?(item)
         value, datatype = item.fetch('@value'), item.fetch('@type', nil)
 
@@ -46,7 +48,7 @@ module JSON::LD
           # Only valid for rdf:JSON
           value = value.to_json_c14n
         else
-          if item.has_key?('@direction') && @options[:rdfDirection]
+          if item.key?('@direction') && @options[:rdfDirection]
             # Either serialize using a datatype, or a compound-literal
             case @options[:rdfDirection]
             when 'i18n-datatype'
@@ -61,7 +63,7 @@ module JSON::LD
           end
 
           # Otherwise, if datatype is null, set it to xsd:string or xsd:langString, depending on if item has a @language key.
-          datatype ||= item.has_key?('@language') ? RDF.langString : RDF::XSD.string
+          datatype ||= item.key?('@language') ? RDF.langString : RDF::XSD.string
           if datatype == RDF::URI(RDF.to_uri + "JSON")
             value = value.to_json_c14n
           end
@@ -76,11 +78,13 @@ module JSON::LD
         return parse_list(item['@list'], graph_name: graph_name, &block)
       end
 
-      # Skip if '@id' is nil
-      subject = if item.has_key?('@id')
-        item['@id'].nil? ? nil : as_resource(item['@id'])
-      else
-        node
+      subject = case item['@id']
+      when nil then node
+      when String then as_resource(item['@id'])
+      when Object
+        # Embedded statement
+        # (No error checking, as this is done in expansion)
+        to_enum(:item_to_rdf, item['@id']).to_a.first
       end
 
       #log_debug("item_to_rdf")  {"subject: #{subject.to_ntriples rescue 'malformed rdf'}"}

data/lib/json/ld/utils.rb

@@ -11,8 +11,8 @@ module JSON::LD
     # @return [Boolean]
     def node?(value)
       value.is_a?(Hash) &&
-        !(value.has_key?('@value') || value.has_key?('@list') || value.has_key?('@set')) &&
-        (value.length > 1 || !value.has_key?('@id'))
+        !(value.key?('@value') || value.key?('@list') || value.key?('@set')) &&
+        (value.length > 1 || !value.key?('@id'))
     end
 
     ##
@@ -29,7 +29,7 @@ module JSON::LD
     # @return [Boolean]
     def node_or_ref?(value)
       value.is_a?(Hash) &&
-        !(value.has_key?('@value') || value.has_key?('@list') || value.has_key?('@set'))
+        !(value.key?('@value') || value.key?('@list') || value.key?('@set'))
     end
 
     ##
@@ -66,7 +66,7 @@ module JSON::LD
     # @param [Object] value
     # @return [Boolean]
     def simple_graph?(value)
-      graph?(value) && !value.has_key?('@id')
+      graph?(value) && !value.key?('@id')
     end
     
     ##
@@ -75,7 +75,7 @@ module JSON::LD
     # @param [Object] value
     # @return [Boolean]
     def list?(value)
-      value.is_a?(Hash) && value.has_key?('@list')
+      value.is_a?(Hash) && value.key?('@list')
     end
 
     ##
@@ -84,7 +84,7 @@ module JSON::LD
     # @param [Object] value
     # @return [Boolean]
     def index?(value)
-      value.is_a?(Hash) && value.has_key?('@index')
+      value.is_a?(Hash) && value.key?('@index')
     end
 
     ##
@@ -93,7 +93,7 @@ module JSON::LD
     # @param [Object] value
     # @return [Boolean]
     def value?(value)
-      value.is_a?(Hash) && value.has_key?('@value')
+      value.is_a?(Hash) && value.key?('@value')
     end
 
     ##
@@ -170,7 +170,7 @@ module JSON::LD
         end
       elsif subject[property]
         # check if subject already has value if duplicates not allowed
-        _has_value = !allow_duplicate && has_value(subject, property, value)
+        _has_value = !allow_duplicate && has_value?(subject, property, value)
 
         # make property an array if value not present or always an array
         if !subject[property].is_a?(Array) && (!_has_value || property_is_array)
@@ -188,7 +188,7 @@ module JSON::LD
     # @param property the property to look for.
     # 
     # @return [Boolean] true if the subject has the given property, false if not.
-    def has_property(subject, property)
+    def property?(subject, property)
       return false unless value = subject[property]
       !value.is_a?(Array) || !value.empty?
     end
@@ -200,8 +200,8 @@ module JSON::LD
     # @param [Object] value the value to check.
     # 
     # @return [Boolean] true if the value exists, false if not.
-    def has_value(subject, property, value)
-      if has_property(subject, property)
+    def has_value?(subject, property, value)
+      if property?(subject, property)
         val = subject[property]
         is_list = list?(val)
         if val.is_a?(Array) || is_list
@@ -265,7 +265,7 @@ module JSON::LD
     # @return [String]
     def get_sym(old = "")
       old = old.to_s.sub(/_:/, '')
-      if old && self.has_key?(old)
+      if old && self.key?(old)
         self[old]
       elsif !old.empty?
         self[old] = RDF::Node.new.to_unique_base[2..-1]
@@ -289,7 +289,7 @@ module JSON::LD
     # @return [String]
     def get_sym(old = "")
       old = old.to_s.sub(/_:/, '')
-      if !old.empty? && self.has_key?(old)
+      if !old.empty? && self.key?(old)
         self[old]
       elsif !old.empty?
         @num += 1

data/lib/json/ld/writer.rb

@@ -93,7 +93,7 @@ module JSON::LD
           datatype: RDF::URI,
           control: :url2,
           on: ["--context CONTEXT"],
-          description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
+          description: "Context to use when compacting.") {|arg| RDF::URI(arg).absolute? ? RDF::URI(arg) : StringIO.new(File.read(arg))},
         RDF::CLI::Option.new(
           symbol: :embed,
           datatype: %w(@always @once @never),
@@ -107,6 +107,13 @@ module JSON::LD
           control: :checkbox,
           on: ["--[no-]explicit"],
           description: "Only include explicitly declared properties in output (false)") {|arg| arg},
+        RDF::CLI::Option.new(
+          symbol: :frame,
+          datatype: RDF::URI,
+          control: :url2,
+          use: :required,
+          on: ["--frame FRAME"],
+          description: "Frame to use when serializing.") {|arg| RDF::URI(arg).absolute? ? RDF::URI(arg) : StringIO.new(File.read(arg))},
         RDF::CLI::Option.new(
           symbol: :lowercaseLanguage,
           datatype: TrueClass,
@@ -137,7 +144,7 @@ module JSON::LD
           default: 'null',
           control: :select,
           on: ["--rdf-direction DIR", %w(i18n-datatype compound-literal)],
-          description: "How to serialize literal direction (i18n-datatype compound-literal)") {|arg| RDF::URI(arg)},
+          description: "How to serialize literal direction (i18n-datatype compound-literal)") {|arg| arg},
         RDF::CLI::Option.new(
           symbol: :requireAll,
           datatype: TrueClass,
@@ -202,7 +209,7 @@ module JSON::LD
     end
 
     ##
-    # Initializes the RDF-LD writer instance.
+    # Initializes the JSON-LD writer instance.
     #
     # @param  [IO, File] output
     #   the output stream
@@ -230,8 +237,8 @@ module JSON::LD
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, **options, &block)
-      options[:base_uri] ||= options[:base] if options.has_key?(:base)
-      options[:base] ||= options[:base_uri] if options.has_key?(:base_uri)
+      options[:base_uri] ||= options[:base] if options.key?(:base)
+      options[:base] ||= options[:base_uri] if options.key?(:base_uri)
       super do
         @repo = RDF::Repository.new