rdf-rdfxml 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.2.2
+* Fix bug creating datatyped literal where datatype is a string, not an RDF::URI
+* Added more XMLLiteral tests (fail, until full canonicalization working)
+* Added RDF_Reader and RDF_Writer behavior expectations
+* Use RDF::Writer#prefix and #prefixes implementation instead of internal version.
+* Added RDF::Reader#rewind and #close, which override default behavior as stream is closed on initialization and rewinding isn't required.
+* In console, load RDF.rb from parent directory, if it exists.
+* Dependencies on RDF 0.2.2
+* Replace String#rdf_escape with RDF::NTriples.escape
+* Fixed bug in Writer where a qname was expected for sorting, but property has no qname
+* Handle XMLLiteral when value is a Nokogiri node set.
+* Ensure URIs are properly RDF Escaped (patch to RDF::NTriples::Writer#format_uri)
+
 === 0.2.1
 * Update for RDF 0.2.1
 * Writer bug fixes:

data/Rakefile

@@ -13,10 +13,10 @@ begin
     gemspec.email = "gregg@kellogg-assoc.com"
     gemspec.homepage = "http://github.com/gkellogg/rdf-rdfxml"
     gemspec.authors = ["Gregg Kellogg"]
-    gemspec.add_dependency('rdf', '>= 0.2.1')
+    gemspec.add_dependency('rdf', '>= 0.2.2')
     gemspec.add_dependency('nokogiri', '>= 1.3.3')
     gemspec.add_development_dependency('rspec')
-    gemspec.add_development_dependency('rdf-spec', '>= 0.2.1')
+    gemspec.add_development_dependency('rdf-spec', '>= 0.2.2')
     gemspec.add_development_dependency('rdf-isomorphic')
     gemspec.add_development_dependency('yard')
     gemspec.extra_rdoc_files     = %w(README.rdoc History.txt AUTHORS CONTRIBUTORS)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/etc/doap.nt

@@ -0,0 +1,47 @@
+<http://ar.to/#self> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://ar.to/#self> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://datagraph.org/bendiken/foaf> .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/homepage> <http://ar.to/> .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/made> <http://rubygems.org/gems/rdf> .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/mbox> <mailto:arto.bendiken@gmail.com> .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/mbox_sha1sum> "a033f652c84a4d73b8c26d318c2395699dd2bdfb" .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/mbox_sha1sum> "d0737cceb55eb7d740578d2db1bc0727e3ed49ce" .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/name> "Arto Bendiken" .
+<http://bhuga.net/#ben> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://bhuga.net/#ben> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://datagraph.org/bhuga/foaf> .
+<http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/homepage> <http://bhuga.net/> .
+<http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/mbox> <mailto:blavender@gmail.com> .
+<http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/mbox_sha1sum> "dbf45f4ffbd27b67aa84f02a6a31c144727d10af" .
+<http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/name> "Ben Lavender" .
+<http://rubygems.org/gems/rdf> <http://purl.org/dc/terms/creator> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://ar.to/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://blog.datagraph.org/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#bug-database> <http://github.com/bendiken/rdf/issues> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#category> <http://dbpedia.org/resource/Resource_Description_Framework> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#category> <http://dbpedia.org/resource/Ruby_(programming_language)> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#created> "2007-10-23" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#description> "RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data."@en .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://bhuga.net/#ben> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubyforge.org/projects/rdf/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid1 .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid2 .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid3 .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#homepage> <http://rdf.rubyforge.org/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#license> <http://creativecommons.org/licenses/publicdomain/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#maintainer> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#name> "RDF.rb" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#platform> "Ruby" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#shortdesc> "A Ruby library for working with Resource Description Framework (RDF) data."@en .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#vendor> <http://datagraph.org/> .
+<http://rubygems.org/gems/rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://usefulinc.com/ns/doap#Project> .
+<http://rubygems.org/gems/rdf> <http://xmlns.com/foaf/0.1/maker> <http://ar.to/#self> .
+_:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:genid1 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "c69f3255ff0639543cc5edfd8116eac8df16fab8" .
+_:genid1 <http://xmlns.com/foaf/0.1/name> "Hellekin O. Wolf" .
+_:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:genid2 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "f7653fc1ac0e82ebb32f092389bd5fc728eaae12" .
+_:genid2 <http://xmlns.com/foaf/0.1/name> "John Fieber" .
+_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:genid3 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "bedbbf2451e5beb38d59687c0460032aff92cd3c" .
+_:genid3 <http://xmlns.com/foaf/0.1/name> "Pius Uzamere" .

data/etc/doap.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF xmlns="http://usefulinc.com/ns/doap#"
+    xmlns:log="http://www.w3.org/2000/10/swap/log#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+    <Person xmlns="http://xmlns.com/foaf/0.1/"
+        rdf:about="#_ggenid1">
+        <mbox_sha1sum>c69f3255ff0639543cc5edfd8116eac8df16fab8</mbox_sha1sum>
+        <name>Hellekin O. Wolf</name>
+    </Person>
+
+    <Person xmlns="http://xmlns.com/foaf/0.1/"
+        rdf:about="#_ggenid3">
+        <mbox_sha1sum>bedbbf2451e5beb38d59687c0460032aff92cd3c</mbox_sha1sum>
+        <name>Pius Uzamere</name>
+    </Person>
+
+    <Person xmlns="http://xmlns.com/foaf/0.1/"
+        rdf:about="#_ggenid2">
+        <mbox_sha1sum>f7653fc1ac0e82ebb32f092389bd5fc728eaae12</mbox_sha1sum>
+        <name>John Fieber</name>
+    </Person>
+
+    <Person xmlns="http://xmlns.com/foaf/0.1/"
+        rdf:about="http://ar.to/#self">
+        <isDefinedBy xmlns="http://www.w3.org/2000/01/rdf-schema#"
+            rdf:resource="http://datagraph.org/bendiken/foaf"/>
+        <homepage rdf:resource="http://ar.to/"/>
+        <made rdf:resource="http://rubygems.org/gems/rdf"/>
+        <mbox rdf:resource="mailto:arto.bendiken@gmail.com"/>
+        <mbox_sha1sum>a033f652c84a4d73b8c26d318c2395699dd2bdfb</mbox_sha1sum>
+        <mbox_sha1sum>d0737cceb55eb7d740578d2db1bc0727e3ed49ce</mbox_sha1sum>
+        <name>Arto Bendiken</name>
+    </Person>
+
+    <Person xmlns="http://xmlns.com/foaf/0.1/"
+        rdf:about="http://bhuga.net/#ben">
+        <isDefinedBy xmlns="http://www.w3.org/2000/01/rdf-schema#"
+            rdf:resource="http://datagraph.org/bhuga/foaf"/>
+        <homepage rdf:resource="http://bhuga.net/"/>
+        <mbox rdf:resource="mailto:blavender@gmail.com"/>
+        <mbox_sha1sum>dbf45f4ffbd27b67aa84f02a6a31c144727d10af</mbox_sha1sum>
+        <name>Ben Lavender</name>
+    </Person>
+
+    <Project rdf:about="http://rubygems.org/gems/rdf">
+        <creator xmlns="http://purl.org/dc/terms/"
+            rdf:resource="http://ar.to/#self"/>
+        <blog rdf:resource="http://ar.to/"/>
+        <blog rdf:resource="http://blog.datagraph.org/"/>
+        <bug-database rdf:resource="http://github.com/bendiken/rdf/issues"/>
+        <category rdf:resource="http://dbpedia.org/resource/Resource_Description_Framework"/>
+        <category rdf:resource="http://dbpedia.org/resource/Ruby_(programming_language)"/>
+        <created>2007-10-23</created>
+        <description xml:lang="en">RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.</description>
+        <developer rdf:resource="http://ar.to/#self"/>
+        <developer rdf:resource="http://bhuga.net/#ben"/>
+        <documenter rdf:resource="http://ar.to/#self"/>
+        <download-page rdf:resource="http://rubyforge.org/projects/rdf/"/>
+        <helper rdf:resource="#_ggenid1"/>
+        <helper rdf:resource="#_ggenid2"/>
+        <helper rdf:resource="#_ggenid3"/>
+        <homepage rdf:resource="http://rdf.rubyforge.org/"/>
+        <license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <maintainer rdf:resource="http://ar.to/#self"/>
+        <name>RDF.rb</name>
+        <platform>Ruby</platform>
+        <shortdesc xml:lang="en">A Ruby library for working with Resource Description Framework (RDF) data.</shortdesc>
+        <vendor rdf:resource="http://datagraph.org/"/>
+        <maker xmlns="http://xmlns.com/foaf/0.1/"
+            rdf:resource="http://ar.to/#self"/>
+    </Project>
+</rdf:RDF>

data/lib/rdf/rdfxml.rb

@@ -26,7 +26,6 @@ module RDF
     require 'rdf/rdfxml/patches/literal_hacks'
     require 'rdf/rdfxml/patches/nokogiri_hacks'
     require 'rdf/rdfxml/patches/qname_hacks'
-    require 'rdf/rdfxml/patches/rdf_escape'
     require 'rdf/rdfxml/patches/uri_hacks'
     autoload :Reader,  'rdf/rdfxml/reader'
     autoload :Writer,  'rdf/rdfxml/writer'

data/lib/rdf/rdfxml/patches/literal_hacks.rb

@@ -20,8 +20,7 @@ module RDF; class Literal
     ##
     # @param  [Object] value
     # @option options [String] :lexical (nil)
-    # @option options [Hash] :namespaces (nil)
-    # @option options [Hash] :namespaces ({})
+    # @option options [Hash] :namespaces ({}) Use :__default__ or "" to declare default namespace
     # @option options [Symbol] :language (nil)
     # @option options [Symbol] :library (:nokogiri, :libxml, or :rexml)
     def initialize(value, options = {})
@@ -69,7 +68,8 @@ module RDF; class Literal
     def parse_value(value, options)
       ns_hash = {}
       options[:namespaces].each_pair do |prefix, uri|
-        attr = prefix.to_s.empty? ? "xmlns" : "xmlns:#{prefix}"
+        prefix = prefix == :__default__ ? "" : prefix.to_s
+        attr = prefix.empty? ? "xmlns" : "xmlns:#{prefix}"
         ns_hash[attr] = uri.to_s
       end
       ns_strs = []
@@ -94,10 +94,18 @@ module RDF; class Literal
     
     # Nokogiri implementations
     if defined?(::Nokogiri)
+      # A somewhat half-hearted attempt at C14N.
+      # Main problem is that it promotes all namespaces to top element, instead of demoting them
+      # to the required element, and does not properly order either namespaces or attributes.
+      #
+      # An open-issue in Nokogiri is to add support for C14N from the underlying libxml2 libraries.
       def parse_value_nokogiri(value, ns_strs, language)
-        return value if value.is_a?(Nokogiri::XML::NodeSet)
-        # Add inherited namespaces to created root element so that they're inherited to sub-elements
-        elements = Nokogiri::XML::Document.parse("<foo #{ns_strs.join(" ")}>#{value.to_s}</foo>").root.children
+        elements = if value.is_a?(Nokogiri::XML::NodeSet)
+          value
+        else
+          # Add inherited namespaces to created root element so that they're inherited to sub-elements
+          Nokogiri::XML::Document.parse("<foo #{ns_strs.join(" ")}>#{value.to_s}</foo>").root.children
+        end
 
         elements.map do |c|
           if c.is_a?(Nokogiri::XML::Element)
@@ -110,9 +118,9 @@ module RDF; class Literal
               c[prefix] = ns.href.to_s unless c.namespaces[prefix]
             end
 
-            # Add lanuage
+            # Add language
             if language && c["lang"].to_s.empty?
-              c["xml:lang"] = language
+              c["xml:lang"] = language.to_s
             end
           end
           c
@@ -125,6 +133,7 @@ module RDF; class Literal
     end   # Nokogiri
     
     if defined?(::LibXML)
+      # This should use Document#canonicalize if as and when it is available in libxml-ruby
       def parse_value_libxml(value, ns_strs, language)
         # Fixme
       end
@@ -135,6 +144,8 @@ module RDF; class Literal
     end   # LibXML
     
     # REXML
+    # This could make use of the XMLCanonicalizer gem (http://rubygems.org/gems/XMLCanonicalizer)
+    # But, it hasn't been touched since 2007 and relies on log4r.
     def parse_value_rexml(value, ns_strs, language)
       # Fixme
     end

data/lib/rdf/rdfxml/patches/seq.rb

@@ -8,7 +8,7 @@ module RDF
 
       #puts "seq; #{rdf_type} #{rdf_type - [RDF.Seq, RDF.Bag, RDF.Alt]}"
       if !(rdf_type - [RDF.Seq, RDF.Bag, RDF.Alt]).empty?
-        props.keys.select {|k| k.match(/#{RDF.to_s}_(\d)$/)}.
+        props.keys.select {|k| k.match(/#{RDF._}(\d)$/)}.
           sort_by {|i| i.sub(RDF._.to_s, "").to_i}.
           map {|key| props[key]}.
           flatten

data/lib/rdf/rdfxml/patches/uri_hacks.rb

@@ -15,4 +15,10 @@ module RDF
       self.class.new(result)
     end
   end
+  
+  class NTriples::Writer
+    def format_uri(uri, options = {})
+      "<%s>" % escaped(uri_for(uri))
+    end
+  end
 end

data/lib/rdf/rdfxml/reader.rb

@@ -141,6 +141,12 @@ module RDF::RDFXML
       end
     end
 
+    # No need to rewind, as parsing is done in initialize
+    def rewind; end
+    
+    # Document closed when read in initialize
+    def close; end
+    
     ##
     # Iterates the given block for each RDF statement in the input.
     #
@@ -329,9 +335,9 @@ module RDF::RDFXML
         end
 
         # Apply character transformations
-        id = id_check(el, id.rdf_escape, nil) if id
-        resourceAttr = resourceAttr.rdf_escape if resourceAttr
-        nodeID = nodeID_check(el, nodeID.rdf_escape) if nodeID
+        id = id_check(el, RDF::NTriples.escape(id), nil) if id
+        resourceAttr = RDF::NTriples.escape(resourceAttr) if resourceAttr
+        nodeID = nodeID_check(el, RDF::NTriples.escape(nodeID)) if nodeID
 
         add_debug(child, "attrs: #{attrs.inspect}")
         add_debug(child, "datatype: #{datatype}") if datatype
@@ -354,7 +360,7 @@ module RDF::RDFXML
           
           literal_opts = {}
           if datatype
-            literal_opts[:datatype] = datatype
+            literal_opts[:datatype] = RDF::URI.intern(datatype)
           else
             literal_opts[:language] = child_ec.language
           end
@@ -515,15 +521,15 @@ module RDF::RDFXML
 
       case
       when id
-        add_debug(el, "parse_subject, id: '#{id.value.rdf_escape}'")
-        id_check(el, id.value.rdf_escape, ec.base) # Returns URI
+        add_debug(el, "parse_subject, id: '#{RDF::NTriples.escape(id.value)}'")
+        id_check(el, RDF::NTriples.escape(id.value), ec.base) # Returns URI
       when nodeID
         # The value of rdf:nodeID must match the XML Name production
-        nodeID = nodeID_check(el, nodeID.value.rdf_escape)
+        nodeID = nodeID_check(el, RDF::NTriples.escape(nodeID.value))
         add_debug(el, "parse_subject, nodeID: '#{nodeID}")
         bnode(nodeID)
       when about
-        about = about.value.rdf_escape
+        about = RDF::NTriples.escape(about.value)
         add_debug(el, "parse_subject, about: '#{about}'")
         ec.base.join(about)
       else

data/lib/rdf/rdfxml/version.rb

@@ -1,7 +1,7 @@
 module RDF::RDFXML::VERSION
   MAJOR = 0
   MINOR = 2
-  TINY  = 1
+  TINY  = 2
   EXTRA = nil
 
   STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rdf/rdfxml/writer.rb

@@ -119,20 +119,20 @@ module RDF::RDFXML
       # Get QNames and necessary namespaces from predicates and objects
       @graph.predicates.each {|pred| add_debug("serialize pred: #{pred.inspect}"); get_qname(pred)}
       @graph.objects.each {|obj| add_debug("serialize obj: #{obj.inspect}"); get_qname(obj)}
-      add_namespace(:rdf, RDF.to_uri)
-      add_namespace(:xml, RDF::XML) if @base_uri || @lang
+      prefix(:rdf, RDF.to_uri)
+      prefix(:xml, RDF::XML) if @base_uri || @lang
       
       if @default_namespace
-        add_namespace("", @default_namespace)
-        @default_namespace_prefix = @namespaces.invert[@default_namespace]
+        prefix(:__default__, @default_namespace)
+        @default_namespace_prefix = prefixes.invert[@default_namespace]
         add_debug("def_namespace: #{@default_namespace}, prefix: #{@default_namespace_prefix}")
       end
       
-      add_debug "\nserialize: graph namespaces: #{@namespaces.inspect}"
+      add_debug "\nserialize: graph namespaces: #{prefixes.inspect}"
       
       doc.root = Nokogiri::XML::Element.new("rdf:RDF", doc)
-      @namespaces.each_pair do |p, uri|
-        if p.to_s.empty?
+      prefixes.each_pair do |p, uri|
+        if p == :__default__
           doc.root.default_namespace = uri.to_s
         else
           doc.root.add_namespace(p.to_s, uri.to_s)
@@ -376,13 +376,13 @@ module RDF::RDFXML
       if uri.is_a?(RDF::URI)
         # Duplicate logic from URI#qname to remember namespace assigned
         if uri.qname
-          add_namespace(uri.qname.first, uri.vocab)
+          prefix(uri.qname.first, uri.vocab)
           add_debug "get_qname(uri.qname): #{uri.qname.join(':')}"
           return uri.qname.join(":") 
         end
         
         # No vocabulary assigned, find one from cache of created namespace URIs
-        @namespaces.each_pair do |prefix, vocab|
+        prefixes.each_pair do |prefix, vocab|
           if uri.to_s.index(vocab.to_s) == 0
             uri.vocab = vocab
             local_name = uri.to_s[(vocab.to_s.length)..-1]
@@ -411,21 +411,16 @@ module RDF::RDFXML
         @tmp_ns = @tmp_ns ? @tmp_ns.succ : "ns0"
         add_debug "create namespace definition for #{uri}"
         uri.vocab = RDF::Vocabulary(base_uri)
-        add_namespace(@tmp_ns.to_sym, uri.vocab)
+        prefix(@tmp_ns.to_sym, uri.vocab)
         add_debug "get_qname(tmp_ns): #{@tmp_ns}:#{local_name}"
         return "#{@tmp_ns}:#{local_name}"
       end
     end
     
-    def add_namespace(prefix, ns)
-      add_debug "add_namespace: '#{prefix}', <#{ns}>"
-      @namespaces[prefix.to_s] = ns.to_s
-    end
-
     def reset
       @depth = 0
       @lists = {}
-      @namespaces = {}
+      prefixes = {}
       @references = {}
       @serialized = {}
       @subjects = {}
@@ -437,8 +432,8 @@ module RDF::RDFXML
     def sort_properties(properties)
       properties.keys.each do |k|
         properties[k] = properties[k].sort do |a, b|
-          a_li = a.is_a?(RDF::URI) && a.qname.last =~ /^_\d+$/ ? a.to_i : a.to_s
-          b_li = b.is_a?(RDF::URI) && b.qname.last =~ /^_\d+$/ ? b.to_i : b.to_s
+          a_li = a.is_a?(RDF::URI) && a.qname && a.qname.last =~ /^_\d+$/ ? a.to_i : a.to_s
+          b_li = b.is_a?(RDF::URI) && b.qname && b.qname.last =~ /^_\d+$/ ? b.to_i : b.to_s
           
           a_li <=> b_li
         end

data/rdf-rdfxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-08-03}
   s.description = %q{    RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.
 }
   s.email = %q{gregg@kellogg-assoc.com}
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "etc/doap.nt",
+     "etc/doap.xml",
      "example.rb",
      "lib/rdf/rdfxml.rb",
      "lib/rdf/rdfxml/format.rb",
@@ -36,7 +38,6 @@ Gem::Specification.new do |s|
      "lib/rdf/rdfxml/patches/literal_hacks.rb",
      "lib/rdf/rdfxml/patches/nokogiri_hacks.rb",
      "lib/rdf/rdfxml/patches/qname_hacks.rb",
-     "lib/rdf/rdfxml/patches/rdf_escape.rb",
      "lib/rdf/rdfxml/patches/seq.rb",
      "lib/rdf/rdfxml/patches/uri_hacks.rb",
      "lib/rdf/rdfxml/reader.rb",
@@ -45,11 +46,11 @@ Gem::Specification.new do |s|
      "lib/rdf/rdfxml/writer.rb",
      "rdf-rdfxml.gemspec",
      "script/console",
+     "script/parse",
      "spec/format_spec.rb",
      "spec/graph_spec.rb",
      "spec/literal_spec.rb",
      "spec/matchers.rb",
-     "spec/rdf_escape_spec.rb",
      "spec/rdf_helper.rb",
      "spec/rdf_tests/cc197bad-dc9c-440d-a5b5-d52ba2e14234.nt",
      "spec/rdf_tests/cc197bad-dc9c-440d-a5b5-d52ba2e14234.rdf",
@@ -419,14 +420,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfxml}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RDF/XML reader/writer for RDF.rb.}
   s.test_files = [
     "spec/format_spec.rb",
      "spec/graph_spec.rb",
      "spec/literal_spec.rb",
      "spec/matchers.rb",
-     "spec/rdf_escape_spec.rb",
+     "spec/rdf-iso-falure.rb",
      "spec/rdf_helper.rb",
      "spec/reader_spec.rb",
      "spec/spec_helper.rb",
@@ -438,26 +439,26 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdf>, [">= 0.2.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rdf>, [">= 0.2.2"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rdf-spec>, [">= 0.2.1"])
+      s.add_development_dependency(%q<rdf-spec>, [">= 0.2.2"])
       s.add_development_dependency(%q<rdf-isomorphic>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<rdf>, [">= 0.2.1"])
+      s.add_dependency(%q<rdf>, [">= 0.2.2"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rdf-spec>, [">= 0.2.1"])
+      s.add_dependency(%q<rdf-spec>, [">= 0.2.2"])
       s.add_dependency(%q<rdf-isomorphic>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rdf>, [">= 0.2.1"])
+    s.add_dependency(%q<rdf>, [">= 0.2.2"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rdf-spec>, [">= 0.2.1"])
+    s.add_dependency(%q<rdf-spec>, [">= 0.2.2"])
     s.add_dependency(%q<rdf-isomorphic>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end