rdf 0.1.9 → 0.1.10

data/README

@@ -6,6 +6,7 @@ This is a pure-Ruby library for working with [Resource Description Framework
 
 * <http://github.com/bendiken/rdf>
 * <http://blog.datagraph.org/2010/03/rdf-for-ruby>
+* <http://blog.datagraph.org/2010/04/parsing-rdf-with-ruby>
 * <http://blog.datagraph.org/2010/04/rdf-repository-howto>
 
 Features

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/rdf/mixin/enumerable.rb

@@ -107,6 +107,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which statements are yielded is undefined.
+    #
     # @overload each_statement
     #   @yield  [statement]
     #   @yieldparam [Statement] statement
@@ -162,6 +164,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which triples are yielded is undefined.
+    #
     # @overload each_triple
     #   @yield  [subject, predicate, object]
     #   @yieldparam [Resource] subject
@@ -220,6 +224,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which quads are yielded is undefined.
+    #
     # @overload each_quad
     #   @yield  [subject, predicate, object, context]
     #   @yieldparam [Resource] subject
@@ -284,6 +290,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which values are yielded is undefined.
+    #
     # @overload each_subject
     #   @yield  [subject]
     #   @yieldparam [Resource] subject
@@ -350,6 +358,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which values are yielded is undefined.
+    #
     # @overload each_predicate
     #   @yield  [predicate]
     #   @yieldparam [URI] predicate
@@ -416,6 +426,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which values are yielded is undefined.
+    #
     # @overload each_object
     #   @yield  [object]
     #   @yieldparam [Value] object
@@ -482,6 +494,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which values are yielded is undefined.
+    #
     # @overload each_context
     #   @yield  [context]
     #   @yieldparam [Resource] context
@@ -523,6 +537,8 @@ module RDF
     #
     # If no block was given, returns an enumerator.
     #
+    # The order in which graphs are yielded is undefined.
+    #
     # @overload each_graph
     #   @yield  [graph]
     #   @yieldparam [RDF::Graph] graph
@@ -533,7 +549,7 @@ module RDF
     #
     # @return [void]
     # @see    #enum_graph
-    # @since  0.1.19
+    # @since  0.1.9
     def each_graph(&block)
       if block_given?
         block.call(RDF::Graph.new(nil, :data => self))
@@ -550,7 +566,7 @@ module RDF
     #
     # @return [Enumerator]
     # @see    #each_graph
-    # @since  0.1.19
+    # @since  0.1.9
     def enum_graph
       Enumerator.new(self, :each_graph)
     end

data/lib/rdf/mixin/queryable.rb

@@ -56,7 +56,7 @@ module RDF
     #   @return [RDF::Statement]
     #
     # @return [RDF::Statement]
-    # @since  0.1.19
+    # @since  0.1.9
     def first(pattern = nil)
       if pattern
         query(pattern) do |statement|
@@ -82,7 +82,7 @@ module RDF
     #   @return [RDF::Resource]
     #
     # @return [RDF::Resource]
-    # @since  0.1.19
+    # @since  0.1.9
     def first_subject(pattern = nil)
       __send__(*(pattern ? [:query, pattern] : [:each])) do |statement|
         return statement.subject
@@ -104,7 +104,7 @@ module RDF
     #   @return [RDF::URI]
     #
     # @return [RDF::URI]
-    # @since  0.1.19
+    # @since  0.1.9
     def first_predicate(pattern = nil)
       __send__(*(pattern ? [:query, pattern] : [:each])) do |statement|
         return statement.predicate
@@ -126,7 +126,7 @@ module RDF
     #   @return [RDF::Value]
     #
     # @return [RDF::Value]
-    # @since  0.1.19
+    # @since  0.1.9
     def first_object(pattern = nil)
       __send__(*(pattern ? [:query, pattern] : [:each])) do |statement|
         return statement.object
@@ -149,7 +149,7 @@ module RDF
     #   @return [RDF::Literal]
     #
     # @return [RDF::Literal]
-    # @since  0.1.19
+    # @since  0.1.9
     def first_literal(pattern = nil)
       __send__(*(pattern ? [:query, pattern] : [:each])) do |statement|
         return statement.object if statement.object.is_a?(RDF::Literal)
@@ -172,7 +172,7 @@ module RDF
     #   @return [Object]
     #
     # @return [Object]
-    # @since  0.1.19
+    # @since  0.1.9
     def first_value(pattern = nil)
       (literal = first_literal(pattern)) ? literal.value : nil
     end

data/lib/rdf/model/graph.rb

@@ -41,7 +41,7 @@ module RDF
     # @yield  [graph]
     # @yieldparam [Graph] graph
     # @return [Graph]
-    # @since  0.1.17
+    # @since  0.1.7
     def self.load(url, options = {}, &block)
       self.new(url, options) do |graph|
         graph.load! unless graph.unnamed?

data/lib/rdf/model/value.rb

@@ -83,7 +83,7 @@ module RDF
     # Returns `true` if this value is a query variable.
     #
     # @return [Boolean]
-    # @since  0.1.17
+    # @since  0.1.7
     def variable?
       false
     end

data/lib/rdf/ntriples.rb

@@ -38,6 +38,7 @@ module RDF
   #
   # @author [Arto Bendiken](http://ar.to/)
   module NTriples
+    require 'iconv' # needed on Ruby 1.8.x
     require 'rdf/ntriples/format'
     autoload :Reader, 'rdf/ntriples/reader'
     autoload :Writer, 'rdf/ntriples/writer'

data/lib/rdf/ntriples/reader.rb

@@ -42,6 +42,15 @@ module RDF::NTriples
     PREDICATE             = Regexp.union(URIREF).freeze
     OBJECT                = Regexp.union(URIREF, NODEID, LITERAL).freeze
 
+    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    ESCAPE_CHARS          = ["\t", "\n", "\r", "\"", "\\"].freeze
+    ESCAPE_CHAR4          = /\\u([0-9A-Fa-f]{4,4})/.freeze
+    ESCAPE_CHAR8          = /\\U([0-9A-Fa-f]{8,8})/.freeze
+    ESCAPE_CHAR           = Regexp.union(ESCAPE_CHAR4, ESCAPE_CHAR8).freeze
+    ESCAPE_SURROGATE      = /\\u([0-9A-Fa-f]{4,4})\\u([0-9A-Fa-f]{4,4})/.freeze
+    ESCAPE_SURROGATE1     = (0xD800..0xDBFF).freeze
+    ESCAPE_SURROGATE2     = (0xDC00..0xDFFF).freeze
+
     ##
     # Reconstructs an RDF value from its serialized N-Triples
     # representation.
@@ -112,12 +121,35 @@ module RDF::NTriples
     # @param  [String] string
     # @return [String]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    # @see    http://blog.grayproductions.net/articles/understanding_m17n
     def self.unescape(string)
-      ["\t", "\n", "\r", "\"", "\\"].each do |escape|
-        string.gsub!(escape.inspect[1...-1], escape)
+      string.force_encoding(Encoding::ASCII_8BIT) if string.respond_to?(:force_encoding)
+
+      # Decode \t|\n|\r|\"|\\ character escapes:
+      ESCAPE_CHARS.each { |escape| string.gsub!(escape.inspect[1...-1], escape) }
+
+      # Decode \uXXXX\uXXXX surrogate pairs:
+      while
+        (string.sub!(ESCAPE_SURROGATE) do
+          if ESCAPE_SURROGATE1.include?($1.hex) && ESCAPE_SURROGATE2.include?($2.hex)
+            s = [$1, $2].pack('H*H*')
+            s = s.respond_to?(:force_encoding) ?
+              s.force_encoding(Encoding::UTF_16BE).encode!(Encoding::UTF_8) : # for Ruby 1.9+
+              Iconv.conv('UTF-8', 'UTF-16BE', s)                              # for Ruby 1.8.x
+          else
+            s = [$1.hex].pack('U*') << '\u' << $2
+          end
+          s.respond_to?(:force_encoding) ? s.force_encoding(Encoding::ASCII_8BIT) : s
+        end)
       end
-      string.gsub!(/\\u([0-9A-Fa-f]{4,4})/u) { [$1.hex].pack('U*') }
-      string.gsub!(/\\U([0-9A-Fa-f]{8,8})/u) { [$1.hex].pack('U*') }
+
+      # Decode \uXXXX and \UXXXXXXXX code points:
+      string.gsub!(ESCAPE_CHAR) do
+        s = [($1 || $2).hex].pack('U*')
+        s.respond_to?(:force_encoding) ? s.force_encoding(Encoding::ASCII_8BIT) : s
+      end
+
+      string.force_encoding(Encoding::UTF_8) if string.respond_to?(:force_encoding)
       string
     end
 

data/lib/rdf/query/variable.rb

@@ -59,7 +59,7 @@ class RDF::Query
     #
     # @return [Boolean]
     # @see    RDF::Value#variable?
-    # @since  0.1.17
+    # @since  0.1.7
     def variable? 
       true
     end

data/lib/rdf/reader.rb

@@ -193,27 +193,48 @@ module RDF
 
       @@subclasses = [] # @private
 
-      def self.inherited(child) #:nodoc:
+      ##
+      # @private
+      def self.inherited(child)
         @@subclasses << child
         super
       end
 
+      ##
+      # @return [Integer]
       def lineno
         @input.lineno
       end
 
+      ##
+      # @return [String]
       def readline
         @line = @input.readline.chomp
+        @line.force_encoding(encoding) if @line.respond_to?(:force_encoding) # for Ruby 1.9+
+        @line
       end
 
+      ##
+      # @return [Encoding]
+      def encoding
+        @encoding ||= ::Encoding::UTF_8
+      end
+
+      ##
+      # @return [void]
       def strip!
         @line.strip!
       end
 
+      ##
+      # @return [Boolean]
       def blank?
         @line.nil? || @line.empty?
       end
 
+      ##
+      # @param  [Regexp] pattern
+      # @return [Object]
       def match(pattern)
         if @line =~ pattern
           result, @line = $1, $'.lstrip

data/lib/rdf/repository.rb

@@ -128,6 +128,20 @@ module RDF
     ##
     # @see RDF::Repository
     module Implementation
+      ##
+      # Returns `true` if this repository supports `feature`.
+      #
+      # @param  [Symbol, #to_sym] feature
+      # @return [Boolean]
+      # @since  0.1.10
+      def supports?(feature)
+        case feature.to_sym
+          when :context   then true   # statement contexts / named graphs
+          when :inference then false  # forward-chaining inference
+          else false
+        end
+      end
+
       ##
       # Returns `false` to indicate that this repository is nondurable.
       #

data/lib/rdf/version.rb

@@ -2,7 +2,7 @@ module RDF
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 9
+    TINY  = 10
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rdf/writer.rb

@@ -295,12 +295,13 @@ module RDF
       # @param  [Resource] uriref
       # @return [String]
       def uri_for(uriref)
-        if uriref.respond_to?(:anonymous?) && uriref.anonymous?
-          @nodes[uriref]
-        elsif uriref.respond_to?(:to_uri)
-          uriref.to_uri.to_s
-        else
-          uriref.to_s
+        case
+          when uriref.is_a?(RDF::Node)
+            @nodes[uriref]
+          when uriref.respond_to?(:to_uri)
+            uriref.to_uri.to_s
+          else
+            uriref.to_s
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 8
-        version: 0.1.8
+        - 10
+        version: 0.1.10
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -56,8 +56,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency