json-ld 3.1.7 → 3.1.8

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/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\..*$/, '')

data/spec/compact_spec.rb

@@ -3389,7 +3389,7 @@ describe JSON::LD::API do
     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')
+    context = context['@context'] if context.key?('@context')
     pending params.fetch(:pending, "test implementation") unless input
     if params[:exception]
       expect {JSON::LD::API.compact(input, context, logger: logger, **params)}.to raise_error(params[:exception])

data/spec/expand_spec.rb

@@ -3371,6 +3371,43 @@ describe JSON::LD::API do
           }),
           exception: JSON::LD::JsonLdError::InvalidReversePropertyMap,
         },
+        "Explicit and implicit @reverse in same object": {
+          input: %({
+            "@context": {
+              "fooOf": {"@reverse": "ex:foo", "@type": "@id"}
+            },
+            "@id": "ex:s",
+            "fooOf": "ex:o1",
+            "@reverse": {
+              "ex:bar": {"@id": "ex:o2"}
+            }
+          }),
+          output: %([{
+            "@id": "ex:s",
+            "@reverse": {
+              "ex:bar": [{"@id": "ex:o2"}],
+              "ex:foo": [{"@id": "ex:o1"}]
+            }
+          }])
+        },
+        "Two properties both with @reverse": {
+          input: %({
+            "@context": {
+              "fooOf": {"@reverse": "ex:foo", "@type": "@id"},
+              "barOf": {"@reverse": "ex:bar", "@type": "@id"}
+            },
+            "@id": "ex:s",
+            "fooOf": "ex:o1",
+            "barOf": "ex:o2"
+          }),
+          output: %([{
+            "@id": "ex:s",
+            "@reverse": {
+              "ex:bar": [{"@id": "ex:o2"}],
+              "ex:foo": [{"@id": "ex:o1"}]
+            }
+          }])
+        },
       }.each do |title, params|
         it(title) {run_expand params}
       end
@@ -3388,6 +3425,36 @@ describe JSON::LD::API do
           }),
           exception: JSON::LD::JsonLdError::InvalidIdValue
         },
+        "node object with @annotation property is ignored without rdfstar option": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@id": "ex:fred",
+              "@annotation": {
+                "ex:certainty": 0.8
+              }
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:knows": [{"@id": "ex:fred"}]
+          }])
+        },
+        "value object with @annotation property is ignored without rdfstar option": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:age": {
+              "@value": 23,
+              "@annotation": {
+                "ex:certainty": 0.8
+              }
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:age": [{"@value": 23}]
+          }])
+        },
       }.each do |title, params|
         it(title) {run_expand params}
       end
@@ -3569,7 +3636,7 @@ describe JSON::LD::API do
             }]
           }])
         },
-        "illegal node with embedded object having properties": {
+        "node with embedded object having properties": {
           input: %({
             "@id": "ex:subj",
             "ex:value": {
@@ -3619,6 +3686,322 @@ describe JSON::LD::API do
             }]
           }])
         },
+        "node with @annotation property on value object": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:age": {
+              "@value": 23,
+              "@annotation": {"ex:certainty": 0.8}
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:age": [{
+              "@value": 23,
+              "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+            }]
+          }])
+        },
+        "node with @annotation property on node object": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "ex:knows": {
+              "@id": "ex:fred",
+              "ex:name": "Fred",
+              "@annotation": {"ex:certainty": 0.8}
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:name": [{"@value": "Bob"}],
+            "ex:knows": [{
+              "@id": "ex:fred",
+              "ex:name": [{"@value": "Fred"}],
+              "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+            }]
+          }])
+        },
+        "node with @annotation property multiple values": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "ex:knows": {
+              "@id": "ex:fred",
+              "ex:name": "Fred",
+              "@annotation": [{
+                "ex:certainty": 0.8
+              }, {
+                "ex:source": {"@id": "http://example.org/"}
+              }]
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:name": [{"@value": "Bob"}],
+            "ex:knows": [{
+              "@id": "ex:fred",
+              "ex:name": [{"@value": "Fred"}],
+              "@annotation": [{
+                "ex:certainty": [{"@value": 0.8}]
+              }, {
+                "ex:source": [{"@id": "http://example.org/"}]
+              }]
+            }]
+          }])
+        },
+        "node with @annotation property that is on the top-level is invalid": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "@annotation": {"ex:prop": "value2"}
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation property on a top-level graph node is invalid": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "@graph": {
+              "@id": "ex:fred",
+              "ex:name": "Fred",
+              "@annotation": {"ex:prop": "value2"}
+            }
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation property having @id is invalid": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@id": "ex:fred",
+              "@annotation": {
+                "@id": "ex:invalid-ann-id",
+                "ex:prop": "value2"
+              }
+            }
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation property with value object value is invalid": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@id": "fred",
+              "@annotation": "value2"
+            }
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation on a list": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@list": [{"@id": "ex:fred"}],
+              "@annotation": {"ex:prop": "value2"}
+            }
+          }),
+          exception: JSON::LD::JsonLdError::InvalidSetOrListObject
+        },
+        "node with @annotation on a list value": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@list": [
+                {
+                  "@id": "ex:fred",
+                  "@annotation": {"ex:prop": "value2"}
+                }
+              ]
+            }
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation property on a top-level @included node is invalid": {
+          input: %({
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "@included": [{
+              "@id": "ex:fred",
+              "ex:name": "Fred",
+              "@annotation": {"ex:prop": "value2"}
+            }]
+          }),
+          exception: JSON::LD::JsonLdError::InvalidAnnotation
+        },
+        "node with @annotation property on embedded subject": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": {"@id": "_:value"}
+            },
+            "ex:prop": {
+              "@value": "value2",
+              "@annotation": {"ex:certainty": 0.8}
+            }
+          }),
+          output: %([{
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": [{"@id": "_:value"}]
+            },
+            "ex:prop": [{
+              "@value": "value2",
+              "@annotation": [{
+                "ex:certainty": [{"@value": 0.8}]
+              }]
+            }]
+          }])
+        },
+        "node with @annotation property on embedded object": {
+          input: %({
+            "@id": "ex:subj",
+            "ex:value": {
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": "value"
+              },
+              "@annotation": {"ex:certainty": 0.8}
+            }
+          }),
+          output: %([{
+            "@id": "ex:subj",
+            "ex:value": [{
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": [{"@value": "value"}]
+              },
+              "@annotation": [{
+                "ex:certainty": [{"@value": 0.8}]
+              }]
+            }]
+          }])
+        },
+        "embedded node with reverse relationship": {
+          input: %({
+            "@context": {
+              "rel": {"@reverse": "ex:rel"}
+            },
+            "@id": {
+              "@id": "ex:rei",
+              "rel": {"@id": "ex:value"}
+            },
+            "ex:prop": "value2"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "embedded node with expanded reverse relationship": {
+          input: %({
+            "@id": {
+              "@id": "ex:rei",
+              "@reverse": {
+                "ex:rel": {"@id": "ex:value"}
+              }
+            },
+            "ex:prop": "value2"
+          }),
+          exception: JSON::LD::JsonLdError::InvalidEmbeddedNode
+        },
+        "embedded node used as subject in reverse relationship": {
+          input: %({
+            "@context": {
+              "rel": {"@reverse": "ex:rel"}
+            },
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": {"@id": "ex:value"}
+            },
+            "rel": {"@id": "ex:value2"}
+          }),
+          output: %([{
+            "@id": {
+              "@id": "ex:rei",
+              "ex:prop": [{"@id": "ex:value"}]
+            },
+            "@reverse": {
+              "ex:rel": [{"@id": "ex:value2"}]
+            }
+          }])
+        },
+        "embedded node used as object in reverse relationship": {
+          input: %({
+            "@context": {
+              "rel": {"@reverse": "ex:rel"}
+            },
+            "@id": "ex:subj",
+            "rel": {
+              "@id": {
+                "@id": "ex:rei",
+                "ex:prop": {"@id": "ex:value"}
+              },
+              "ex:prop": {"@id": "ex:value2"}
+            }
+          }),
+          output: %([{
+            "@id": "ex:subj",
+            "@reverse": {
+              "ex:rel": [{
+                "@id": {
+                  "@id": "ex:rei",
+                  "ex:prop": [{"@id": "ex:value"}]
+                },
+                "ex:prop": [{"@id": "ex:value2"}]
+              }]
+            }
+          }])
+        },
+        "node with @annotation property on node object with reverse relationship": {
+          input: %({
+            "@context": {
+              "knownBy": {"@reverse": "ex:knows"}
+            },
+            "@id": "ex:bob",
+            "ex:name": "Bob",
+            "knownBy": {
+              "@id": "ex:fred",
+              "ex:name": "Fred",
+              "@annotation": {"ex:certainty": 0.8}
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:name": [{"@value": "Bob"}],
+            "@reverse": {
+              "ex:knows": [{
+                "@id": "ex:fred",
+                "ex:name": [{"@value": "Fred"}],
+                "@annotation": [{"ex:certainty": [{"@value": 0.8}]}]
+              }]
+            }
+          }])
+        },
+        "reverse relationship inside annotation": {
+          input: %({
+            "@context": {
+              "claims": {"@reverse": "ex:claims", "@type": "@id"}
+            },
+            "@id": "ex:bob",
+            "ex:knows": {
+              "@id": "ex:jane",
+              "@annotation": {
+                "ex:certainty": 0.8,
+                "claims": "ex:sue"
+              }
+            }
+          }),
+          output: %([{
+            "@id": "ex:bob",
+            "ex:knows": [{
+              "@id": "ex:jane",
+              "@annotation": [{
+                "ex:certainty": [{"@value": 0.8}],
+                "@reverse": {
+                  "ex:claims": [{"@id": "ex:sue"}]
+                }
+              }]
+            }]
+          }])
+        },
       }.each do |title, params|
         it(title) {run_expand params.merge(rdfstar: true)}
       end