rdf 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rdf.rb

@@ -29,6 +29,7 @@ module RDF
 
   # RDF serialization formats
   autoload :NTriples,   'rdf/ntriples'
+  autoload :NQuads,     'rdf/nquads'
 
   # RDF storage
   autoload :Repository, 'rdf/repository'

data/lib/rdf/nquads.rb

@@ -0,0 +1,7 @@
+module RDF
+  ##
+  # **`RDF::NQuads`** provides support for the N-Quads serialization format.
+  module NQuads
+    include NTriples # TODO
+  end
+end

data/lib/rdf/ntriples/reader.rb

@@ -28,41 +28,67 @@ module RDF::NTriples
   class Reader < RDF::Reader
     format RDF::NTriples::Format
 
+    ##
+    # Reconstructs an RDF value from its serialized N-Triples
+    # representation.
+    #
+    # @param  [String] data
+    # @return [RDF::Value]
+    def self.unserialize(data)
+      self.new(data).read_value
+    end
+
+    ##
+    # @return [RDF::Value]
+    def read_value
+      begin
+        read_statement
+      rescue RDF::ReaderError => e
+        read_uriref || read_bnode || read_literal
+      end
+    end
+
     ##
     # @return [Array]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
     def read_triple
       loop do
         readline.strip! # EOFError thrown on end of input
+        line = @line    # for backtracking input in case of parse error
 
-        unless blank? || read_comment
-          subject   = read_uriref || read_bnode || fail_subject
-          predicate = read_uriref || fail_predicate
-          object    = read_uriref || read_bnode || read_literal || fail_object
-          return [subject, predicate, object]
+        begin
+          unless blank? || read_comment
+            subject   = read_uriref || read_bnode || fail_subject
+            predicate = read_uriref || fail_predicate
+            object    = read_uriref || read_bnode || read_literal || fail_object
+            return [subject, predicate, object]
+          end
+        rescue RDF::ReaderError => e
+          @line = line  # this allows #read_value to work
+          raise e
         end
       end
     end
 
     ##
     # @return [Boolean]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (comment)
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (comment)
     def read_comment
       match(/^#\s*(.*)$/)
     end
 
     ##
-    # @return [URI, nil]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (uriref)
+    # @return [URI]
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (uriref)
     def read_uriref
       if uri = match(/^<([^>]+)>/)
-        RDF::URI.parse(uri)
+        RDF::URI.new(uri)
       end
     end
 
     ##
-    # @return [Node, nil]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (nodeID)
+    # @return [Node]
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (nodeID)
     def read_bnode
       if node_id = match(/^_:([A-Za-z][A-Za-z0-9]*)/)
         @nodes[node_id] ||= RDF::Node.new(node_id)
@@ -70,8 +96,8 @@ module RDF::NTriples
     end
 
     ##
-    # @return [String, Literal, nil]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (literal)
+    # @return [Literal]
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (literal)
     def read_literal
       if literal = match(/^"((?:\\"|[^"])*)"/)
         literal = unescaped(literal)
@@ -89,7 +115,7 @@ module RDF::NTriples
     ##
     # @param  [String] string
     # @return [String]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
     def unescaped(string)
       ["\t", "\n", "\r", "\"", "\\"].each do |escape|
         string.gsub!(escape.inspect[1...-1], escape)

data/lib/rdf/ntriples/writer.rb

@@ -27,6 +27,22 @@ module RDF::NTriples
   class Writer < RDF::Writer
     format RDF::NTriples::Format
 
+    ##
+    # Returns the serialized N-Triples representation of the given RDF
+    # value.
+    #
+    # @param  [RDF::Value] value
+    # @return [String]
+    def self.serialize(value)
+      writer = self.new
+      case value
+        when RDF::Statement
+          writer.format_statement(value) + "\n"
+        else
+          writer.format_value(value)
+      end
+    end
+
     ##
     # Outputs an N-Triples comment line.
     #

data/lib/rdf/reader.rb

@@ -138,26 +138,33 @@ module RDF
     ##
     # @yield  [statement]
     # @yieldparam [Statement]
-    # @return [Reader]
+    # @return [Enumerator]
     def each_statement(&block)
-      each_triple { |*triple| block.call(Statement.new(*triple)) }
-      self
+      begin
+        loop { block.call(read_statement) }
+      rescue EOFError => e
+      end
     end
 
     ##
     # @yield  [triple]
     # @yieldparam [Array(Value)]
-    # @return [Reader]
+    # @return [Enumerator]
     def each_triple(&block)
       begin
         loop { block.call(*read_triple) }
       rescue EOFError => e
       end
-      self
     end
 
     protected
 
+      ##
+      # @raise [NotImplementedError] unless implemented in subclass
+      def read_statement
+        Statement.new(*read_triple)
+      end
+
       ##
       # @raise [NotImplementedError] unless implemented in subclass
       def read_triple

data/lib/rdf/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/rdf/model/statement.rb
 - lib/rdf/model/uri.rb
 - lib/rdf/model/value.rb
+- lib/rdf/nquads.rb
 - lib/rdf/ntriples/format.rb
 - lib/rdf/ntriples/reader.rb
 - lib/rdf/ntriples/writer.rb