rdf 1.1.0.p3 → 1.1.0p4

data/lib/rdf/model/uri.rb

@@ -108,6 +108,13 @@ module RDF
       "prospero" => 1525
     }
 
+    # List of schemes known not to be hierarchical
+    NON_HIER_SCHEMES = %w(
+      about acct bitcoin callto cid data fax geo gtalk h323 iax icon im jabber
+      jms magnet mailto maps news pres proxy session sip sips skype sms spotify stun stuns
+      tag tel turn turns tv urn javascript
+    ).freeze
+
     ##
     # @return [RDF::Util::Cache]
     # @private
@@ -266,6 +273,21 @@ module RDF
       @object ? @object[:scheme] == 'urn' : start_with?('urn:')
     end
 
+    ##
+    # Returns `true` if the URI scheme is hierarchical.
+    #
+    # @example
+    #   RDF::URI('http://example.org/').hier?                    #=> true
+    #   RDF::URI('urn:isbn:125235111').hier?                     #=> false
+    #
+    # @return [Boolean] `true` or `false`
+    # @see    http://en.wikipedia.org/wiki/URI_scheme
+    # @see    {NON_HIER_SCHEMES}
+    # @since  1.0.10
+    def hier?
+      !NON_HIER_SCHEMES.include?(scheme)
+    end
+
     ##
     # Returns `true` if this URI is a URL.
     #
@@ -510,15 +532,19 @@ module RDF
     end
 
     ##
-    # Returns `true` if this URI's path component is equal to `/`.
+    # Returns `true` if this URI's scheme is not hierarchical,
+    # or its path component is equal to `/`.
+    # Protocols not using hierarchical components are always considered
+    # to be at the root.
     #
     # @example
     #   RDF::URI('http://example.org/').root?                   #=> true
     #   RDF::URI('http://example.org/path/').root?              #=> false
+    #   RDF::URI('urn:isbn').root?                              #=> true
     #
     # @return [Boolean] `true` or `false`
     def root?
-      self.path == '/' || self.path.to_s.empty?
+      !self.hier?  || self.path == '/' || self.path.to_s.empty?
     end
 
     ##
@@ -540,7 +566,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if this URI's path component isn't equal to `/`.
+    # 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
@@ -812,6 +838,7 @@ module RDF
       parts = {}
       if matchdata = value.to_s.match(IRI_PARTS)
         scheme, authority, path, query, fragment = matchdata.to_a[1..-1]
+        authority = nil if authority.to_s.empty?
         userinfo, hostport = authority.to_s.split('@', 2)
         hostport, userinfo = userinfo, nil unless hostport
         user, password = userinfo.to_s.split(':', 2)

data/lib/rdf/model/value.rb

@@ -156,6 +156,27 @@ module RDF
     end
     alias_method :validate, :validate!
 
+    ##
+    # Returns a copy of this value converted into its canonical
+    # representation.
+    #
+    # @return [RDF::Value]
+    # @since  1.0.8
+    def canonicalize
+      self.dup.canonicalize!
+    end
+
+    ##
+    # Converts this value into its canonical representation.
+    #
+    # Should be overridden by concrete classes.
+    #
+    # @return [RDF::Value] `self`
+    # @since  1.0.8
+    def canonicalize!
+      self
+    end
+
     ##
     # Returns an `RDF::Value` representation of `self`.
     #

data/lib/rdf/nquads.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF
   ##
   # **`RDF::NQuads`** provides support for the N-Quads serialization format.
@@ -17,7 +18,7 @@ module RDF
     #   RDF::Format.for(:content_type   => "application/n-quads")
     #   RDF::Format.for(:content_type   => "text/x-nquads")
     #
-    # @see http://sw.deri.org/2008/07/n-quads/#mediatype
+    # @see http://www.w3.org/TR/n-quads/
     # @since  0.4.0
     class Format < RDF::Format
       content_type     'application/n-quads', :extension => :nq, :alias => ['text/x-nquads']
@@ -80,7 +81,7 @@ module RDF
               subject   = read_uriref || read_node || fail_subject
               predicate = read_uriref(:intern => true) || fail_predicate
               object    = read_uriref || read_node || read_literal || fail_object
-              context    = read_uriref || read_node || read_literal
+              context    = read_uriref || read_node
               if validate? && !read_eos
                 raise RDF::ReaderError, "expected end of statement in line #{lineno}: #{current_line.inspect}"
               end

data/lib/rdf/ntriples/reader.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF::NTriples
   ##
   # N-Triples parser.

data/lib/rdf/ntriples/writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF::NTriples
   ##
   # N-Triples serializer.
@@ -58,12 +59,14 @@ module RDF::NTriples
           string
         when string.ascii_only?
           StringIO.open do |buffer|
+            buffer.set_encoding(Encoding::ASCII)
             string.each_byte { |u| buffer << escape_ascii(u, encoding) }
             buffer.string
           end
-        when encoding && encoding != Encoding::ASCII
+        when string.respond_to?(:each_char) && encoding && encoding != Encoding::ASCII
           # Not encoding UTF-8 characters
           StringIO.open do |buffer|
+            buffer.set_encoding(encoding)
             string.each_char do |u|
               buffer << case u.ord
               when (0x00..0x7F)
@@ -77,11 +80,12 @@ module RDF::NTriples
         else
           # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
+            buffer.set_encoding(Encoding::ASCII)
             string.each_codepoint { |u| buffer << escape_unicode(u, encoding) }
             buffer.string
           end
       end
-      encoding ? ret.dup.force_encoding(encoding) : ret
+      encoding ? ret.encode(encoding) : ret
     end
 
     ##
@@ -170,6 +174,23 @@ module RDF::NTriples
       end
     end
 
+    ##
+    # Initializes the writer.
+    #
+    # @param  [IO, File] output
+    #   the output stream
+    # @param  [Hash{Symbol => Object}] options
+    #   any additional options. See {RDF::Writer#initialize}
+    # @option options [Boolean]  :validate (true)
+    #   whether to validate terms when serializing
+    # @yield  [writer] `self`
+    # @yieldparam  [RDF::Writer] writer
+    # @yieldreturn [void]
+    def initialize(output = $stdout, options = {}, &block)
+      options = {:validate => true}.merge(options)
+      super
+    end
+
     ##
     # Outputs an N-Triples comment line.
     #

data/lib/rdf/ntriples.rb

@@ -32,9 +32,8 @@ module RDF
   # @example Requiring the `RDF::NTriples` module explicitly
   #   require 'rdf/ntriples'
   #
-  # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   # @see http://en.wikipedia.org/wiki/N-Triples
-  # @see http://librdf.org/ntriples/
   #
   # @author [Arto Bendiken](http://ar.to/)
   module NTriples

data/lib/rdf/query/solutions.rb

@@ -114,7 +114,7 @@ module RDF; class Query
     # @param [RDF::Query::Solutions] other
     # @return [RDF::Query::Solutions] a new solution set
     # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
-    def -(other)
+    def minus(other)
       self.dup.filter! do |soln|
         !other.any? {|soln2| soln.compatible?(soln2) && !soln.disjoint?(soln2)}
       end

data/lib/rdf/reader.rb

@@ -486,7 +486,7 @@ module RDF
       @line = @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
       @line = @line.to_s.chomp
-      @line.force_encoding(encoding)
+      @line.encode!(encoding)
       @line
     end
 

data/lib/rdf/repository.rb

@@ -77,7 +77,7 @@ module RDF
     # @return [void]
     def self.load(filenames, options = {}, &block)
       self.new(options) do |repository|
-        [filenames].flatten.each do |filename|
+        Array(filenames).each do |filename|
           repository.load(filename, options)
         end
 

data/lib/rdf/util/file.rb

@@ -27,16 +27,23 @@ module RDF; module Util
     # @param  [Hash{Symbol => Object}] options
     #   options are ignored in this implementation. Applications are encouraged
     #   to override this implementation to provide more control over HTTP
-    #   headers and redirect following.
+    #   headers and redirect following. If opening as a file,
+    #   options are passed to `Kernel.open`.
     # @option options [Array, String] :headers
     #   HTTP Request headers, passed to Kernel.open.
     # @return [IO] File stream
     # @yield [IO] File stream
     def self.open_file(filename_or_url, options = {}, &block)
       filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
-      options[:headers] ||= {}
-      options[:headers]['Accept'] ||= (RDF::Format.reader_types + %w(*/*;q=0.1)).join(", ")
-      Kernel.open(filename_or_url.to_s, options[:headers], &block)
+      if filename_or_url.to_s =~ /^#{RDF::URI::SCHEME}/
+        # Open as a URL
+        headers = options.fetch(:headers, {})
+        headers['Accept'] ||= (RDF::Format.reader_types + %w(*/*;q=0.1)).join(", ")
+        Kernel.open(filename_or_url.to_s, headers, &block)
+      else
+        # Open as a file, passing any options
+        Kernel.open(filename_or_url, "r", options, &block)
+      end
     end
   end # File
 end; end # RDF::Util