rdf-raptor 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: c42b95d9190c14c278a7070846273170d4a3729d
-  data.tar.gz: 498f96cf1f00e20fb06cb98611b8a1b42158ec76
-SHA512:
-  metadata.gz: fd1d8457304c061a69c1e77d92ffb34b401783cf45b45bbbebc13cde84c3d7a0ec2fbb6a9543f3f3ffe89c8ad7debf320aece460b3c5a8c3d42b81fc1e9a86dc
-  data.tar.gz: 6930375299c6a2a6efb71179e8452c1e459b4b9ee832d1b3e536660fc611e122673b2f5fdf11f43eb3603ead34a1a83e801b678a4dd7a1955b245b5535b45c3c
+--- 
+SHA1: 
+  metadata.gz: c280bd4c2d61fce08c1f23c4924e648a43b8d4c2
+  data.tar.gz: 0d3f0b2640f3b2c08b1834e2ee4e39d5e7007c5b
+SHA512: 
+  metadata.gz: 957fac71b4c7d3895241b61dd2d7ed11c2386245608d521ddba60d3bdaceab9162dd39d0eccc3410eb7197ebe0c47623142f642cfc614c41b05ddeaf084d82d2
+  data.tar.gz: 9c2bdce799908d6b794cce599b08486dd77f2c6919dc617c12987edf56efdbf5cdafd76edfeee84469f7969dc9689962641bcb47d41a39232183f75684893250

data/README

@@ -1,11 +1,11 @@
 Raptor RDF Parser Plugin for RDF.rb
 ===================================
 
-This is an [RDF.rb][] plugin that adds support for parsing/serializing [NTriples][],
+This is an [RDF.rb][] extension that adds support for parsing/serializing [NTriples][],
 [RDF/XML][], [Turtle][], [RDFa][], and [Graphviz][] data using the [Raptor RDF Parser][Raptor]
 library.
 
-* <http://github.com/ruby-rdf/rdf-raptor>
+* <https://github.com/ruby-rdf/rdf-raptor>
 * <http://blog.datagraph.org/2010/04/parsing-rdf-with-ruby>
 
 [![Gem Version](https://badge.fury.io/rb/rdf-raptor.png)](http://badge.fury.io/rb/rdf-raptor)
@@ -173,12 +173,12 @@ Download
 
 To get a local working copy of the development repository, do:
 
-    % git clone git://github.com/ruby-rdf/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/ruby-rdf/rdf-raptor/tarball/master
+    % wget https://github.com/ruby-rdf/rdf-raptor/tarball/master
 
 Mailing List
 ------------
@@ -188,15 +188,15 @@ Mailing List
 Authors
 -------
 
-* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
-* [John Fieber](http://github.com/jfieber) - <http://github.com/jfieber>
+* [Arto Bendiken](https://github.com/bendiken) - <http://ar.to/>
+* [John Fieber](https://github.com/jfieber) - <http://github.com/jfieber>
 
 Contributors
 ------------
 
-* [Ben Lavender](http://github.com/bhuga) - <http://bhuga.net/>
-* [David Butler](http://github.com/dwbutler) - <http://github.com/dwbutler>
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Ben Lavender](https://github.com/bhuga) - <http://bhuga.net/>
+* [David Butler](https://github.com/dwbutler) - <http://github.com/dwbutler>
+* [Gregg Kellogg](https://github.com/gkellogg) - <http://greggkellogg.net/>
 
 License
 -------
@@ -204,10 +204,10 @@ License
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying [UNLICENSE][] file.
 
-[RDF.rb]:   http://ruby-rdf.github.com/rdf
-[NTriples]: http://en.wikipedia.org/wiki/N-Triples
+[RDF.rb]:   https://ruby-rdf.github.io/rdf
+[NTriples]: https://en.wikipedia.org/wiki/N-Triples
 [RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/
-[Turtle]:   http://en.wikipedia.org/wiki/Turtle_(syntax)
+[Turtle]:   https://en.wikipedia.org/wiki/Turtle_(syntax)
 [RDFa]:     http://rdfa.info/
 [Graphviz]: http://www.graphviz.org/
 [Raptor]:   http://librdf.org/raptor/

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/rdf/raptor/ffi.rb

@@ -41,8 +41,14 @@ module RDF::Raptor
       def initialize(input = $stdin, options = {}, &block)
         @format = self.class.format.rapper_format
         @parser = V2::Parser.new(@format)
-        @parser.error_handler   = ERROR_HANDLER
+        @parser.error_handler = ERROR_HANDLER
         @parser.warning_handler = WARNING_HANDLER
+        
+        @parser.namespace_handler = Proc.new do |user_data, raptor_namespace|
+          namespace = V2::Namespace.new(raptor_namespace)
+          prefix(namespace.prefix, namespace.uri) if namespace.prefix_length > 0
+        end
+
         super
       end
 

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

@@ -11,6 +11,7 @@ module RDF::Raptor::FFI
     autoload :Statement,       'rdf/raptor/ffi/v2/statement'
     autoload :URI,             'rdf/raptor/ffi/v2/uri'
     autoload :Term,            'rdf/raptor/ffi/v2/term'
+    autoload :Namespace,       'rdf/raptor/ffi/v2/namespace'
     autoload :World,           'rdf/raptor/ffi/v2/world'
 
     extend ::FFI::Library
@@ -77,13 +78,19 @@ module RDF::Raptor::FFI
     attach_function :raptor_new_term_from_blank, [:raptor_world, :blank], :raptor_term
     attach_function :raptor_free_term, [:raptor_term], :void
 
+    # @see http://librdf.org/raptor/api/raptor2-section-xml-namespace.html
+    typedef :pointer, :raptor_namespace
+    attach_function :raptor_free_namespace, [:raptor_namespace], :void
+
     # @see http://librdf.org/raptor/api/raptor2-section-parser.html
     callback :raptor_statement_handler, [:pointer, :raptor_statement], :void
+    callback :raptor_namespace_handler, [:pointer, :raptor_namespace], :void
     typedef :pointer, :raptor_parser
     typedef :string, :mime_type
     typedef :string, :buffer
     attach_function :raptor_new_parser, [:raptor_world, :string], :raptor_parser
     attach_function :raptor_world_guess_parser_name, [:raptor_world, :raptor_uri, :mime_type, :buffer, :size_t, :string], :string
+    attach_function :raptor_parser_set_namespace_handler, [:raptor_parser, :pointer, :raptor_namespace_handler], :void
     #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_parser_set_statement_handler, [:raptor_parser, :pointer, :raptor_statement_handler], :void
@@ -112,9 +119,6 @@ module RDF::Raptor::FFI
     callback        :raptor_iostream_read_bytes_func, [:pointer, :pointer, :size_t, :size_t], :int
     callback        :raptor_iostream_read_eof_func, [:pointer], :int
 
-    # @see http://librdf.org/raptor/api-1.4/raptor-section-xml-namespace.html
-    typedef :pointer, :raptor_namespace
-
     # @see http://librdf.org/raptor/api/raptor2-section-serializer.html
     typedef :pointer, :raptor_serializer
     typedef :string, :prefix

data/lib/rdf/raptor/ffi/v2/namespace.rb

@@ -0,0 +1,38 @@
+module RDF::Raptor::FFI::V2
+  ##
+  # @see http://librdf.org/raptor/api/raptor2-section-xml-namespace.html
+  class Namespace < ::FFI::Struct
+    include RDF::Raptor::FFI
+    # @see https://github.com/dajobe/raptor/blob/f4b2597d4279dcb283bf5c32e5435696fd28a8ec/src/raptor_internal.h#L428
+    layout  :next, :pointer,
+            :nstack, :pointer,
+            :prefix, :string,
+            :prefix_length, :int,
+            :uri, :pointer,
+            :depth, :int,
+            :is_xml, :int,
+            :is_rdf_ms, :int,
+            :is_rdf_schema, :int
+
+    def prefix
+      self[:prefix].to_s
+    end
+
+    def prefix_length
+      self[:prefix_length]
+    end
+
+    def uri
+      RDF::URI.new(V2.raptor_uri_as_string(self[:uri]))
+    end
+
+    ##
+    # Releases `libraptor` memory associated with this structure.
+    #
+    # @return [void]
+    def free
+      V2.raptor_free_namespace(self) unless ptr.null?
+    end
+    alias_method :release, :free
+  end
+end

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

@@ -3,7 +3,7 @@ module RDF::Raptor::FFI::V2
   # This class provides the functionality of turning syntaxes into RDF
   # triples - RDF parsing.
   #
-  # @see http://librdf.org/raptor/api-1.4/raptor-section-parser.html
+  # @see http://librdf.org/raptor/api/raptor2-section-parser.html
   class Parser < ::FFI::ManagedStruct
     include RDF::Raptor::FFI
     layout :world, :pointer # the actual layout is private
@@ -62,6 +62,13 @@ module RDF::Raptor::FFI::V2
       V2.raptor_parser_set_statement_handler(self, self, handler)
     end
 
+    ##
+    # @param  [Proc] handler
+    # @return [void]
+    def namespace_handler=(handler)
+      V2.raptor_parser_set_namespace_handler(self, self, handler)
+    end
+
     ##
     # @param  [Object] input
     #   the input to parse

metadata

@@ -1,107 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rdf-raptor
-version: !ruby/object:Gem::Version
-  version: 1.1.2
+version: !ruby/object:Gem::Version 
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Arto Bendiken
 - John Fieber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+
+date: 2014-04-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.9.3
-  type: :runtime
+  name: ffi
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-- !ruby/object:Gem::Dependency
-  name: rdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :development
+  name: rdf
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.8.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
+  name: yard
+  requirement: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
+  name: rspec
+  requirement: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: rdf-spec
+  requirement: *id005
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id007 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  name: rake
+  requirement: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: RDF.rb plugin for parsing/serializing NTriples, RDF/XML, Turtle and RDFa
-  data using the Raptor RDF Parser library.
+  type: :development
+description: RDF.rb plugin for parsing/serializing NTriples, 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
@@ -121,6 +101,7 @@ files:
 - lib/rdf/raptor/ffi/v2.rb
 - lib/rdf/raptor/ffi/v2/iostream.rb
 - lib/rdf/raptor/ffi/v2/iostream_handler.rb
+- lib/rdf/raptor/ffi/v2/namespace.rb
 - lib/rdf/raptor/ffi/v2/parser.rb
 - lib/rdf/raptor/ffi/v2/serializer.rb
 - lib/rdf/raptor/ffi/v2/statement.rb
@@ -135,24 +116,24 @@ files:
 - lib/rdf/raptor/turtle.rb
 - lib/rdf/raptor/version.rb
 homepage: http://ruby-rdf.github.com/rdf-raptor
-licenses:
+licenses: 
 - Public Domain
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
+requirements: 
 - libraptor (>= 2.0)
 rubyforge_project: rdf
 rubygems_version: 2.2.2
@@ -160,4 +141,5 @@ signing_key:
 specification_version: 4
 summary: Raptor RDF Parser plugin for RDF.rb.
 test_files: []
+
 has_rdoc: false