rdf-turtle 1.0.9 → 1.1.0p0

data/README.md

@@ -15,8 +15,7 @@ Install with `gem install rdf-turtle`
 
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
-* Compatible with Ruby 1.8.7+, Ruby >= 1.9, and JRuby 1.7+.
-* Optional streaming writer, to serialize large graphs
+* Compatible with Ruby >= 1.9.2.
 
 ## Usage
 Instantiate a reader from a local file:
@@ -46,18 +45,16 @@ Full documentation available on [Rubydoc.info][Turtle doc]
 ### Variations from the spec
 In some cases, the specification is unclear on certain issues:
 
-* The LC version of the [Turtle][] specification separates rules for `@base` and `@prefix` with
-  closing '.' from the
-  SPARQL-like `BASE` and `PREFIX` without closing '.'. This version implements a more flexible
-  syntax where the `@` and closing `.` are optional and `base/prefix` are matched case independently.
-* Additionally, both `a` and `A` match `rdf:type`.
+* For the time being, plain literals are generated without an xsd:string datatype, but literals with an xsd:string
+  datatype are saved as non-datatyped triples in the graph. This will be updated in the future when the rest of the
+  library suite is brought up to date with RDF 1.1.
 
 ### Freebase-specific Reader
 There is a special reader useful for processing [Freebase Dumps][]. To invoke
 this, add the `:freebase => true` option to the {RDF::Turtle::Reader.new}, or
 use {RDF::Turtle::FreebaseReader} directly. As with {RDF::Turtle::Reader},
 prefix definitions may be passed in using the `:prefixes` option to
-RDF::Turtle::FreebaseReader} using the standard mechanism defined
+{RDF::Turtle::FreebaseReader#initialize} using the standard mechanism defined
 for `RDF::Reader`.
 
 The [Freebase Dumps][] have a very normalized form, similar to N-Triples but
@@ -93,9 +90,9 @@ using the [EBNF][] gem.
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 1.8.7) or (>= 1.8.1 with [Backports][])
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
-* [EBNF][] (>= 0.1.0)
+* [Ruby](http://ruby-lang.org/) (>= 1.9.2)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
+* [EBNF][] (>= 0.3.0)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.1.0p0

data/lib/rdf/turtle/meta.rb

@@ -1,4 +1,4 @@
-# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p429/bundler/gems/ebnf-3f823030418a/bin/ebnf
+# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p374/bundler/gems/ebnf-a5c008da3a01/bin/ebnf
 # BRANCH derived from etc/turtle.bnf
 module RDF::Turtle::Meta
   START = :turtleDoc
@@ -66,19 +66,7 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_SINGLE_QUOTE => [:STRING_LITERAL_SINGLE_QUOTE],
     },
     :base => {
-      :BASE => [:BASE, :IRIREF, :_base_1],
-    },
-    :_base_1 => {
-      "(" => [],
-      "." => ["."],
-      :ANON => [],
-      :BASE => [],
-      :BLANK_NODE_LABEL => [],
-      :IRIREF => [],
-      :PNAME_LN => [],
-      :PNAME_NS => [],
-      :PREFIX => [],
-      "[" => [],
+      "@base" => ["@base", :IRIREF, "."],
     },
     :blankNodePropertyList => {
       "[" => ["[", :predicateObjectList, "]"],
@@ -124,8 +112,10 @@ module RDF::Turtle::Meta
       "true" => [:object, :_collection_1],
     },
     :directive => {
-      :BASE => [:base],
-      :PREFIX => [:prefixID],
+      "@base" => [:base],
+      "@prefix" => [:prefixID],
+      :SPARQL_BASE => [:sparqlBase],
+      :SPARQL_PREFIX => [:sparqlPrefix],
     },
     :iri => {
       :IRIREF => [:IRIREF],
@@ -229,29 +219,25 @@ module RDF::Turtle::Meta
       "a" => [:verb, :objectList],
     },
     :prefixID => {
-      :PREFIX => [:PREFIX, :PNAME_NS, :IRIREF, :_prefixID_1],
+      "@prefix" => ["@prefix", :PNAME_NS, :IRIREF, "."],
     },
-    :_prefixID_1 => {
-      "(" => [],
-      "." => ["."],
-      :ANON => [],
-      :BASE => [],
-      :BLANK_NODE_LABEL => [],
-      :IRIREF => [],
-      :PNAME_LN => [],
-      :PNAME_NS => [],
-      :PREFIX => [],
-      "[" => [],
+    :sparqlBase => {
+      :SPARQL_BASE => [:SPARQL_BASE, :IRIREF],
+    },
+    :sparqlPrefix => {
+      :SPARQL_PREFIX => [:SPARQL_PREFIX, :PNAME_NS, :IRIREF],
     },
     :statement => {
       "(" => [:_statement_1],
+      "@base" => [:directive],
+      "@prefix" => [:directive],
       :ANON => [:_statement_1],
-      :BASE => [:directive],
       :BLANK_NODE_LABEL => [:_statement_1],
       :IRIREF => [:_statement_1],
       :PNAME_LN => [:_statement_1],
       :PNAME_NS => [:_statement_1],
-      :PREFIX => [:directive],
+      :SPARQL_BASE => [:directive],
+      :SPARQL_PREFIX => [:directive],
       "[" => [:_statement_1],
     },
     :_statement_1 => {
@@ -300,24 +286,28 @@ module RDF::Turtle::Meta
     },
     :turtleDoc => {
       "(" => [:_turtleDoc_1],
+      "@base" => [:_turtleDoc_1],
+      "@prefix" => [:_turtleDoc_1],
       :ANON => [:_turtleDoc_1],
-      :BASE => [:_turtleDoc_1],
       :BLANK_NODE_LABEL => [:_turtleDoc_1],
       :IRIREF => [:_turtleDoc_1],
       :PNAME_LN => [:_turtleDoc_1],
       :PNAME_NS => [:_turtleDoc_1],
-      :PREFIX => [:_turtleDoc_1],
+      :SPARQL_BASE => [:_turtleDoc_1],
+      :SPARQL_PREFIX => [:_turtleDoc_1],
       "[" => [:_turtleDoc_1],
     },
     :_turtleDoc_1 => {
       "(" => [:statement, :turtleDoc],
+      "@base" => [:statement, :turtleDoc],
+      "@prefix" => [:statement, :turtleDoc],
       :ANON => [:statement, :turtleDoc],
-      :BASE => [:statement, :turtleDoc],
       :BLANK_NODE_LABEL => [:statement, :turtleDoc],
       :IRIREF => [:statement, :turtleDoc],
       :PNAME_LN => [:statement, :turtleDoc],
       :PNAME_NS => [:statement, :turtleDoc],
-      :PREFIX => [:statement, :turtleDoc],
+      :SPARQL_BASE => [:statement, :turtleDoc],
+      :SPARQL_PREFIX => [:statement, :turtleDoc],
       "[" => [:statement, :turtleDoc],
     },
     :verb => {
@@ -333,8 +323,9 @@ module RDF::Turtle::Meta
     ",",
     ".",
     ";",
+    "@base",
+    "@prefix",
     :ANON,
-    :BASE,
     :BLANK_NODE_LABEL,
     :DECIMAL,
     :DOUBLE,
@@ -343,7 +334,8 @@ module RDF::Turtle::Meta
     :LANGTAG,
     :PNAME_LN,
     :PNAME_NS,
-    :PREFIX,
+    :SPARQL_BASE,
+    :SPARQL_PREFIX,
     :STRING_LITERAL_LONG_QUOTE,
     :STRING_LITERAL_LONG_SINGLE_QUOTE,
     :STRING_LITERAL_QUOTE,
@@ -393,15 +385,9 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :base => [
-      :BASE],
+      "@base"],
     :_base_1 => [
-      ".",
-      :_eps],
-    :_base_2 => [
       :IRIREF],
-    :_base_3 => [
-      ".",
-      :_eps],
     :blankNodePropertyList => [
       "["],
     :_blankNodePropertyList_1 => [
@@ -487,8 +473,10 @@ module RDF::Turtle::Meta
     :_collection_5 => [
       ")"],
     :directive => [
-      :PREFIX,
-      :BASE],
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE],
     :_empty => [
       :_eps],
     :iri => [
@@ -640,20 +628,22 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :prefixID => [
-      :PREFIX],
+      "@prefix"],
     :_prefixID_1 => [
-      ".",
-      :_eps],
-    :_prefixID_2 => [
       :PNAME_NS],
-    :_prefixID_3 => [
+    :sparqlBase => [
+      :SPARQL_BASE],
+    :_sparqlBase_1 => [
       :IRIREF],
-    :_prefixID_4 => [
-      ".",
-      :_eps],
+    :sparqlPrefix => [
+      :SPARQL_PREFIX],
+    :_sparqlPrefix_1 => [
+      :PNAME_NS],
     :statement => [
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -714,8 +704,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :turtleDoc => [
       :_eps,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -724,8 +716,10 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :_turtleDoc_1 => [
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -735,8 +729,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_turtleDoc_2 => [
       :_eps,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -977,8 +973,10 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :base => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -988,30 +986,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_base_1 => [
       :_eof,
-      :PREFIX,
-      :BASE,
-      "[",
-      :IRIREF,
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "(",
-      :PNAME_LN,
-      :PNAME_NS],
-    :_base_2 => [
-      :_eof,
-      :PREFIX,
-      :BASE,
-      "[",
-      :IRIREF,
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "(",
-      :PNAME_LN,
-      :PNAME_NS],
-    :_base_3 => [
-      :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1165,8 +1143,10 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :directive => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1330,8 +1310,10 @@ module RDF::Turtle::Meta
       "]"],
     :prefixID => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1341,8 +1323,23 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_prefixID_1 => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
+      "[",
+      :IRIREF,
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      :PNAME_LN,
+      :PNAME_NS],
+    :sparqlBase => [
+      :_eof,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1350,10 +1347,12 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :_prefixID_2 => [
+    :_sparqlBase_1 => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1361,10 +1360,12 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :_prefixID_3 => [
+    :sparqlPrefix => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1372,10 +1373,12 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :_prefixID_4 => [
+    :_sparqlPrefix_1 => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1385,8 +1388,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :statement => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1396,8 +1401,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_statement_1 => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1407,8 +1414,10 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_statement_2 => [
       :_eof,
-      :PREFIX,
-      :BASE,
+      "@prefix",
+      "@base",
+      :SPARQL_PREFIX,
+      :SPARQL_BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,

data/lib/rdf/turtle/reader.rb

@@ -67,58 +67,54 @@ module RDF::Turtle
     end
     
     # String terminals
-    terminal(nil,                  %r([\(\),.;\[\]Aa]|\^\^|true|false)) do |prod, token, input|
+    terminal(nil,                  %r([\(\),.;\[\]a]|\^\^|@base|@prefix|true|false)) do |prod, token, input|
       case token.value
-      when 'A', 'a'           then input[:resource] = RDF.type
+      when 'a'                then input[:resource] = RDF.type
       when 'true', 'false'    then input[:resource] = RDF::Literal::Boolean.new(token.value)
       when '@base', '@prefix' then input[:lang] = token.value[1..-1]
-      when '.'                then input[:terminated] = true
       else                         input[:string] = token.value
       end
     end
 
-    terminal(:PREFIX,      PREFIX) do |prod, token, input|
-      input[:string_value] = token.value
-    end
-    terminal(:BASE,      BASE) do |prod, token, input|
-      input[:string_value] = token.value
-    end
-
     terminal(:LANGTAG,              LANGTAG) do |prod, token, input|
       input[:lang] = token.value[1..-1]
     end
 
+    terminal(:SPARQL_PREFIX,      SPARQL_PREFIX) do |prod, token, input|
+      input[:string_value] = token.value.downcase
+    end
+    terminal(:SPARQL_BASE,      SPARQL_BASE) do |prod, token, input|
+      input[:string_value] = token.value.downcase
+    end
+
     # Productions
     # [4] prefixID defines a prefix mapping
     production(:prefixID) do |input, current, callback|
       prefix = current[:prefix]
       iri = current[:resource]
-      lexical = current[:string_value]
-      terminated = current[:terminated]
       debug("prefixID") {"Defined prefix #{prefix.inspect} mapping to #{iri.inspect}"}
-      if lexical.start_with?('@') && lexical != '@prefix'
-        error(:prefixID, "should be downcased")
-      elsif lexical == '@prefix'
-        error(:prefixID, "directive not terminated") unless terminated
-      else
-        error(:prefixID, "directive should not be terminated") if terminated
-      end
       prefix(prefix, iri)
     end
     
     # [5] base set base_uri
     production(:base) do |input, current, callback|
       iri = current[:resource]
-      lexical = current[:string_value]
-      terminated = current[:terminated]
       debug("base") {"Defined base as #{iri}"}
-      if lexical.start_with?('@') && lexical != '@base'
-        error(:base, "should be downcased")
-      elsif lexical == '@base'
-        error(:base, "directive not terminated") unless terminated
-      else
-        error(:base, "directive should not be terminated") if terminated
-      end
+      options[:base_uri] = iri
+    end
+    
+    # [28s] sparqlPrefix ::= [Pp][Rr][Ee][Ff][Ii][Xx] PNAME_NS IRIREF
+    production(:sparqlPrefix) do |input, current, callback|
+      prefix = current[:prefix]
+      iri = current[:resource]
+      debug("sparqlPrefix") {"Defined prefix #{prefix.inspect} mapping to #{iri.inspect}"}
+      prefix(prefix, iri)
+    end
+    
+    # [29s] sparqlBase ::= [Bb][Aa][Ss][Ee] IRIREF
+    production(:sparqlBase) do |input, current, callback|
+      iri = current[:resource]
+      debug("base") {"Defined base as #{iri}"}
       options[:base_uri] = iri
     end
     
@@ -180,15 +176,20 @@ module RDF::Turtle
     
     production(:collection) do |input, current, callback|
       # Create an RDF list
+      bnode = self.bnode
       objects = current[:object_list]
-      list = RDF::List[*objects]
+      list = RDF::List.new(bnode, nil, objects)
       list.each_statement do |statement|
+        # Spec Confusion, referenced section "Collection" is missing from the spec.
+        # Anicdodal evidence indicates that some expect each node to be of type rdf:list,
+        # but existing Notation3 and Turtle tests (http://www.w3.org/2001/sw/DataAccess/df1/tests/manifest.ttl) do not.
         next if statement.predicate == RDF.type && statement.object == RDF.List
         callback.call(:statement, "collection", statement.subject, statement.predicate, statement.object)
       end
+      bnode = RDF.nil if list.empty?
 
       # Return bnode as resource
-      input[:resource] = list.subject
+      input[:resource] = bnode
     end
     
     # [16] RDFLiteral ::= String ( LanguageTag | ( "^^" IRIref ) )? 

data/lib/rdf/turtle/terminals.rb

@@ -4,60 +4,16 @@ module RDF::Turtle
   module Terminals
     # Definitions of token regular expressions used for lexical analysis
   
-    if RUBY_VERSION >= '1.9'
-      ##
-      # Unicode regular expressions for Ruby 1.9+ with the Oniguruma engine.
-      U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                           [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
-                           [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
-                           [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
-                           [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
-                         EOS
-      U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
-      IRI_RANGE        = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]").freeze
-    else
-      ##
-      # UTF-8 regular expressions for Ruby 1.8.x.
-      U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                           \\xC3[\\x80-\\x96]|                                (?# [\\u00C0-\\u00D6]|)
-                           \\xC3[\\x98-\\xB6]|                                (?# [\\u00D8-\\u00F6]|)
-                           \\xC3[\\xB8-\\xBF]|[\\xC4-\\xCB][\\x80-\\xBF]|     (?# [\\u00F8-\\u02FF]|)
-                           \\xCD[\\xB0-\\xBD]|                                (?# [\\u0370-\\u037D]|)
-                           \\xCD\\xBF|[\\xCE-\\xDF][\\x80-\\xBF]|             (?# [\\u037F-\\u1FFF]|)
-                           \\xE0[\\xA0-\\xBF][\\x80-\\xBF]|                   (?# ...)
-                           \\xE1[\\x80-\\xBF][\\x80-\\xBF]|                   (?# ...)
-                           \\xE2\\x80[\\x8C-\\x8D]|                           (?# [\\u200C-\\u200D]|)
-                           \\xE2\\x81[\\xB0-\\xBF]|                           (?# [\\u2070-\\u218F]|)
-                           \\xE2[\\x82-\\x85][\\x80-\\xBF]|                   (?# ...)
-                           \\xE2\\x86[\\x80-\\x8F]|                           (?# ...)
-                           \\xE2[\\xB0-\\xBE][\\x80-\\xBF]|                   (?# [\\u2C00-\\u2FEF]|)
-                           \\xE2\\xBF[\\x80-\\xAF]|                           (?# ...)
-                           \\xE3\\x80[\\x81-\\xBF]|                           (?# [\\u3001-\\uD7FF]|)
-                           \\xE3[\\x81-\\xBF][\\x80-\\xBF]|                   (?# ...)
-                           [\\xE4-\\xEC][\\x80-\\xBF][\\x80-\\xBF]|           (?# ...)
-                           \\xED[\\x80-\\x9F][\\x80-\\xBF]|                   (?# ...)
-                           \\xEF[\\xA4-\\xB6][\\x80-\\xBF]|                   (?# [\\uF900-\\uFDCF]|)
-                           \\xEF\\xB7[\\x80-\\x8F]|                           (?# ...)
-                           \\xEF\\xB7[\\xB0-\\xBF]|                           (?# [\\uFDF0-\\uFFFD]|)
-                           \\xEF[\\xB8-\\xBE][\\x80-\\xBF]|                   (?# ...)
-                           \\xEF\\xBF[\\x80-\\xBD]|                           (?# ...)
-                           \\xF0[\\x90-\\xBF][\\x80-\\xBF][\\x80-\\xBF]|      (?# [\\u{10000}-\\u{EFFFF}])
-                           [\\xF1-\\xF2][\\x80-\\xBF][\\x80-\\xBF][\\x80-\\xBF]|
-                           \\xF3[\\x80-\\xAF][\\x80-\\xBF][\\x80-\\xBF]       (?# ...)
-                         EOS
-      U_CHARS2         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                           \\xC2\\xB7|                                        (?# \\u00B7|)
-                           \\xCC[\\x80-\\xBF]|\\xCD[\\x80-\\xAF]|             (?# [\\u0300-\\u036F]|)
-                           \\xE2\\x80\\xBF|\\xE2\\x81\\x80                    (?# [\\u203F-\\u2040])
-                         EOS
-      IRI_RANGE        = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                           \\x21|                                             (?# ")
-                           [\\x23-\\x3b]|\\x3d|                               (?# < & >)
-                           [\\x3f-\\x5b]|\\x5d|\\x5f|                         (?# \ ^ `)
-                           [\\x61-\\x7a]|                                     (?# { } |)
-                           [\\x7e-\\xff]
-                         EOS
-    end
+    ##
+    # Unicode regular expressions for Ruby 1.9+ with the Oniguruma engine.
+    U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
+                         [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
+                         [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
+                         [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
+                         [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
+                       EOS
+    U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
+    IRI_RANGE        = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]").freeze
 
     # 26
     UCHAR                = EBNF::LL1::Lexer::UCHAR
@@ -100,22 +56,22 @@ module RDF::Turtle
     # 21
     DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/.freeze
     # 22
-    STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/.freeze
+    STRING_LITERAL_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/.freeze
     # 23
-    STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/.freeze.freeze
+    STRING_LITERAL_SINGLE_QUOTE      = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/.freeze.freeze
     # 24
     STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/m.freeze
     # 25
-    STRING_LITERAL_LONG_QUOTE        = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/m.freeze
+    STRING_LITERAL_LONG_QUOTE = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/m.freeze
 
     # 161s
     WS                   = / |\t|\r|\n  /.freeze
     # 162s
     ANON                 = /\[#{WS}*\]/m.freeze
     # 28t
-    PREFIX               = /@?prefix/i.freeze
+    SPARQL_PREFIX        = /prefix/i.freeze
     # 29t
-    BASE                 = /@?base/i.freeze
+    SPARQL_BASE          = /base/i.freeze
   
   end
 end

data/lib/rdf/turtle/writer.rb

@@ -1,5 +1,4 @@
 require 'rdf/turtle/terminals'
-require 'rdf/turtle/streaming_writer'
 
 module RDF::Turtle
   ##
@@ -35,13 +34,6 @@ module RDF::Turtle
   #     end
   #   end
   #
-  # @example Serializing RDF statements to a string in streaming mode
-  #   RDF::Turtle::Writer.buffer(:stream => true) do |writer|
-  #     graph.each_statement do |statement|
-  #       writer << statement
-  #     end
-  #   end
-  #
   # The writer will add prefix definitions, and use them for creating @prefix definitions, and minting QNames
   #
   # @example Creating @base and @prefix definitions in output
@@ -56,11 +48,12 @@ module RDF::Turtle
   #
   # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Writer < RDF::Writer
-    include StreamingWriter
     format RDF::Turtle::Format
 
     # @return [Graph] Graph of statements serialized
     attr_accessor :graph
+    # @return [URI] Base URI used for relativizing URIs
+    attr_accessor :base_uri
     
     ##
     # Initializes the Turtle writer instance.
@@ -70,7 +63,7 @@ module RDF::Turtle
     # @param  [Hash{Symbol => Object}] options
     #   any additional options
     # @option options [Encoding] :encoding     (Encoding::UTF_8)
-    #   the encoding to use on the output stream (Ruby 1.9+)
+    #   the encoding to use on the output stream
     # @option options [Boolean]  :canonicalize (false)
     #   whether to canonicalize literals when serializing
     # @option options [Hash]     :prefixes     (Hash.new)
@@ -81,8 +74,6 @@ module RDF::Turtle
     #   Maximum depth for recursively defining resources, defaults to 3
     # @option options [Boolean]  :standard_prefixes   (false)
     #   Add standard prefixes to @prefixes, if necessary.
-    # @option options [Boolean] :stream (false)
-    #   Do not attempt to optimize graph presentation, suitable for streaming large graphs.
     # @option options [String]   :default_namespace (nil)
     #   URI to use as default namespace, same as `prefixes[nil]`
     # @yield  [writer] `self`
@@ -91,11 +82,10 @@ module RDF::Turtle
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
-      reset
-      @graph = RDF::Graph.new
-      @uri_to_pname = {}
-      @uri_to_prefix = {}
       super do
+        @graph = RDF::Graph.new
+        @uri_to_pname = {}
+        @uri_to_prefix = {}
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -105,18 +95,21 @@ module RDF::Turtle
       end
     end
 
+    ##
+    # Write whole graph
+    #
+    # @param  [Graph] graph
+    # @return [void]
+    def write_graph(graph)
+      @graph = graph
+    end
+
     ##
     # Adds a statement to be serialized
     # @param  [RDF::Statement] statement
     # @return [void]
     def write_statement(statement)
-      case
-      when @options[:stream]
-        stream_statement(statement)
-      else
-        # Add to local graph and output in epilogue
-        @graph.insert(statement)
-      end
+      @graph.insert(statement)
     end
 
     ##
@@ -125,19 +118,10 @@ module RDF::Turtle
     # @param  [RDF::URI]      predicate
     # @param  [RDF::Value]    object
     # @return [void]
+    # @raise  [NotImplementedError] unless implemented in subclass
+    # @abstract
     def write_triple(subject, predicate, object)
-      write_statement(Statement.new(subject, predicate, object))
-    end
-
-    ##
-    # Write out declarations
-    # @return [void] `self`
-    def write_prologue
-      case
-      when @options[:stream]
-        stream_prologue
-      else
-      end
+      @graph.insert(Statement.new(subject, predicate, object))
     end
 
     ##
@@ -146,23 +130,19 @@ module RDF::Turtle
     # @return [void]
     # @see    #write_triple
     def write_epilogue
-      case
-      when @options[:stream]
-        stream_epilogue
-      else
-        @max_depth = @options[:max_depth] || 3
+      @max_depth = @options[:max_depth] || 3
+      @base_uri = RDF::URI(@options[:base_uri])
 
-        self.reset
+      self.reset
 
-        debug("\nserialize") {"graph: #{@graph.size}"}
+      debug("\nserialize") {"graph: #{@graph.size}"}
 
-        preprocess
-        start_document
+      preprocess
+      start_document
 
-        order_subjects.each do |subject|
-          unless is_done?(subject)
-            statement(subject)
-          end
+      order_subjects.each do |subject|
+        unless is_done?(subject)
+          statement(subject)
         end
       end
     end
@@ -320,8 +300,8 @@ module RDF::Turtle
       
       # Start with base_uri
       if base_uri && @subjects.keys.include?(base_uri)
-        subjects << RDF::URI(base_uri)
-        seen[RDF::URI(base_uri)] = true
+        subjects << base_uri
+        seen[base_uri] = true
       end
       
       # Add distinguished classes
@@ -348,16 +328,11 @@ module RDF::Turtle
       (@options[:prefixes] || {}).each_pair do |k, v|
         @uri_to_prefix[v.to_s] = k
       end
+      @options[:prefixes] = {}  # Will define actual used when matched
 
       prefix(nil, @options[:default_namespace]) if @options[:default_namespace]
 
-      case
-      when @options[:stream]
-      else
-        @options[:prefixes] = {}  # Will define actual used when matched
-
-        @graph.each {|statement| preprocess_statement(statement)}
-      end
+      @graph.each {|statement| preprocess_statement(statement)}
     end
     
     # Perform any statement preprocessing required. This is used to perform reference counts and determine required

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0p0
+  prerelease: 5
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,20 +126,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -151,7 +170,6 @@ files:
 - lib/rdf/turtle/freebase_reader.rb
 - lib/rdf/turtle/meta.rb
 - lib/rdf/turtle/reader.rb
-- lib/rdf/turtle/streaming_writer.rb
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
@@ -159,26 +177,27 @@ files:
 homepage: http://ruby-rdf.github.com/rdf-turtle
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf-turtle
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Turtle reader/writer for Ruby.
 test_files: []
 has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWFjZTgwYTA4YmJmMDk2NDZkZGQ1YjA3MTkxMmY1ZDFhM2ViMDBlNg==
-  data.tar.gz: !binary |-
-    MDhmM2ZlOWEwYjdlYmY4MWU4NTM1YmY3MjdlOTFiOTEwOGU4NWYzMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDQ3ODc2YWMwY2I5YzhlOGY0ZmQxOThhMzcyM2U5ZDE4OTU3NDNmNjFkZjVl
-    YWU0MTg3Y2I3MDQzN2Q4MDYxNDlkMzVjYTFhZDZhMWY4ZmQzNjBjNzkyZWRk
-    NjBiYzVjY2RmNGY2MjUzNzQyMzIxNjI5M2E4YjI4OTc4NGJlYTE=
-  data.tar.gz: !binary |-
-    ODQ3Njk3ZWM3NGFiZGJlNzE2ODcxMzRiNGQ0Mjg5NzIzYmI0Y2EzMDQyN2Rj
-    YWI4ZjA3M2EzMjJjMzliMTgyYjRmNmM2MDdkYzAzYjRmMjgwYzkwOGVkZDk3
-    NGY0MmY2MmVkZmVhOGFlYWY1MTMwMTdjYmQ2NDQ5NTk1NzZiNDQ=

data/lib/rdf/turtle/streaming_writer.rb

@@ -1,52 +0,0 @@
-require 'rdf/turtle/terminals'
-
-module RDF::Turtle
-  ##
-  # Streaming writer interface
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
-  module StreamingWriter
-    ##
-    # Write out declarations
-    # @return [void] `self`
-    def stream_prologue
-      if @options[:standard_prefixes]
-        RDF::Vocabulary.each do |vocab|
-          pfx = vocab.__name__.to_s.split('::').last.downcase
-          prefix(pfx, vocab.to_uri)
-        end
-      end
-      preprocess
-      start_document
-      @output.puts ""
-      self
-    end
-
-    ##
-    # Write out a statement, retaining current
-    # `subject` and `predicate` to create more compact output
-    # @return [void] `self`
-    def stream_statement(statement)
-      if statement.subject != @streaming_subject
-        @output.puts ' .' if @streaming_subject
-        @streaming_subject, @streaming_predicate = statement.subject, statement.predicate
-        @output.write "#{format_term(statement.subject)} "
-        @output.write "#{format_term(statement.predicate)} "
-      elsif statement.predicate != @streaming_predicate
-        @streaming_predicate = statement.predicate
-        @output.write ";\n#{indent(1)}#{format_term(statement.predicate)} "
-      else
-        @output.write ",\n#{indent(2)}"
-      end
-      @output.write("#{format_term(statement.object)}")
-    end
-
-    ##
-    # Complete open statements
-    # @return [void] `self`
-    def stream_epilogue
-      @output.puts ' .' if @streaming_subject
-    end
-
-    private
-  end
-end