json-ld 3.1.7 → 3.2.0

data/lib/json/ld/extensions.rb

@@ -11,10 +11,10 @@ module RDF
   class Statement
     # Validate extended RDF
     def valid_extended?
-      has_subject?    && subject.resource? && subject.valid_extended? &&
-      has_predicate?  && predicate.resource? && predicate.valid_extended? &&
-      has_object?     && object.term? && object.valid_extended? &&
-      (has_graph?      ? (graph_name.resource? && graph_name.valid_extended?) : true)
+      subject?    && subject.resource? && subject.valid_extended? &&
+      predicate?  && predicate.resource? && predicate.valid_extended? &&
+      object?     && object.term? && object.valid_extended? &&
+      (graph?      ? (graph_name.resource? && graph_name.valid_extended?) : true)
     end
   end
 

data/lib/json/ld/flatten.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+require 'json/canonicalization'
+
 module JSON::LD
   module Flatten
     include Utils
@@ -7,6 +9,10 @@ module JSON::LD
     ##
     # This algorithm creates a JSON object node map holding an indexed representation of the graphs and nodes represented in the passed expanded document. All nodes that are not uniquely identified by an IRI get assigned a (new) blank node identifier. The resulting node map will have a member for every graph in the document whose value is another object with a member for every node represented in the document. The default graph is stored under the @default member, all other graphs are stored under their graph name.
     #
+    # For RDF-star/JSON-LD-star:
+    #   * Values of `@id` can be an object (embedded node); when these are used as keys in a Node Map, they are serialized as canonical JSON, and de-serialized when flattening.
+    #   * The presence of `@annotation` implies an embedded node and the annotation object is removed from the node/value object in which it appears.
+    #
     # @param [Array, Hash] element
     #   Expanded JSON-LD input
     # @param [Hash] graph_map A map of graph name to subjects
@@ -16,12 +22,15 @@ module JSON::LD
     #   Node identifier
     # @param [String] active_property (nil)
     #   Property within current node
+    # @param [Boolean] reverse (false)
+    #   Processing a reverse relationship
     # @param [Array] list (nil)
     #   Used when property value is a list
     def create_node_map(element, graph_map,
                         active_graph: '@default',
                         active_subject: nil,
                         active_property: nil,
+                        reverse: false,
                         list: nil)
       if element.is_a?(Array)
         # If element is an array, process each entry in element recursively by passing item for element, node map, active graph, active subject, active property, and list.
@@ -30,21 +39,45 @@ module JSON::LD
                           active_graph: active_graph,
                           active_subject: active_subject,
                           active_property: active_property,
+                          reverse: false,
                           list: list)
         end
       elsif !element.is_a?(Hash)
         raise "Expected hash or array to create_node_map, got #{element.inspect}"
       else
         graph = (graph_map[active_graph] ||= {})
-        subject_node = graph[active_subject]
+        subject_node = !reverse && graph[active_subject.is_a?(Hash) ? active_subject.to_json_c14n : active_subject]
 
         # Transform BNode types
-        if element.has_key?('@type')
+        if element.key?('@type')
           element['@type'] = Array(element['@type']).map {|t| blank_node?(t) ? namer.get_name(t) : t}
         end
 
         if value?(element)
           element['@type'] = element['@type'].first if element ['@type']
+
+          # For rdfstar, if value contains an `@annotation` member ...
+          # note: active_subject will not be nil, and may be an object itself.
+          if element.key?('@annotation')
+            # rdfstar being true is implicit, as it is checked in expansion
+            as = node_reference?(active_subject) ?
+              active_subject['@id'] :
+              active_subject
+            star_subject = {
+              "@id" => as,
+              active_property => [element]
+            }
+
+            # Note that annotation is an array, make the reified subject the id of each member of that array.
+            annotation = element.delete('@annotation').map do |a|
+              a.merge('@id' => star_subject)
+            end
+
+            # Invoke recursively using annotation.
+            create_node_map(annotation, graph_map,
+                            active_graph: active_graph)
+          end
+
           if list.nil?
             add_value(subject_node, active_property, element, property_is_array: true, allow_duplicate: false)
           else
@@ -64,13 +97,19 @@ module JSON::LD
           end
         else
           # Element is a node object
-          id = element.delete('@id')
-          id = namer.get_name(id) if blank_node?(id)
+          ser_id = id = element.delete('@id')
+          if id.is_a?(Hash)
+            # Index graph using serialized id
+            ser_id = id.to_json_c14n
+          elsif id.nil?
+            ser_id = id = namer.get_name
+          end
 
-          node = graph[id] ||= {'@id' => id}
+          node = graph[ser_id] ||= {'@id' => id}
 
-          if active_subject.is_a?(Hash)
-            # If subject is a hash, then we're processing a reverse-property relationship.
+          if reverse
+            # Note: active_subject is a Hash
+            # We're processing a reverse-property relationship.
             add_value(node, active_property, active_subject, property_is_array: true, allow_duplicate: false)
           elsif active_property
             reference = {'@id' => id}
@@ -81,7 +120,30 @@ module JSON::LD
             end
           end
 
-          if element.has_key?('@type')
+          # For rdfstar, if node contains an `@annotation` member ...
+          # note: active_subject will not be nil, and may be an object itself.
+          # XXX: what if we're reversing an annotation?
+          if element.key?('@annotation')
+            # rdfstar being true is implicit, as it is checked in expansion
+            as = node_reference?(active_subject) ?
+              active_subject['@id'] :
+              active_subject
+            star_subject = reverse ? 
+              {"@id" => node['@id'], active_property => [{'@id' => as}]} :
+              {"@id" => as, active_property => [{'@id' => node['@id']}]}
+
+            # Note that annotation is an array, make the reified subject the id of each member of that array.
+            annotation = element.delete('@annotation').map do |a|
+              a.merge('@id' => star_subject)
+            end
+
+            # Invoke recursively using annotation.
+            create_node_map(annotation, graph_map,
+                            active_graph: active_graph,
+                            active_subject: star_subject)
+          end
+
+          if element.key?('@type')
             add_value(node, '@type', element.delete('@type'), property_is_array: true, allow_duplicate: false)
           end
 
@@ -99,7 +161,8 @@ module JSON::LD
                 create_node_map(value, graph_map,
                                 active_graph: active_graph,
                                 active_subject: referenced_node,
-                                active_property: property)
+                                active_property: property,
+                                reverse: true)
               end
             end
           end
@@ -128,7 +191,72 @@ module JSON::LD
       end
     end
 
+    ##
+    # Create annotations
+    #
+    # Updates a node map from which annotations have been folded into embedded triples to re-extract the annotations.
+    #
+    # Map entries where the key is of the form of a canonicalized JSON object are used to find keys with the `@id` and property components. If found, the original map entry is removed and entries added to an `@annotation` property of the associated value.
+    #
+    # * Keys which are of the form of a canonicalized JSON object are examined in inverse order of length.
+    # * Deserialize the key into a map, and re-serialize the value of `@id`.
+    # * If the map contains an entry with that value (after re-canonicalizing, as appropriate), and the associated antry has a item which matches the non-`@id` item from the map, the node is used to create an `@annotation` entry within that value.
+    #
+    # @param [Hash{String => Hash}] node_map
+    # @return [Hash{String => Hash}]
+    def create_annotations(node_map)
+      node_map.keys.
+        select {|k| k.start_with?('{')}.
+        sort_by(&:length).
+        reverse.each do |key|
+
+        annotation = node_map[key]
+        # Deserialize key, and re-serialize the `@id` value.
+        emb = annotation['@id'].dup
+        id = emb.delete('@id')
+        property, value = emb.to_a.first
+
+        # If id is a map, set it to the result of canonicalizing that value, otherwise to itself.
+        id = id.to_json_c14n if id.is_a?(Hash)
+
+        next unless node_map.key?(id)
+        # If node map has an entry for id and that entry contains the same property and value from entry:
+        node = node_map[id] 
+
+        next unless node.key?(property)
+
+        node[property].each do |emb_value|
+          next unless emb_value == value.first
+
+          node_map.delete(key)
+          annotation.delete('@id')
+          add_value(emb_value, '@annotation', annotation, property_is_array: true) unless
+            annotation.empty?
+        end
+      end
+    end
+
+    ##
+    # Rename blank nodes recursively within an embedded object
+    #
+    # @param [Object] node
+    # @return [Hash]
+    def rename_bnodes(node)
+      case node
+      when Array
+        node.map {|n| rename_bnodes(n)}
+      when Hash
+        node.inject({}) do |memo, (k, v)|
+          v = namer.get_name(v) if k == '@id' && v.is_a?(String) && blank_node?(v)
+          memo.merge(k => rename_bnodes(v))
+        end
+      else
+        node
+      end
+    end
+
   private
+
     ##
     # Merge nodes from all graphs in the graph_map into a new node map
     #

data/lib/json/ld/format.rb

@@ -57,7 +57,7 @@ module JSON::LD
           lambda: ->(files, **options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
-            options = options.merge(expandContext: options.delete(:context)) if options.has_key?(:context)
+            options = options.merge(expandContext: options.delete(:context)) if options.key?(:context)
             options[:base] ||= options[:base_uri]
             if options[:format] == :jsonld
               if files.empty?
@@ -174,6 +174,13 @@ module JSON::LD
               use: :required,
               on: ["--context CONTEXT"],
               description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
+            RDF::CLI::Option.new(
+              symbol: :createAnnotations,
+              datatype: TrueClass,
+              default: false,
+              control: :checkbox,
+              on: ["--[no-]create-annotations"],
+              description: "Unfold embedded nodes which can be represented using `@annotation`."),
           ]
         },
         frame: {

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

@@ -40,8 +40,10 @@ module JSON::LD
 
         default_graph[name] ||= {'@id' => name} unless name == '@default'
 
-        subject = statement.subject.to_s
-        node = node_map[subject] ||= resource_representation(statement.subject,useNativeTypes)
+        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'
@@ -50,12 +52,14 @@ module JSON::LD
 
         # 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?
-          node_map[statement.object.to_s] ||=
+          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.
-        # XXX JSON-LD* does not support embedded value of @type
         if statement.predicate == RDF.type && statement.object.resource? && !useRdfType
           merge_value(node, '@type', statement.object.to_s)
           next
@@ -75,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] = {
@@ -112,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|
@@ -141,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]

data/lib/json/ld/html/nokogiri.rb

@@ -136,11 +136,10 @@ module JSON::LD
           input
         else
           begin
-            require 'nokogumbo' unless defined?(::Nokogumbo)
             input = input.read if input.respond_to?(:read)
-            ::Nokogiri::HTML5(input.dup.force_encoding('utf-8'), max_parse_errors: 1000)
-          rescue LoadError
-            ::Nokogiri::HTML.parse(input, 'utf-8')
+            ::Nokogiri::HTML5(input.force_encoding('utf-8'), max_parse_errors: 1000)
+          rescue LoadError, NoMethodError
+            ::Nokogiri::HTML.parse(input, base_uri.to_s, 'utf-8')
           end
         end
 

data/lib/json/ld/reader.rb

@@ -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

@@ -48,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'
@@ -63,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

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

@@ -237,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
 

data/lib/json/ld.rb

@@ -47,6 +47,7 @@ module JSON
     DEFAULT_CONTEXT = "http://schema.org"
 
     KEYWORDS = Set.new(%w(
+      @annotation
       @base
       @container
       @context
@@ -116,6 +117,7 @@ module JSON
       class CollidingKeywords < JsonLdError; @code = "colliding keywords"; end
       class ConflictingIndexes < JsonLdError; @code = "conflicting indexes"; end
       class CyclicIRIMapping < JsonLdError; @code = "cyclic IRI mapping"; end
+      class InvalidAnnotation < JsonLdError; @code = "invalid annotation"; end
       class InvalidBaseIRI < JsonLdError; @code = "invalid base IRI"; end
       class InvalidContainerMapping < JsonLdError; @code = "invalid container mapping"; end
       class InvalidContextEntry < JsonLdError; @code = "invalid context entry"; end
@@ -137,7 +139,7 @@ module JSON
       class InvalidNestValue < JsonLdError; @code = "invalid @nest value"; end
       class InvalidPrefixValue < JsonLdError; @code = "invalid @prefix value"; end
       class InvalidPropagateValue < JsonLdError; @code = "invalid @propagate value"; end
-      class InvalidEmbeddedNode < JsonLdError; @code = "invalid reified node"; end
+      class InvalidEmbeddedNode < JsonLdError; @code = "invalid embedded node"; end
       class InvalidRemoteContext < JsonLdError; @code = "invalid remote context"; end
       class InvalidReverseProperty < JsonLdError; @code = "invalid reverse property"; end
       class InvalidReversePropertyMap < JsonLdError; @code = "invalid reverse property map"; end

data/spec/api_spec.rb

@@ -44,7 +44,7 @@ describe JSON::LD::API do
   end
 
   context "Test Files" do
-    %w(oj json_gem ok_json yajl).map(&:to_sym).each do |adapter|
+    %i(oj json_gem ok_json yajl).each do |adapter|
       context "with MultiJson adapter #{adapter.inspect}" do
         Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), 'test-files/*-input.*'))) do |filename|
           test = File.basename(filename).sub(/-input\..*$/, '')