rdf-raptor 0.4.1 → 0.4.2

data/CREDITS

@@ -1 +1,3 @@
 * Ben Lavender <blavender@gmail.com>
+* David Butler <david.william.butler@gmail.com>
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README

@@ -1,11 +1,12 @@
 Raptor RDF Parser Plugin for RDF.rb
 ===================================
+[![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-raptor.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-raptor)
 
 This is an [RDF.rb][] plugin that adds support for parsing/serializing
 [RDF/XML][], [Turtle][] and [RDFa][] data using the [Raptor RDF Parser][Raptor]
 library.
 
-* <http://github.com/bendiken/rdf-raptor>
+* <http://github.com/ruby-rdf/rdf-raptor>
 * <http://blog.datagraph.org/2010/04/parsing-rdf-with-ruby>
 
 Features
@@ -16,7 +17,7 @@ Features
 * Extracts RDF statements from XHTML+RDFa documents.
 * Provides serialization format autodetection for RDF/XML, Turtle and RDFa.
 * Compatible with any operating system supported by Raptor and Ruby.
-* Compatible with MRI 1.8.x, 1.9.x and JRuby (tested with JRuby 1.4).
+* Compatible with MRI 1.8.x, 1.9.x and JRuby (tested with JRuby 1.8 and 1.9 mode).
 
 Examples
 --------
@@ -44,7 +45,7 @@ Examples
       end
     end
 
-### Extracting RDF statements from an XHTML+RDFa document
+### Extracting RDF statements from an HTML+RDFa document
 
     RDF::Reader.open(url = "http://bblfish.net/", :format => :rdfa, :base_uri => url) do |reader|
       reader.each_statement do |statement|
@@ -72,6 +73,14 @@ Examples
       end
     end
 
+### Obtaining the NTriples format specification class
+
+    RDF::Format.for(:ntriples)      #=> RDF::Raptor::NTriples::Format
+    RDF::Format.for("input.nt")
+    RDF::Format.for(:file_name      => "input.nt")
+    RDF::Format.for(:file_extension => "nt")
+    RDF::Format.for(:content_type   => "application/n-triples")
+
 ### Obtaining the RDF/XML format specification class
 
     RDF::Format.for(:rdfxml)       #=> RDF::Raptor::RDFXML::Format
@@ -113,7 +122,7 @@ Dependencies
 
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
 * [FFI](http://rubygems.org/gems/ffi) (>= 1.0.0)
-* [Raptor][] (>= 1.4.16), the `libraptor` library or the `rapper` binary
+* [Raptor][] (>= 1.4.21), the `libraptor` library or the `rapper` binary
 
 Installation
 ------------
@@ -130,6 +139,7 @@ Mac and the most common Linux and BSD distributions:
 
     % [sudo] port install raptor             # Mac OS X with MacPorts
     % [sudo] fink install raptor-bin         # Mac OS X with Fink
+    % brew install raptor                    # Mac OS X with Homebrew
     % [sudo] aptitude install raptor-utils   # Ubuntu / Debian
     % [sudo] yum install raptor              # Fedora / CentOS / RHEL
     % [sudo] zypper install raptor           # openSUSE
@@ -143,12 +153,12 @@ Download
 
 To get a local working copy of the development repository, do:
 
-    % git clone git://github.com/bendiken/rdf-raptor.git
+    % git clone git://github.com/ruby-rdf/rdf-raptor.git
 
 Alternatively, download the latest development version as a tarball as
 follows:
 
-    % wget http://github.com/bendiken/rdf-raptor/tarball/master
+    % wget http://github.com/ruby-rdf/rdf-raptor/tarball/master
 
 Mailing List
 ------------
@@ -165,6 +175,8 @@ Contributors
 ------------
 
 * [Ben Lavender](http://github.com/bhuga) - <http://bhuga.net/>
+* [David Butler](http://github.com/dwbutler)
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
 License
 -------

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/etc/doap.ttl

@@ -7,19 +7,22 @@
 
 <> a doap:Project ;
   doap:name          "RDF::Raptor" ;
-  doap:homepage      <http://rdf.rubyforge.org/raptor/> ;
+  doap:homepage      <http://ruby-rdf.github.com/rdf-raptor> ;
   doap:license       <http://creativecommons.org/licenses/publicdomain/> ;
   doap:shortdesc     "Raptor RDF Parser plugin 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:download-page <http://rubygems.org/gems/rdf-turtle> ;
+  doap:bug-database  <http://github.com/ruby-rdf/rdf-raptor/issues> ;
   doap:blog          <http://ar.to/>, <http://blog.datagraph.org/> ;
-  doap:developer     <http://ar.to/#self>, _:jfieber ;
+  doap:developer     <http://ar.to/#self>,
+                     _:jfieber,
+                     <http://greggkellogg.net/foaf#me> ;
   doap:maintainer    <http://ar.to/#self> ;
   doap:documenter    <http://ar.to/#self> ;
-  doap:helper        <http://bhuga.net/#ben> ;
+  doap:helper        <http://bhuga.net/#ben>,
+                     <http://greggkellogg.net/foaf#me> ;
   foaf:maker         <http://ar.to/#self> ;
   dc:creator         <http://ar.to/#self> .
 
@@ -43,3 +46,10 @@ _:jfieber a foaf:Person ;
   foaf:mbox          <mailto:jrf@ursamaris.org> ;
   foaf:mbox_sha1sum "f7653fc1ac0e82ebb32f092389bd5fc728eaae12" ;
   foaf:homepage      <http://ursamaris.org/> .
+
+<http://greggkellogg.net/foaf#me> a foaf:Person ;
+  foaf:name          "Gregg Kellogg" ;
+  foaf:mbox          <mailto:gregg@greggkellogg.net> ;
+  foaf:mbox_sha1sum  "35bc44e6d0070e5ad50ccbe0d24403c96af2b9bd" ;
+  foaf:homepage      <http://greggkellogg.net/>;
+  rdfs:isDefinedBy   <http://greggkellogg.net/foaf> .

data/lib/rdf/raptor/cli.rb

@@ -191,7 +191,7 @@ module RDF::Raptor
           chunk_size = @options[:chunk_size] || 4096 # bytes
           begin
             loop do
-              @output.write(may_block ? @rapper.readpartial(chunk_size) : @rapper.read_nonblock(chunk_size))
+              @output.write(may_block ? @rapper.sysread(chunk_size) : @rapper.read_nonblock(chunk_size))
             end
           rescue EOFError => e
             @rapper.close

data/lib/rdf/raptor/ffi/v1/iostream.rb

@@ -31,6 +31,9 @@ module RDF::Raptor::FFI::V1
           V1.raptor_new_iostream_to_sink()
         else nil
       end
+      
+      @free_iostream = options[:free_iostream] || true
+      
       raise ArgumentError, "invalid argument: #{ptr_or_obj.inspect}" if ptr.nil? || ptr.null?
       super(ptr)
     end
@@ -41,7 +44,9 @@ module RDF::Raptor::FFI::V1
     # @param  [FFI::Pointer] ptr
     # @return [void]
     def self.release(ptr)
-      V1.raptor_free_iostream(ptr)
+      if @free_iostrem
+        V1.raptor_free_iostream(ptr)
+      end
     end
   end # IOStream
 end # RDF::Raptor::FFI::V1

data/lib/rdf/raptor/ffi/v1/iostream_handler.rb

@@ -28,17 +28,19 @@ module RDF::Raptor::FFI::V1
     #   @param  [IO, StringIO] io
     #
     def initialize(ptr_or_io = nil)
-      ptr = case ptr_or_io
+      if ptr_or_io.respond_to?(:write)
+        @io = ptr_or_io
+        super()
+      else
+        case ptr_or_io
         when FFI::Pointer
-          ptr_or_io
-        when IO, StringIO
-          @io = ptr_or_io
-          nil
-        when nil then nil
+          super(ptr_or_io)
+        when nil
+          super()
         else
           raise ArgumentError, "invalid argument: #{ptr_or_io.inspect}"
+        end
       end
-      super(ptr)
       initialize!
     end
 

data/lib/rdf/raptor/ffi/v1/parser.rb

@@ -150,7 +150,7 @@ module RDF::Raptor::FFI::V1
       begin
         parse_start!((options[:base_uri] || BASE_URI).to_s)
         loop do
-          parse_chunk(stream.readpartial(BUFFER_SIZE))
+          parse_chunk(stream.sysread(BUFFER_SIZE))
         end
       rescue EOFError => e
         parse_end!

data/lib/rdf/raptor/ffi/v1/serializer.rb

@@ -58,11 +58,10 @@ module RDF::Raptor::FFI::V1
     #   the base URI to use when resolving relative URIs
     # @return [void]
     def start_to(output, options = {})
-      case output
-        when IO, StringIO
-          start_to_stream(output, options)
-        else
-          raise ArgumentError, "don't know how to serialize to #{output.inspect}"
+      if output.respond_to?(:write)
+        start_to_stream(output, options)
+       else
+        raise ArgumentError, "don't know how to serialize to #{output.inspect}"
       end
     end
 
@@ -72,7 +71,7 @@ module RDF::Raptor::FFI::V1
     #   any additional options for serializing (see {#start_to})
     # @return [void]
     def start_to_stream(stream, options = {})
-      iostream = V1::IOStream.new(V1::IOStreamHandler.new(stream))
+      iostream = V1::IOStream.new(V1::IOStreamHandler.new(stream), :free_iostream => false)
       start_to_iostream(iostream, options)
     end
 

data/lib/rdf/raptor/ffi/v1.rb

@@ -64,7 +64,10 @@ module RDF::Raptor::FFI
     # @see http://librdf.org/raptor/api-1.4/raptor-section-parser.html
     callback :raptor_statement_handler, [:pointer, :raptor_statement], :void
     typedef :pointer, :raptor_parser
+    typedef :string, :mime_type
+    typedef :string, :buffer
     attach_function :raptor_new_parser, [:string], :raptor_parser
+    attach_function :raptor_guess_parser_name, [:raptor_uri, :mime_type, :buffer, :size_t, :string], :string
     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

data/lib/rdf/raptor/ffi.rb

@@ -25,7 +25,6 @@ module RDF::Raptor
        V1.raptor_version_minor,
        V1.raptor_version_release].join('.').freeze
     end
-    module_function :version
 
     ##
     # FFI reader implementation.

data/lib/rdf/raptor/format.rb

@@ -0,0 +1,27 @@
+module RDF
+  module Raptor
+    ##
+    # RDF::Raptor::Format mixin.
+    module Format
+      ##
+      # @overload rapper_format
+      #
+      # @overload rapper_format(format)
+      #   @param  [Symbol] format
+      #
+      # @return [void]
+      def rapper_format(format = nil)
+        unless format
+          @rapper_format
+        else
+          @rapper_format = format
+        end
+      end
+      
+      def detect(sample)
+        parser_name = RDF::Raptor::FFI::V1.raptor_guess_parser_name(nil, nil, sample, sample.length, nil)
+        parser_name == rapper_format.to_s
+      end
+    end # Format
+  end
+end

data/lib/rdf/raptor/graphviz.rb

@@ -24,12 +24,15 @@ module RDF::Raptor
     #   RDF::Format.for(:content_type   => "text/vnd.graphviz")
     #
     # @see http://www.iana.org/assignments/media-types/text/vnd.graphviz
-    class Format < RDF::Raptor::Format
+    class Format < RDF::Format
+      extend 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 }
+      reader { RDF::Raptor::Graphviz::Reader }
     end # Format
 
     ##
@@ -52,5 +55,13 @@ module RDF::Raptor
     class Writer < RDF::Raptor::Writer
       format RDF::Raptor::Graphviz::Format
     end # Writer
+    
+    ##
+    # Raptor does not implement a Graphviz reader, but we need one in
+    # order for the Format to pass specs. This class should always
+    # raise a NoMethodError to indicate it shouldn't be used.
+    #
+    class Reader
+    end
   end # Graphviz
 end # RDF::Raptor

data/lib/rdf/raptor/ntriples.rb

@@ -31,13 +31,20 @@ module RDF::Raptor
     #   RDF::Format.for(:file_extension => "nt")
     #   RDF::Format.for(:content_type   => "text/plain")
     #
-    class Format < RDF::Raptor::Format
-      content_type     'text/plain', :extension => :nt
-      content_encoding 'ascii'
+    class Format < RDF::Format
+      extend RDF::Raptor::Format
+      
+      content_type     'application/n-triples', :extension => :nt, :alias => ['text/plain']
+      content_encoding 'utf-8'
       rapper_format    :ntriples
 
       reader { RDF::Raptor::NTriples::Reader }
       writer { RDF::Raptor::NTriples::Writer }
+      
+      def self.detect(sample)
+        # Raptor's format guessing isn't fully supported
+        RDF::NTriples::Format.detect(sample)
+      end
     end # Format
 
     ##

data/lib/rdf/raptor/rdfa.rb

@@ -24,7 +24,9 @@ module RDF::Raptor
     #   RDF::Format.for(:file_extension => "html")
     #   RDF::Format.for(:content_type   => "application/xhtml+xml")
     #
-    class Format < RDF::Raptor::Format
+    class Format < RDF::Format
+      extend RDF::Raptor::Format
+      
       content_type     'application/xhtml+xml', :aliases => ['text/html'], :extension => :html
       content_encoding 'utf-8'
       rapper_format    :rdfa

data/lib/rdf/raptor/rdfxml.rb

@@ -31,13 +31,20 @@ module RDF::Raptor
     #   RDF::Format.for(:file_extension => "rdf")
     #   RDF::Format.for(:content_type   => "application/rdf+xml")
     #
-    class Format < RDF::Raptor::Format
+    class Format < RDF::Format
+      extend RDF::Raptor::Format
+      
       content_type     'application/rdf+xml', :extension => :rdf
       content_encoding 'utf-8'
       rapper_format    :rdfxml
 
       reader { RDF::Raptor::RDFXML::Reader }
       writer { RDF::Raptor::RDFXML::Writer }
+      
+      def self.detect(sample)
+        # Raptor guess is not fully supported
+        sample.match(/<(\w+:)?(RDF)/)
+      end
     end # Format
 
     ##

data/lib/rdf/raptor/turtle.rb

@@ -31,7 +31,9 @@ module RDF::Raptor
     #   RDF::Format.for(:file_extension => "ttl")
     #   RDF::Format.for(:content_type   => "text/turtle")
     #
-    class Format < RDF::Raptor::Format
+    class Format < RDF::Format
+      extend RDF::Raptor::Format
+      
       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,10 +1,7 @@
 module RDF; module Raptor
   module VERSION
-    MAJOR = 0
-    MINOR = 4
-    TINY  = 1
-    EXTRA = nil
-
+    VERSION_FILE = File.expand_path("../../../../VERSION", __FILE__)
+    MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 
     ##

data/lib/rdf/raptor.rb

@@ -1,4 +1,5 @@
 require 'rdf' # @see http://rubygems.org/gems/rdf
+require 'rdf/raptor/format'
 
 module RDF
   ##
@@ -106,26 +107,7 @@ module RDF
       !!version
     end
 
-    ##
-    # Format base class.
-    class Format < RDF::Format
-      ##
-      # @overload rapper_format
-      #
-      # @overload rapper_format(format)
-      #   @param  [Symbol] format
-      #
-      # @return [void]
-      def self.rapper_format(format = nil)
-        unless format
-          @rapper_format
-        else
-          @rapper_format = format
-        end
-      end
-    end # Format
-
-    #require 'rdf/raptor/ntriples'
+    require 'rdf/raptor/ntriples'
     require 'rdf/raptor/turtle'
     require 'rdf/raptor/rdfxml'
     require 'rdf/raptor/rdfa'

metadata

@@ -1,101 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-raptor
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.4.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Arto Bendiken
 - John Fieber
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdf
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: RDF.rb plugin for parsing/serializing RDF/XML, Turtle and RDFa data using the Raptor RDF Parser library.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - CREDITS
 - README
@@ -111,6 +114,7 @@ files:
 - lib/rdf/raptor/ffi/v1/uri.rb
 - lib/rdf/raptor/ffi/v1.rb
 - lib/rdf/raptor/ffi.rb
+- lib/rdf/raptor/format.rb
 - lib/rdf/raptor/graphviz.rb
 - lib/rdf/raptor/ntriples.rb
 - lib/rdf/raptor/rdfa.rb
@@ -118,37 +122,31 @@ files:
 - lib/rdf/raptor/turtle.rb
 - lib/rdf/raptor/version.rb
 - lib/rdf/raptor.rb
-has_rdoc: false
 homepage: http://rdf.rubyforge.org/raptor/
-licenses: 
+licenses:
 - Public Domain
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- libraptor (>= 1.4.16)
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
+- libraptor (>= 1.4.21)
 rubyforge_project: rdf
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Raptor RDF Parser plugin for RDF.rb.
 test_files: []
-
+has_rdoc: false