rdf-n3 0.3.1.3 → 0.3.3

data/.yardopts

@@ -1,9 +1,9 @@
---title "Notation-3 (n3-rdf) and Turtle reader/writer for RDF.rb."
+--title "Notation-3 and Turtle reader/writer for RDF.rb."
 --output-dir doc/yard
 --protected
 --no-private
 --hide-void-return
---markup rdoc
+--markup markdown
 --readme README.md
 -
 History.md

data/History.md

@@ -1,3 +1,15 @@
+0.3.3
+-----
+* Update dependencies to RDF.rb 0.3.3
+* Update specs to use open-uri-cached and Spira; no longer directly include W3C test cases.
+* Use Bundler when running specs.
+* Only output prefix definitions used in serialization.
+* Fixed stack overflow in regular expression when matching long multi-line literals.
+* Fixed bug (issue 14) where illegal QNames were generated in writer.
+
+0.3.2
+-----
+* Skipped
 0.3.1.3
 -----
 * Normalize language tags to lower case (only when canonicalizing). SPARQL specs expect the reader

data/README

@@ -0,0 +1,153 @@
+RDF::N3 reader/writer
+=====================
+Notation-3 and Turtle reader/writer for [RDF.rb][RDF.rb] .
+
+Description
+-----------
+RDF::N3 is an Notation-3 parser for Ruby using the [RDF.rb][RDF.rb]  library suite.
+
+Reader inspired from TimBL predictiveParser and Python librdf implementation.
+
+Features
+--------
+RDF::N3 parses [Notation-3][N3], [Turtle][Turtle] and [N-Triples][N-Triples] into statements or triples. It also serializes to Turtle.
+
+Install with `gem install rdf-n3`
+
+## Limitations
+* Full support of Unicode input requires Ruby version 1.9 or greater.
+* Support for Variables in Formulae dependent on underlying repository. Existential variables are quantified to RDF::Node instances, Universals to RDF::Query::Variable, with the URI of the variable target used as the variable name.
+* No support for N3 Reification. If there were, it would be through a :reify option to the reader.
+
+## Usage
+Instantiate a reader from a local file:
+
+    RDF::N3::Reader.open("etc/foaf.n3") do |reader|
+       reader.each_statement do |statement|
+         puts statement.inspect
+       end
+    end
+
+Define `@base` and `@prefix` definitions, and use for serialization using `:base_uri` an `:prefixes` options
+
+Write a graph to a file:
+
+    RDF::N3::Writer.open("etc/test.n3") do |writer|
+       writer << graph
+    end
+
+### Formulae
+N3 Formulae are introduced with the { statement-list } syntax. A given formula is assigned an RDF::Node instance, which is also used as the context for RDF::Statement instances provided to RDF::N3::Reader#each_statement. For example, the following N3 generates the associated statements:
+
+    { [ x:firstname  "Ora" ] dc:wrote [ dc:title  "Moby Dick" ] } a n3:falsehood .
+  
+results in
+
+    f = RDF::Node.new
+    s = RDF::Node.new
+    o = RDF::Node.new
+    RDF::Statement(f, rdf:type n3:falsehood)
+    RDF::Statement(s, x:firstname, "Ora", :context => f)
+    RDF::Statement(s, dc:wrote, o, :context => f)
+    RDF::Statement(o, dc:title, "Moby Dick", :context => f)
+
+### Variables
+N3 Variables are introduced with @forAll, @forEach, or ?x. Variables reference URIs described in formulae, typically defined in the default vocabulary (e.g., ":x"). Existential variables are replaced with an allocated RDF::Node instance. Universal variables are replaced with a RDF::Query::Variable instance. For example, the following N3 generates the associated statements:
+
+    @forAll <#h>. @forSome <#g>. <#g> <#loves> <#h> .
+
+results in:
+
+    h = RDF::Query::Variable.new(<#h>)
+    g = RDF::Node.new()
+    RDF::Statement.new(f, <#loves>, h)
+
+## Implementation Notes
+The parser is driven through a rules table contained in lib/rdf/n3/reader/meta.rb. This includes
+branch rules to indicate productions to be taken based on a current production. Terminals are denoted
+through a set of regular expressions used to match each type of terminal.
+
+The [meta.rb][file:lib/rdf/n3/reader/meta.rb] file is generated from lib/rdf/n3/reader/n3-selectors.n3
+(taken from http://www.w3.org/2000/10/swap/grammar/n3-selectors.n3) which is the result of parsing
+http://www.w3.org/2000/10/swap/grammar/n3.n3 (along with bnf-rules.n3) using cwm using the following command sequence:
+
+    cwm n3.n3 bnf-rules.n3 --think --purge --data > n3-selectors.n3
+
+[n3-selectors.n3][file:lib/rdf/n3/reader/n3-selectors.rb] is itself used to generate meta.rb using script/build_meta.
+
+## TODO
+* Generate Formulae and solutions using BGP and SPARQL CONSTRUCT mechanisms
+* Create equivalent to `--think` to iterate on solutions.
+
+## Dependencies
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.1)
+
+## Documentation
+Full documentation available on [RubyForge](http://rdf.rubyforge.org/n3)
+
+### Principle Classes
+* {RDF::N3}
+* {RDF::N3::Format}
+* {RDF::N3::Reader}
+* {RDF::N3::Writer}
+
+### Additional vocabularies
+* {RDF::LOG}
+* {RDF::REI}
+
+### Patches
+* {Array}
+* {RDF::Graph}
+
+## Resources
+* [RDF.rb][RDF.rb]
+* [Distiller](http://distiller.kellogg-assoc)
+* [Documentation](http://rdf.rubyforge.org/n3)
+* [History](file:file.History.html)
+* [Notation-3][N3]
+* [N3 Primer](http://www.w3.org/2000/10/swap/Primer.html)
+* [N3 Reification](http://www.w3.org/DesignIssues/Reify.html)
+* [Turtle][Turtle]
+* [W3C SWAP Test suite](http://www.w3.org/2000/10/swap/test/README.html)
+* [W3C Turtle Test suite](http://www.w3.org/2001/sw/DataAccess/df1/tests/README.txt)
+* [N-Triples][N-Triples]
+
+## Author
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+
+## Contributors
+* [Nicholas Humfrey](http://github.com/njh)
+
+## Contributing
+
+* Do your best to adhere to the existing coding conventions and idioms.
+* Don't use hard tabs, and don't leave trailing whitespace on any line.
+* Do document every method you add using [YARD][] annotations. Read the
+  [tutorial][YARD-GS] or just look at the existing code for examples.
+* Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to
+  change them, do so on your private branch only.
+* Do feel free to add yourself to the `CREDITS` file and the corresponding
+  list in the the `README`. Alphabetical order applies.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you.
+
+## License
+
+This is free and unencumbered public domain software. For more information,
+see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+
+Feedback
+--------
+* <gregg@kellogg-assoc.com>
+* <http://rubygems.org/gem/rdf-n3>
+* <http://github.com/gkellogg/rdf-n3>
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
+[RDF.rb]:    http://rdf.rubyforge.org/
+[N3]:        http://www.w3.org/DesignIssues/Notation3.html "Notation-3"
+[Turtle]:    http://www.w3.org/TeamSubmission/turtle/
+[N-Triples]: http://www.w3.org/2001/sw/RDFCore/ntriples/
+[YARD]:      http://yardoc.org/
+[YARD-GS]:   http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:       http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/README.md

@@ -112,6 +112,26 @@ Full documentation available on [RubyForge](http://rdf.rubyforge.org/n3)
 * [W3C Turtle Test suite](http://www.w3.org/2001/sw/DataAccess/df1/tests/README.txt)
 * [N-Triples][N-Triples]
 
+## Author
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+
+## Contributors
+* [Nicholas Humfrey](http://github.com/njh)
+
+## Contributing
+
+* Do your best to adhere to the existing coding conventions and idioms.
+* Don't use hard tabs, and don't leave trailing whitespace on any line.
+* Do document every method you add using [YARD][] annotations. Read the
+  [tutorial][YARD-GS] or just look at the existing code for examples.
+* Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to
+  change them, do so on your private branch only.
+* Do feel free to add yourself to the `CREDITS` file and the corresponding
+  list in the the `README`. Alphabetical order applies.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you.
+
 ## License
 
 This is free and unencumbered public domain software. For more information,
@@ -124,7 +144,10 @@ Feedback
 * <http://github.com/gkellogg/rdf-n3>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF.rb]: http://rdf.rubyforge.org/
-[N3]: http://www.w3.org/DesignIssues/Notation3.html "Notation-3"
-[Turtle]: http://www.w3.org/TeamSubmission/turtle/
+[RDF.rb]:    http://rdf.rubyforge.org/
+[N3]:        http://www.w3.org/DesignIssues/Notation3.html "Notation-3"
+[Turtle]:    http://www.w3.org/TeamSubmission/turtle/
 [N-Triples]: http://www.w3.org/2001/sw/RDFCore/ntriples/
+[YARD]:      http://yardoc.org/
+[YARD-GS]:   http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:       http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/Rakefile

@@ -6,17 +6,17 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "rdf-n3"
-    gemspec.summary = "Notation-3 (n3-rdf) and Turtle reader/writer for RDF.rb."
-    gemspec.description = %q(RDF::N3 is an Notation-3 (n3-rdf) parser for Ruby using the RDF.rb library suite.)
+    gemspec.summary = "N3/Turtle reader/writer for RDF.rb."
+    gemspec.description = %q(RDF::N3 is an Notation-3 and Turtle reader/writer for the RDF.rb library suite.)
     gemspec.email = "gregg@kellogg-assoc.com"
     gemspec.homepage = "http://github.com/gkellogg/rdf-n3"
     gemspec.authors = ["Gregg Kellogg"]
-    gemspec.add_dependency('rdf', '>= 0.3.1')
+    gemspec.add_dependency('rdf', '>= 0.3.3')
     gemspec.add_development_dependency('open-uri-cached')
     gemspec.add_development_dependency('spira', '>= 0.0.12')
     gemspec.add_development_dependency('rspec', '>= 2.5.0')
-    gemspec.add_development_dependency('rdf-spec', '>= 0.3.1')
-    gemspec.add_development_dependency('rdf-rdfxml', '>= 0.3.1')
+    gemspec.add_development_dependency('rdf-spec', '>= 0.3.3')
+    gemspec.add_development_dependency('rdf-rdfxml', '>= 0.3.3')
     gemspec.add_development_dependency('rdf-isomorphic', '>= 0.3.4')
     gemspec.add_development_dependency('yard')
     gemspec.extra_rdoc_files     = %w(README.md History.md AUTHORS VERSION UNLICENSE)
@@ -40,8 +40,6 @@ RSpec::Core::RakeTask.new("doc:spec") do |spec|
   spec.rspec_opts = ["--format", "html", "-o", "doc/spec.html"]
 end
 
-YARD::Rake::YardocTask.new do |t|
-  t.files   = %w(lib/**/*.rb README.md History.md AUTHORS VERSION)   # optional
-end
+YARD::Rake::YardocTask.new
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.3.1.3
+0.3.3

data/example-files/arnau-stack-overflow.ttl

@@ -0,0 +1,12 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+:foo rdf:value """Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet "consectetur adipisicing elit" sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  Lorem ipsum dolor sit amet, co.""", """foo"""; a :bar .
+:t1049 rdf:value     """sameDan.n3 sameThing.n3 --think --apply=forgetDups.n3 --purge --n3="/" """.

data/example-files/dwbutler-mj.n3

@@ -0,0 +1,10 @@
+@base <http://example.com> .
+@prefix db: <http://dbpedia.org/resource/> .
+@prefix dbo: <http://dbpedia.org/ontology/> .
+
+db:Michael_Jackson dbo:activeYearsEndYear "2009-01-01T00:00:00Z";
+   dbo:activeYearsStartYear "1964-01-01T00:00:00Z";
+   dbo:artistOf db:%28I_Can%27t_Make_It%29_Another_Day .
+
+Parsed 3 statements in 0.044056 seconds @ 68.0951516252043 statements/second.
+

data/example-files/dwbutler-mj.ttl

@@ -0,0 +1,8 @@
+@prefix db: <http://dbpedia.org/resource/> .
+@prefix dbm: <http://dbpedia.org/meta/> .
+@prefix dbo: <http://dbpedia.org/ontology/> .
+
+db:Michael_Jackson dbo:activeYearsEndYear "2009-01-01T00:00:00Z";
+  dbo:activeYearsStartYear "1964-01-01T00:00:00Z";
+  dbo:artistOf <http://dbpedia.org/resource/%28I_Can%27t_Make_It%29_Another_Day> .
+

data/example-files/lee-reilly-list.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'rdf'
+require 'rdf/n3'
+
+doc = %q(
+@prefix dms: <http://example.stanford.edu/ns/> .
+@prefix ore: <http://www.openarchives.org/ore/terms/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+<http://dmstech.groups.stanford.edu/ccc001/manifest/NormalSequence> a dms:Sequence,
+        ore:Aggregation,
+        rdf:List;
+    ore:aggregates (
+      <http://example.stanford.edu/item/DOC001/fob>
+      <http://example.stanford.edu/item/DOC001/fib>
+      <http://example.stanford.edu/item/DOC001/iR>
+      <http://example.stanford.edu/item/DOC001/iV>
+      <http://example.stanford.edu/item/DOC001/iiR>
+      <http://example.stanford.edu/item/DOC001/iiV>
+      <http://example.stanford.edu/item/DOC001/1R>
+      <http://example.stanford.edu/item/DOC001/1V>
+      <http://example.stanford.edu/item/DOC001/2R>
+      <http://example.stanford.edu/item/DOC001/2V>
+      <http://example.stanford.edu/item/DOC001/iiiR>
+      <http://example.stanford.edu/item/DOC001/iiiV>
+      <http://example.stanford.edu/item/DOC001/ivR>
+      <http://example.stanford.edu/item/DOC001/ivV>
+      <http://example.stanford.edu/item/DOC001/bib>
+      <http://example.stanford.edu/item/DOC001/bob> ) .
+)
+
+r = RDF::N3::Reader.new(doc)
+g = RDF::Graph.new << r
+
+puts "NTriples Representation"
+puts g.dump(:ntriples)
+
+puts "Turtle/N3 Representation"
+puts g.dump(:n3, :prefixes => r.prefixes)

data/lib/rdf/n3/reader.rb

@@ -9,7 +9,8 @@ module RDF::N3
   # Separate pass to create branch_table from n3-selectors.n3
   #
   # @todo
-  # Existentials, Universals and Formulae
+  # * Formulae as RDF::Query representations
+  # * Formula expansion similar to SPARQL Construct
   #
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   class Reader < RDF::Reader
@@ -45,7 +46,8 @@ module RDF::N3
     # @raise [Error]:: Raises RDF::ReaderError if _validate_
     def initialize(input = $stdin, options = {}, &block)
       super do
-        @input = input.respond_to?(:read) ? (input.rewind; input) : StringIO.new(input.to_s)
+        input.rewind if input.respond_to?(:rewind)
+        @input = input.respond_to?(:read) ? input : StringIO.new(input.to_s)
         @lineno = 0
         readline  # Prime the pump
         
@@ -82,6 +84,10 @@ module RDF::N3
       end
     end
 
+    def inspect
+      sprintf("#<%s:%#0x(%s)>", self.class.name, __id__, base_uri.to_s)
+    end
+
     ##
     # XXX Remove when added to RDF::Reader
     # Returns the base URI determined by this reader.

data/lib/rdf/n3/reader/meta.rb

@@ -632,7 +632,7 @@ module RDF::N3::Meta
     :"http://www.w3.org/2000/10/swap/grammar/n3#prefix" => Regexp.compile(%(^([#{BARENAME_START}][#{BARENAME_TAIL}]*)?:)),
     :"http://www.w3.org/2000/10/swap/grammar/n3#qname" => Regexp.compile(%(^(([#{BARENAME_START}][#{BARENAME_TAIL}]*)?:)?([#{BARENAME_START}][#{BARENAME_TAIL}]*)?)),
     :"http://www.w3.org/2000/10/swap/grammar/n3#quickvariable" => Regexp.compile(%(^\\?[#{BARENAME_START}][#{BARENAME_TAIL}]*)),
-    :"http://www.w3.org/2000/10/swap/grammar/n3#string" => Regexp.compile("(\"\"\"[^\"\\\\]*(?:(?:\\\\.|\"(?!\"\"))[^\"\\\\]*)*\"\"\")|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")"),
+    :"http://www.w3.org/2000/10/swap/grammar/n3#string" => Regexp.compile("(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")"),
 
     # Hack to replace integer|double|decimal with numericliteral
     :"http://www.w3.org/2000/10/swap/grammar/n3#numericliteral" => Regexp.compile(%(^[-+]?[0-9]+(\\.[0-9]+)?(e[-+]?[0-9]+)?))

data/lib/rdf/n3/reader/parser.rb

@@ -3,7 +3,7 @@ module RDF::N3
   module Parser
     START = 'http://www.w3.org/2000/10/swap/grammar/n3#document'
     R_WHITESPACE = Regexp.compile('\A\s*(?:#.*$)?')
-    R_MLSTRING = Regexp.compile("(\"\"\"[^\"\\\\]*(?:(?:\\\\.|\"(?!\"\"))[^\"\\\\]*)*\"\"\")")
+    R_MLSTRING = Regexp.compile("^.*([^\"\\\\]*)\"\"\"")
     SINGLE_CHARACTER_SELECTORS = %{\t\r\n !\"#$\%&'()*.,+/;<=>?[\\]^`{|}~}
     NOT_QNAME_CHARS = SINGLE_CHARACTER_SELECTORS + "@"
     NOT_NAME_CHARS = NOT_QNAME_CHARS + ":"
@@ -56,22 +56,29 @@ module RDF::N3
           elsif regexp = @regexps[term]
             if abbr(term) == 'string' && buffer[0, 3] == '"""'
               # Read until end of multi-line comment if this is the start of a multi-line comment
-              until R_MLSTRING.match(buffer)
+              string = '"""'
+              consume(3)
+              next_line = buffer
+              #puts "ml-str(start): #{next_line.dump}" if $verbose
+              until md = R_MLSTRING.match(next_line)
                 begin
-                  next_line = @input.readline
-                  @line += next_line
-                  @lineno += 1
+                  string += next_line
+                  next_line = readline
                 rescue EOFError => e
                   error("EOF reached searching for end of multi-line comment")
                 end
               end
+              string += md[0].to_s
+              consume(md[0].to_s.length)
+              onToken('string', string)
               #puts "ml-str now #{buffer.dump}"
+            else
+              md = regexp.match(buffer)
+              error("Token(#{abbr(term)}) '#{buffer[0, 10]}...' should match #{regexp}") unless md
+              puts "parse term(#{abbr(term)}:regexp): #{term}, #{regexp}.match('#{buffer[0, 10]}...') => '#{md.inspect}'" if $verbose
+              onToken(abbr(term), md.to_s)
+              consume(md[0].length)
             end
-            md = regexp.match(buffer)
-            error("Token(#{abbr(term)}) '#{buffer[0, 10]}...' should match #{regexp}") unless md
-            puts "parse term(#{abbr(term)}:regexp): #{term}, #{regexp}.match('#{buffer[0, 10]}...') => '#{md.inspect}'" if $verbose
-            onToken(abbr(term), md.to_s)
-            consume(md[0].length)
           else
             puts "parse term(push): #{term}" if $verbose
             todo_stack << {:prod => term, :terms => nil}
@@ -159,7 +166,7 @@ module RDF::N3
       @line = @input.readline
       @lineno += 1
       @line.force_encoding(Encoding::UTF_8) if @line.respond_to?(:force_encoding) # for Ruby 1.9+
-      puts "readline[#{@lineno}]: '#{@line}'" if $verbose
+      puts "readline[#{@lineno}]: #{@line.dump}" if $verbose
       @pos = 0
       @line
     rescue EOFError => e

data/lib/rdf/n3/writer.rb

@@ -53,6 +53,7 @@ module RDF::N3
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   class Writer < RDF::Writer
     format RDF::N3::Format
+    QNAME = Meta::REGEXPS[:"http://www.w3.org/2000/10/swap/grammar/n3#qname"]
 
     # @return [Graph] Graph of statements serialized
     attr_accessor :graph
@@ -89,7 +90,7 @@ module RDF::N3
       super do
         @graph = RDF::Graph.new
         @uri_to_qname = {}
-        prefix(nil, @options[:default_namespace]) if @options[:default_namespace]
+        @uri_to_prefix = {}
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -154,35 +155,44 @@ module RDF::N3
     end
     
     # Return a QName for the URI, or nil. Adds namespace of QName to defined prefixes
-    # @param [URI,#to_s] uri
-    # @return [Array<Symbol,Symbol>, nil] Prefix, Suffix pair or nil, if none found
-    def get_qname(uri)
-      uri = RDF::URI.intern(uri.to_s) unless uri.is_a?(URI)
+    # @param [RDF::Resource] resource
+    # @return [String, nil] value to use to identify URI
+    def get_qname(resource)
+      case resource
+      when RDF::Node
+        return resource.to_s
+      when RDF::URI
+        uri = resource.to_s
+      else
+        return nil
+      end
 
-      unless @uri_to_qname.has_key?(uri)
-        # Find in defined prefixes
-        prefixes.each_pair do |prefix, vocab|
-          if uri.to_s.index(vocab.to_s) == 0
-            local_name = uri.to_s[(vocab.to_s.length)..-1]
-            add_debug "get_qname(ns): #{prefix}:#{local_name}"
-            return @uri_to_qname[uri] = "#{prefix}:#{local_name}"
-          end
-        end
-        
-        # Use a default vocabulary
-        if @options[:standard_prefixes] && vocab = RDF::Vocabulary.detect {|v| uri.to_s.index(v.to_uri.to_s) == 0}
-          prefix = vocab.__name__.to_s.split('::').last.downcase
-          prefixes[prefix.to_sym] = vocab.to_uri
-          suffix = uri.to_s[vocab.to_uri.to_s.size..-1]
-          return @uri_to_qname[uri] = "#{prefix}:#{suffix}"
-        end
-        
-        @uri_to_qname[uri] = nil
+      qname = case
+      when @uri_to_qname.has_key?(uri)
+        return @uri_to_qname[uri]
+      when u = @uri_to_prefix.keys.detect {|u| uri.index(u.to_s) == 0}
+        # Use a defined prefix
+        prefix = @uri_to_prefix[u]
+        prefix(prefix, u)  # Define for output
+        uri.sub(u.to_s, "#{prefix}:")
+      when @options[:standard_prefixes] && vocab = RDF::Vocabulary.detect {|v| uri.index(v.to_uri.to_s) == 0}
+        prefix = vocab.__name__.to_s.split('::').last.downcase
+        @uri_to_prefix[vocab.to_uri.to_s] = prefix
+        prefix(prefix, vocab.to_uri) # Define for output
+        uri.sub(vocab.to_uri.to_s, "#{prefix}:")
+      else
+        nil
       end
       
-      @uri_to_qname[uri]
+      # Make sure qname is a valid qname
+      if qname
+        md = QNAME.match(qname)
+        qname = nil unless md.to_s.length == qname.length
+      end
+
+      @uri_to_qname[uri] = qname
     rescue Addressable::URI::InvalidURIError => e
-       @uri_to_qname[uri] = nil
+      raise RDF::WriterError, "Invalid URI #{resource.inspect}: #{e.message}"
     end
     
     # Take a hash from predicate uris to lists of values.
@@ -242,7 +252,7 @@ module RDF::N3
     # @return [String]
     def format_uri(uri, options = {})
       md = relativize(uri)
-      md && md != uri.to_s ? "<#{md}>" : (get_qname(uri) || "<#{uri_for(uri)}>")
+      md && md != uri.to_s ? "<#{md}>" : (get_qname(uri) || "<#{uri}>")
     end
     
     ##
@@ -287,17 +297,24 @@ module RDF::N3
     
     # Order subjects for output. Override this to output subjects in another order.
     #
-    # Uses top_classes
+    # Uses #top_classes and #base_uri.
     # @return [Array<Resource>] Ordered list of subjects
     def order_subjects
       seen = {}
       subjects = []
       
+      # Start with base_uri
+      if base_uri && @subjects.keys.include?(base_uri)
+        subjects << base_uri
+        seen[subject] = true
+      end
+      
+      # Add distinguished classes
       top_classes.each do |class_uri|
         graph.query(:predicate => RDF.type, :object => class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
           #add_debug "order_subjects: #{subject.inspect}"
           subjects << subject
-          seen[subject] = @top_levels[subject] = true
+          seen[subject] = true
         end
       end
       
@@ -312,6 +329,14 @@ module RDF::N3
     
     # Perform any preprocessing of statements required
     def preprocess
+      # Load defined prefixes
+      (@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]
+
       @graph.each {|statement| preprocess_statement(statement)}
     end
     
@@ -353,7 +378,6 @@ module RDF::N3
       @references = {}
       @serialized = {}
       @subjects = {}
-      @top_levels = {}
       @shortNames = {}
       @started = false
     end