rdf 3.1.8 → 3.1.13

data/lib/rdf/model/term.rb

@@ -57,11 +57,21 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Term}.
+    # @overload term?
+    #   Returns `true` if `self` is a {RDF::Term}.
     #
-    # @return [Boolean]
-    def term?
-      true
+    #   @return [Boolean]
+    # @overload term?(name)
+    #   Returns `true` if `self` contains the given RDF subject term.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    def term?(*args)
+      case args.length
+      when 0 then true
+      when 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##
@@ -72,6 +82,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/model/value.rb

@@ -29,19 +29,38 @@ module RDF
   # @see RDF::Statement
   module Value
     ##
-    # Returns `true` if `self` is a {RDF::Graph}.
+    # @overload graph?
+    #   Returns `true` if `self` is a {RDF::Graph}.
     #
-    # @return [Boolean]
-    def graph?
-      false
+    #   @return [Boolean]
+    # @overload graph?(name)
+    #   Returns `true` if `self` contains the given RDF graph_name.
+    #
+    #   @param  [RDF::Resource, false] graph_name
+    #     Use value `false` to query for the default graph_name
+    #   @return [Boolean]
+    def graph?(*args)
+      case args.length
+      when 0, 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##
-    # Is this a {RDF::Statement}?
+    # @overload statement?
+    #   Returns `true` if `self` is a {RDF::Statement}.
     #
-    # @return [Boolean]
-    def statement?
-      false
+    #   @return [Boolean]
+    # @overload statement?(statement)
+    #   Returns `true` if `self` contains the given {RDF::Statement}.
+    #
+    #   @param  [RDF::Statement] statement
+    #   @return [Boolean]
+    def statement?(*args)
+      case args.length
+      when 0, 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##
@@ -53,11 +72,20 @@ module RDF
     end
 
     ##
-    # Is this a {RDF::Term}?
+    # @overload term?
+    #   Returns `true` if `self` is a {RDF::Term}.
     #
-    # @return [Boolean]
-    def term?
-      false
+    #   @return [Boolean]
+    # @overload term?(name)
+    #   Returns `true` if `self` contains the given RDF subject term.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    def term?(*args)
+      case args.length
+      when 0, 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##
@@ -103,12 +131,21 @@ module RDF
     end
 
     ##
-    # Is this a {RDF::Query::Variable}, or does it contain a variable?
+    # @overload variable?
+    #   Returns `true` if `self` is a {RDF::Query::Variable}, or does it contain a variable?
     #
-    # @return [Boolean]
+    #   @return [Boolean]
+    # @overload variable?(variable)
+    #   Returns `true` if `self` contains the given variable.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
     # @since  0.1.7
-    def variable?
-      false
+    def variable?(*args)
+      case args.length
+      when 0, 1 then false
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##

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.rb

@@ -443,11 +443,22 @@ module RDF
     end
 
     ##
-    # Returns `true` if any pattern contains a variable.
+    # @overload variable?
+    #   Returns `true` if any pattern contains a variable.
     #
-    # @return [Boolean]
-    def variable?
-      !variables.empty?
+    #   @return [Boolean]
+    # @overload variable?(variables)
+    #   Returns `true` if any pattern contains any of the variables.
+    #
+    #   @param  [Array<Symbol, #to_sym>] variables
+    #   @return [Boolean]
+    def variable?(*args)
+      case args.length
+      when 0 then !variables.empty?
+      when 1
+        patterns.any? {|p| p.variable?(*args)}
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
     alias_method :variables?, :variable?
     alias_method :has_variables?, :variable?

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

@@ -23,10 +23,13 @@ class RDF::Query
   class Solution
     # Undefine all superfluous instance methods:
     alias_method :__send, :send
+
+    # Temporarily remember instance method for deprecation message in `method_missing`.
+    INSTANCE_METHODS = instance_methods
     undef_method(*instance_methods.
                   map(&:to_s).
                   select {|m| m.match?(/^\w+$/)}.
-                  reject {|m| %w(object_id dup instance_eval inspect to_s private_methods class should should_not pretty_print).include?(m) || m[0,2] == '__'}.
+                  reject {|m| %w(object_id dup instance_eval inspect to_s private_methods public_methods class method pretty_print).include?(m) || m[0,2] == '__'}.
                   map(&:to_sym))
 
     include Enumerable
@@ -114,16 +117,27 @@ class RDF::Query
     end
 
     ##
-    # Returns `true` if this solution contains bindings for any of the given
+    # @overload variable?
+    #   Returns `false`.
+    #
+    #   @return [Boolean]
+    # @overload variable?(variables)
+    #   Returns `true` if this solution contains bindings for any of the given
     # `variables`.
     #
-    # @param  [Array<Symbol, #to_sym>] variables
-    #   an array of variables to check
-    # @return [Boolean] `true` or `false`
+    #   @param  [Array<Symbol, #to_sym>] variables
+    #   @return [Boolean]
     # @since  0.3.0
-    def has_variables?(variables)
-      variables.any? { |variable| bound?(variable) }
+    def variable?(*args)
+      case args.length
+      when 0 then false
+      when 1
+        args.first.any? { |variable| bound?(variable) }
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
+    alias_method :variables?, :variable?
+    alias_method :has_variables?, :variable?
 
     ##
     # Enumerates over every variable in this solution.
@@ -253,7 +267,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 +281,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 +295,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 +346,13 @@ 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)
+        if INSTANCE_METHODS.include?(name)
+          warn "[DEPRECATION] RDF::Query::Solution##{name} is an overridden instance method.\n" +
+               "Its use as a solution accessor is deprecated and will be removed in a future version.\n" +
+               "Use #[] for safe access.\n" +
+               "Called from #{Gem.location_of_caller.join(':')}"
+        end
         @bindings[name.to_sym]
       else
         super # raises NoMethodError
@@ -342,7 +362,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

@@ -78,17 +78,28 @@ module RDF; class Query
     end
 
     ##
-    # Returns `true` if this solution sequence contains bindings for any of
+    # @overload variable?
+    #   Returns `false`.
+    #
+    #   @return [Boolean]
+    # @overload variable?(variables)
+    #   Returns `true` if this solution sequence contains bindings for any of
     # the given `variables`.
     #
-    # @param  [Array<Symbol, #to_sym>] variables
-    #   an array of variables to check
-    # @return [Boolean] `true` or `false`
-    # @see    RDF::Query::Solution#has_variables?
+    #   @param  [Array<Symbol, #to_sym>] variables
+    #   @return [Boolean]
+    # @see    RDF::Query::Solution#variable?
     # @see    RDF::Query#execute
-    def have_variables?(variables)
-      self.any? { |solution| solution.has_variables?(variables) }
+    def variable?(*args)
+      case args.length
+      when 0 then false
+      when 1
+        self.any? { |solution| solution.variables?(args.first) }
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
+    alias_method :variables?, :variable?
+    alias_method :have_variables?, :variable?
     alias_method :has_variables?, :have_variables?
 
     ##

data/lib/rdf/query/variable.rb

@@ -87,13 +87,27 @@ class RDF::Query
     end
 
     ##
-    # Returns `true`.
+    # @overload variable?
+    #   Returns `true` if `self` is a {RDF::Query::Variable}, or does it contain a variable?
     #
-    # @return [Boolean]
-    # @see    RDF::Term#variable?
+    #   @return [Boolean]
+    # @overload variable?(variable)
+    #   Returns `true` if `self` contains the given variable.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
     # @since  0.1.7
-    def variable? 
-      true
+    def variable?(*args)
+      case args.length
+      when 0 then true
+      when 1
+        case variable = args.first
+        when RDF::Query::Variable then self == variable
+        when Symbol then to_sym == variable
+        else false
+        end
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
     end
 
     ##