rdf 3.1.6 → 3.1.11

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

@@ -27,11 +27,6 @@ module RDF
   class URI
     include RDF::Resource
 
-    ##
-    # Defines the maximum number of interned URI references that can be held
-    # cached in memory at any one time.
-    CACHE_SIZE = -1 # unlimited by default
-    
     # IRI components
     UCSCHAR = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
       [\\u00A0-\\uD7FF]|[\\uF900-\\uFDCF]|[\\uFDF0-\\uFFEF]|
@@ -117,11 +112,13 @@ module RDF
     ).freeze
 
     ##
+    # Cache size may be set through {RDF.config} using `uri_cache_size`.
+    #
     # @return [RDF::Util::Cache]
     # @private
     def self.cache
       require 'rdf/util/cache' unless defined?(::RDF::Util::Cache)
-      @cache ||= RDF::Util::Cache.new(CACHE_SIZE)
+      @cache ||= RDF::Util::Cache.new(RDF.config.uri_cache_size)
     end
 
     ##
@@ -229,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)
@@ -311,12 +308,22 @@ module RDF
     # @param [#to_s] base_uri
     # @return [RDF::URI]
     def relativize(base_uri)
-      if base_uri.to_s.end_with?("/", "#") &&
+      if self.to_s.start_with?(base_uri.to_s) && %w(# ?).include?(self.to_s[base_uri.to_s.length, 1]) ||
+         base_uri.to_s.end_with?("/", "#") &&
          self.to_s.start_with?(base_uri.to_s)
-        RDF::URI(self.to_s[base_uri.to_s.length..-1])
+        return RDF::URI(self.to_s[base_uri.to_s.length..-1])
       else
-        self
+        # Create a list of parents, for which this IRI may be relative.
+        u = RDF::URI(base_uri)
+        iri_set = u.to_s.end_with?('/') ? [u.to_s] : []
+        iri_set << u.to_s while (u = u.parent)
+        iri_set.each_with_index do |bb, index|
+          next unless self.to_s.start_with?(bb)
+          rel = "../" * index + self.to_s[bb.length..-1]
+          return rel.empty? ? "./" : rel
+        end
       end
+      self
     end
 
     ##
@@ -409,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)
@@ -573,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
 
@@ -581,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
@@ -1115,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
@@ -1145,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/nquads.rb

@@ -69,9 +69,9 @@ module RDF
 
           begin
             unless blank? || read_comment
-              subject   = read_uriref || read_node || read_rdfstar || fail_subject
+              subject   = read_uriref || read_node || read_embTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_rdfstar || fail_object
+              object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)

data/lib/rdf/ntriples/reader.rb

@@ -213,7 +213,7 @@ module RDF::NTriples
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_rdfstar
+        value = read_uriref || read_node || read_literal || read_embTriple
         log_recover
         value
       end
@@ -229,9 +229,9 @@ module RDF::NTriples
 
         begin
           unless blank? || read_comment
-            subject   = read_uriref || read_node || read_rdfstar || fail_subject
+            subject   = read_uriref || read_node || read_embTriple || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_rdfstar || fail_object
+            object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -247,11 +247,11 @@ module RDF::NTriples
 
     ##
     # @return [RDF::Statement]
-    def read_rdfstar
+    def read_embTriple
       if @options[:rdfstar] && match(ST_START)
-        subject   = read_uriref || read_node || read_rdfstar || fail_subject
+        subject   = read_uriref || read_node || read_embTriple || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
-        object    = read_uriref || read_node || read_literal || read_rdfstar || fail_object
+        object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
         if !match(ST_END)
           log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
         end

data/lib/rdf/ntriples/writer.rb

@@ -227,7 +227,7 @@ module RDF::NTriples
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
-    def format_rdfstar(statement, **options)
+    def format_embTriple(statement, **options)
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
     ##
@@ -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

@@ -255,7 +255,7 @@ module RDF
     # @see    RDF::Query::Pattern#cost
     # @since  0.3.0
     def optimize!(**options)
-      optional, required = @patterns.partition(&:optional?)
+      optional, required = @patterns.uniq.partition(&:optional?)
       required.sort! do |a, b|
         (a.cost || 0) <=> (b.cost || 0)
       end

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/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,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