RubyGems - rdf-turtle - Versions diffs - 1.1.0p0 → 1.1.0p1 - Mend

rdf-turtle 1.1.0p0 → 1.1.0p1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/README.md CHANGED

@@ -45,16 +45,18 @@ Full documentation available on [Rubydoc.info][Turtle doc]
 ### Variations from the spec
 In some cases, the specification is unclear on certain issues:
-* 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.
+* 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`.
 ### 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#initialize} using the standard mechanism defined
+RDF::Turtle::FreebaseReader} using the standard mechanism defined
 for `RDF::Reader`.
 The [Freebase Dumps][] have a very normalized form, similar to N-Triples but

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.1.~~0p0~~
1	+ 1.1.0p1

data/lib/rdf/turtle/meta.rb CHANGED

@@ -1,4 +1,4 @@
-# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p374/bundler/gems/ebnf-a5c008da3a01/bin/ebnf
+# This file is automatically generated by /Users/gregg/.rvm/gems/ruby-1.9.3-p392/bundler/gems/ebnf-af9a669d518f/bin/ebnf
 # BRANCH derived from etc/turtle.bnf
 module RDF::Turtle::Meta
   START = :turtleDoc
@@ -66,7 +66,19 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_SINGLE_QUOTE => [:STRING_LITERAL_SINGLE_QUOTE],
     },
     :base => {
-      "@base" => ["@base", :IRIREF, "."],
+      :BASE => [:BASE, :IRIREF, :_base_1],
+    },
+    :_base_1 => {
+      "(" => [],
+      "." => ["."],
+      :ANON => [],
+      :BASE => [],
+      :BLANK_NODE_LABEL => [],
+      :IRIREF => [],
+      :PNAME_LN => [],
+      :PNAME_NS => [],
+      :PREFIX => [],
+      "[" => [],
     },
     :blankNodePropertyList => {
       "[" => ["[", :predicateObjectList, "]"],
@@ -112,10 +124,10 @@ module RDF::Turtle::Meta
       "true" => [:object, :_collection_1],
     },
     :directive => {
-      "@base" => [:base],
-      "@prefix" => [:prefixID],
-      :SPARQL_BASE => [:sparqlBase],
-      :SPARQL_PREFIX => [:sparqlPrefix],
+      :BASE => [:base],
+      :PREFIX => [:prefixID],
+      :sparqlBase => [:sparqlBase],
+      :sparqlPrefix => [:sparqlPrefix],
     },
     :iri => {
       :IRIREF => [:IRIREF],
@@ -187,6 +199,7 @@ module RDF::Turtle::Meta
       :PNAME_NS => [:iri],
     },
     :predicateObjectList => {
+      "A" => [:verb, :objectList, :_predicateObjectList_1],
       :IRIREF => [:verb, :objectList, :_predicateObjectList_1],
       :PNAME_LN => [:verb, :objectList, :_predicateObjectList_1],
       :PNAME_NS => [:verb, :objectList, :_predicateObjectList_1],
@@ -206,6 +219,7 @@ module RDF::Turtle::Meta
     :_predicateObjectList_4 => {
       "." => [],
       ";" => [],
+      "A" => [:_predicateObjectList_5],
       :IRIREF => [:_predicateObjectList_5],
       :PNAME_LN => [:_predicateObjectList_5],
       :PNAME_NS => [:_predicateObjectList_5],
@@ -213,31 +227,36 @@ module RDF::Turtle::Meta
       "a" => [:_predicateObjectList_5],
     },
     :_predicateObjectList_5 => {
+      "A" => [:verb, :objectList],
       :IRIREF => [:verb, :objectList],
       :PNAME_LN => [:verb, :objectList],
       :PNAME_NS => [:verb, :objectList],
       "a" => [:verb, :objectList],
     },
     :prefixID => {
-      "@prefix" => ["@prefix", :PNAME_NS, :IRIREF, "."],
-    },
-    :sparqlBase => {
-      :SPARQL_BASE => [:SPARQL_BASE, :IRIREF],
+      :PREFIX => [:PREFIX, :PNAME_NS, :IRIREF, :_prefixID_1],
     },
-    :sparqlPrefix => {
-      :SPARQL_PREFIX => [:SPARQL_PREFIX, :PNAME_NS, :IRIREF],
+    :_prefixID_1 => {
+      "(" => [],
+      "." => ["."],
+      :ANON => [],
+      :BASE => [],
+      :BLANK_NODE_LABEL => [],
+      :IRIREF => [],
+      :PNAME_LN => [],
+      :PNAME_NS => [],
+      :PREFIX => [],
+      "[" => [],
     },
     :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],
-      :SPARQL_BASE => [:directive],
-      :SPARQL_PREFIX => [:directive],
+      :PREFIX => [:directive],
       "[" => [:_statement_1],
     },
     :_statement_1 => {
@@ -279,6 +298,7 @@ module RDF::Turtle::Meta
     },
     :_triples_3 => {
       "." => [],
+      "A" => [:predicateObjectList],
       :IRIREF => [:predicateObjectList],
       :PNAME_LN => [:predicateObjectList],
       :PNAME_NS => [:predicateObjectList],
@@ -286,31 +306,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],
-      :SPARQL_BASE => [:_turtleDoc_1],
-      :SPARQL_PREFIX => [:_turtleDoc_1],
+      :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],
-      :SPARQL_BASE => [:statement, :turtleDoc],
-      :SPARQL_PREFIX => [:statement, :turtleDoc],
+      :PREFIX => [:statement, :turtleDoc],
       "[" => [:statement, :turtleDoc],
     },
     :verb => {
+      "A" => ["A"],
       :IRIREF => [:predicate],
       :PNAME_LN => [:predicate],
       :PNAME_NS => [:predicate],
@@ -323,9 +340,9 @@ module RDF::Turtle::Meta
     ",",
     ".",
     ";",
-    "@base",
-    "@prefix",
+    "A",
     :ANON,
+    :BASE,
     :BLANK_NODE_LABEL,
     :DECIMAL,
     :DOUBLE,
@@ -334,8 +351,7 @@ module RDF::Turtle::Meta
     :LANGTAG,
     :PNAME_LN,
     :PNAME_NS,
-    :SPARQL_BASE,
-    :SPARQL_PREFIX,
+    :PREFIX,
     :STRING_LITERAL_LONG_QUOTE,
     :STRING_LITERAL_LONG_SINGLE_QUOTE,
     :STRING_LITERAL_QUOTE,
@@ -385,12 +401,19 @@ 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 => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -473,10 +496,8 @@ module RDF::Turtle::Meta
     :_collection_5 => [
       ")"],
     :directive => [
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE],
+      :PREFIX,
+      :BASE],
     :_empty => [
       :_eps],
     :iri => [
@@ -562,6 +583,7 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :predicateObjectList => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -575,11 +597,13 @@ module RDF::Turtle::Meta
       ";"],
     :_predicateObjectList_4 => [
       :_eps,
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_predicateObjectList_5 => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -606,6 +630,7 @@ module RDF::Turtle::Meta
       ";"],
     :_predicateObjectList_8 => [
       :_eps,
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -628,22 +653,20 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :prefixID => [
-      "@prefix"],
+      :PREFIX],
     :_prefixID_1 => [
+      ".",
+      :_eps],
+    :_prefixID_2 => [
       :PNAME_NS],
-    :sparqlBase => [
-      :SPARQL_BASE],
-    :_sparqlBase_1 => [
+    :_prefixID_3 => [
       :IRIREF],
-    :sparqlPrefix => [
-      :SPARQL_PREFIX],
-    :_sparqlPrefix_1 => [
-      :PNAME_NS],
+    :_prefixID_4 => [
+      ".",
+      :_eps],
     :statement => [
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -687,27 +710,28 @@ module RDF::Turtle::Meta
       "["],
     :_triples_3 => [
       :_eps,
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_triples_4 => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :_triples_5 => [
       :_eps,
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
     :turtleDoc => [
       :_eps,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -716,10 +740,8 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :_turtleDoc_1 => [
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -729,10 +751,8 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_turtleDoc_2 => [
       :_eps,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -741,6 +761,7 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :verb => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,
@@ -748,6 +769,7 @@ module RDF::Turtle::Meta
   }.freeze
   FOLLOW = {
     :BlankNode => [
+      "A",
       "a",
       ")",
       ",",
@@ -815,6 +837,7 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :PrefixedName => [
+      "A",
       "a",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -973,10 +996,8 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :base => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -986,10 +1007,30 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_base_1 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :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,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -999,6 +1040,7 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :blankNodePropertyList => [
       ".",
+      "A",
       "a",
       ")",
       ",",
@@ -1022,6 +1064,7 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :_blankNodePropertyList_1 => [
       ".",
+      "A",
       "a",
       ")",
       ",",
@@ -1045,6 +1088,7 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :_blankNodePropertyList_2 => [
       ".",
+      "A",
       "a",
       ")",
       ",",
@@ -1067,6 +1111,7 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_SINGLE_QUOTE,
       :STRING_LITERAL_LONG_QUOTE],
     :collection => [
+      "A",
       "a",
       ")",
       ",",
@@ -1094,6 +1139,7 @@ module RDF::Turtle::Meta
     :_collection_2 => [
       ")"],
     :_collection_3 => [
+      "A",
       "a",
       ")",
       ",",
@@ -1119,6 +1165,7 @@ module RDF::Turtle::Meta
     :_collection_4 => [
       ")"],
     :_collection_5 => [
+      "A",
       "a",
       ")",
       ",",
@@ -1143,10 +1190,8 @@ module RDF::Turtle::Meta
       :STRING_LITERAL_LONG_QUOTE],
     :directive => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1155,6 +1200,7 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :iri => [
+      "A",
       "a",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1310,10 +1356,8 @@ module RDF::Turtle::Meta
       "]"],
     :prefixID => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1323,23 +1367,8 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_prefixID_1 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
-      "[",
-      :IRIREF,
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "(",
-      :PNAME_LN,
-      :PNAME_NS],
-    :sparqlBase => [
-      :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1347,12 +1376,10 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :_sparqlBase_1 => [
+    :_prefixID_2 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1360,12 +1387,10 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :sparqlPrefix => [
+    :_prefixID_3 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1373,12 +1398,10 @@ module RDF::Turtle::Meta
       "(",
       :PNAME_LN,
       :PNAME_NS],
-    :_sparqlPrefix_1 => [
+    :_prefixID_4 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1388,10 +1411,8 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :statement => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1401,10 +1422,8 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_statement_1 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1414,10 +1433,8 @@ module RDF::Turtle::Meta
       :PNAME_NS],
     :_statement_2 => [
       :_eof,
-      "@prefix",
-      "@base",
-      :SPARQL_PREFIX,
-      :SPARQL_BASE,
+      :PREFIX,
+      :BASE,
       "[",
       :IRIREF,
       :BLANK_NODE_LABEL,
@@ -1426,6 +1443,7 @@ module RDF::Turtle::Meta
       :PNAME_LN,
       :PNAME_NS],
     :subject => [
+      "A",
       "a",
       :IRIREF,
       :PNAME_LN,

data/lib/rdf/turtle/reader.rb CHANGED

@@ -67,26 +67,26 @@ module RDF::Turtle
     end
     # String terminals
-    terminal(nil,                  %r([\(\),.;\[\]a]|\^\^|@base|@prefix|true|false)) do |prod, token, input|
+    terminal(nil,                  %r([\(\),.;\[\]Aa]|\^\^|true|false)) do |prod, token, input|
       case token.value
-      when 'a'                then input[:resource] = RDF.type
+      when 'A', '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]
       else                         input[:string] = token.value
       end
     end
-    terminal(:LANGTAG,              LANGTAG) do |prod, token, input|
-      input[:lang] = token.value[1..-1]
-    end
-    terminal(:SPARQL_PREFIX,      SPARQL_PREFIX) do |prod, token, input|
+    terminal(:PREFIX,      PREFIX) do |prod, token, input|
       input[:string_value] = token.value.downcase
     end
-    terminal(:SPARQL_BASE,      SPARQL_BASE) do |prod, token, input|
+    terminal(:BASE,      BASE) do |prod, token, input|
       input[:string_value] = token.value.downcase
     end
+    terminal(:LANGTAG,              LANGTAG) do |prod, token, input|
+      input[:lang] = token.value[1..-1]
+    end
     # Productions
     # [4] prefixID defines a prefix mapping
     production(:prefixID) do |input, current, callback|
@@ -103,21 +103,6 @@ module RDF::Turtle
       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
     # [6] triples
     start_production(:triples) do |input, current, callback|
       # Note production as triples for blankNodePropertyList
@@ -176,20 +161,15 @@ module RDF::Turtle
     production(:collection) do |input, current, callback|
       # Create an RDF list
-      bnode = self.bnode
       objects = current[:object_list]
-      list = RDF::List.new(bnode, nil, objects)
+      list = RDF::List[*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] = bnode
+      input[:resource] = list.subject
     end
     # [16] RDFLiteral ::= String ( LanguageTag | ( "^^" IRIref ) )?

data/lib/rdf/turtle/terminals.rb CHANGED

@@ -56,22 +56,22 @@ module RDF::Turtle
     # 21
     DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/.freeze
     # 22
-    STRING_LITERAL_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/.freeze
+    STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/.freeze
     # 23
-    STRING_LITERAL_SINGLE_QUOTE      = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/.freeze.freeze
+    STRING_LITERAL_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
-    SPARQL_PREFIX        = /prefix/i.freeze
+    PREFIX               = /@?prefix/i.freeze
     # 29t
-    SPARQL_BASE          = /base/i.freeze
+    BASE                 = /@?base/i.freeze
   end
 end

metadata CHANGED

@@ -1,160 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 1.1.0p0
+  version: 1.1.0p1
   prerelease: 5
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ebnf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
 email: [email protected]
 executables: []
@@ -166,6 +166,7 @@ files:
 - History
 - UNLICENSE
 - VERSION
+- lib/rdf/turtle.rb
 - lib/rdf/turtle/format.rb
 - lib/rdf/turtle/freebase_reader.rb
 - lib/rdf/turtle/meta.rb
@@ -173,30 +174,29 @@ files:
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
-- lib/rdf/turtle.rb
 homepage: http://ruby-rdf.github.com/rdf-turtle
 licenses:
 - Public Domain
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: rdf-turtle
-rubygems_version: 1.8.25
-signing_key:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Turtle reader/writer for Ruby.
 test_files: []