rdf 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d123aacfde151f76648a3593e62fb0821441c67cf8668983becd2b1800ef41
-  data.tar.gz: 42ecb0370f71b7487f0255af21a8959365138da7c5791c68a3e7aaa2f7a63a2e
+  metadata.gz: 3d464dd558551830f9c3948ffc879108e5619ef12384a0df1b0d25c0859a95ab
+  data.tar.gz: a3df4023d8417ffa7f94a95b9c2c2f5cb87eecbdcfb8ab89ae8c9b49d63f3060
 SHA512:
-  metadata.gz: 22b1e9556b6327e9e8aaaa0f244ffc04565d9c9ef7d075d14f5636672596c40fbb544d49c1bafcc11f2bf90799f85c2ae2fbfb8afbcc6148e5ee357e2d5cde22
-  data.tar.gz: d86ba20c17b43f887fc5609897cc24814ccf75c2bb4f0d0a8dd5a164e531e55442960e9733792aad628075b811b31f066e18182b8864bdfa0287317280417630
+  metadata.gz: 76afd5faf910dcc364f6367590654d69eabbcc409ee6e3b9892b1871c4c760e70f31aea6958394b80b16b04117868acd0adecf602e64b3030a4bf5fa81eb229f
+  data.tar.gz: 277b395451e0109f442a86ae41da2cebac078d41799beec31194d38e0cea4163092bb756ef8f435ead80d6078c48c27ec2a00b9c569be4044e36e9cd3e4b870b

data/VERSION

@@ -1 +1 @@
-3.0.9
+3.0.10

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

@@ -7,7 +7,7 @@ module RDF; class Literal
   class DateTime < Literal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#dateTime")
     GRAMMAR  = %r(\A(-?(?:\d{4}|[1-9]\d{4,})-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%Y-%m-%dT%H:%M:%S%:z'.freeze
+    FORMAT   = '%Y-%m-%dT%H:%M:%S.%L%:z'.freeze
 
     ##
     # @param  [DateTime] value
@@ -31,9 +31,9 @@ module RDF; class Literal
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
-          @object.strftime(FORMAT[0..-4])
+          @object.strftime(FORMAT[0..-4]).sub('.000', '')
         end
       end
       self
@@ -80,6 +80,16 @@ module RDF; class Literal
       super && object && value !~ %r(\A0000)
     end
 
+    ##
+    # Does the literal representation include millisectonds?
+    #
+    # @return [Boolean]
+    # @since 1.1.6
+    def has_milliseconds?
+      self.format("%L").to_i > 0
+    end
+    alias_method :has_ms?, :has_milliseconds?
+
     ##
     # Does the literal representation include a timezone? Note that this is only possible if initialized using a string, or `:lexical` option.
     #
@@ -98,7 +108,7 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || @object.strftime(FORMAT).sub("+00:00", 'Z')
+      @string || @object.strftime(FORMAT).sub("+00:00", 'Z').sub('.000', '')
     end
 
     ##

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

@@ -12,7 +12,7 @@ module RDF; class Literal
   class Time < Literal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#time")
     GRAMMAR  = %r(\A(\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%H:%M:%S%:z'.freeze
+    FORMAT   = '%H:%M:%S.%L%:z'.freeze
 
     ##
     # @param  [String, DateTime, #to_datetime] value
@@ -43,9 +43,9 @@ module RDF; class Literal
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z').sub('.000', '')
         else
-          @object.strftime(FORMAT[0..-4])
+          @object.strftime(FORMAT[0..-4]).sub('.000', '')
         end
       end
       self
@@ -91,7 +91,7 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || @object.strftime(FORMAT).sub("+00:00", 'Z')
+      @string || @object.strftime(FORMAT).sub("+00:00", 'Z').sub('.000', '')
     end
 
     ##
@@ -122,7 +122,7 @@ module RDF; class Literal
         return super unless other.valid?
         # Compare as strings, as time includes a date portion, and adjusting for UTC
         # can create a mismatch in the date portion.
-        self.object.new_offset.strftime('%H%M%S') == other.object.new_offset.strftime('%H%M%S')
+        self.object.new_offset.strftime('%H%M%S.%L') == other.object.new_offset.strftime('%H%M%S.%L')
       when Literal::DateTime, Literal::Date
         false
       else

data/lib/rdf/model/statement.rb

@@ -57,6 +57,9 @@ module RDF
     # @return [RDF::Term]
     attr_accessor :object
 
+    # @return [Hash{Symbol => Object}]
+    attr_accessor :options
+
     ##
     # @overload initialize(**options)
     #   @param  [Hash{Symbol => Object}] options

data/lib/rdf/model/uri.rb

@@ -169,8 +169,7 @@ module RDF
     def self.normalize_path(path)
       output, input = "", path.to_s
       if input.encoding != Encoding::ASCII_8BIT
-        input = input.dup if input.frozen?
-        input = input.force_encoding(Encoding::ASCII_8BIT)
+        input = input.dup.force_encoding(Encoding::ASCII_8BIT)
       end
       until input.empty?
         if input.match(RDS_2A)
@@ -228,8 +227,7 @@ module RDF
       if uri
         @value = uri.to_s
         if @value.encoding != Encoding::UTF_8
-          @value = @value.dup if @value.frozen?
-          @value.force_encoding(Encoding::UTF_8)
+          @value.dup.force_encoding(Encoding::UTF_8)
           @value.freeze
         end
       else
@@ -842,16 +840,16 @@ module RDF
         user, password = userinfo.to_s.split(':', 2)
         host, port = hostport.to_s.split(':', 2)
 
-        parts[:scheme] = (scheme.force_encoding(Encoding::UTF_8) if scheme)
-        parts[:authority] = (authority.force_encoding(Encoding::UTF_8) if authority)
-        parts[:userinfo] = (userinfo.force_encoding(Encoding::UTF_8) if userinfo)
-        parts[:user] = (user.force_encoding(Encoding::UTF_8) if user)
-        parts[:password] = (password.force_encoding(Encoding::UTF_8) if password)
-        parts[:host] = (host.force_encoding(Encoding::UTF_8) if host)
+        parts[:scheme] = (scheme.dup.force_encoding(Encoding::UTF_8) if scheme)
+        parts[:authority] = (authority.dup.force_encoding(Encoding::UTF_8) if authority)
+        parts[:userinfo] = (userinfo.dup.force_encoding(Encoding::UTF_8) if userinfo)
+        parts[:user] = (user.dup.force_encoding(Encoding::UTF_8) if user)
+        parts[:password] = (password.dup.force_encoding(Encoding::UTF_8) if password)
+        parts[:host] = (host.dup.force_encoding(Encoding::UTF_8) if host)
         parts[:port] = (::URI.decode(port).to_i if port)
-        parts[:path] = (path.to_s.force_encoding(Encoding::UTF_8) unless path.empty?)
-        parts[:query] = (query[1..-1].force_encoding(Encoding::UTF_8) if query)
-        parts[:fragment] = (fragment[1..-1].force_encoding(Encoding::UTF_8) if fragment)
+        parts[:path] = (path.to_s.dup.force_encoding(Encoding::UTF_8) unless path.empty?)
+        parts[:query] = (query[1..-1].dup.force_encoding(Encoding::UTF_8) if query)
+        parts[:fragment] = (fragment[1..-1].dup.force_encoding(Encoding::UTF_8) if fragment)
       end
       
       parts
@@ -869,7 +867,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def scheme=(value)
-      object[:scheme] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:scheme] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @value = nil
       self
     end
@@ -893,7 +891,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def user=(value)
-      object[:user] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:user] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @object[:userinfo] = format_userinfo("")
       @object[:authority] = format_authority
       @value = nil
@@ -919,7 +917,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def password=(value)
-      object[:password] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:password] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @object[:userinfo] = format_userinfo("")
       @object[:authority] = format_authority
       @value = nil
@@ -947,7 +945,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def host=(value)
-      object[:host] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:host] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @object[:authority] = format_authority
       @value = nil
       self
@@ -1010,7 +1008,7 @@ module RDF
       if value
         # Always lead with a slash
         value = "/#{value}" if host && value.to_s.match?(/^[^\/]/)
-        object[:path] = value.to_s.force_encoding(Encoding::UTF_8)
+        object[:path] = value.to_s.dup.force_encoding(Encoding::UTF_8)
       else
         object[:path] = nil
       end
@@ -1069,7 +1067,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def query=(value)
-      object[:query] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:query] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @value = nil
       self
     end
@@ -1093,7 +1091,7 @@ module RDF
     # @param [String, #to_s] value
     # @return [RDF::URI] self
     def fragment=(value)
-      object[:fragment] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:fragment] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       @value = nil
       self
     end
@@ -1118,7 +1116,7 @@ module RDF
     # @return [RDF::URI] self
     def authority=(value)
       object.delete_if {|k, v| [:user, :password, :host, :port, :userinfo].include?(k)}
-      object[:authority] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:authority] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       user; password; userinfo; host; port
       @value = nil
       self
@@ -1148,7 +1146,7 @@ module RDF
     # @return [RDF::URI] self
     def userinfo=(value)
       object.delete_if {|k, v| [:user, :password, :authority].include?(k)}
-      object[:userinfo] = (value.to_s.force_encoding(Encoding::UTF_8) if value)
+      object[:userinfo] = (value.to_s.dup.force_encoding(Encoding::UTF_8) if value)
       user; password; authority
       @value = nil
       self
@@ -1263,6 +1261,26 @@ module RDF
       return res
     end
 
+    ##
+    # Dump of data needed to reconsitute this object using Marshal.load
+    # This override is needed to avoid serializing @mutex.
+    #
+    # @param [Integer] level The maximum depth of objects to dump.
+    # @return [String] The dump of data needed to reconsitute this object.
+    def _dump(level)
+      value
+    end
+
+    ##
+    # Load dumped data to reconsitute marshaled object
+    # This override is needed to avoid serializing @mutex.
+    #
+    # @param [String] data The dump of data needed to reconsitute this object.
+    # @return [RDF::URI] The reconsituted object.
+    def self._load(data)
+      new(data)
+    end
+
   private
 
     ##
@@ -1274,8 +1292,7 @@ module RDF
     # @return [String]
     def normalize_segment(value, expr, downcase = false)
       if value
-        value = value.dup if value.frozen?
-        value = value.force_encoding(Encoding::UTF_8)
+        value = value.dup.force_encoding(Encoding::UTF_8)
         decoded = ::URI.decode(value)
         decoded.downcase! if downcase
         ::URI.encode(decoded, /[^(?:#{expr})]/)

data/lib/rdf/ntriples/reader.rb

@@ -32,7 +32,7 @@ module RDF::NTriples
     format RDF::NTriples::Format
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    ESCAPE_CHARS    = ["\b", "\f", "\t", "\n", "\r", "\"", "\\"].freeze
+    ESCAPE_CHARS    = ["\b", "\f", "\t", "\n", "\r", "\"", "'", "\\"].freeze
     UCHAR4          = /\\u([0-9A-Fa-f]{4,4})/.freeze
     UCHAR8          = /\\U([0-9A-Fa-f]{8,8})/.freeze
     UCHAR           = Regexp.union(UCHAR4, UCHAR8).freeze
@@ -60,7 +60,7 @@ module RDF::NTriples
     # 166s
     PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/.freeze
     # 159s
-    ECHAR                = /\\[tbnrf\\"]/.freeze
+    ECHAR                = /\\[tbnrf"'\\]/.freeze
     # 18
     IRIREF               = /<((?:#{IRI_RANGE}|#{UCHAR})*)>/.freeze
     # 141s
@@ -135,7 +135,6 @@ module RDF::NTriples
     # @return [RDF::URI]
     def self.parse_uri(input, intern: false, **options)
       if input =~ URIREF
-        uri_str = unescape($1)
         RDF::URI.send(intern ? :intern : :new, unescape($1))
       end
     end
@@ -155,9 +154,16 @@ module RDF::NTriples
     end
 
     # cache constants to optimize escaping the escape chars in self.unescape
-    ESCAPE_CHARS_ESCAPED = ESCAPE_CHARS.each_with_object({}) do |escape, memo|
-      memo[escape.inspect[1...-1]] = escape
-    end.freeze
+    ESCAPE_CHARS_ESCAPED = {
+      "\\b"   =>  "\b",
+      "\\f"   =>  "\f",
+      "\\t"   =>  "\t",
+      "\\n"   =>  "\n",
+      "\\r"   =>  "\r",
+      "\\\""  =>  "\"",
+      "\\'"   =>  "'",
+      "\\\\"  =>  "\\"
+    } .freeze
     ESCAPE_CHARS_ESCAPED_REGEXP = Regexp.union(
       ESCAPE_CHARS_ESCAPED.keys
     ).freeze
@@ -171,26 +177,23 @@ module RDF::NTriples
     def self.unescape(string)
       # Note: avoiding copying the input string when no escaping is needed
       # greatly reduces the number of allocations and the processing time.
-      unless string.encoding == Encoding::UTF_8
-        string = string.dup.force_encoding(Encoding::UTF_8)
-      end
-
-      has_escape_chars = ESCAPE_CHARS_ESCAPED_REGEXP.match?(string)
-      has_uchar = UCHAR.match?(string)
-
-      string = string.dup if has_escape_chars || has_uchar
+      string = string.dup.force_encoding(Encoding::UTF_8) unless string.encoding == Encoding::UTF_8
+      scanner = StringScanner.new(string)
 
-      # Decode \t|\n|\r|\"|\\ character escapes using Regexp:
-      string.gsub!(ESCAPE_CHARS_ESCAPED_REGEXP) do
-        ESCAPE_CHARS_ESCAPED.fetch($~[0])
-      end if has_escape_chars
+      buffer = ""
 
-      # Decode \uXXXX and \UXXXXXXXX code points:
-      string.gsub!(UCHAR) do
-        [($1 || $2).hex].pack('U*')
-      end if has_uchar
+      while !scanner.eos?
+        buffer << if scanner.scan(ESCAPE_CHARS_ESCAPED_REGEXP)
+          ESCAPE_CHARS_ESCAPED[scanner.matched]
+        elsif scanner.scan(UCHAR)
+          scanner.matched.sub(UCHAR) {[($1 || $2).hex].pack('U*')}
+        else
+          # Scan one character
+          scanner.getch
+        end
+      end
 
-      string
+      buffer
     end
 
     ##
@@ -250,7 +253,7 @@ module RDF::NTriples
         uri.canonicalize! if canonicalize?
         uri
       end
-    rescue ArgumentError => e
+    rescue ArgumentError
       log_error("Invalid URI (found: \"<#{uri_str}>\")", lineno: lineno, token: "<#{uri_str}>", exception: RDF::ReaderError)
     end
 
@@ -258,7 +261,7 @@ module RDF::NTriples
     # @return [RDF::Node]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (nodeID)
     def read_node
-       if node_id = match(NODEID)
+      if node_id = match(NODEID)
         @nodes ||= {}
         @nodes[node_id] ||= RDF::Node.new(node_id)
       end

data/lib/rdf/ntriples/writer.rb

@@ -42,7 +42,7 @@ module RDF::NTriples
     format RDF::NTriples::Format
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    ESCAPE_PLAIN = /\A[\x20-\x21\x23-#{Regexp.escape '['}#{Regexp.escape ']'}-\x7E]*\z/m.freeze
+    ESCAPE_PLAIN = /\A[\x20-\x21\x23-\x26\x28#{Regexp.escape '['}#{Regexp.escape ']'}-\x7E]*\z/m.freeze
     ESCAPE_PLAIN_U = /\A(?:#{Reader::IRI_RANGE}|#{Reader::UCHAR})*\z/.freeze
 
     ##
@@ -116,6 +116,8 @@ module RDF::NTriples
     # sequences, otherwise, assume the test-cases escape sequences. Otherwise,
     # the N-Triples recommendation includes `\b` and `\f` escape sequences.
     #
+    # Within STRING_LITERAL_QUOTE, only the characters `U+0022`, `U+005C`, `U+000A`, `U+000D` are encoded using `ECHAR`. `ECHAR` must not be used for characters that are allowed directly in STRING_LITERAL_QUOTE.
+    #
     # @param  [Integer, #ord] u
     # @return [String]
     # @raise  [ArgumentError] if `u` is not a valid Unicode codepoint
@@ -124,11 +126,7 @@ module RDF::NTriples
     def self.escape_ascii(u, encoding)
       case (u = u.ord)
         when (0x00..0x07) then escape_utf16(u)
-        when (0x08)       then (encoding && encoding == Encoding::ASCII ? escape_utf16(u) : "\\b")
-        when (0x09)       then "\\t"
         when (0x0A)       then "\\n"
-        when (0x0B)       then escape_utf16(u)
-        when (0x0C)       then (encoding && encoding == Encoding::ASCII ? escape_utf16(u) : "\\f")
         when (0x0D)       then "\\r"
         when (0x0E..0x1F) then escape_utf16(u)
         when (0x22)       then "\\\""
@@ -264,7 +262,7 @@ module RDF::NTriples
             string.each_char do |u|
               buffer << case u.ord
                 when (0x00..0x20) then self.class.escape_utf16(u)
-                when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # <>"{}|`\
+                when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # "<>\^`{|}
                   self.class.escape_utf16(u)
                 else u
               end
@@ -278,7 +276,7 @@ module RDF::NTriples
             string.each_byte do |u|
               buffer << case u
                 when (0x00..0x20) then self.class.escape_utf16(u)
-                when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # <>"{}|`\
+                when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # "<>\^`{|}
                   self.class.escape_utf16(u)
                 when (0x80..0xFFFF)                then self.class.escape_utf16(u)
                 when (0x10000..0x10FFFF)           then self.class.escape_utf32(u)

data/lib/rdf/query.rb

@@ -171,10 +171,12 @@ module RDF
     #     Alias for `:graph_name`.
     #   @param  [Hash{Symbol => Object}] options
     #     any additional keyword options
+    # @option options [Boolean] validate (false)
+    #   validate patterns
     #   @yield  [query]
     #   @yieldparam  [RDF::Query] query
     #   @yieldreturn [void] ignored
-    def initialize(*patterns, solutions: nil, graph_name: nil, name: nil, **options, &block)
+    def initialize(*patterns, solutions: nil, graph_name: nil, name: nil, validate: false, **options, &block)
       @options = options.dup
       @solutions = Query::Solutions(solutions)
       graph_name = name if graph_name.nil?
@@ -195,6 +197,8 @@ module RDF
           else instance_eval(&block)
         end
       end
+
+      validate! if validate
     end
 
     ##
@@ -291,7 +295,6 @@ module RDF
     # @see    http://www.holygoat.co.uk/blog/entry/2005-10-25-1
     # @see    http://www.w3.org/TR/sparql11-query/#emptyGroupPattern
     def execute(queryable, solutions: Solution.new, graph_name: nil, name: nil, **options, &block)
-      validate!
       options = {bindings: {}}.merge(options)
 
       # Use provided solutions to allow for query chaining
@@ -356,8 +359,9 @@ module RDF
         return @solutions if @solutions.empty?
 
         if !pattern.optional?
-          # We have no solutions for variables we should have solutions for:
-          need_vars = pattern.variables.keys
+          # We have no solutions for variables we should have solutions for
+          # (excludes non-distinguished variables):
+          need_vars = pattern.variables.select {|k,v| v.distinguished?}.keys
           @solutions.each do |solution|
             break if need_vars.empty?
             need_vars -= solution.bindings.keys
@@ -516,12 +520,12 @@ module RDF
     end
 
     ##
-    # Determine if the URI is a valid according to RFC3987
+    # Determine if the query containts valid patterns
     #
     # @return [Boolean] `true` or `false`
     # @since 0.3.9
     def valid?
-      !!validate!
+      !!validate! rescue raise false
     rescue
       false
     end

data/lib/rdf/query/pattern.rb

@@ -47,6 +47,13 @@ module RDF; class Query
       @subject    = Variable.new(@subject)    if @subject.is_a?(Symbol)
       @predicate  = Variable.new(@predicate)  if @predicate.is_a?(Symbol)
       @object     = Variable.new(@object)     if @object.is_a?(Symbol)
+
+      # Estmate cost positionally, with variables being least expensive as objects, then predicates, then subjects, then graph_names.
+      # XXX does not consider bound variables, which would need to be dynamically calculated.
+      @cost = (@object.nil?     || @object.is_a?(Variable)      ? 1 : 0) +
+              (@predicate.nil?  || @predicate.is_a?(Variable)   ? 2 : 0) +
+              (@subject.nil?    || @subject.is_a?(Variable)     ? 4 : 0) +
+              (@graph_name.is_a?(Variable)                      ? 8 : 0)
       super
     end
 

data/lib/rdf/query/solution.rb

@@ -22,6 +22,7 @@ class RDF::Query
   #
   class Solution
     # Undefine all superfluous instance methods:
+    alias_method :__send, :send
     undef_method(*instance_methods.
                   map(&:to_s).
                   select {|m| m.match?(/^\w+$/)}.
@@ -57,10 +58,20 @@ class RDF::Query
     # @yieldparam [RDF::Term] value
     # @return [Enumerator]
     def each_binding(&block)
-      @bindings.each(&block)
+      @bindings.each(&block) if block_given?
+      enum_binding
     end
     alias_method :each, :each_binding
 
+    ##
+    # Returns an enumerator for {#each_binding}.
+    #
+    # @return [Enumerator<RDF::Resource>]
+    # @see    #each_subject
+    def enum_binding
+      enum_for(:each_binding)
+    end
+
     ##
     # Enumerates over every variable name in this solution.
     #
@@ -68,10 +79,20 @@ class RDF::Query
     # @yieldparam [Symbol] name
     # @return [Enumerator]
     def each_name(&block)
-      @bindings.each_key(&block)
+      @bindings.each_key(&block) if block_given?
+      enum_name
     end
     alias_method :each_key, :each_name
 
+    ##
+    # Returns an enumerator for {#each_name}.
+    #
+    # @return [Enumerator<RDF::Resource>]
+    # @see    #each_subject
+    def enum_name
+      enum_for(:each_name)
+    end
+
     ##
     # Enumerates over every variable value in this solution.
     #
@@ -79,7 +100,17 @@ class RDF::Query
     # @yieldparam [RDF::Term] value
     # @return [Enumerator]
     def each_value(&block)
-      @bindings.each_value(&block)
+      @bindings.each_value(&block) if block_given?
+      enum_value
+    end
+
+    ##
+    # Returns an enumerator for {#each_value}.
+    #
+    # @return [Enumerator<RDF::Resource>]
+    # @see    #each_subject
+    def enum_value
+      enum_for(:each_value)
     end
 
     ##
@@ -101,9 +132,21 @@ class RDF::Query
     # @yieldparam [Variable]
     # @return [Enumerator]
     def each_variable
-      @bindings.each do |name, value|
-        yield Variable.new(name, value)
+      if block_given?
+        @bindings.each do |name, value|
+          yield Variable.new(name, value)
+        end
       end
+      enum_variable
+    end
+
+    ##
+    # Returns an enumerator for {#each_variable}.
+    #
+    # @return [Enumerator<RDF::Resource>]
+    # @see    #each_subject
+    def enum_variable
+      enum_for(:each_variable)
     end
 
     ##
@@ -282,5 +325,19 @@ class RDF::Query
     def respond_to_missing?(name, include_private = false)
       @bindings.has_key?(name.to_sym) || super
     end
+
+    ##
+    # @private
+    # @param  [Symbol, #to_sym] method
+    # @return [Enumerator]
+    # @see    Object#enum_for
+    def enum_for(method = :each)
+      # Ensure that enumerators are, themselves, queryable
+      this = self
+      Enumerator.new do |yielder|
+        this.__send(method) {|*y| yielder << (y.length > 1 ? y : y.first)}
+      end
+    end
+    alias_method :to_enum, :enum_for
   end # Solution
 end # RDF::Query

data/lib/rdf/query/solutions.rb

@@ -104,7 +104,29 @@ module RDF; class Query
       end
       bindings
     end
-    
+
+    ##
+    # Duplicates each solution.
+    # @return [RDF::Query::Solutions]
+    def dup
+      RDF::Query::Solutions.new(self.compact.map(&:dup))
+    end
+
+    ##
+    # Merge solutions in `other` into a new solutions instance. Each solution in `other` is merged into those solutions in `self` that are compatible.
+    #
+    # @param [RDF::Query::Solutions] other
+    # @return [RDF::Query::Solutions]
+    def merge(other)
+      other ||= RDF::Query::Solutions()
+      return other if self.empty?
+      return self if other.empty?
+
+      RDF::Query::Solutions(self.map do |s1|
+        other.map { |s2| s2.merge(s1) if s2.compatible?(s1) }
+      end.flatten.compact)
+    end
+
     ##
     # Filters this solution sequence by the given `criteria`.
     #

data/lib/rdf/query/variable.rb

@@ -65,9 +65,25 @@ class RDF::Query
     #   the variable name
     # @param  [RDF::Term] value
     #   an optional variable value
-    def initialize(name = nil, value = nil)
-      @name  = (name || "g#{__id__.to_i.abs}").to_sym
+    # @param [Boolean] distinguished (true) Also interpreted by leading '??' or '$$' in name.
+    # @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
+      if name.start_with?('??')
+        name, dis, ex = name[2..-1], false, false
+      elsif name.start_with?('?')
+        name, dis, ex = name[1..-1], true, false
+      elsif name.start_with?('$$')
+        name, dis, ex = name[2..-1], false, true
+      elsif name.start_with?('$')
+        name, dis, ex = name[1..-1], true, true
+      else
+        dis, ex = true, false
+      end
+      @name = name.to_sym
       @value = value
+      @distinguished = distinguished.nil? ? dis : distinguished
+      @existential = existential.nil? ? ex : existential
     end
 
     ##
@@ -109,7 +125,7 @@ class RDF::Query
     #
     # @return [Boolean]
     def distinguished?
-      @distinguished.nil? || @distinguished
+      @distinguished
     end
 
     ##
@@ -121,6 +137,23 @@ class RDF::Query
       @distinguished = value
     end
 
+    ##
+    # Returns `true` if this variable is existential.
+    #
+    # @return [Boolean]
+    def existential?
+      @existential
+    end
+
+    ##
+    # Sets if variable is existential or univeresal.
+    # By default, variables are universal
+    #
+    # @return [Boolean]
+    def existential=(value)
+      @existential = value
+    end
+
     ##
     # Rebinds this variable to the given `value`.
     #
@@ -208,6 +241,7 @@ class RDF::Query
     #
     # Non-distinguished variables are indicated with a double `??`
     #
+    # Existential variables are indicated using a single `$`, or with `$$` if also non-distinguished
     # @example
     #   v = Variable.new("a")
     #   v.to_s => '?a'
@@ -216,7 +250,7 @@ class RDF::Query
     #
     # @return [String]
     def to_s
-      prefix = distinguished? ? '?' : "??"
+      prefix = distinguished? ? (existential? ? '$' : '?') : (existential? ? '$$' : '??')
       unbound? ? "#{prefix}#{name}" : "#{prefix}#{name}=#{value}"
     end
   end # Variable

data/lib/rdf/repository.rb

@@ -206,8 +206,9 @@ module RDF
     # @private
     # @see RDF::Enumerable#project_graph
     def project_graph(graph_name, &block)
-      RDF::Graph.new(graph_name: graph_name, data: self).
-        project_graph(graph_name, &block)
+      graph = RDF::Graph.new(graph_name: graph_name, data: self)
+      graph.each(&block) if block_given?
+      graph
     end
 
     ##
@@ -324,8 +325,8 @@ module RDF
           @data.each do |g, ss|
             ss.each do |s, ps|
               ps.each do |p, os|
-                os.each do |o|
-                  yield RDF::Statement.new(s, p, o, graph_name: g.equal?(DEFAULT_GRAPH) ? nil : g)
+                os.each do |o, object_options|
+                  yield RDF::Statement.new(s, p, o, object_options.merge(graph_name: g.equal?(DEFAULT_GRAPH) ? nil : g))
                 end
               end
             end
@@ -402,9 +403,9 @@ module RDF
                      []
                    end
               ps.each do |p, os|
-                os.each do |o|
+                os.each do |o, object_options|
                   next unless object.nil? || object.eql?(o)
-                  yield RDF::Statement.new(s, p, o, graph_name: c.equal?(DEFAULT_GRAPH) ? nil : c)
+                  yield RDF::Statement.new(s, p, o, object_options.merge(graph_name: c.equal?(DEFAULT_GRAPH) ? nil : c))
                 end
               end
             end
@@ -461,7 +462,7 @@ module RDF
         data.has_key?(g) &&
           data[g].has_key?(s) &&
           data[g][s].has_key?(p) &&
-          data[g][s][p].include?(o)
+          data[g][s][p].has_key?(o)
       end
 
       ##
@@ -475,9 +476,9 @@ module RDF
           c ||= DEFAULT_GRAPH
           
           return data.put(c) do |subs|
-            subs = (subs || Hamster::Hash.new).put(s) do |preds|
-              preds = (preds || Hamster::Hash.new).put(p) do |objs|
-                (objs || Hamster::Set.new).add(o)
+            (subs || Hamster::Hash.new).put(s) do |preds|
+              (preds || Hamster::Hash.new).put(p) do |objs|
+                (objs || Hamster::Hash.new).put(o, statement.options)
               end
             end
           end

metadata

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