rdf-raptor 1.99.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5ae888c81773bd00155b708856b8120550a8d4a
-  data.tar.gz: 585cb977bc2f5850249bc4874de401a2864d17f8
+  metadata.gz: 1f524bedbbad075002013ef85da611107b1fbc9c
+  data.tar.gz: c6588defdb51badb022569508b072cc6e16e1482
 SHA512:
-  metadata.gz: 322d066746c0bf42d28c804e36c86ea9bea5269bbcdf2378054c7c454501e0d25953887373cf53f003a453dddc9c4614e495c31e1bea105a164d5443702f08e5
-  data.tar.gz: c07b84899ecbcfa949d06c4a589b5effa63eadb7a4656499defaec1622ec4f51633a9b80f45481ddc0ce1154cf8c5dd570682521eeb5db4de4fbccb11e5756a8
+  metadata.gz: 0253224a82c7202453af159b3fba9941791a4647a5314bdbbe6e5a6eb7ba325a61ddc8e7420d03de46eb2f1998ae833fd35bbd3314833f30acbb4b19723618e9
+  data.tar.gz: 0d5b7581ad861980985e47905d4470c2be745d4f644270a258443a07cb65656dcbae1ed0e8a758496bf29264e5131ef4a32bac9a2b1c2e5ea25a64bfb136c777

data/README

@@ -20,7 +20,7 @@ Features
 * Serializes RDF statements into Graphviz format.
 * 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, 2.x, REE, JRuby and Rubinius (1.8 and 1.9 mode).
+* Compatible with MRI 2.x, REE, JRuby and Rubinius.
 
 Examples
 --------

data/VERSION

@@ -1 +1 @@
-1.99.0
+2.0.0

data/lib/rdf/raptor/ffi.rb

@@ -28,6 +28,8 @@ module RDF::Raptor
     ##
     # FFI reader implementation.
     class Reader < RDF::Reader
+      include RDF::Util::Logger
+
       ##
       # Initializes the FFI reader instance.
       #
@@ -54,12 +56,12 @@ module RDF::Raptor
 
       ERROR_HANDLER = Proc.new do |user_data, locator, message|
         line = V2.raptor_locator_line(locator)
-        raise RDF::ReaderError, line > -1 ? "Line #{line}: #{message}" : message
+        log_error(message, lineno: line)
       end
 
       WARNING_HANDLER = Proc.new do |user_data, locator, message|
-        # line = V2.raptor_locator_line(locator)
-        # $stderr.puts line > -1 ? "Line #{line}: #{message}" : message
+        line = V2.raptor_locator_line(locator)
+        log_warn(message, lineno: line)
       end
 
       ##
@@ -85,6 +87,10 @@ module RDF::Raptor
               block.call(V2::Statement.new(statement, self).to_rdf)
             end
           end
+
+          if validate? && log_statistics[:error]
+            raise RDF::ReaderError, "Errors found during processing"
+          end
         end
         enum_for(:each_statement, options)
       end
@@ -97,8 +103,8 @@ module RDF::Raptor
       # @see   RDF::Reader#each_triple
       def each_triple(&block)
         if block_given?
-          parse(@input) do |parser, statement|
-            block.call(V2::Statement.new(statement, self).to_triple)
+          each_statement do |statement|
+            block.call(*statement.to_triple)
           end
         end
         enum_for(:each_triple)
@@ -139,6 +145,8 @@ module RDF::Raptor
     ##
     # FFI writer implementation.
     class Writer < RDF::Writer
+      include RDF::Util::Logger
+
       ##
       # Initializes the FFI writer instance.
       #
@@ -151,18 +159,18 @@ module RDF::Raptor
       def initialize(output = $stdout, options = {}, &block)
         @format = self.class.format.rapper_format
         @serializer = V2::Serializer.new(@format)
-        #@serializer.error_handler   = ERROR_HANDLER
-        #@serializer.warning_handler = WARNING_HANDLER
+        @serializer.error_handler   = ERROR_HANDLER
+        @serializer.warning_handler = WARNING_HANDLER
         @serializer.start_to(output, options)
         super
       end
 
       ERROR_HANDLER = Proc.new do |user_data, locator, message|
-        raise RDF::WriterError, message
+        log_error(message)
       end
 
       WARNING_HANDLER = Proc.new do |user_data, locator, message|
-        # $stderr.puts "warning"
+        log_warn(message)
       end
 
       ##
@@ -171,6 +179,23 @@ module RDF::Raptor
       # @return [V2::Serializer]
       attr_reader :serializer
 
+      def self.serialize(value)
+        output = StringIO.new
+        writer = new(output)
+        case value
+        when nil then nil
+        when FalseClass then value.to_s
+        when RDF::Statement
+          writer.write_triple(statement.subject, statement.predicate, statement.object)
+        when RDF::Term
+          writer.write_term(value)
+        else
+          raise ArgumentError, "expected an RDF::Statement or RDF::Term, but got #{value.inspect}"
+        end
+
+        output.to_s
+      end
+
       ##
       # @param  [RDF::Resource] subject
       # @param  [RDF::URI]      predicate
@@ -181,6 +206,10 @@ module RDF::Raptor
         @serializer.serialize_triple(subject, predicate, object)
       end
 
+      def write_term(value)
+        raise NotImplementedError
+      end
+
       ##
       # @return [void]
       # @see    RDF::Writer#write_prologue

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

@@ -28,6 +28,7 @@ module RDF::Raptor::FFI
     # @see http://librdf.org/raptor/api/tutorial-initialising-finishing.html
     typedef :pointer, :raptor_world
     typedef :int, :raptor_version
+    typedef :pointer, :raptor_iostream
     attach_function :raptor_new_world_internal, [:raptor_version], :raptor_world
     attach_function :raptor_free_world, [], :void
     attach_function :raptor_alloc_memory, [:size_t], :pointer
@@ -77,6 +78,7 @@ module RDF::Raptor::FFI
     attach_function :raptor_new_term_from_literal, [:raptor_world, :literal, :datatype, :language], :raptor_term
     attach_function :raptor_new_term_from_blank, [:raptor_world, :blank], :raptor_term
     attach_function :raptor_free_term, [:raptor_term], :void
+    attach_function :raptor_term_ntriples_write, [:raptor_term, :raptor_iostream], :int
 
     # @see http://librdf.org/raptor/api/raptor2-section-xml-namespace.html
     typedef :pointer, :raptor_namespace
@@ -106,7 +108,6 @@ module RDF::Raptor::FFI
     attach_function :raptor_free_parser, [:raptor_parser], :void
 
     # @see http://librdf.org/raptor/api/raptor2-section-iostream.html
-    typedef :pointer, :raptor_iostream
     attach_function :raptor_new_iostream_from_handler, [:raptor_world, :pointer, :pointer], :raptor_iostream
     attach_function :raptor_new_iostream_to_filename, [:raptor_world, :string], :raptor_iostream
     attach_function :raptor_new_iostream_to_sink, [:raptor_world], :raptor_iostream

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

@@ -7,6 +7,8 @@ module RDF::Raptor::FFI::V2
   class Serializer < ::FFI::ManagedStruct
     include RDF::Raptor::FFI
 
+    attr_reader :iostream
+
     # Note this layout is private
     layout  :world, :pointer,
             :locator, :pointer,
@@ -49,14 +51,14 @@ module RDF::Raptor::FFI::V2
     # @param  [Proc] handler
     # @return [void]
     def error_handler=(handler)
-      V2.raptor_serializer_set_error_handler(self, self, handler)
+      V2.raptor_serializer_set_error_handler(self, self, handler) if V2.respond_to?(:raptor_serializer_set_error_handler)
     end
 
     ##
     # @param  [Proc] handler
     # @return [void]
     def warning_handler=(handler)
-      V2.raptor_serializer_set_warning_handler(self, self, handler)
+      V2.raptor_serializer_set_warning_handler(self, self, handler) if V2.respond_to?(:raptor_serializer_set_warning_handler)
     end
 
     ##

data/lib/rdf/raptor/ntriples.rb

@@ -86,7 +86,12 @@ module RDF::Raptor
     #   end
     #
     class Writer < RDF::Raptor::Writer
+      include RDF::Raptor::FFI
       format RDF::Raptor::NTriples::Format
+
+      def write_term(value)
+        V2.raptor_term_ntriples_write(value, @serializer.iostream)
+      end
     end # Writer
   end # NTriples
 end # RDF::Raptor

data/lib/rdf/raptor/rdfa.rb

@@ -27,11 +27,32 @@ module RDF::Raptor
     class Format < RDF::Format
       extend RDF::Raptor::Format
       
-      content_type     'application/xhtml+xml', aliases: ['text/html'], extension: :html
+      content_type     'text/html',
+        aliases: %w(application/xhtml+xml image/svg+xml),
+        extensions: [:html, :xhtml, :svg]
       content_encoding 'utf-8'
       rapper_format    :rdfa
 
       reader { RDF::Raptor::RDFa::Reader }
+
+      ##
+      # Sample detection to see if it matches RDFa (not RDF/XML or Microdata)
+      #
+      # Use a text sample to detect the format of an input file. Sub-classes implement
+      # a matcher sufficient to detect probably format matches, including disambiguating
+      # between other similar formats.
+      #
+      # @param [String] sample Beginning several bytes (~ 1K) of input.
+      # @return [Boolean]
+      def self.detect(sample)
+        (sample.match(/<[^>]*(about|resource|prefix|typeof|property|vocab)\s*="[^>]*>/m) ||
+         sample.match(/<[^>]*DOCTYPE\s+html[^>]*>.*xmlns:/im)
+        ) && !sample.match(/<(\w+:)?(RDF)/)
+      end
+
+      def self.symbols
+        [:rdfa, :lite, :html, :xhtml, :svg]
+      end
     end # Format
 
     ##

data/lib/rdf/raptor/rdfxml.rb

@@ -45,6 +45,10 @@ module RDF::Raptor
         # Raptor guess is not fully supported
         sample.match(/<(\w+:)?(RDF)/)
       end
+
+      def self.symbols
+        [:rdfxml, :rdf]
+      end
     end # Format
 
     ##

data/lib/rdf/raptor/turtle.rb

@@ -40,6 +40,37 @@ module RDF::Raptor
 
       reader { RDF::Raptor::Turtle::Reader }
       writer { RDF::Raptor::Turtle::Writer }
+
+      ##
+      # Sample detection to see if it matches Turtle (or N-Triples)
+      #
+      # Use a text sample to detect the format of an input file. Sub-classes implement
+      # a matcher sufficient to detect probably format matches, including disambiguating
+      # between other similar formats.
+      #
+      # @param [String] sample Beginning several bytes (~ 1K) of input.
+      # @return [Boolean]
+      def self.detect(sample)
+        !!sample.match(%r(
+          (?:@(base|prefix)) |                                            # Turtle keywords
+          ["']{3} |                                                       # STRING_LITERAL_LONG_SINGLE_QUOTE/2
+          "[^"]*"^^ | "[^"]*"@ |                                          # Typed/Language literals
+          (?:
+            (?:\s*(?:(?:<[^>]*>) | (?:\w*:\w+) | (?:"[^"]*"))\s*[,;]) ||
+            (?:\s*(?:(?:<[^>]*>) | (?:\w*:\w+) | (?:"[^"]*"))){3}
+          )
+        )mx) && !(
+          sample.match(%r([{}])) ||                                       # TriG
+          sample.match(%r(@keywords|=>|\{)) ||                            # N3
+          sample.match(%r(<(?:\/|html|rdf))i) ||                          # HTML, RDF/XML
+          sample.match(%r(^(?:\s*<[^>]*>){4}.*\.\s*$)) ||                 # N-Quads
+          sample.match(%r("@(context|subject|iri)"))                      # JSON-LD
+        )
+      end
+
+      def self.symbols
+        [:turtle, :ttl]
+      end
     end # Format
 
     ##

data/lib/rdf/raptor/version.rb

@@ -14,6 +14,6 @@ module RDF; module Raptor
 
     ##
     # @return [Array(Integer, Integer, Integer)]
-    def self.to_a() [MAJOR, MINOR, TINY] end
+    def self.to_a() STRING.split(".") end
   end
 end; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-raptor
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,106 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.9.10
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 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
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libraptor2 (>= 2.0)
 rubyforge_project: rdf
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Raptor RDF Parser plugin for RDF.rb.