rdf 3.1.9 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bef3d8a6e581bbf440091f39f73f61504a942ea38ec97d5a4885030d93400d6
-  data.tar.gz: 83fc1c5544b286a7e859e98f0674fc48dec07fd3756371e00677393358a3d6ca
+  metadata.gz: 5de713395026fd70491ac47ef4c5c89e63681bccf27d8b9e39fe21fcf63c1344
+  data.tar.gz: a2bc97b12d11858f4089fba2915f358ba28db0bb4704ce70e668f17c80e9a739
 SHA512:
-  metadata.gz: 0bfe6c39d8f96cddd544b908e43fb1481ad6ef4fd32b4eefaf2a38f590ffa226f86150adc655cc34a411737956ee9f2c403352ff88056026d1f422b4db5f2a84
-  data.tar.gz: 02142d3d36e4cce7a65d71d287a0748de0b716f0cbf25647092c65ba662bc4c78736403cc57e53deafc41ed37b36dc55fc602703b1a21ccaf543a1a084ab7363
+  metadata.gz: 334cf936abb27e4c0a8fe225c4bd309b455ab96fcf1e79369abe3a763b28e922172b5d477a9a2112677f3ae21d8b3a0fdb9696d6d89bb6ce85bf49831464f611
+  data.tar.gz: 76d46e91f93f70e021f482b089fb4a5afebb955e835d89965e270688a46fb938a5b1e334d2c0e5d9992a149de97bb84c5f14e8f4da62019aaa7bec7fcb7f582e

data/README.md

@@ -7,7 +7,7 @@ This is a pure-Ruby library for working with [Resource Description Framework
 
 [![Gem Version](https://badge.fury.io/rb/rdf.png)](https://badge.fury.io/rb/rdf)
 [![Build Status](https://github.com/ruby-rdf/rdf/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf/actions?query=workflow%3ACI)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Features

data/VERSION

@@ -1 +1 @@
-3.1.9
+3.1.10

data/lib/rdf/cli.rb

@@ -333,7 +333,7 @@ module RDF
 
           # Add format-specific reader options
           reader.options.each do |cli_opt|
-            next if options.options.has_key?(cli_opt.symbol)
+            next if options.options.key?(cli_opt.symbol)
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
@@ -355,7 +355,7 @@ module RDF
 
           # Add format-specific writer options
           writer.options.each do |cli_opt|
-            next if options.options.has_key?(cli_opt.symbol)
+            next if options.options.key?(cli_opt.symbol)
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
@@ -419,7 +419,7 @@ module RDF
       end
 
       cli_opts.each do |cli_opt|
-        next if opts.has_key?(cli_opt.symbol)
+        next if opts.key?(cli_opt.symbol)
         on_args = cli_opt.on || []
         on_args << cli_opt.description if cli_opt.description
         options.on(*on_args) do |arg|

data/lib/rdf/mixin/enumerable.rb

@@ -12,15 +12,15 @@ module RDF
   #   enumerable.count
   #
   # @example Checking whether a specific statement exists
-  #   enumerable.has_statement?(RDF::Statement(subject, predicate, object))
-  #   enumerable.has_triple?([subject, predicate, object])
-  #   enumerable.has_quad?([subject, predicate, object, graph_name])
+  #   enumerable.statement?(RDF::Statement(subject, predicate, object))
+  #   enumerable.triple?([subject, predicate, object])
+  #   enumerable.quad?([subject, predicate, object, graph_name])
   #
   # @example Checking whether a specific value exists
-  #   enumerable.has_subject?(RDF::URI("https://rubygems.org/gems/rdf"))
-  #   enumerable.has_predicate?(RDF::RDFS.label)
-  #   enumerable.has_object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", language: :en))
-  #   enumerable.has_graph?(RDF::URI("http://ar.to/#self"))
+  #   enumerable.subject?(RDF::URI("https://rubygems.org/gems/rdf"))
+  #   enumerable.predicate?(RDF::RDFS.label)
+  #   enumerable.object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", language: :en))
+  #   enumerable.graph?(RDF::URI("http://ar.to/#self"))
   #
   # @example Enumerating all statements
   #   enumerable.each_statement do |statement|
@@ -127,14 +127,20 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` contains the given RDF statement.
+    # @overload statement?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @return [Boolean]
+    #   @see RDF::Value#statement?
+    # @overload statement?(statement)
+    #   Returns `true` if `self` contains the given RDF statement.
     #
-    # @param  [RDF::Statement] statement
-    # @return [Boolean]
-    def has_statement?(statement)
-      !enum_statement.find { |s| s.eql?(statement) }.nil?
+    #   @param  [RDF::Statement] statement
+    #   @return [Boolean]
+    def statement?(statement = nil)
+      statement && !enum_statement.find { |s| s.eql?(statement) }.nil?
     end
-    alias_method :include?, :has_statement?
+    alias_method :has_statement?, :statement?
+    alias_method :include?, :statement?
 
     ##
     # Iterates the given block for each RDF statement.
@@ -194,9 +200,10 @@ module RDF
     #
     # @param  [Array(RDF::Resource, RDF::URI, RDF::Term)] triple
     # @return [Boolean]
-    def has_triple?(triple)
+    def triple?(triple)
       triples.include?(triple)
     end
+    alias_method :has_triple?, :triple?
 
     ##
     # Iterates the given block for each RDF triple.
@@ -255,9 +262,10 @@ module RDF
     #
     # @param  [Array(RDF::Resource, RDF::URI, RDF::Term, RDF::Resource)] quad
     # @return [Boolean]
-    def has_quad?(quad)
+    def quad?(quad)
       quads.include?(quad)
     end
+    alias_method :has_quad?, :quad?
 
     ##
     # Iterates the given block for each RDF quad.
@@ -321,9 +329,10 @@ module RDF
     #
     # @param  [RDF::Resource] value
     # @return [Boolean]
-    def has_subject?(value)
+    def subject?(value)
       enum_subject.include?(value)
     end
+    alias_method :has_subject?, :subject?
 
     ##
     # Iterates the given block for each unique RDF subject term.
@@ -386,9 +395,10 @@ module RDF
     #
     # @param  [RDF::URI] value
     # @return [Boolean]
-    def has_predicate?(value)
+    def predicate?(value)
       enum_predicate.include?(value)
     end
+    alias_method :has_predicate?, :predicate?
 
     ##
     # Iterates the given block for each unique RDF predicate term.
@@ -451,9 +461,10 @@ module RDF
     #
     # @param  [RDF::Term] value
     # @return [Boolean]
-    def has_object?(value)
+    def object?(value)
       enum_object.include?(value)
     end
+    alias_method :has_object?, :object?
 
     ##
     # Iterates the given block for each unique RDF object term.
@@ -511,7 +522,7 @@ module RDF
     def terms(unique: true)
       unless unique
         enum_statement.
-          map(&:to_quad).
+          map(&:terms).
           flatten.
           compact
       else
@@ -520,14 +531,20 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` contains the given RDF subject term.
+    # @overload term?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @see RDF::Value#statement?
+    #   @return [Boolean]
+    # @overload term?(value)
+    #   Returns `true` if `self` contains the given RDF subject term.
     #
-    # @param  [RDF::Resource] value
-    # @return [Boolean]
-    # @since 2.0
-    def has_term?(value)
-      enum_term.include?(value)
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    #   @since 2.0
+    def term?(value = nil)
+      value && enum_term.include?(value)
     end
+    alias_method :has_term?, :term?
 
     ##
     # Iterates the given block for each unique RDF term (subject, predicate, object, or graph_name).
@@ -551,8 +568,8 @@ module RDF
       if block_given?
         values = {}
         each_statement do |statement|
-          statement.to_quad.each do |value|
-            unless value.nil? || values.include?(value.hash)
+          statement.terms.each do |value|
+            unless values.include?(value.hash)
               values[value.hash] = true
               yield value
             end
@@ -595,9 +612,10 @@ module RDF
     # @param  [RDF::Resource, false] graph_name
     #   Use value `false` to query for the default graph_name
     # @return [Boolean]
-    def has_graph?(graph_name)
+    def graph?(graph_name)
       enum_statement.any? {|s| s.graph_name == graph_name}
     end
+    alias_method :has_graph?, :graph?
 
     ##
     # Limits statements to be from a specific graph.

data/lib/rdf/mixin/mutable.rb

@@ -122,7 +122,7 @@ module RDF
 
       statements.each do |statement|
         if (statement = Statement.from(statement))
-          if statement.has_object?
+          if statement.object?
             delete_insert([[statement.subject, statement.predicate, nil]], [statement])
           else
             delete([statement.subject, statement.predicate, nil])

data/lib/rdf/model/dataset.rb

@@ -104,7 +104,7 @@ module RDF
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      return true if [:graph_name, :rdfstar].include?(feature)
+      return true if %i(graph_name rdfstar).include?(feature)
       super
     end
 

data/lib/rdf/model/graph.rb

@@ -215,18 +215,25 @@ module RDF
     end
 
     ##
-    # Returns `true` if this graph contains the given RDF statement.
+    # @overload statement?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @see RDF::Value#statement?
+    #   @return [Boolean]
+    # @overload statement?(statement)
+    #   Returns `true` if this graph contains the given RDF statement.
     #
-    # A statement is in a graph if the statement if it has the same triples without regard to graph_name.
+    #   A statement is in a graph if the statement if it has the same triples without regard to graph_name.
     #
-    # @param  [Statement] statement
-    # @return [Boolean]
-    # @see    RDF::Enumerable#has_statement?
-    def has_statement?(statement)
+    #   @param  [Statement] statement
+    #   @return [Boolean]
+    #   @see    RDF::Enumerable#statement?
+    def statement?(statement = nil)
+      return false if statement.nil?
       statement = statement.dup
       statement.graph_name = graph_name
-      @data.has_statement?(statement)
+      @data.statement?(statement)
     end
+    alias_method :has_statement?, :statement?
 
     ##
     # Enumerates each RDF statement in this graph.

data/lib/rdf/model/literal.rb

@@ -25,7 +25,7 @@ module RDF
   #
   # @example Creating a language-tagged literal (1)
   #   value = RDF::Literal.new("Hello!", language: :en)
-  #   value.has_language?                            #=> true
+  #   value.language?                                #=> true
   #   value.language                                 #=> :en
   #
   # @example Creating a language-tagged literal (2)
@@ -35,12 +35,12 @@ module RDF
   #
   # @example Creating an explicitly datatyped literal
   #   value = RDF::Literal.new("2009-12-31", datatype: RDF::XSD.date)
-  #   value.has_datatype?                            #=> true
+  #   value.datatype?                                #=> true
   #   value.datatype                                 #=> RDF::XSD.date
   #
   # @example Creating an implicitly datatyped literal
   #   value = RDF::Literal.new(Date.today)
-  #   value.has_datatype?                            #=> true
+  #   value.datatype?                                #=> true
   #   value.datatype                                 #=> RDF::XSD.date
   #
   # @example Creating implicitly datatyped literals
@@ -225,7 +225,7 @@ module RDF
       # * The arguments are simple literals or literals typed as xsd:string
       # * The arguments are plain literals with identical language tags
       # * The first argument is a plain literal with language tag and the second argument is a simple literal or literal typed as xsd:string
-      has_language? ?
+      language? ?
         (language == other.language || other.datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")) :
         other.datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
@@ -289,7 +289,7 @@ module RDF
         case
         when self.eql?(other)
           true
-        when self.has_language? && self.language.to_s == other.language.to_s
+        when self.language? && self.language.to_s == other.language.to_s
           # Literals with languages can compare if languages are identical
           self.value_hash == other.value_hash && self.value == other.value
         when self.simple? && other.simple?
@@ -335,10 +335,10 @@ module RDF
     #
     # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-plain-literal
-    def has_language?
+    def language?
       datatype == RDF.langString
     end
-    alias_method :language?, :has_language?
+    alias_method :has_language?, :language?
 
     ##
     # Returns `true` if this is a datatyped literal.
@@ -347,12 +347,12 @@ module RDF
     #
     # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-typed-literal
-    def has_datatype?
+    def datatype?
       !plain? && !language?
     end
-    alias_method :datatype?,  :has_datatype?
-    alias_method :typed?,     :has_datatype?
-    alias_method :datatyped?, :has_datatype?
+    alias_method :has_datatype?,  :datatype?
+    alias_method :typed?,         :datatype?
+    alias_method :datatyped?,     :datatype?
 
     ##
     # Returns `true` if the value adheres to the defined grammar of the
@@ -386,16 +386,16 @@ module RDF
     # This behavior is intuited from SPARQL data-r2/expr-equal/eq-2-2
     # @return [Boolean]
     def comperable_datatype?(other)
-      return false unless self.plain? || self.has_language?
+      return false unless self.plain? || self.language?
 
       case other
       when RDF::Literal::Numeric, RDF::Literal::Boolean,
            RDF::Literal::Date, RDF::Literal::Time, RDF::Literal::DateTime
         # Invald types can be compared without raising a TypeError if literal has a language (open-eq-08)
-        !other.valid? && self.has_language?
+        !other.valid? && self.language?
       else
         # An unknown datatype may not be used for comparison, unless it has a language? (open-eq-8)
-        self.has_language?
+        self.language?
       end
     end
 

data/lib/rdf/model/literal/date.rb

@@ -51,11 +51,13 @@ module RDF; class Literal
     #
     # @return [Boolean]
     # @since 1.1.6
-    def has_timezone?
+    def timezone?
       md = self.to_s.match(GRAMMAR)
       md && !!md[2]
     end
-    alias_method :has_tz?, :has_timezone?
+    alias_method :tz?, :timezone?
+    alias_method :has_tz?, :timezone?
+    alias_method :has_timezone?, :timezone?
 
     ##
     # Returns the value as a string.
@@ -72,7 +74,7 @@ module RDF; class Literal
     # @since 1.1.6
     def humanize(lang = :en)
       d = object.strftime("%A, %d %B %Y")
-      if has_timezone?
+      if timezone?
         d += if self.tz == 'Z'
           " UTC"
         else

data/lib/rdf/model/literal/datetime.rb

@@ -30,7 +30,7 @@ module RDF; class Literal
     # @see    http://www.w3.org/TR/xmlschema11-2/#dateTime
     def canonicalize!
       if self.valid?
-        @string = if has_timezone?
+        @string = if timezone?
           @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
           @object.strftime(FORMAT[0..-4]).sub('.000', '')
@@ -45,7 +45,7 @@ module RDF; class Literal
     # @return [RDF::Literal]
     # @see http://www.w3.org/TR/sparql11-query/#func-tz
     def tz
-      zone =  has_timezone? ? object.zone : ""
+      zone =  timezone? ? object.zone : ""
       zone = "Z" if zone == "+00:00"
       RDF::Literal(zone)
     end
@@ -85,21 +85,25 @@ module RDF; class Literal
     #
     # @return [Boolean]
     # @since 1.1.6
-    def has_milliseconds?
+    def milliseconds?
       self.format("%L").to_i > 0
     end
-    alias_method :has_ms?, :has_milliseconds?
+    alias_method :has_milliseconds?, :milliseconds?
+    alias_method :has_ms?, :milliseconds?
+    alias_method :ms?, :milliseconds?
 
     ##
     # Does the literal representation include a timezone? Note that this is only possible if initialized using a string, or `:lexical` option.
     #
     # @return [Boolean]
     # @since 1.1.6
-    def has_timezone?
+    def timezone?
       md = self.to_s.match(GRAMMAR)
       md && !!md[2]
     end
-    alias_method :has_tz?, :has_timezone?
+    alias_method :tz?, :timezone?
+    alias_method :has_tz?, :timezone?
+    alias_method :has_timezone?, :timezone?
 
     ##
     # Returns the `timezone` of the literal. If the
@@ -118,7 +122,7 @@ module RDF; class Literal
     # @since 1.1.6
     def humanize(lang = :en)
       d = object.strftime("%r on %A, %d %B %Y")
-      if has_timezone?
+      if timezone?
         zone = if self.tz == 'Z'
           "UTC"
         else

data/lib/rdf/model/literal/time.rb

@@ -42,7 +42,7 @@ module RDF; class Literal
     # @see    http://www.w3.org/TR/xmlschema11-2/#time
     def canonicalize!
       if self.valid?
-        @string = if has_timezone?
+        @string = if timezone?
           @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
           @object.strftime(FORMAT[0..-4]).sub('.000', '')
@@ -57,7 +57,7 @@ module RDF; class Literal
     # @return [RDF::Literal]
     # @see http://www.w3.org/TR/sparql11-query/#func-tz
     def tz
-      zone =  has_timezone? ? object.zone : ""
+      zone =  timezone? ? object.zone : ""
       zone = "Z" if zone == "+00:00"
       RDF::Literal(zone)
     end
@@ -79,11 +79,13 @@ module RDF; class Literal
     #
     # @return [Boolean]
     # @since 1.1.6
-    def has_timezone?
+    def timezone?
       md = self.to_s.match(GRAMMAR)
       md && !!md[2]
     end
-    alias_method :has_tz?, :has_timezone?
+    alias_method :tz?, :timezone?
+    alias_method :has_tz?, :timezone?
+    alias_method :has_timezone?, :timezone?
 
     ##
     # Returns the value as a string.
@@ -101,7 +103,7 @@ module RDF; class Literal
     # @since 1.1.6
     def humanize(lang = :en)
       t = object.strftime("%r")
-      if has_timezone?
+      if timezone?
         t += if self.tz == 'Z'
           " UTC"
         else

data/lib/rdf/model/statement.rb

@@ -96,7 +96,7 @@ module RDF
         @predicate = predicate
         @object    = object
       end
-      @id          = @options.delete(:id) if @options.has_key?(:id)
+      @id          = @options.delete(:id) if @options.key?(:id)
       @graph_name  = @options.delete(:graph_name)
       initialize!
     end
@@ -149,10 +149,10 @@ module RDF
     #
     # @return [Boolean]
     def variable?
-      !(has_subject?    && subject.constant? &&
-        has_predicate?  && predicate.constant? &&
-        has_object?     && object.constant? &&
-        (has_graph?     ? graph_name.constant? : true))
+      !(subject?    && subject.constant? &&
+        predicate?  && predicate.constant? &&
+        object?     && object.constant? &&
+        (graph?     ? graph_name.constant? : true))
     end
 
     ##
@@ -172,10 +172,10 @@ module RDF
     ##
     # @return [Boolean]
     def valid?
-      has_subject?    && subject.resource? && subject.valid? &&
-      has_predicate?  && predicate.uri? && predicate.valid? &&
-      has_object?     && object.term? && object.valid? &&
-      (has_graph?      ? (graph_name.resource? && graph_name.valid?) : true)
+      subject?    && subject.resource? && subject.valid? &&
+      predicate?  && predicate.uri? && predicate.valid? &&
+      object?     && object.term? && object.valid? &&
+      (graph?      ? (graph_name.resource? && graph_name.valid?) : true)
     end
 
     ##
@@ -216,31 +216,37 @@ module RDF
 
     ##
     # @return [Boolean]
-    def has_graph?
+    def graph?
       !!graph_name
     end
-    alias_method :has_name?, :has_graph?
+    alias_method :name?, :graph?
+    alias_method :has_graph?, :graph?
+    alias_method :has_name?, :graph?
 
     ##
     # @return [Boolean]
-    def has_subject?
+    def subject?
       !!subject
     end
+    alias_method :has_subject?, :subject?
 
     ##
     # @return [Boolean]
-    def has_predicate?
+    def predicate?
       !!predicate
     end
+    alias_method :has_predicate?, :predicate?
 
     ##
     # @return [Boolean]
-    def has_object?
+    def object?
       !!object
     end
+    alias_method :has_object?, :object?
 
     ##
-    # Returns `true` if any resource of this statement is a blank node.
+    # Returns `true` if any resource of this statement is a blank node
+    # or has an embedded statement including a blank node.
     #
     # @return [Boolean]
     # @since 2.0
@@ -312,10 +318,10 @@ module RDF
     # @see RDF::Literal#eql?
     # @see RDF::Query::Variable#eql?
     def ===(other)
-      return false if has_object?    && !object.eql?(other.object)
-      return false if has_predicate? && !predicate.eql?(other.predicate)
-      return false if has_subject?   && !subject.eql?(other.subject)
-      return false if has_graph?     && !graph_name.eql?(other.graph_name)
+      return false if object?    && !object.eql?(other.object)
+      return false if predicate? && !predicate.eql?(other.predicate)
+      return false if subject?   && !subject.eql?(other.subject)
+      return false if graph?     && !graph_name.eql?(other.graph_name)
       return true
     end
 
@@ -359,6 +365,13 @@ module RDF
     end
     alias_method :to_a, :to_triple
 
+    ##
+    # Returns an array of all the non-nil non-statement terms.
+    # @return [Array(RDF::Term)]
+    def terms
+      to_quad.map {|t| t.respond_to?(:terms) ? t.terms : t}.flatten.compact
+    end
+
     ##
     # Canonicalizes each unfrozen term in the statement
     #
@@ -366,10 +379,10 @@ module RDF
     # @since  1.0.8
     # @raise [ArgumentError] if any element cannot be canonicalized.
     def canonicalize!
-      self.subject.canonicalize!    if has_subject? && !self.subject.frozen?
-      self.predicate.canonicalize!  if has_predicate? && !self.predicate.frozen?
-      self.object.canonicalize!     if has_object? && !self.object.frozen?
-      self.graph_name.canonicalize! if has_graph? && !self.graph_name.frozen?
+      self.subject.canonicalize!    if subject? && !self.subject.frozen?
+      self.predicate.canonicalize!  if predicate? && !self.predicate.frozen?
+      self.object.canonicalize!     if object? && !self.object.frozen?
+      self.graph_name.canonicalize! if graph? && !self.graph_name.frozen?
       self.validate!
       @hash = nil
       self

data/lib/rdf/model/term.rb

@@ -72,6 +72,14 @@ module RDF
       self
     end
 
+    ##
+    # Returns an array including just itself.
+    #
+    # @return [Array<RDF::Value>]
+    def terms
+      [self]
+    end
+
     ##
     # Returns the base representation of this term.
     #

data/lib/rdf/model/uri.rb

@@ -226,13 +226,13 @@ module RDF
         @value.dup.force_encoding(Encoding::UTF_8) if @value.encoding != Encoding::UTF_8
         @value.freeze
       else
-        %w(
+        %i(
           scheme
           user password userinfo
           host port authority
           path query fragment
-        ).map(&:to_sym).each do |meth|
-          if options.has_key?(meth)
+        ).each do |meth|
+          if options.key?(meth)
             self.send("#{meth}=".to_sym, options[meth])
           else
             self.send(meth)
@@ -416,7 +416,7 @@ module RDF
     # @see http://tools.ietf.org/html/rfc3986#section-5.2.2
     # @see http://tools.ietf.org/html/rfc3986#section-5.2.3
     def join(*uris)
-      joined_parts = object.dup.delete_if {|k, v| [:user, :password, :host, :port].include?(k)}
+      joined_parts = object.dup.delete_if {|k, v| %i(user password host port).include?(k)}
 
       uris.each do |uri|
         uri = RDF::URI.new(uri) unless uri.is_a?(RDF::URI)
@@ -580,7 +580,7 @@ module RDF
       else
         RDF::URI.new(
           **object.merge(path: '/').
-          keep_if {|k, v| [:scheme, :authority, :path].include?(k)})
+          keep_if {|k, v| %i(scheme authority path).include?(k)})
       end
     end
 
@@ -588,13 +588,14 @@ module RDF
     # Returns `true` if this URI is hierarchical and it's path component isn't equal to `/`.
     #
     # @example
-    #   RDF::URI('http://example.org/').has_parent?             #=> false
-    #   RDF::URI('http://example.org/path/').has_parent?        #=> true
+    #   RDF::URI('http://example.org/').parent?             #=> false
+    #   RDF::URI('http://example.org/path/').parent?        #=> true
     #
     # @return [Boolean] `true` or `false`
-    def has_parent?
+    def parent?
       !root?
     end
+    alias_method :has_parent?, :parent?
 
     ##
     # Returns a copy of this URI with the path component ascended to the
@@ -1122,7 +1123,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def authority=(value)
-      object.delete_if {|k, v| [:user, :password, :host, :port, :userinfo].include?(k)}
+      object.delete_if {|k, v| %i(user password host port userinfo).include?(k)}
       object[:authority] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       user; password; userinfo; host; port
       @value = nil
@@ -1152,7 +1153,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def userinfo=(value)
-      object.delete_if {|k, v| [:user, :password, :authority].include?(k)}
+      object.delete_if {|k, v| %i(user password authority).include?(k)}
       object[:userinfo] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       user; password; authority
       @value = nil

data/lib/rdf/ntriples/writer.rb

@@ -309,8 +309,8 @@ module RDF::NTriples
         when RDF::Literal
           # Note, escaping here is more robust than in Term
           text = quoted(escaped(literal.value))
-          text << "@#{literal.language}" if literal.has_language?
-          text << "^^<#{uri_for(literal.datatype)}>" if literal.has_datatype?
+          text << "@#{literal.language}" if literal.language?
+          text << "^^<#{uri_for(literal.datatype)}>" if literal.datatype?
           text
         else
           quoted(escaped(literal.to_s))

data/lib/rdf/query/pattern.rb

@@ -85,13 +85,13 @@ module RDF; class Query
     #
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
-    def has_variables?
+    def variables?
       subject    && subject.variable? ||
       predicate  && predicate.variable? ||
       object     && object.variable? ||
       graph_name && graph_name.variable?
     end
-    alias_method :variables?, :has_variables?
+    alias_method :has_variables?, :variables?
 
     ##
     # Returns `true` if this is an optional pattern.
@@ -111,10 +111,10 @@ module RDF; class Query
     #
     # @return [Boolean] `true` or `false`
     def valid?
-      (has_subject?   ? (subject.resource? || subject.variable?) && subject.valid? : true) && 
-      (has_predicate? ? (predicate.uri? || predicate.variable?) && predicate.valid? : true) &&
-      (has_object?    ? (object.term? || object.variable?) && object.valid? : true) &&
-      (has_graph?     ? (graph_name.resource? || graph_name.variable?) && graph_name.valid? : true)
+      (subject?   ? (subject.resource? || subject.variable?) && subject.valid? : true) && 
+      (predicate? ? (predicate.uri? || predicate.variable?) && predicate.valid? : true) &&
+      (object?    ? (object.term? || object.variable?) && object.valid? : true) &&
+      (graph?     ? (graph_name.resource? || graph_name.variable?) && graph_name.valid? : true)
     rescue NoMethodError
       false
     end
@@ -248,7 +248,7 @@ module RDF; class Query
     # @param [RDF::Statement] statement
     # @return [Array<RDF::Term>]
     def var_values(var, statement)
-      [:subject, :predicate, :object, :graph_name].map do |position|
+      %i(subject predicate object graph_name).map do |position|
         po = self.send(position)
         so = statement.send(position)
         po.var_values(var, so) if po.respond_to?(:var_values)

data/lib/rdf/query/solution.rb

@@ -121,9 +121,11 @@ class RDF::Query
     #   an array of variables to check
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
-    def has_variables?(variables)
+    def variable?(variables)
       variables.any? { |variable| bound?(variable) }
     end
+    alias_method :variables?, :variable?
+    alias_method :has_variables?, :variable?
 
     ##
     # Enumerates over every variable in this solution.
@@ -253,7 +255,7 @@ class RDF::Query
     # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algCompatibleMapping
     def compatible?(other)
       @bindings.all? do |k, v|
-        !other.to_h.has_key?(k) || other[k].eql?(v)
+        !other.to_h.key?(k) || other[k].eql?(v)
       end
     end
 
@@ -267,7 +269,7 @@ class RDF::Query
     # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
     def disjoint?(other)
       @bindings.none? do |k, v|
-        v && other.to_h.has_key?(k) && other[k].eql?(v)
+        v && other.to_h.key?(k) && other[k].eql?(v)
       end
     end
 
@@ -281,7 +283,7 @@ class RDF::Query
     # @return [Boolean]
     def isomorphic_with?(other)
       @bindings.all? do |k, v|
-        !other.to_h.has_key?(k) || other[k].eql?(v)
+        !other.to_h.key?(k) || other[k].eql?(v)
       end
     end
     
@@ -332,7 +334,7 @@ class RDF::Query
     #   @param  [Symbol] name
     #   @return [RDF::Term]
     def method_missing(name, *args, &block)
-      if args.empty? && @bindings.has_key?(name.to_sym)
+      if args.empty? && @bindings.key?(name.to_sym)
         @bindings[name.to_sym]
       else
         super # raises NoMethodError
@@ -342,7 +344,7 @@ class RDF::Query
     ##
     # @return [Boolean]
     def respond_to_missing?(name, include_private = false)
-      @bindings.has_key?(name.to_sym) || super
+      @bindings.key?(name.to_sym) || super
     end
 
     ##

data/lib/rdf/query/solutions.rb

@@ -84,11 +84,13 @@ module RDF; class Query
     # @param  [Array<Symbol, #to_sym>] variables
     #   an array of variables to check
     # @return [Boolean] `true` or `false`
-    # @see    RDF::Query::Solution#has_variables?
+    # @see    RDF::Query::Solution#variable?
     # @see    RDF::Query#execute
-    def have_variables?(variables)
-      self.any? { |solution| solution.has_variables?(variables) }
+    def variable?(variables)
+      self.any? { |solution| solution.variables?(variables) }
     end
+    alias_method :variables?, :variable?
+    alias_method :have_variables?, :variable?
     alias_method :has_variables?, :have_variables?
 
     ##

data/lib/rdf/repository.rb

@@ -20,7 +20,7 @@ module RDF
   #   repository.count
   #
   # @example Checking whether a repository contains a specific statement
-  #   repository.has_statement?(statement)
+  #   repository.statement?(statement)
   #
   # @example Enumerating statements in a repository
   #   repository.each_statement { |statement| statement.inspect! }
@@ -69,7 +69,7 @@ module RDF
   #
   # @example Transational read from a repository
   #   repository.transaction do |tx|
-  #     tx.has_statement?(statement)
+  #     tx.statement?(statement)
   #     tx.query([:s, :p, :o])
   #   end
   #
@@ -288,10 +288,11 @@ module RDF
       
       ##
       # @private
-      # @see RDF::Enumerable#has_graph?      
-      def has_graph?(graph)
-        @data.has_key?(graph)
+      # @see RDF::Enumerable#graph?      
+      def graph?(graph)
+        @data.key?(graph)
       end
+      alias_method :has_graph?, :graph?
 
       ##
       # @private
@@ -312,12 +313,19 @@ module RDF
         enum_graph
       end
 
+
       ##
-      # @private
-      # @see RDF::Enumerable#has_statement?
-      def has_statement?(statement)
-        has_statement_in?(@data, statement)
+      # @overload statement?
+      #   Returns `false` indicating this is not an RDF::Statemenet.
+      #   @return [Boolean]
+      #   @see RDF::Value#statement?
+      # @overload statement?(statement)
+      #   @private
+      #   @see    RDF::Enumerable#statement?
+      def statement?(statement = nil)
+        statement && statement_in?(@data, statement)
       end
+      alias_method :has_statement?, :statement?
 
       ##
       # @private
@@ -389,7 +397,7 @@ module RDF
           predicate   = pattern.predicate
           object      = pattern.object
 
-          cs = snapshot.has_key?(graph_name) ? { graph_name => snapshot[graph_name] } : snapshot
+          cs = snapshot.key?(graph_name) ? { graph_name => snapshot[graph_name] } : snapshot
 
           cs.each do |c, ss|
             next unless graph_name.nil? ||
@@ -403,7 +411,7 @@ module RDF
               ss.keys.select {|s| s.statement? && subject.eql?(s)}.inject({}) do |memo, st|
                 memo.merge(st => ss[st])
               end
-            elsif ss.has_key?(subject)
+            elsif ss.key?(subject)
               { subject => ss[subject] }
             else
               []
@@ -411,7 +419,7 @@ module RDF
             ss.each do |s, ps|
               ps = if predicate.nil? || predicate.is_a?(RDF::Query::Variable)
                 ps
-              elsif ps.has_key?(predicate)
+              elsif ps.key?(predicate)
                 { predicate => ps[predicate] }
               else
                 []
@@ -468,16 +476,17 @@ module RDF
 
       ##
       # @private
-      # @see #has_statement
-      def has_statement_in?(data, statement)
+      # @see #statement?
+      def statement_in?(data, statement)
         s, p, o, g = statement.to_quad
         g ||= DEFAULT_GRAPH
 
-        data.has_key?(g) &&
-          data[g].has_key?(s) &&
-          data[g][s].has_key?(p) &&
-          data[g][s][p].has_key?(o)
+        data.key?(g) &&
+          data[g].key?(s) &&
+          data[g][s].key?(p) &&
+          data[g][s][p].key?(o)
       end
+      alias_method :has_statement_in?, :statement_in?
 
       ##
       # @private
@@ -485,7 +494,7 @@ module RDF
       def insert_to(data, statement)
         raise ArgumentError, "Statement #{statement.inspect} is incomplete" if statement.incomplete?
 
-        unless has_statement_in?(data, statement)
+        unless statement_in?(data, statement)
           s, p, o, c = statement.to_quad
           c ||= DEFAULT_GRAPH
           
@@ -504,7 +513,7 @@ module RDF
       # @private
       # @return [Hamster::Hash] a new, updated hamster hash 
       def delete_from(data, statement)
-        if has_statement_in?(data, statement)
+        if statement_in?(data, statement)
           s, p, o, g = statement.to_quad
           g = DEFAULT_GRAPH unless supports?(:graph_name)
           g ||= DEFAULT_GRAPH

data/lib/rdf/transaction.rb

@@ -207,10 +207,16 @@ module RDF
     end
 
     ##
-    # @see RDF::Enumerable#has_statement?
-    def has_statement?(statement)
-      read_target.has_statement?(statement)
+    # @overload statement?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @return [Boolean]
+    #   @see RDF::Value#statement?
+    # @overload statement?(statement)
+    #   @see    RDF::Enumerable#statement?
+    def statement?(statement = nil)
+      statement && read_target.has_statement?(statement)
     end
+    alias_method :has_statement?, :statement?
 
     ##
     # Returns a developer-friendly representation of this transaction.

data/lib/rdf/util/cache.rb

@@ -53,9 +53,10 @@ module RDF; module Util
 
     ##
     # @return [Boolean]
-    def has_capacity?
+    def capacity?
       @capacity.equal?(-1) || @capacity > @cache.size
     end
+    alias_method :has_capacity?, :capacity?
 
     ##
     # This implementation relies on `ObjectSpace#_id2ref` and performs
@@ -80,7 +81,7 @@ module RDF; module Util
       # @param  [Object] value
       # @return [Object]
       def []=(key, value)
-        if has_capacity?
+        if capacity?
           id = value.__id__
           @cache[key] = id
           @index[id] = key
@@ -133,7 +134,7 @@ module RDF; module Util
       # @param  [Object] value
       # @return [Object]
       def []=(key, value)
-        if has_capacity?
+        if capacity?
           @cache[key] = WeakRef.new(value)
         end
         value

data/lib/rdf/util/logger.rb

@@ -285,7 +285,7 @@ module RDF; module Util
       
       def respond_to_missing?(name, include_private = false)
         return true if 
-          [:fatal, :error, :warn, :info, :debug, :level, :sev_threshold]
+          %i(fatal error warn info debug level sev_threshold)
           .include?(name.to_sym)
         super
       end

data/lib/rdf/vocabulary.rb

@@ -430,7 +430,7 @@ module RDF
       # @param  [#to_s] property
       # @return [RDF::URI]
       def [](property)
-        if props.has_key?(property.to_sym)
+        if props.key?(property.to_sym)
           props[property.to_sym]
         else
           Term.intern([to_s, property.to_s].join(''), vocab: self, attributes: {})
@@ -508,7 +508,7 @@ module RDF
       #
       # @return [String]
       def to_s
-        @@uris.has_key?(self) ? @@uris[self].to_s : super
+        @@uris.key?(self) ? @@uris[self].to_s : super
       end
 
       ##
@@ -1153,7 +1153,7 @@ module RDF
              :onProperty, :someValuesFrom
           self.restriction?
         when :broader, :exactMatch, :hasTopConcept, :inScheme, :member, :narrower, :related
-          @attributes.has_key?(method)
+          @attributes.key?(method)
         else
           super
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.