rdf 3.1.5 → 3.1.10

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/query/variable.rb

@@ -65,7 +65,7 @@ class RDF::Query
     #   the variable name
     # @param  [RDF::Term] value
     #   an optional variable value
-    # @param [Boolean] distinguished (true) Also interpreted by leading '??' or '$$' in name.
+    # @param [Boolean] distinguished (true) Also interpreted by leading '?' or '$' in name. If non-distinguished, '??' or '$$'.
     # @param [Boolean] existential (true) Also interpreted by leading '$' in name
     def initialize(name = nil, value = nil, distinguished: nil, existential: nil)
       name = (name || "g#{__id__.to_i.abs}").to_s
@@ -246,6 +246,16 @@ class RDF::Query
       end
     end
 
+    ##
+    # Returns term if var is the same as this variable.
+    #
+    # @param [Symbol] var
+    # @param [RDF::Term] term
+    # @return [RDF::Term]
+    def var_values(var, term)
+      term if var == name
+    end
+
     ##
     # Returns a string representation of this variable.
     #
@@ -265,5 +275,6 @@ class RDF::Query
       prefix = distinguished? ? (existential? ? '$' : '?') : (existential? ? '$$' : '??')
       unbound? ? "#{prefix}#{name}" : "#{prefix}#{name}=#{value}"
     end
+    alias_method :to_base, :to_s
   end # Variable
 end # RDF::Query

data/lib/rdf/reader.rb

@@ -160,10 +160,10 @@ module RDF
         end,
         RDF::CLI::Option.new(
           symbol: :rdfstar,
-          control: :select,
-          datatype: [:PG, :SA],
-          on: ["--rdf-star MODE"],
-          description: "Parse RDF*, either in Property Graph mode (PG) or Separate Assertions mode (SA).") {|arg| arg.to_sym},
+          datatype: TrueClass,
+          control: :checkbox,
+          on: ["--rdfstar"],
+          description: "Parse RDF*."),
         RDF::CLI::Option.new(
           symbol: :validate,
           datatype: TrueClass,
@@ -276,10 +276,8 @@ module RDF
     #   the encoding of the input stream
     # @param [Boolean]  intern       (true)
     #   whether to intern all parsed URIs
-    # @param [:PG, :SA] rdfstar      (nil)
+    # @param [Boolean] rdfstar      (false)
     #   support parsing RDF* statement resources.
-    #   If `:PG`, referenced statements are also emitted.
-    #   If `:SA`, referenced statements are not emitted.
     # @param [Hash]     prefixes     (Hash.new)
     #   the prefix mappings to use (not supported by all readers)
     # @param  [Hash{Symbol => Object}] options
@@ -295,7 +293,7 @@ module RDF
                    encoding:      Encoding::UTF_8,
                    intern:        true,
                    prefixes:      Hash.new,
-                   rdfstar:       nil,
+                   rdfstar:       false,
                    validate:      false,
                    **options,
                    &block)
@@ -401,9 +399,6 @@ module RDF
     # Statements are yielded in the order that they are read from the input
     # stream.
     #
-    # If the `rdfstar` option is `:PG` and triples include
-    # embedded statements, they are also enumerated.
-    #
     # @overload each_statement
     #   @yield  [statement]
     #     each statement
@@ -423,7 +418,6 @@ module RDF
           loop do
             st = read_statement
             block.call(st)
-            each_pg_statement(st, &block) if options[:rdfstar] == :PG
           end
         rescue EOFError
           rewind rescue nil
@@ -441,9 +435,6 @@ module RDF
     # Triples are yielded in the order that they are read from the input
     # stream.
     #
-    # If the `rdfstar` option is `:PG` and triples include
-    # embedded statements, they are also enumerated.
-    #
     # @overload each_triple
     #   @yield  [subject, predicate, object]
     #     each triple
@@ -464,10 +455,6 @@ module RDF
           loop do
             triple = read_triple
             block.call(*triple)
-            if options[:rdfstar] == :PG
-              block.call(*triple[0].to_a) if triple[0].is_a?(Statement)
-              block.call(*triple[2].to_a) if triple[2].is_a?(Statement)
-            end
           end
         rescue EOFError
           rewind rescue nil

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,19 +411,19 @@ 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
               []
             end
             ss.each do |s, ps|
               ps = if predicate.nil? || predicate.is_a?(RDF::Query::Variable)
-                  ps
-                elsif ps.has_key?(predicate)
-                  { predicate => ps[predicate] }
-                else
-                  []
-                end
+                ps
+              elsif ps.key?(predicate)
+                { predicate => ps[predicate] }
+              else
+                []
+              end
               ps.each do |p, os|
                 os.each do |o, object_options|
                   next unless object.nil? || object.eql?(o)
@@ -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

@@ -17,6 +17,9 @@ module RDF; module Util
   # @see   http://en.wikipedia.org/wiki/Weak_reference
   # @since 0.2.0
   class Cache
+    # The configured cache capacity.
+    attr_reader :capacity
+
     ##
     # @private
     def self.new(*args)
@@ -36,8 +39,8 @@ module RDF; module Util
 
     ##
     # @param  [Integer] capacity
-    def initialize(capacity = -1)
-      @capacity = capacity
+    def initialize(capacity = nil)
+      @capacity = capacity || RDF.config.cache_size
       @cache  ||= {}
       @index  ||= {}
     end
@@ -50,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
@@ -77,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
@@ -106,7 +110,7 @@ module RDF; module Util
     class WeakRefCache < Cache
       ##
       # @param  [Integer] capacity
-      def initialize(capacity = -1)
+      def initialize(capacity = nil)
         require 'weakref' unless defined?(::WeakRef)
         super
       end
@@ -130,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/vocab/writer.rb

@@ -263,7 +263,7 @@ module RDF
 
       def serialize_value(value, key, indent: "")
         if value.is_a?(Literal) && %w(: comment definition notation note editorialNote).include?(key.to_s)
-          "%(#{value.to_s.gsub('(', '\(').gsub(')', '\)')}).freeze"
+          "#{value.to_s.inspect}.freeze"
         elsif value.is_a?(RDF::URI)
           "#{value.pname.inspect}.freeze"
         elsif value.is_a?(RDF::Vocabulary::Term)

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
 
       ##
@@ -731,7 +731,7 @@ module RDF
     # @param  [#to_s] property
     # @return [URI]
     def [](property)
-      Term.intern([to_s, property.to_s].join(''), vocab: self.class, attributes: {})
+      Term.intern([to_s, property.to_s].join(''), vocab: self, attributes: {})
     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

data/lib/rdf/writer.rb

@@ -516,7 +516,7 @@ module RDF
         when RDF::Literal   then format_literal(term, **options)
         when RDF::URI       then format_uri(term, **options)
         when RDF::Node      then format_node(term, **options)
-        when RDF::Statement then format_rdfstar(term, **options)
+        when RDF::Statement then format_embTriple(term, **options)
         else nil
       end
     end
@@ -574,7 +574,7 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_rdfstar(value, **options)
+    def format_embTriple(value, **options)
       raise NotImplementedError.new("#{self.class}#format_statement") # override in subclasses
     end