rdf-raptor 0.3.0 → 0.4.0

data/AUTHORS

@@ -1 +1,2 @@
 * Arto Bendiken <arto.bendiken@gmail.com>
+* John Fieber <jrf@ursamaris.org>

data/CONTRIBUTORS

@@ -0,0 +1 @@
+* Ben Lavender <blavender@gmail.com>

data/README

@@ -2,11 +2,11 @@ Raptor RDF Parser Wrapper for RDF.rb
 ====================================
 
 This is an [RDF.rb][] plugin that adds support for parsing/serializing
-[RDF/XML][] and [Turtle][] data using the [Raptor RDF Parser][Raptor]
+[RDF/XML][], [Turtle][] and [RDFa][] data using the [Raptor RDF Parser][Raptor]
 library.
 
 * <http://github.com/bendiken/rdf-raptor>
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/2010Apr/0003.html>
+* <http://blog.datagraph.org/2010/04/parsing-rdf-with-ruby>
 
 Features
 --------
@@ -106,11 +106,12 @@ Documentation
   * {RDF::Raptor::RDFXML}
   * {RDF::Raptor::Turtle}
   * {RDF::Raptor::RDFa}
+  * {RDF::Raptor::Graphviz}
 
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.9)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.2.0)
 * [Raptor][] (>= 1.4.16), specifically the `rapper` binary
 
 Installation
@@ -152,6 +153,12 @@ Author
 ------
 
 * [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
+* [John Fieber](mailto:jrf@ursamaris.org) - <http://github.com/jfieber>
+
+Contributors
+------------
+
+* [Ben Lavender](mailto:blavender@gmail.com) - <http://bhuga.net/>
 
 License
 -------
@@ -162,5 +169,6 @@ information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
 [RDF.rb]:   http://rdf.rubyforge.org/
 [RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/
 [Turtle]:   http://en.wikipedia.org/wiki/Turtle_(syntax)
+[RDFa]:     http://rdfa.info/
 [Raptor]:   http://librdf.org/raptor/
 [rapper]:   http://librdf.org/raptor/rapper.html

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/etc/doap.ttl

@@ -0,0 +1,45 @@
+@base         <http://rubygems.org/gems/rdf-json> .
+@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix dc:   <http://purl.org/dc/terms/> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix doap: <http://usefulinc.com/ns/doap#> .
+
+<> a doap:Project ;
+  doap:name          "RDF::Raptor" ;
+  doap:homepage      <http://rdf.rubyforge.org/raptor/> ;
+  doap:license       <http://creativecommons.org/licenses/publicdomain/> ;
+  doap:shortdesc     "Raptor RDF Parser wrapper for RDF.rb."@en ;
+  doap:description   "RDF.rb plugin for parsing/serializing RDF/XML, Turtle and RDFa data using the Raptor RDF Parser library."@en ;
+  doap:created       "2010-03-23" ;
+  doap:platform      "Ruby" ;
+  doap:download-page <http://rubyforge.org/projects/rdf/> ;
+  doap:bug-database  <http://github.com/bendiken/rdf-raptor/issues> ;
+  doap:blog          <http://ar.to/>, <http://blog.datagraph.org/> ;
+  doap:developer     <http://ar.to/#self>, _:jfieber ;
+  doap:maintainer    <http://ar.to/#self> ;
+  doap:documenter    <http://ar.to/#self> ;
+  doap:helper        <http://bhuga.net/#ben> ;
+  foaf:maker         <http://ar.to/#self> ;
+  dc:creator         <http://ar.to/#self> .
+
+<http://ar.to/#self> a foaf:Person ;
+  foaf:name          "Arto Bendiken" ;
+  foaf:mbox          <mailto:arto.bendiken@gmail.com> ;
+  foaf:mbox_sha1sum  "d0737cceb55eb7d740578d2db1bc0727e3ed49ce",
+                     "a033f652c84a4d73b8c26d318c2395699dd2bdfb" ;
+  foaf:homepage      <http://ar.to/> ;
+  rdfs:isDefinedBy   <http://datagraph.org/bendiken/foaf> .
+
+<http://bhuga.net/#ben> a foaf:Person ;
+  foaf:name          "Ben Lavender" ;
+  foaf:mbox          <mailto:blavender@gmail.com> ;
+  foaf:mbox_sha1sum  "dbf45f4ffbd27b67aa84f02a6a31c144727d10af" ;
+  foaf:homepage      <http://bhuga.net/> ;
+  rdfs:isDefinedBy   <http://datagraph.org/bhuga/foaf> .
+
+_:jfieber a foaf:Person ;
+  foaf:name          "John Fieber" ;
+  foaf:mbox          <mailto:jrf@ursamaris.org> ;
+  foaf:mbox_sha1sum "f7653fc1ac0e82ebb32f092389bd5fc728eaae12" ;
+  foaf:homepage      <http://ursamaris.org/> .

data/lib/rdf/raptor.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 require 'rdf'
 
 module RDF
@@ -10,6 +11,8 @@ module RDF
   #   human-readable Turtle format.
   # * {RDF::Raptor::RDFa} provides support for extracting
   #   RDF statements from XHTML+RDFa documents.
+  # * {RDF::Raptor::Graphviz} provides support for serializing
+  #   RDF statements to the Graphviz DOT format.
   #
   # @example Requiring the `RDF::Raptor` module
   #   require 'rdf/raptor'
@@ -20,6 +23,9 @@ module RDF
   # @example Obtaining the Raptor version number
   #   RDF::Raptor.version            #=> "1.4.21"
   #
+  # @example Obtaining the Raptor engine
+  #   RDF::Raptor::ENGINE            #=> :ffi
+  #
   # @example Obtaining an RDF/XML format class
   #   RDF::Format.for(:rdfxml)       #=> RDF::Raptor::RDFXML::Format
   #   RDF::Format.for("input.rdf")
@@ -41,18 +47,42 @@ module RDF
   #   RDF::Format.for(:file_extension => "html")
   #   RDF::Format.for(:content_type   => "application/xhtml+xml")
   #
+  # {RDF::Raptor} includes an ffi implementation, which loads
+  # the libraptor library into the ruby process, and a cli
+  # implementation, which uses the rapper command line tool
+  # in a subprocess.  The ffi implementation is used unless
+  # libraptor library is not found, or the RDF_RAPTOR_ENGINE
+  # environment variable is set to 'cli'.
+  #
+  # If the libraptor library is in the standard library search
+  # path, and the rapper command is in the standard command
+  # search path, all should be well.  If either is in a
+  # non-standard location, set the RDF_RAPTOR_LIBPATH and/or
+  # RDF_RAPTOR_BINPATH appropriately before requiring rdf/raptor.
+  #
   # @see http://rdf.rubyforge.org/
   # @see http://librdf.org/raptor/
+  # @see http://wiki.github.com/ffi/ffi/
   #
   # @author [Arto Bendiken](http://ar.to/)
+  # @author [John Fieber](http://github.com/jfieber)
   module Raptor
-    ENGINE    = (ENV['RDF_RAPTOR_ENGINE'] || :cli).to_sym unless const_defined?(:ENGINE)
     LIBRAPTOR = ENV['RDF_RAPTOR_LIBPATH'] || 'libraptor'  unless const_defined?(:LIBRAPTOR)
     RAPPER    = ENV['RDF_RAPTOR_BINPATH'] || 'rapper'     unless const_defined?(:RAPPER)
 
     require 'rdf/raptor/version'
-    require 'rdf/raptor/cli'
-    require 'rdf/raptor/ffi' if ENGINE == :ffi
+    begin
+      # Try ffi implementation
+      raise LoadError if ENV['RDF_RAPTOR_ENGINE'] == 'cli' # override
+      require 'rdf/raptor/ffi'
+      include RDF::Raptor::FFI
+      extend RDF::Raptor::FFI
+    rescue LoadError => e
+      # cli fallback
+      require 'rdf/raptor/cli'
+      include RDF::Raptor::CLI
+      extend RDF::Raptor::CLI
+    end
 
     ##
     # Returns `true` if the `rapper` binary is available.
@@ -65,20 +95,6 @@ module RDF
       !!version
     end
 
-    ##
-    # Returns the installed `rapper` version number, or `nil` if `rapper` is
-    # not available.
-    #
-    # @example
-    #   RDF::Raptor.version  #=> "1.4.21"
-    #
-    # @return [String]
-    def self.version
-      if `#{RAPPER} --version 2>/dev/null` =~ /^(\d+)\.(\d+)\.(\d+)/
-        [$1, $2, $3].join('.')
-      end
-    end
-
     ##
     # Format base class.
     class Format < RDF::Format
@@ -98,21 +114,9 @@ module RDF
       end
     end
 
-    ##
-    # Reader base class.
-    class Reader < RDF::Reader
-      include RDF::Raptor::CLI::Reader if ENGINE == :cli
-      include RDF::Raptor::FFI::Reader if ENGINE == :ffi
-    end
-
-    ##
-    # Writer base class.
-    class Writer < RDF::Writer
-      include RDF::Raptor::CLI::Writer
-    end
-
     require 'rdf/raptor/rdfxml'
     require 'rdf/raptor/turtle'
     require 'rdf/raptor/rdfa'
+    require 'rdf/raptor/graphviz'
   end # module Raptor
 end # module RDF

data/lib/rdf/raptor/cli.rb

@@ -2,9 +2,26 @@ module RDF::Raptor
   ##
   # A command-line interface to Raptor's `rapper` utility.
   module CLI
+
+    ENGINE = :cli
+
+    ##
+    # Returns the installed `rapper` version number, or `nil` if `rapper` is
+    # not available.
+    #
+    # @example
+    #   RDF::Raptor.version  #=> "1.4.21"
+    #
+    # @return [String]
+    def version
+      if `#{RAPPER} --version 2>/dev/null` =~ /^(\d+)\.(\d+)\.(\d+)/
+        [$1, $2, $3].join('.')
+      end
+    end
+
     ##
     # Reader implementation.
-    module Reader
+    class Reader < RDF::Reader
       ##
       # @param  [IO, File, RDF::URI, String] input
       # @param  [Hash{Symbol => Object}]     options
@@ -17,18 +34,35 @@ module RDF::Raptor
         format = self.class.format.rapper_format
         case input
           when RDF::URI, %r(^(file|http|https|ftp)://)
-            @command = "#{RAPPER} -q -i #{format} -o ntriples #{input}"
-            @command << " #{options[:base_uri]}" if options.has_key?(:base_uri)
+            @command = "#{RAPPER} -q -i #{format} -o ntriples '#{input}'"
+            @command << " '#{options[:base_uri]}'" if options.has_key?(:base_uri)
             @rapper  = IO.popen(@command, 'rb')
-          when File
-            @command = "#{RAPPER} -q -i #{format} -o ntriples #{File.expand_path(input.path)}"
-            @command << " #{options[:base_uri]}" if options.has_key?(:base_uri)
+          when File, Tempfile
+            @command = "#{RAPPER} -q -i #{format} -o ntriples '#{File.expand_path(input.path)}'"
+            @command << " '#{options[:base_uri]}'" if options.has_key?(:base_uri)
             @rapper  = IO.popen(@command, 'rb')
           else # IO, String
             @command = "#{RAPPER} -q -i #{format} -o ntriples file:///dev/stdin"
-            @command << " #{options[:base_uri]}" if options.has_key?(:base_uri)
+            @command << " '#{options[:base_uri]}'" if options.has_key?(:base_uri)
             @rapper  = IO.popen(@command, 'rb+')
-            @rapper.write(input.respond_to?(:read) ? input.read : input.to_s)
+            pid = fork do
+              # process to feed rapper
+              begin
+                @rapper.close_read
+                if input.respond_to?(:read)
+                  buf = String.new
+                  while input.read(8192, buf)
+                    @rapper.write(buf)
+                  end
+                else
+                  @rapper.write(input.to_s)
+                end
+                @rapper.close_write
+              ensure
+                Process.exit
+              end
+            end
+            Process.detach(pid)
             @rapper.close_write
         end
         @reader = RDF::NTriples::Reader.new(@rapper, options, &block)
@@ -39,13 +73,21 @@ module RDF::Raptor
       ##
       # @return [Array]
       def read_triple
-        @reader.read_triple
+        raise EOFError if @rapper.closed?
+        begin
+          triple = @reader.read_triple
+        rescue EOFError
+          @rapper.close
+          raise
+        end
+        triple
       end
+
     end
 
     ##
     # Writer implementation.
-    module Writer
+    class Writer < RDF::Writer
       ##
       # @param  [IO, File]               output
       # @param  [Hash{Symbol => Object}] options
@@ -56,9 +98,9 @@ module RDF::Raptor
 
         format = self.class.format.rapper_format
         case output
-          when File, IO, StringIO
-            @command = "#{RAPPER} -q -i ntriples -o #{format} file:///dev/stdin"
-            @command << " #{options[:base_uri]}" if options.has_key?(:base_uri)
+          when File, IO, StringIO, Tempfile
+            @command = "#{RAPPER} -q -i turtle -o #{format} file:///dev/stdin"
+            @command << " '#{options[:base_uri]}'" if options.has_key?(:base_uri)
             @rapper  = IO.popen(@command, 'rb+')
           else
             raise ArgumentError.new("unsupported output type: #{output.inspect}")
@@ -81,22 +123,36 @@ module RDF::Raptor
       # @param  [RDF::Value]    object
       # @return [void]
       def write_triple(subject, predicate, object)
+        output_transit(false)
         @writer.write_triple(subject, predicate, object)
+        output_transit(false)
       end
 
       ##
       # @return [void]
       def write_epilogue
-        @rapper.close_write
-        begin
+        @rapper.close_write unless @rapper.closed?
+        output_transit(true)
+      end
+
+      ##
+      # Feed any available rapper output to the destination.
+      # @return [void]
+      def output_transit(block)
+        unless @rapper.closed?
           chunk_size = @options[:chunk_size] || 4096 # bytes
-          loop do
-            @output.write(@rapper.readpartial(chunk_size))
+          begin
+            loop do
+              @output.write(block ? @rapper.readpartial(chunk_size) : @rapper.read_nonblock(chunk_size))
+            end
+          rescue EOFError => e
+            @rapper.close
+          rescue Errno::EAGAIN, Errno::EINTR
+            # eat
           end
-        rescue EOFError => e
-          # we're all done
         end
       end
+
     end
   end
 end

data/lib/rdf/raptor/ffi.rb

@@ -7,9 +7,26 @@ module RDF::Raptor
   # @see http://librdf.org/raptor/api/
   # @see http://librdf.org/raptor/libraptor.html
   module FFI
+
+    ENGINE = :ffi
+
+    ##
+    # Returns the installed `rapper` version number, or `nil` if `rapper` is
+    # not available.
+    #
+    # @example
+    #   RDF::Raptor.version  #=> "1.4.21"
+    #
+    # @return [String]
+    def version
+      [ V1_4.raptor_version_major,
+        V1_4.raptor_version_minor,
+        V1_4.raptor_version_release ].join('.')
+    end
+
     ##
     # Reader implementation.
-    module Reader
+    class Reader < RDF::Reader
       ##
       # @param  [IO, File, RDF::URI, String] input
       # @param  [Hash{Symbol => Object}]     options
@@ -21,6 +38,17 @@ module RDF::Raptor
         super
       end
 
+      ERROR_HANDLER = Proc.new do |user_data, locator, message|
+        line = V1_4.raptor_locator_line(locator)
+        raise RDF::ReaderError, line > -1 ? "Line #{line}: #{message}" : message
+      end
+
+      WARNING_HANDLER = Proc.new do |user_data, locator, message|
+        # line = V1_4.raptor_locator_line(locator)
+        # $stderr.puts line > -1 ? "Line #{line}: #{message}" : message
+      end
+
+
       ##
       # @yield [statement]
       # @yieldparam [RDF::Statement] statement
@@ -34,59 +62,130 @@ module RDF::Raptor
       # @yield [triple]
       # @yieldparam [Array(RDF::Resource, RDF::URI, RDF::Value)] triple
       def each_triple(&block)
-        @parser = Proc.new do |user_data, statement|
+        statement_handler = Proc.new do |user_data, statement|
           triple = V1_4::Statement.new(statement).to_triple
           block.call(triple)
         end
 
-        V1_4.with_world do |world|
-          V1_4.with_parser(:name => @format) do |parser|
-            V1_4.raptor_set_statement_handler(parser, nil, @parser)
-            case @input
-              when RDF::URI, %r(^(file|http|https|ftp)://)
-                begin
-                  data_url = V1_4.raptor_new_uri(@input.to_s)
-                  base_uri = @options.has_key?(:base_uri) ? V1_4.raptor_new_uri(@options[:base_uri].to_s) : nil
-                  unless (result = V1_4.raptor_parse_uri(parser, data_url, base_uri)).zero?
-                    # TODO: error handling
-                  end
-                ensure
-                  V1_4.raptor_free_uri(base_uri) if base_uri
-                  V1_4.raptor_free_uri(data_url) if data_url
-                end
-
-              when File
-                begin
-                  data_url = V1_4.raptor_new_uri("file://#{File.expand_path(@input.path)}")
-                  base_uri = @options.has_key?(:base_uri) ? V1_4.raptor_new_uri(@options[:base_uri].to_s) : nil
-                  unless (result = V1_4.raptor_parse_file(parser, data_url, base_uri)).zero?
-                    # TODO: error handling
-                  end
-                ensure
-                  V1_4.raptor_free_uri(base_uri) if base_uri
-                  V1_4.raptor_free_uri(data_url) if data_url
-                end
-
-              else # IO, String
-                base_uri = (@options[:base_uri] || 'file:///dev/stdin').to_s
-                unless (result = V1_4.raptor_start_parse(parser, base_uri)).zero?
+        V1_4.with_parser(:name => @format) do |parser|
+          V1_4.raptor_set_error_handler(parser, nil, ERROR_HANDLER)
+          V1_4.raptor_set_warning_handler(parser, nil, WARNING_HANDLER)
+          V1_4.raptor_set_statement_handler(parser, nil, statement_handler)
+          case @input
+            when RDF::URI, %r(^(file|http|https|ftp)://)
+              begin
+                data_url = V1_4.raptor_new_uri(@input.to_s)
+                base_uri = @options[:base_uri].to_s.empty? ? nil : V1_4.raptor_new_uri(@options[:base_uri].to_s)
+                unless (result = V1_4.raptor_parse_uri(parser, data_url, base_uri)).zero?
                   # TODO: error handling
                 end
-                # TODO: read in chunks instead of everything in one go:
-                unless (result = V1_4.raptor_parse_chunk(parser, buffer = @input.read, buffer.size, 0)).zero?
+              ensure
+                V1_4.raptor_free_uri(base_uri) if base_uri
+                V1_4.raptor_free_uri(data_url) if data_url
+              end
+
+            when File, Tempfile
+              begin
+                data_url = V1_4.raptor_new_uri("file://#{File.expand_path(@input.path)}")
+                base_uri = @options[:base_uri].to_s.empty? ? nil : V1_4.raptor_new_uri(@options[:base_uri].to_s)
+                unless (result = V1_4.raptor_parse_file(parser, data_url, base_uri)).zero?
                   # TODO: error handling
                 end
-                V1_4.raptor_parse_chunk(parser, nil, 0, 1) # EOF
-            end
+              ensure
+                V1_4.raptor_free_uri(base_uri) if base_uri
+                V1_4.raptor_free_uri(data_url) if data_url
+              end
+
+            else # IO, String
+              base_uri = (@options[:base_uri] || 'file:///dev/stdin').to_s
+              unless (result = V1_4.raptor_start_parse(parser, base_uri)).zero?
+                # TODO: error handling
+              end
+              # TODO: read in chunks instead of everything in one go:
+              unless (result = V1_4.raptor_parse_chunk(parser, buffer = @input.read, buffer.size, 0)).zero?
+                # TODO: error handling
+              end
+              V1_4.raptor_parse_chunk(parser, nil, 0, 1) # EOF
           end
         end
 
-        @parser = nil
       end
 
       alias_method :each, :each_statement
     end
 
+    ##
+    # Writer implementation.
+    class Writer < RDF::Writer
+
+      ERROR_HANDLER = Proc.new do |user_data, locator, message|
+        raise RDF::WriterError, message
+      end
+
+      WARNING_HANDLER = Proc.new do |user_data, locator, message|
+        # $stderr.puts "warning"
+      end
+
+      def initialize(output = $stdout, options = {}, &block)
+        raise ArgumentError, "Block required" unless block_given?  # Can we work without this?
+        @format = self.class.format.rapper_format
+        begin
+          # make a serializer
+          @serializer = V1_4.raptor_new_serializer((@format || :rdfxml).to_s)
+          raise RDF::WriterError, "raptor_new_serializer failed" if @serializer.nil?
+          V1_4.raptor_serializer_set_error_handler(@serializer, nil, ERROR_HANDLER)
+          V1_4.raptor_serializer_set_warning_handler(@serializer, nil, WARNING_HANDLER)
+          base_uri = options[:base_uri].to_s.empty? ? nil : V1_4.raptor_new_uri(options[:base_uri].to_s)
+
+          # make an iostream
+          handler = V1_4::IOStreamHandler.new
+          handler.rubyio = output
+          raptor_iostream = V1_4.raptor_new_iostream_from_handler2(nil, handler)
+
+          # connect the two
+          unless V1_4.raptor_serialize_start_to_iostream(@serializer, base_uri, raptor_iostream).zero?
+            raise RDF::WriterError, "raptor_serialize_start_to_iostream failed"
+          end
+          super
+        ensure
+          V1_4.raptor_free_iostream(raptor_iostream) if raptor_iostream
+          V1_4.raptor_free_uri(base_uri) if base_uri
+          V1_4.raptor_free_serializer(@serializer) if @serializer
+        end
+      end
+
+      ##
+      # @param  [RDF::Resource] subject
+      # @param  [RDF::URI]      predicate
+      # @param  [RDF::Value]    object
+      # @return [void]
+      def write_triple(subject, predicate, object)
+        raptor_statement = V1_4::Statement.new
+        raptor_statement.subject = subject
+        raptor_statement.predicate = predicate
+        raptor_statement.object = object
+        begin
+          unless V1_4.raptor_serialize_statement(@serializer, raptor_statement.to_ptr).zero?
+            raise RDF::WriterError, "raptor_serialize_statement failed"
+          end
+        ensure
+          raptor_statement.release
+          raptor_statement = nil
+        end
+      end
+
+      ##
+      # @return [void]
+      def write_epilogue
+        unless V1_4.raptor_serialize_end(@serializer).zero?
+          raise RDF::WriterError, "raptor_serialize_end failed"
+        end
+        super
+      end
+
+    end
+
+
     ##
     # Helper methods for FFI modules.
     module Base
@@ -100,23 +199,6 @@ module RDF::Raptor
     #
     # @see http://librdf.org/raptor/libraptor.html
     module V1_4
-      ##
-      # @param  [Hash{Symbol => Object}] options
-      # @option (options) [Boolean] :init (true)
-      # @yield  [world]
-      # @yieldparam [FFI::Pointer] world
-      # @return [void]
-      def self.with_world(options = {}, &block)
-        options = {:init => true}.merge(options)
-        begin
-          raptor_init if options[:init]
-          raptor_world_open(world = raptor_new_world)
-          block.call(world)
-        ensure
-          raptor_free_world(world) if world
-          raptor_finish if options[:init]
-        end
-      end
 
       ##
       # @param  [Hash{Symbol => Object}] options
@@ -133,6 +215,7 @@ module RDF::Raptor
         end
       end
 
+
       extend Base
       extend ::FFI::Library
       ffi_lib LIBRAPTOR
@@ -153,19 +236,62 @@ module RDF::Raptor
                :object, :pointer,
                :object_type, :int,
                :object_literal_datatype, :pointer,
-               :object_literal_language, :string
+               :object_literal_language, :pointer
+
+        def initialize(*args)
+          super
+          # Objects we need to keep a Ruby reference
+          # to so they don't get garbage collected out from under
+          # the C code we pass them to.
+          @mp = {}
+
+          # Raptor object references we we need to explicitly free
+          # when release is called
+          @raptor_uri_list = []
+        end
+
+        ##
+        # Release raptor memory associated with this struct.
+        # Use of the object after calling this will most likely
+        # cause a crash.  This is kind of ugly.
+        def release
+          if pointer.kind_of?(::FFI::MemoryPointer) && !pointer.null?
+            pointer.free
+          end
+          while uri = @raptor_uri_list.pop
+            V1_4.raptor_free_uri(uri) unless uri.nil? || uri.null?
+          end
+        end
 
         ##
         # @return [RDF::Resource]
         def subject
           @subject ||= case self[:subject_type]
             when RAPTOR_IDENTIFIER_TYPE_RESOURCE
-              RDF::URI.new(V1_4.raptor_uri_to_string(self[:subject]))
+              RDF::URI.intern(V1_4.raptor_uri_to_string(self[:subject]))
             when RAPTOR_IDENTIFIER_TYPE_ANONYMOUS
               RDF::Node.new(self[:subject].read_string)
           end
         end
 
+        ##
+        # Set the subject from an RDF::Resource
+        # @param  [RDF::Resource] value
+        def subject=(resource)
+          @subject = nil
+          case resource
+          when RDF::Node
+            self[:subject] = @mp[:subject] = ::FFI::MemoryPointer.from_string(resource.id.to_s)
+            self[:subject_type] = RAPTOR_IDENTIFIER_TYPE_ANONYMOUS
+          when RDF::URI
+            self[:subject] = @mp[:subject] = @raptor_uri_list.push(V1_4.raptor_new_uri(resource.to_s)).last
+            self[:subject_type] = RAPTOR_IDENTIFIER_TYPE_RESOURCE
+          else
+            raise ArgumentError, "subject must be of kind RDF::Node or RDF::URI"
+          end
+          @subject = resource
+        end
+
         ##
         # @return [String]
         def subject_as_string
@@ -180,10 +306,21 @@ module RDF::Raptor
         def predicate
           @predicate ||= case self[:predicate_type]
             when RAPTOR_IDENTIFIER_TYPE_RESOURCE
-              RDF::URI.new(V1_4.raptor_uri_to_string(self[:predicate]))
+              RDF::URI.intern(V1_4.raptor_uri_to_string(self[:predicate]))
           end
         end
 
+        ##
+        # Set the predicate from an RDF::URI
+        # @param  [RDF::URI] value
+        def predicate=(uri)
+          @predicate = nil
+          raise ArgumentError, "predicate must be a kind of RDF::URI" unless uri.kind_of?(RDF::URI)
+          self[:predicate] = @raptor_uri_list.push(V1_4.raptor_new_uri(uri.to_s)).last
+          self[:predicate_type] = RAPTOR_IDENTIFIER_TYPE_RESOURCE
+          @predicate = uri
+        end
+
         ##
         # @return [String]
         def predicate_as_string
@@ -198,13 +335,13 @@ module RDF::Raptor
         def object
           @object ||= case self[:object_type]
             when RAPTOR_IDENTIFIER_TYPE_RESOURCE
-              RDF::URI.new(V1_4.raptor_uri_to_string(self[:object]))
+              RDF::URI.intern(V1_4.raptor_uri_to_string(self[:object]))
             when RAPTOR_IDENTIFIER_TYPE_ANONYMOUS
               RDF::Node.new(self[:object].read_string)
             when RAPTOR_IDENTIFIER_TYPE_LITERAL
               case
-                when self[:object_literal_language]
-                  RDF::Literal.new(self[:object].read_string, :language => self[:object_literal_language])
+                when self[:object_literal_language] && !self[:object_literal_language].null?
+                  RDF::Literal.new(self[:object].read_string, :language => self[:object_literal_language].read_string)
                 when self[:object_literal_datatype] && !self[:object_literal_datatype].null?
                   RDF::Literal.new(self[:object].read_string, :datatype => V1_4.raptor_uri_to_string(self[:object_literal_datatype]))
                 else
@@ -213,6 +350,38 @@ module RDF::Raptor
           end
         end
 
+        ##
+        # Set the object from an RDF::Value.
+        # Value must be one of RDF::Resource or RDF::Literal.
+        # @param  [RDF::Value] value
+        def object=(value)
+          @object = nil
+          case value
+          when RDF::Node
+            self[:object] = @mp[:object] = ::FFI::MemoryPointer.from_string(value.id.to_s)
+            self[:object_type] = RAPTOR_IDENTIFIER_TYPE_ANONYMOUS
+          when RDF::URI
+            self[:object] = @mp[:object] = @raptor_uri_list.push(V1_4.raptor_new_uri(value.to_s)).last
+            self[:object_type] = RAPTOR_IDENTIFIER_TYPE_RESOURCE
+          when RDF::Literal
+            self[:object_type] = RAPTOR_IDENTIFIER_TYPE_LITERAL
+            self[:object] = @mp[:object] = ::FFI::MemoryPointer.from_string(value.value)
+            self[:object_literal_datatype] = if value.datatype
+              @raptor_uri_list.push(V1_4.raptor_new_uri(value.datatype.to_s)).last
+            else
+              nil
+            end
+            self[:object_literal_language] = @mp[:object_literal_language] = if value.language?
+              ::FFI::MemoryPointer.from_string(value.language.to_s)
+            else
+              nil
+            end
+          else
+            raise ArgumentError, "object must be of type RDF::Node, RDF::URI or RDF::Literal"
+          end
+          @object = value
+        end
+
         ##
         # @return [String]
         def object_as_string
@@ -234,17 +403,25 @@ module RDF::Raptor
         def to_quad
           [subject, predicate, object, nil]
         end
+
       end
 
       # @see http://librdf.org/raptor/api/tutorial-initialising-finishing.html
       attach_function :raptor_init, [], :void
       attach_function :raptor_finish, [], :void
 
-      # @see http://librdf.org/raptor/api/raptor-section-world.html
-      define_pointer  :raptor_world
-      attach_function :raptor_new_world, [], raptor_world
-      attach_function :raptor_world_open, [raptor_world], :int
-      attach_function :raptor_free_world, [raptor_world], :void
+      # @see http://librdf.org/raptor/api/raptor-section-locator.html
+      define_pointer  :raptor_locator
+      attach_function :raptor_locator_line, [raptor_locator], :int
+      attach_function :raptor_locator_column, [raptor_locator], :int
+      attach_function :raptor_locator_byte, [raptor_locator], :int
+
+      # @see http://librdf.org/raptor/api/raptor-section-general.html
+      attach_variable :raptor_version_major, :int
+      attach_variable :raptor_version_minor, :int
+      attach_variable :raptor_version_release, :int
+      attach_variable :raptor_version_decimal, :int
+      callback        :raptor_message_handler, [:pointer, raptor_locator, :string], :void
 
       # @see http://librdf.org/raptor/api/raptor-section-uri.html
       define_pointer  :raptor_uri
@@ -255,6 +432,7 @@ module RDF::Raptor
       attach_function :raptor_free_uri, [raptor_uri], :void
 
       # @see http://librdf.org/raptor/api/raptor-section-triples.html
+      define_pointer  :raptor_identifier
       define_pointer  :raptor_statement
       attach_function :raptor_statement_compare, [raptor_statement, raptor_statement], :int
       attach_function :raptor_print_statement, [raptor_statement, :pointer], :void
@@ -265,6 +443,8 @@ module RDF::Raptor
       callback :raptor_statement_handler, [:pointer, raptor_statement], :void
       define_pointer  :raptor_parser
       attach_function :raptor_new_parser, [:string], raptor_parser
+      attach_function :raptor_set_error_handler, [raptor_parser, :pointer, :raptor_message_handler], :void
+      attach_function :raptor_set_warning_handler, [raptor_parser, :pointer, :raptor_message_handler], :void
       attach_function :raptor_set_statement_handler, [raptor_parser, :pointer, :raptor_statement_handler], :void
       attach_function :raptor_parse_file, [raptor_parser, raptor_uri, raptor_uri], :int
       attach_function :raptor_parse_file_stream, [raptor_parser, :pointer, :string, raptor_uri], :int
@@ -274,8 +454,95 @@ module RDF::Raptor
       attach_function :raptor_get_mime_type, [raptor_parser], :string
       attach_function :raptor_set_parser_strict, [raptor_parser, :int], :void
       attach_function :raptor_get_need_base_uri, [raptor_parser], :int
-      attach_function :raptor_parser_get_world, [raptor_parser], raptor_world
       attach_function :raptor_free_parser, [raptor_parser], :void
+
+      # @see http://librdf.org/raptor/api/raptor-section-iostream.html
+      define_pointer  :raptor_iostream
+      callback        :raptor_iostream_init_func, [:pointer], :int
+      callback        :raptor_iostream_finish_func, [:pointer], :void
+      callback        :raptor_iostream_write_byte_func, [:pointer, :int], :int
+      callback        :raptor_iostream_write_bytes_func, [:pointer, :pointer, :size_t, :size_t], :int
+      callback        :raptor_iostream_write_end_func, [:pointer], :void
+      callback        :raptor_iostream_read_bytes_func, [:pointer, :pointer, :size_t, :size_t], :int
+      callback        :raptor_iostream_read_eof_func, [:pointer], :int
+      attach_function :raptor_new_iostream_from_handler2, [:pointer, :pointer], raptor_iostream
+      attach_function :raptor_free_iostream, [raptor_iostream], :void
+
+      class IOStreamHandler < ::FFI::Struct
+        layout :version, :int,
+               :init, :raptor_iostream_init_func,
+               :finish, :raptor_iostream_finish_func,
+               :write_byte, :raptor_iostream_write_byte_func,
+               :write_bytes, :raptor_iostream_write_bytes_func,
+               :write_end, :raptor_iostream_write_end_func,
+               :read_bytes, :raptor_iostream_read_bytes_func,
+               :read_eof, :raptor_iostream_read_eof_func
+
+        attr_accessor :rubyio
+
+        def initialize(*args)
+          super
+          # Keep a ruby land reference to our procs so they don't
+          # get snatched by GC.
+          @procs = {}
+
+          self[:version] = 2
+
+          # @procs[:init] = self[:init] = Proc.new do |context|
+          #   $stderr.puts("#{self.class}: init")
+          # end
+          # @procs[:finish] = self[:finish] = Proc.new do |context|
+          #   $stderr.puts("#{self.class}: finish")
+          # end
+          @procs[:write_byte] = self[:write_byte] = Proc.new do |context, byte|
+            begin
+              @rubyio.putc(byte)
+            rescue
+              return 1
+            end
+            0
+          end
+          @procs[:write_bytes] = self[:write_bytes] = Proc.new do |context, data, size, nmemb|
+            begin
+              @rubyio.write(data.read_string(size * nmemb))
+            rescue
+              return 1
+            end
+            0
+          end
+          # @procs[:write_end] = self[:write_end] = Proc.new do |context|
+          #   $stderr.puts("#{self.class}: write_end")
+          # end
+          # @procs[:read_bytes] = self[:read_bytes] = Proc.new do |context, data, size, nmemb|
+          #   $stderr.puts("#{self.class}: read_bytes")
+          # end
+          # @procs[:read_eof] = self[:read_eof] = Proc.new do |context|
+          #   $stderr.puts("#{self.class}: read_eof")
+          # end
+        end
+      end
+
+      # @see http://librdf.org/raptor/api/raptor-section-xml-namespace.html
+      define_pointer  :raptor_namespace
+
+      # @see http://librdf.org/raptor/api/raptor-section-serializer.html
+      define_pointer  :raptor_serializer
+      attach_function :raptor_new_serializer, [:string], raptor_serializer
+      attach_function :raptor_free_serializer, [raptor_serializer], :void
+      attach_function :raptor_serialize_start_to_iostream, [raptor_serializer, raptor_uri, raptor_iostream], :int
+      attach_function :raptor_serialize_start_to_filename, [raptor_serializer, :string], :int
+      attach_function :raptor_serialize_statement, [raptor_serializer, raptor_statement], :int
+      attach_function :raptor_serialize_end, [raptor_serializer], :int
+      attach_function :raptor_serializer_set_error_handler, [raptor_serializer, :pointer, :raptor_message_handler], :void
+      attach_function :raptor_serializer_set_warning_handler, [raptor_serializer, :pointer, :raptor_message_handler], :void
+
+      # Initialize the world
+      # We do this exactly once and never release because we can't delegate
+      # any memory management to the ruby GC.
+      # Internally raptor_init/raptor_finish work with ref-counts.
+      raptor_init
+
     end
   end
 end
+

data/lib/rdf/raptor/graphviz.rb

@@ -0,0 +1,56 @@
+module RDF::Raptor
+  ##
+  # Graphviz support.
+  #
+  # @example Requiring the `RDF::Raptor` module
+  #   require 'rdf/raptor'
+  #
+  # @example Serializing RDF statements into a Graphviz file
+  #   RDF::Writer.open("output.dot") do |writer|
+  #     graph.each_statement do |statement|
+  #       writer << statement
+  #     end
+  #   end
+  #
+  module Graphviz
+    ##
+    # Graphviz format specification.
+    #
+    # @example Obtaining a Graphviz format class
+    #   RDF::Format.for(:graphviz)     #=> RDF::Raptor::Graphviz::Format
+    #   RDF::Format.for("output.dot")
+    #   RDF::Format.for(:file_name      => "output.dot")
+    #   RDF::Format.for(:file_extension => "dot")
+    #   RDF::Format.for(:content_type   => "text/vnd.graphviz")
+    #
+    # @see http://www.iana.org/assignments/media-types/text/vnd.graphviz
+    class Format < RDF::Raptor::Format
+      content_type     'text/vnd.graphviz', :aliases => ['application/x-graphviz', 'text/x-graphviz'], :extension => :dot # TODO: also .gv
+      content_encoding 'utf-8'
+      rapper_format    :dot
+
+      writer { RDF::Raptor::Graphviz::Writer }
+    end
+
+    ##
+    # Graphviz serializer.
+    #
+    # @example Obtaining a Graphviz writer class
+    #   RDF::Writer.for(:graphviz)     #=> RDF::Raptor::Graphviz::Writer
+    #   RDF::Writer.for("output.dot")
+    #   RDF::Writer.for(:file_name      => "output.dot")
+    #   RDF::Writer.for(:file_extension => "dot")
+    #   RDF::Writer.for(:content_type   => "text/vnd.graphviz")
+    #
+    # @example Serializing RDF statements into a Graphviz file
+    #   RDF::Writer.open("output.dot") do |writer|
+    #     graph.each_statement do |statement|
+    #       writer << statement
+    #     end
+    #   end
+    #
+    class Writer < RDF::Raptor::Writer
+      format RDF::Raptor::Graphviz::Format
+    end
+  end
+end

data/lib/rdf/raptor/turtle.rb

@@ -23,6 +23,7 @@ module RDF::Raptor
   module Turtle
     ##
     # Turtle format specification.
+    # @see http://www.w3.org/TeamSubmission/turtle/
     #
     # @example Obtaining a Turtle format class
     #   RDF::Format.for(:turtle)       #=> RDF::Raptor::Turtle::Format
@@ -32,7 +33,7 @@ module RDF::Raptor
     #   RDF::Format.for(:content_type   => "text/turtle")
     #
     class Format < RDF::Raptor::Format
-      content_type     'text/turtle', :extension => :ttl
+      content_type     'text/turtle', :aliases => ['application/x-turtle', 'application/turtle'], :extension => :ttl
       content_encoding 'utf-8'
       rapper_format    :turtle
 

data/lib/rdf/raptor/version.rb

@@ -1,12 +1,11 @@
 module RDF; module Raptor
   module VERSION
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
     EXTRA = nil
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
-    STRING << ".#{EXTRA}" if EXTRA
+    STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 
     ##
     # @return [String]

metadata

@@ -4,77 +4,78 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Arto Bendiken
+- John Fieber
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-06-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdf-spec
+  name: rdf
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 9
-        version: 0.1.9
-  type: :development
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 5
+        - 6
+        version: 0.5.6
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 5
+        - 1
         - 3
-        version: 0.5.3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdf
+  name: rdf-spec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 9
-        version: 0.1.9
-  type: :runtime
+        - 2
+        - 0
+        version: 0.2.0
+  type: :development
   version_requirements: *id004
-description: RDF.rb plugin for parsing/serializing RDF/XML and Turtle data using the Raptor RDF Parser library.
-email: arto.bendiken@gmail.com
+description: RDF.rb plugin for parsing/serializing RDF/XML, Turtle and RDFa data using the Raptor RDF Parser library.
+email: public-rdf-ruby@w3.org
 executables: []
 
 extensions: []
@@ -83,11 +84,14 @@ extra_rdoc_files: []
 
 files: 
 - AUTHORS
+- CONTRIBUTORS
 - README
 - UNLICENSE
 - VERSION
+- etc/doap.ttl
 - lib/rdf/raptor/cli.rb
 - lib/rdf/raptor/ffi.rb
+- lib/rdf/raptor/graphviz.rb
 - lib/rdf/raptor/rdfa.rb
 - lib/rdf/raptor/rdfxml.rb
 - lib/rdf/raptor/turtle.rb
@@ -109,8 +113,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
       segments: 
       - 1
       - 8
-      - 2
-      version: 1.8.2
+      - 1
+      version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -119,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- Raptor (>= 1.4.16)
+- libraptor (>= 1.4.16)
 rubyforge_project: rdf
 rubygems_version: 1.3.6
 signing_key: