rdf-n3 0.3.1.1 → 0.3.1.2

data/.yardopts

@@ -9,3 +9,4 @@
 History.md
 AUTHORS
 VERSION
+UNLICENSE

data/History.md

@@ -1,3 +1,7 @@
+0.3.1.2
+-----
+* Normalize language tags to lower case.
+
 0.3.1.1
 -----
 * Assert formats for :ttl, :turtle, and :notation3 in addition to :n3

data/README.md

@@ -1,134 +1,130 @@
 RDF::N3 reader/writer
 =====================
-Notation-3 and Turtle reader/writer for RDF.rb.
+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 library suite.
+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, Turtle and N-Triples into statements or triples. It also serializes to Turtle.
+RDF::N3 parses [Notation-3][N3], [Turtle][Turtle] and [N-Triples][N-Triples] into statements or triples. It also serializes to Turtle.
 
-* Fully compliant N3-rdf parser
-* Also parses Turtle and N-Triples
-* Turtle serializer
+Install with `gem install rdf-n3`
 
-Install with 'gem install rdf-n3'
-
-Limitations
------------
+## 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
------
+## 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
+    RDF::N3::Reader.open("etc/foaf.n3") do |reader|
+       reader.each_statement do |statement|
+         puts statement.inspect
+       end
     end
-  end
 
-Define @base and @prefix definitions, and use for serialization using :base_uri an :prefixes options
+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
+    RDF::N3::Writer.open("etc/test.n3") do |writer|
+       writer << graph
+    end
 
-Formulae
---------
-N3 Formulae are introduced with the { statmenent-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:
+### 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 .
+    { [ 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)
+    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
----------
+### 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> .
+    @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)
+    h = RDF::Query::Variable.new(<#h>)
+    g = RDF::Node.new()
+    RDF::Statement.new(f, <#loves>, h)
 
-Implementation Notes
---------------------
+## 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 is generated from lib/rdf/n3/reader/n3-selectors.n3
+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 is itself used to generate meta.rb using script/build_meta.
-
-Dependencies
-------------
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
-
-Resources
----------
-* Distiller[http://kellogg-assoc/distiller]
-* RDoc[http://rdoc.info/projects/gkellogg/rdf-n3]
-* History[http://github.com/gkellogg/rdf-n3/blob/master/History.txt]
-* "N3 Specification"[http://www.w3.org/DesignIssues/Notation3.html]
-* "N3 Primer"[http://www.w3.org/2000/10/swap/Primer.html]
-* "N3 Reification"[http://www.w3.org/DesignIssues/Reify.html]
-* Turtle[http://www.w3.org/TeamSubmission/turtle/]
-* "RDF Tests"[http://www.w3.org/2000/10/rdf-tests/rdfcore/allTestCases.html]
-* "W3C Turtle Test suite"[http://www.w3.org/2000/10/swap/test/regression.n3]
-
-License
--------
-(The MIT License)
-
-Copyright (c) 2009-2010 Gregg Kellogg
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+[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]
+
+## 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
-* rubygems.org/rdf-n3
-* github.com/gkellogg/rdf-n3
-* gkellogg.lighthouseapp.com for bug reports
-* public-rdf-ruby mailing list on w3.org
+* <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/

data/Rakefile

@@ -19,7 +19,7 @@ begin
     gemspec.add_development_dependency('rdf-rdfxml', '>= 0.3.1')
     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)
+    gemspec.extra_rdoc_files     = %w(README.md History.md AUTHORS VERSION UNLICENSE)
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/UNLICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-0.3.1.1
+0.3.1.2

data/example-files/arnau-registered-vocab.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'rdf/rdfxml'
+require 'rdf/n3'
+
+data = %q(
+<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF
+   xmlns:owl="http://www.w3.org/2002/07/owl#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:vx="http://bcn.cat/data/v8y/xvcard#">
+  
+  <owl:Ontology rdf:about="http://bcn.cat/data/v8y/xvcard#">
+  </owl:Ontology>
+
+</rdf:RDF>)
+
+reader = RDF::RDFXML::Reader.new(data)
+graph = RDF::Graph.new << reader
+
+puts graph.dump(:n3, :prefixes => reader.prefixes)

data/lib/rdf/n3/format.rb

@@ -2,24 +2,24 @@ module RDF::N3
   ##
   # RDFa format specification.
   #
-  # @example Obtaining an RDFa format class
-  #   RDF::Format.for(:n3)            #=> RDF::N3::Format
-  #   RDF::Format.for("etc/foaf.ttl")
-  #   RDF::Format.for("etc/foaf.n3")
-  #   RDF::Format.for(:file_name      => "etc/foaf.ttl")
-  #   RDF::Format.for(:file_name      => "etc/foaf.n3")
-  #   RDF::Format.for(:file_extension => "ttl")
-  #   RDF::Format.for(:file_extension => "n3")
-  #   RDF::Format.for(:content_type   => "text/turtle")
-  #   RDF::Format.for(:content_type   => "text/n3")
+  # @example Obtaining an Notation3 format class
+  #     RDF::Format.for(:n3)            #=> RDF::N3::Format
+  #     RDF::Format.for("etc/foaf.ttl")
+  #     RDF::Format.for("etc/foaf.n3")
+  #     RDF::Format.for(:file_name      => "etc/foaf.ttl")
+  #     RDF::Format.for(:file_name      => "etc/foaf.n3")
+  #     RDF::Format.for(:file_extension => "ttl")
+  #     RDF::Format.for(:file_extension => "n3")
+  #     RDF::Format.for(:content_type   => "text/turtle")
+  #     RDF::Format.for(:content_type   => "text/n3")
   #
   # @example Obtaining serialization format MIME types
-  #   RDF::Format.content_types      #=> {"text/turtle" => [RDF::N3::Format]}
-  #   RDF::Format.content_types      #=> {"text/n3")" => [RDF::N3::Format]}
+  #     RDF::Format.content_types      #=> {"text/turtle" => [RDF::N3::Format]}
+  #     RDF::Format.content_types      #=> {"text/n3")" => [RDF::N3::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #   RDF::Format.file_extensions    #=> {:ttl => "text/turtle"}
-  #   RDF::Format.file_extensions    #=> {:n3 => "text/n3"}
+  #     RDF::Format.file_extensions    #=> {:ttl => "text/turtle"}
+  #     RDF::Format.file_extensions    #=> {:n3 => "text/n3"}
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
@@ -39,10 +39,10 @@ module RDF::N3
   #
   # This allows the following:
   #
-  # @example Obtaining an RDFXML format class
-  #   RDF::Format.for(:ttl)         # RDF::N3::Notation3
-  #   RDF::Format.for(:ttl).reader  # RDF::N3::Reader
-  #   RDF::Format.for(:ttl).writer  # RDF::N3::Writer
+  # @example Obtaining an Notation3 format class
+  #     RDF::Format.for(:ttl)         #=> RDF::N3::Notation3
+  #     RDF::Format.for(:ttl).reader  #=> RDF::N3::Reader
+  #     RDF::Format.for(:ttl).writer  #=> RDF::N3::Writer
   class Notation3 < RDF::Format
     reader { RDF::N3::Reader }
     writer { RDF::N3::Writer }
@@ -52,10 +52,10 @@ module RDF::N3
   #
   # This allows the following:
   #
-  # @example Obtaining an RDFXML format class
-  #   RDF::Format.for(:ttl)         # RDF::N3::TTL
-  #   RDF::Format.for(:ttl).reader  # RDF::N3::Reader
-  #   RDF::Format.for(:ttl).writer  # RDF::N3::Writer
+  # @example Obtaining an TTL format class
+  #     RDF::Format.for(:ttl)         # RDF::N3::TTL
+  #     RDF::Format.for(:ttl).reader  # RDF::N3::Reader
+  #     RDF::Format.for(:ttl).writer  # RDF::N3::Writer
   class TTL < RDF::Format
     reader { RDF::N3::Reader }
     writer { RDF::N3::Writer }
@@ -65,10 +65,10 @@ module RDF::N3
   #
   # This allows the following:
   #
-  # @example Obtaining an RDFXML format class
-  #   RDF::Format.for(:turtle)         # RDF::N3::Turtle
-  #   RDF::Format.for(:turtle).reader  # RDF::N3::Reader
-  #   RDF::Format.for(:turtle).writer  # RDF::N3::Writer
+  # @example Obtaining an Turtle format class
+  #     RDF::Format.for(:turtle)         # RDF::N3::Turtle
+  #     RDF::Format.for(:turtle).reader  # RDF::N3::Reader
+  #     RDF::Format.for(:turtle).writer  # RDF::N3::Writer
   class Turtle < RDF::Format
     reader { RDF::N3::Reader }
     writer { RDF::N3::Writer }

data/lib/rdf/n3/reader.rb

@@ -62,9 +62,8 @@ module RDF::N3
         @variables = {}    # variable definitions along with defining formula
 
         if options[:base_uri]
-          @uri = uri(options[:base_uri])
-          add_debug("@uri", "#{@uri.inspect}")
-          namespace(nil, uri("#{options[:base_uri]}#"))
+          add_debug("@uri", "#{base_uri.inspect}")
+          namespace(nil, uri("#{base_uri}#"))
         end
         add_debug("validate", "#{validate?.inspect}")
         add_debug("canonicalize", "#{canonicalize?.inspect}")
@@ -83,6 +82,19 @@ module RDF::N3
       end
     end
 
+    ##
+    # XXX Remove when added to RDF::Reader
+    # Returns the base URI determined by this reader.
+    #
+    # @example
+    #   reader.prefixes[:dc]  #=> RDF::URI('http://purl.org/dc/terms/')
+    #
+    # @return [Hash{Symbol => RDF::URI}]
+    # @since  0.3.0
+    def base_uri
+      @options[:base_uri]
+    end
+
     ##
     # Iterates the given block for each RDF statement in the input.
     #
@@ -169,7 +181,7 @@ module RDF::N3
       when "@base"
         # Base, set or update document URI
         uri = decl[:explicituri]
-        @uri = process_uri(uri)
+        options[:base_uri] = process_uri(uri)
         
         # The empty prefix "" is by default , bound to "#" -- the local namespace of the file.
         # The parser behaves as though there were a
@@ -177,8 +189,8 @@ module RDF::N3
         # just before the file.
         # This means that <#foo> can be written :foo and using @keywords one can reduce that to foo.
         
-        namespace(nil, uri.match(/[\/\#]$/) ? @uri : process_uri("#{uri}#"))
-        add_debug("declarationFinish[@base]", "@base=#{@uri}")
+        namespace(nil, uri.match(/[\/\#]$/) ? base_uri : process_uri("#{uri}#"))
+        add_debug("declarationFinish[@base]", "@base=#{base_uri}")
       when "@keywords"
         add_debug("declarationFinish[@keywords]", @keywords.inspect)
         # Keywords are handled in tokenizer and maintained in @keywords array
@@ -257,7 +269,7 @@ module RDF::N3
     def literalFinish
       lit = @prod_data.pop
       content = RDF::NTriples.unescape(lit[:string])
-      language = lit[:langcode]
+      language = lit[:langcode].downcase if lit[:langcode]
       datatype = lit[:symbol]
       
       lit = RDF::Literal.new(content, :language => language, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
@@ -554,7 +566,7 @@ module RDF::N3
     end
 
     def process_uri(uri)
-      uri(@uri, RDF::NTriples.unescape(uri))
+      uri(base_uri, RDF::NTriples.unescape(uri))
     end
     
     def process_qname(tok)
@@ -584,7 +596,7 @@ module RDF::N3
         bnode(name)
       else
         add_debug('process_qname(default_ns)', name)
-        namespace(nil, uri("#{@uri}#")) unless prefix(nil)
+        namespace(nil, uri("#{base_uri}#")) unless prefix(nil)
         ns(nil, name)
       end
       add_debug('process_qname', uri.inspect)

data/lib/rdf/n3/writer.rb

@@ -165,7 +165,7 @@ module RDF::N3
           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.to_sym]
+            return @uri_to_qname[uri] = "#{prefix}:#{local_name}"
           end
         end
         
@@ -174,7 +174,7 @@ module RDF::N3
           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.to_sym, suffix.empty? ? nil : suffix.to_sym] if prefix && suffix
+          return @uri_to_qname[uri] = "#{prefix}:#{suffix}"
         end
         
         @uri_to_qname[uri] = nil
@@ -192,8 +192,8 @@ module RDF::N3
     def sort_properties(properties)
       properties.keys.each do |k|
         properties[k] = properties[k].sort do |a, b|
-          a_li = a.is_a?(RDF::URI) && get_qname(a) && get_qname(a).last.to_s =~ /^_\d+$/ ? a.to_i : a.to_s
-          b_li = b.is_a?(RDF::URI) && get_qname(b) && get_qname(b).last.to_s =~ /^_\d+$/ ? b.to_i : b.to_s
+          a_li = a.to_s.index(RDF._.to_s) == 0 ? a.to_s.match(/\d+$/).to_s.to_i : a.to_s
+          b_li = b.to_s.index(RDF._.to_s) == 0 ? b.to_s.match(/\d+$/).to_s.to_i : b.to_s
           
           a_li <=> b_li
         end
@@ -242,13 +242,7 @@ module RDF::N3
     # @return [String]
     def format_uri(uri, options = {})
       md = relativize(uri)
-      if md && md != uri.to_s
-        "<%s>" % md
-      elsif qname = get_qname(uri)
-        qname.map(&:to_s).join(":")
-      else
-        "<%s>" % uri_for(uri)
-      end
+      md && md != uri.to_s ? "<#{md}>" : (get_qname(uri) || "<#{uri_for(uri)}>")
     end
     
     ##

data/rdf-n3.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-n3}
-  s.version = "0.3.1.1"
+  s.version = "0.3.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2011-02-18}
+  s.date = %q{2011-03-30}
   s.description = %q{RDF::N3 is an Notation-3 (n3-rdf) parser for Ruby using the RDF.rb library suite.}
   s.email = %q{gregg@kellogg-assoc.com}
   s.extra_rdoc_files = [
     "AUTHORS",
     "History.md",
     "README.md",
+    "UNLICENSE",
     "VERSION"
   ]
   s.files = [
@@ -24,7 +25,9 @@ Gem::Specification.new do |s|
     "History.md",
     "README.md",
     "Rakefile",
+    "UNLICENSE",
     "VERSION",
+    "example-files/arnau-registered-vocab.rb",
     "example-files/sp2b.n3",
     "example.rb",
     "lib/rdf/n3.rb",
@@ -414,7 +417,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-n3}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Notation-3 (n3-rdf) and Turtle reader/writer for RDF.rb.}
   s.test_files = [
     "spec/cwm_spec.rb",

data/script/parse

@@ -6,48 +6,44 @@ require 'rdf/ntriples'
 require 'getoptlong'
 require 'open-uri'
 
-def run(input, base)
-  reader_class = RDF::Reader.for($input_format.to_sym)
-  writer_class = RDF::Writer.for($output_format.to_sym)
-  raise "Reader not found for #{$input_format}" unless reader_class
-  raise "Writer not found for #{$output_format}" unless writer_class
+def run(input, options)
+  reader_class = RDF::Reader.for(options[:input_format].to_sym)
+  raise "Reader not found for #{options[:input_format]}" unless reader_class
 
   start = Time.new
   num = 0
-  if $parse_only
+  if options[:parse_only]
     include RDF::N3::Meta
     include RDF::N3::Parser
-    puts "\nparse #{input.read}---\n\n" unless $quiet
+    puts "\nparse #{input.read}---\n\n" unless options[:quiet]
     input.rewind
-    if $quiet
+    if options[:quiet]
       $stdout = StringIO.new
     end
     test(input, BRANCHES, REGEXPS)
-    if $quiet
+    if options[:quiet]
       $stdout = STDOUT
       print "."
     end
-  elsif $output_format == :ntriples || $quiet
-    reader_class.new(input, :base_uri => base, :strict => true).each do |statement|
+  elsif options[:output_format] == :ntriples || options[:quiet]
+    reader_class.new(input, :base_uri => options[:base_uri], :strict => true).each do |statement|
       num += 1
-      if $quiet
+      if options[:quiet]
         #print "."
       else
         puts statement.to_ntriples
       end
     end
-  elsif $output_format == :inspect
-    reader_class.new(input, :base_uri => base, :strict => true).each do |statement|
+  elsif options[:output_format] == :inspect
+    reader_class.new(input, :base_uri => options[:base_uri], :strict => true).each do |statement|
       num += 1
       puts statement.inspect
     end
   else
-    puts writer_class.buffer(:base_uri => base, :standard_prefixes => true) { |writer|
-      reader_class.new(input, :base_uri => base, :strict => true).each do |statement|
-        num += 1
-        writer << statement
-      end
-    }
+    r = reader_class.new(input, :base_uri => options[:base_uri], :strict => true)
+    g = RDF::Graph.new << r
+    num = g.count
+    puts g.dump(options[:output_format], :base_uri => r.base_uri, :prefixes => r.prefixes)
   end
   puts
   secs = Time.new - start
@@ -58,10 +54,12 @@ rescue
   raise
 end
 
-$verbose = false
-$output_format = :ntriples
-$input_format = :n3
-base_uri  = "http://example.com"
+options = {
+  :verbose => false,
+  :output_format => :ntriples,
+  :input_format => :n3,
+  :base_uri => "http://example.com",
+}
 input = nil
 
 opts = GetoptLong.new(
@@ -76,23 +74,24 @@ opts = GetoptLong.new(
 )
 opts.each do |opt, arg|
   case opt
-  when '--verbose' then $verbose = true
-  when '--quiet' then $quiet = true
-  when '--debug' then ::RDF::N3::debug = true
-  when '--execute' then input = arg
-  when '--format' then $output_format = arg.to_sym
-  when '--input-format' then $input_format = arg.to_sym
-  when '--uri' then base_uri = arg
-  when '--parse-only' then $parse_only = true
+  when '--base-uri'     then options[:verbose] = true
+  when '--debug'        then ::RDF::N3::debug = true
+  when '--execute'      then input = arg
+  when '--format'       then options[:output_format] = arg.to_sym
+  when '--input-format' then options[:input_format] = arg.to_sym
+  when '--parse-only'   then options[:parse_only] = true
+  when '--quiet'        then options[:quiet] = true
+  when '--uri'          then options[:base_uri] = arg
+  when '--verbose'      then options[:verbose] = true
   end
 end
 
 if ARGV.empty?
   s = input ? input : $stdin.read
-  run(StringIO.new(s), base_uri)
+  run(StringIO.new(s), options)
 else
   ARGV.each do |test_file|
-    run(Kernel.open(test_file), base_uri)
+    run(Kernel.open(test_file), options)
   end
 end
 puts

data/spec/n3reader_spec.rb

@@ -264,7 +264,7 @@ describe "RDF::N3::Reader" do
     it "should allow mixed-case language" do
       n3doc = %(:x2 :p "xyz"@EN .)
       statement = parse(n3doc).statements.first
-      statement.object.to_ntriples.should == %("xyz"@EN)
+      statement.object.to_ntriples.should == %("xyz"@en)
     end
 
     it "should create typed literals" do

data/spec/writer_spec.rb

@@ -34,6 +34,16 @@ describe RDF::N3::Writer do
       )
     end
     
+    # see example-files/arnau-registered-vocab.rb
+    it "should use qname URIs with empty suffix" do
+      input = %(<http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> .)
+      serialize(input, nil,
+        [%r(^@prefix foaf: <http://xmlns.com/foaf/0.1/> \.$),
+        %r(^foaf: foaf: foaf: \.$)],
+        :prefixes => { "foaf" => RDF::FOAF}
+      )
+    end
+    
     it "should order properties" do
       input = %(
         @prefix : <http://xmlns.com/foaf/0.1/> .

metadata

@@ -2,7 +2,7 @@
 name: rdf-n3
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -08:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ extra_rdoc_files:
 - AUTHORS
 - History.md
 - README.md
+- UNLICENSE
 - VERSION
 files: 
 - .yardopts
@@ -118,7 +119,9 @@ files:
 - History.md
 - README.md
 - Rakefile
+- UNLICENSE
 - VERSION
+- example-files/arnau-registered-vocab.rb
 - example-files/sp2b.n3
 - example.rb
 - lib/rdf/n3.rb
@@ -529,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Notation-3 (n3-rdf) and Turtle reader/writer for RDF.rb.