rdf 1.0.9 → 1.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWYzN2ZkYjgxMzA3Mjg3MmNmZDY1NTk5OGE0NDBhODI3OWYwZmEyNA==
+    MDY3ZTk0N2E2NGI5MzA0MDk3ZDJjZWU3MWY4Y2RjNDUyOGMxNDdhYw==
   data.tar.gz: !binary |-
-    MzllMjNhYjczYzI4NWIyMzc0ZDc3YTBlNzNiNGM0NzQ5NWIxMzM1OA==
+    ZTdiN2I3Y2Q5ZmNiZWRlY2U3N2Q0MzU3OGNlODU5ZGE3NzIzYzEwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjA3MjU5MmIzYzcxYWE5ODgzZDI1YWFjODdjYjE3MjVkMWZiMTYzNzJkOTJi
-    YjM5OThhNTUyYjQxNTk4NWIxODBjZWI1ZmNlMTU3NGI1OTBmNjZmNzA3YTY5
-    ZGNmYzBjNDY2ZjJiZGNiYmEyZGEzYWY0ZGFmZDE0NTQxNmE4ZWQ=
+    MmYxNjVmODNjNDE0NWQ2OWI4MTVjZDRhNDE0NzFiYTgwMzk2NjkyZmMyODU3
+    NTI5YWQ3OTI4NWYxYThlNDk1ZGM4OGNhMGU0NzgzYmVkNzk1ZjIxZTJiM2Ix
+    YzlhMTEyNGEzMThhZjhiNzdjODA2ZjM5NmE0YjE1NGRhODhhYjE=
   data.tar.gz: !binary |-
-    MWViMzUxNDhlOTUzYTAxYTNjYmJmZDYwYzQ0M2YyYjZhNjc3MmI1Yjk4NzYy
-    NmJkM2VlYzc3NmZjMWRjOWUwZWM3NWJjYmQ3MTFmYzhjMzE5ZmViMDgzM2Nj
-    YzhiZDFjMTgwNmJhNzA1NDc4YzJiMDBlYzViNDA3M2Q5MGM5ZGQ=
+    Njg1NjhiNDllYjM1ZTBkMDEyMjgxMDJmNWYwMjRmOTgzNDc4NGYxNjlkNjQ5
+    YWU3YmEyMWFlOThiYTA3ZDY2NWFiOTA3NjNiYjliMTczMTlhNDM3MWU0OGM2
+    NmE0MDliODBjZTBjOTY3NzVlMmRjZDAyNmU2NTM4MzFiNDJjZDc=

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/rdf/format.rb

@@ -142,12 +142,14 @@ module RDF
 
       # If we have a sample, use that for format detection
       if sample = (options[:sample] if options.is_a?(Hash)) || (yield if block_given?)
+        sample = sample.to_s
+        sample.force_encoding(Encoding::UTF_8) if sample.respond_to?(:force_encoding)
         # Given a sample, perform format detection across the appropriate formats, choosing
         # the first that matches
         format ||= @@subclasses
 
         # Return first format that has a positive detection
-        format.detect {|f| f.detect(sample.to_s)} || format.first
+        format.detect {|f| f.detect(sample)} || format.first
       elsif format.is_a?(Array)
         # Otherwise, just return the first matching format
         format.first

data/lib/rdf/model/literal.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF
   ##
   # An RDF literal.
@@ -166,6 +167,7 @@ module RDF
       @object   = value
       @string   = options[:lexical] if options[:lexical]
       @string   = value if !defined?(@string) && value.is_a?(String)
+      @string.encode!(Encoding::UTF_8) if @string && @string.respond_to?(:encode!)
       @language = options[:language].to_s.to_sym if options[:language]
       @datatype = RDF::URI(options[:datatype]) if options[:datatype]
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)

data/lib/rdf/model/uri.rb

@@ -90,7 +90,14 @@ module RDF
 
     IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
-    
+
+    # 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
@@ -174,6 +181,21 @@ module RDF
       self.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.
     #
@@ -358,15 +380,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.empty?
+      !self.hier?  || self.path == '/' || self.path.empty?
     end
 
     ##
@@ -388,7 +414,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

data/lib/rdf/nquads.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF
   ##
   # **`RDF::NQuads`** provides support for the N-Quads serialization format.

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.respond_to?(:ascii_only?) && string.ascii_only?
           StringIO.open do |buffer|
+            buffer.set_encoding(Encoding::ASCII) if buffer.respond_to?(:set_encoding)
             string.each_byte { |u| buffer << escape_ascii(u, encoding) }
             buffer.string
           end
         when string.respond_to?(:each_char) && encoding && encoding != Encoding::ASCII
           # Not encoding UTF-8 characters
           StringIO.open do |buffer|
+            buffer.set_encoding(encoding) if buffer.respond_to?(:set_encoding)
             string.each_char do |u|
               buffer << case u.ord
               when (0x00..0x7F)
@@ -77,17 +80,19 @@ module RDF::NTriples
         when string.respond_to?(:each_codepoint)
           # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
+            buffer.set_encoding(Encoding::ASCII) if buffer.respond_to?(:set_encoding)
             string.each_codepoint { |u| buffer << escape_unicode(u, encoding) }
             buffer.string
           end
         else # works in Ruby 1.8.x, too
           # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
+            buffer.set_encoding(Encoding::ASCII) if buffer.respond_to?(:set_encoding)
             string.scan(/./mu) { |c| buffer << escape_unicode(u = c.unpack('U*').first, encoding) }
             buffer.string
           end
       end
-      ret.respond_to?(:force_encoding) && encoding ? ret.dup.force_encoding(encoding) : ret
+      ret.respond_to?(:encode) && encoding && ret.encoding != encoding ? ret.encode(encoding) : ret
     end
 
     ##

data/lib/rdf/reader.rb

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

data/lib/rdf/util/file.rb

@@ -27,7 +27,8 @@ 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. (Ruby >= 1.9 only)
     # @return [IO] File stream
@@ -37,10 +38,14 @@ module RDF; module Util
       filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
       if RUBY_VERSION < "1.9"
         Kernel.open(filename_or_url.to_s, &block)
+      elsif 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
-        options[:headers] ||= {}
-        options[:headers]['Accept'] ||= (RDF::Format.reader_types + %w(*/*;q=0.1)).join(", ")
-        Kernel.open(filename_or_url.to_s, options[:headers], &block)
+        # Open as a file, passing any options
+        Kernel.open(filename_or_url, "r", options, &block)
       end
     end
   end # File

data/lib/rdf/writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF
   ##
   # The base class for RDF serializers.
@@ -299,7 +300,7 @@ module RDF
     #
     # @return [Encoding]
     def encoding
-      return nil unless "".respond_to?(:force_encoding)
+      return nil unless "".respond_to?(:encode!)
       case @options[:encoding]
       when String, Symbol
         Encoding.find(@options[:encoding].to_s)
@@ -474,7 +475,7 @@ module RDF
     ##
     # @return [void]
     def puts(*args)
-      @output.puts(*args.map {|s| s.respond_to?(:force_encoding) ? s.force_encoding(encoding) : s})
+      @output.puts(*args.map {|s| s.respond_to?(:encode!) ? s.encode!(encoding) : s})
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable