solution.rb in rdf-3.1.10

- old
+ new

@@ -119,13 +119,15 @@
     #
     # @param  [Array<Symbol, #to_sym>] variables
     #   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.
     #
     # @yield  [variable]
@@ -251,11 +253,11 @@
     #   another query solution or hash bindings
     # @return [Boolean]
     # @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
 
     ##
     # Disjoint mapping
@@ -265,11 +267,11 @@
     # @param [RDF::Query::Solution] other
     # @return [Boolean]
     # @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
 
     ##
     # Isomorphic Mappings
@@ -279,11 +281,11 @@
     # @param [RDF::Query::Solution, #to_h] other
     #   another query solution or hash bindings
     # @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
     
     ##
     # @return [Array<Array(Symbol, RDF::Term)>}
@@ -330,20 +332,20 @@
     #   Return the binding for this name
     #
     #   @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
       end
     end
 
     ##
     # @return [Boolean]
     def respond_to_missing?(name, include_private = false)
-      @bindings.has_key?(name.to_sym) || super
+      @bindings.key?(name.to_sym) || super
     end
 
     ##
     # @private
     # @param  [Symbol, #to_sym] method