rdf-rdfxml 0.3.2.1 → 0.3.3

data/.yardopts

@@ -1,4 +1,4 @@
---title "RDF::RDFXML - RDF/XML Support for RDF.rb"
+--title "RDF::RDFXML - RDF/XML reader/writer for RDF.rb"
 --output-dir doc/yard
 --protected
 --no-private
@@ -10,3 +10,4 @@ History.rdoc
 AUTHORS
 CONTRIBUTORS
 VERSION
+UNLICENSE

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.3
+* Change licensing to UNLICENSE.
+* Only generate prefix definitions for prefixes actually used within a serialization.
+* Make sure that only valid QNames are generated in writer.
+
 === 0.3.2.1
 * Fix collection serialization bug
 * Assert :xml as a format type (by creating RDF::RDFXML::XML as a sub-class of Format that uses RDFXML::Reader/Writer)

data/README

@@ -0,0 +1,95 @@
+# RDF::RDFXML reader/writer
+
+[RDF/XML][RDF/XML] parser for [RDF.rb][RDF.rb].
+
+## DESCRIPTION
+
+RDF::RDFXML is an [RDF/XML][RDF/XML] reader/writer for Ruby using the [RDF.rb][RDF.rb] library suite.
+
+## FEATURES
+RDF::RDFXML parses [RDF/XML][RDF/XML] into statements or triples and serializes triples, statements or graphs.
+
+Fully compliant [RDF/XML][RDF/XML] parser and serializer.
+
+Install with `gem install rdf-rdfxml`
+
+## Usage:
+Instantiate a parser and parse source, specifying type and base-URL
+
+    RDF::RDFXML::Reader.open("./etc/doap.xml") do |reader|
+      reader.each_statement do |statement|
+        puts statement.inspect
+      end
+    end
+
+## Dependencies
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.1)
+* [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.4.4)
+
+## Documentation
+Full documentation available on [RubyForge](http://rdf.rubyforge.org/rdfxml)
+
+### Principle Classes
+* {RDF::RDFXML}
+* {RDF::RDFXML::Format}
+* {RDF::RDFXML::Reader}
+* {RDF::RDFXML::Writer}
+
+### Additional vocabularies
+* {RDF::XML}
+
+### Patches
+* {Array}
+* {RDF::Graph}
+* {RDF::Literal::XML}
+* {Nokogiri::XML::Node}
+
+## TODO
+* Add support for LibXML and REXML bindings, and use the best available
+* Consider a SAX-based parser for improved performance
+
+## Resources
+* [RDF.rb][RDF.rb]
+* [RDF/XML][RDF/XML]
+* [Distiller](http://distiller.kellogg-assoc)
+* [Documentation](http://rdf.rubyforge.org/rdfxml)
+* [History](file:file.History.html)
+* [RDF Tests](http://www.w3.org/2000/10/rdf-tests/rdfcore/allTestCases.html)
+
+## 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/rdf-rdfxml>
+* <http://github.com/gkellogg/rdf-rdfxml>
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
+[RDF.rb]:   http://rdf.rubyforge.org/
+[RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
+[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

@@ -1,17 +1,17 @@
 # RDF::RDFXML reader/writer
 
-RDF/XML parser for RDF.rb.
+[RDF/XML][RDF/XML] parser for [RDF.rb][RDF.rb].
 
 ## DESCRIPTION
 
-RDF::RDFXML is an RDF/XML reader/writer for Ruby using the RDF.rb library suite.
+RDF::RDFXML is an [RDF/XML][RDF/XML] reader/writer for Ruby using the [RDF.rb][RDF.rb] library suite.
 
 ## FEATURES
-RDF::RDFXML parses RDF/XML into statements or triples and serializes triples, statements or graphs.
+RDF::RDFXML parses [RDF/XML][RDF/XML] into statements or triples and serializes triples, statements or graphs.
 
-Fully compliant RDF/XML parser and serializer.
+Fully compliant [RDF/XML][RDF/XML] parser and serializer.
 
-Install with 'gem install rdf-rdfxml'
+Install with `gem install rdf-rdfxml`
 
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL
@@ -49,19 +49,33 @@ Full documentation available on [RubyForge](http://rdf.rubyforge.org/rdfxml)
 * Consider a SAX-based parser for improved performance
 
 ## Resources
-* [RDF.rb](http://rdf.rubyforge.org/) 
+* [RDF.rb][RDF.rb]
+* [RDF/XML][RDF/XML]
 * [Distiller](http://distiller.kellogg-assoc)
-* [Documentation](http://rdf.rubyforge.org/rdfa)
+* [Documentation](http://rdf.rubyforge.org/rdfxml)
 * [History](file:file.History.html)
-* [XHTML+RDFXML 1.1 Core](http://www.w3.org/TR/2010/WD-xhtml-rdfa-20100422/)
 * [RDF Tests](http://www.w3.org/2000/10/rdf-tests/rdfcore/allTestCases.html)
 
-## AUTHOR
+## Author
 * [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 
-## CONTRIBUTORS
+## 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,
@@ -72,4 +86,10 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * gregg@kellogg-assoc.com
 * <http://rubygems.org/rdf-rdfxml>
 * <http://github.com/gkellogg/rdf-rdfxml>
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
+[RDF.rb]:   http://rdf.rubyforge.org/
+[RDF/XML]:  http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
+[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

@@ -7,19 +7,19 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "rdf-rdfxml"
     gemspec.summary = "RDF/XML reader/writer for RDF.rb."
-    gemspec.description = %q(RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.)
+    gemspec.description = %q(RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.)
     gemspec.email = "gregg@kellogg-assoc.com"
     gemspec.homepage = "http://github.com/gkellogg/rdf-rdfxml"
     gemspec.authors = ["Gregg Kellogg"]
-    gemspec.add_dependency('rdf', '>= 0.3.1')
+    gemspec.add_dependency('rdf', '>= 0.3.3')
     gemspec.add_dependency('nokogiri', '>= 1.4.4')
     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-spec', '>= 0.3.3')
     gemspec.add_development_dependency('rdf-isomorphic', '>= 0.3.4')
     gemspec.add_development_dependency('yard', '>= 0.6.4')
-    gemspec.extra_rdoc_files     = %w(README.md History.rdoc AUTHORS CONTRIBUTORS)
+    gemspec.extra_rdoc_files     = %w(README.md History.rdoc AUTHORS CONTRIBUTORS UNLICENSE)
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -40,9 +40,7 @@ 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.txt AUTHORS CONTRIBUTORS)   # optional
-end
+YARD::Rake::YardocTask.new
 
 desc "Generate RDF Core Manifest.yml"
 namespace :spec do

data/VERSION

@@ -1 +1 @@
-0.3.2.1
+0.3.3

data/lib/rdf/rdfxml/format.rb

@@ -33,7 +33,7 @@ module RDF::RDFXML
   # This allows the following:
   #
   # @example Obtaining an RDFXML format class
-  #   RDF::Format.for(:xml)         # RDF::RDFXML::XML::Format
+  #   RDF::Format.for(:xml)         # RDF::RDFXML::XML
   #   RDF::Format.for(:xml).reader  # RDF::RDFXML::Reader
   #   RDF::Format.for(:xml).writer  # RDF::RDFXML::Writer
   class XML < RDF::Format

data/lib/rdf/rdfxml/reader.rb

@@ -13,19 +13,6 @@ module RDF::RDFXML
     CORE_SYNTAX_TERMS = %w(RDF ID about parseType resource nodeID datatype).map {|n| "http://www.w3.org/1999/02/22-rdf-syntax-ns##{n}"}
     OLD_TERMS = %w(aboutEach aboutEachPrefix bagID).map {|n| "http://www.w3.org/1999/02/22-rdf-syntax-ns##{n}"}
 
-    NC_REGEXP = Regexp.new(
-      %{^
-        (?!\\\\u0301)             # ́ is a non-spacing acute accent.
-                                  # It is legal within an XML Name, but not as the first character.
-        (  [a-zA-Z_]
-         | \\\\u[0-9a-fA-F]
-        )
-        (  [0-9a-zA-Z_\.-]
-         | \\\\u([0-9a-fA-F]{4})
-        )*
-      $},
-      Regexp::EXTENDED)
-  
     # The Recursive Baggage
     class EvaluationContext # :nodoc:
       attr_reader :base

data/lib/rdf/rdfxml/writer.rb

@@ -87,7 +87,7 @@ module RDF::RDFXML
       super do
         @graph = RDF::Graph.new
         @uri_to_qname = {}
-        prefix(nil, @options[:default_namespace]) if @options[:default_namespace]
+        @uri_to_prefix = {}
         block.call(self) if block_given?
       end
     end
@@ -138,7 +138,8 @@ module RDF::RDFXML
 
       doc = Nokogiri::XML::Document.new
 
-      add_debug "\nserialize: graph: #{@graph.size}"
+      add_debug "\nserialize: graph of size #{@graph.size}"
+      add_debug "options: #{@options.inspect}"
 
       preprocess
 
@@ -165,32 +166,46 @@ module RDF::RDFXML
         end
       end
 
+      add_debug "doc:\n #{doc.to_xml(:encoding => "UTF-8", :indent => 2)}"
       doc.write_xml_to(@output, :encoding => "UTF-8", :indent => 2)
     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)
-
-      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.to_sym]
-          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.to_sym, suffix.empty? ? nil : suffix.to_sym] if prefix && suffix
-        end
+    # @param [URI,#to_s] resource
+    # @param [Hash<Symbol => Object>] options
+    # @option [Boolean] :with_default (false) If a default mapping exists, use it, otherwise if a prefixed mapping exists, use it
+    # @return [String, nil] value to use to identify URI
+    def get_qname(resource, options = {})
+      case resource
+      when RDF::Node
+        add_debug "qname(#{resource.inspect}): #{resource}"
+        return resource.to_s
+      when RDF::URI
+        uri = resource.to_s
+      else
+        add_debug "qname(#{resource.inspect}): nil"
+        return nil
+      end
+
+      qname = case
+      when options[:with_default] && prefix(nil) && uri.index(prefix(nil)) == 0
+        # Don't cache
+        add_debug "qname(#{resource.inspect}): #{uri.sub(prefix(nil), '').inspect} (default)"
+        return uri.sub(prefix(nil), '')
+      when @uri_to_qname.has_key?(uri)
+        add_debug "qname(#{resource.inspect}): #{@uri_to_qname[uri].inspect} (cached)"
+        return @uri_to_qname[uri]
+      when u = @uri_to_prefix.keys.detect {|u| uri.index(u.to_s) == 0 && NC_REGEXP.match(uri[u.to_s.length..-1])}
+        # 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 && NC_REGEXP.match(uri[v.to_uri.to_s.length..-1])}
+        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
         
         # No vocabulary found, invent one
         # Add bindings for predicates not already having bindings
@@ -200,20 +215,20 @@ module RDF::RDFXML
         #   in order to break a URI into a namespace name and a local name, split it after the last XML non-NCName
         #   character, ensuring that the first character of the name is a Letter or '_'. If the URI ends in a
         #   non-NCName character then throw a "this graph cannot be serialized in RDF/XML" exception or error.
-        separation = uri.to_s.rindex(%r{[^a-zA-Z_0-9-][a-zA-Z_][a-z0-9A-Z_-]*$})
+        separation = uri.rindex(%r{[^a-zA-Z_0-9-][a-zA-Z_][a-z0-9A-Z_-]*$})
         return @uri_to_qname[uri] = nil unless separation
         base_uri = uri.to_s[0..separation]
         suffix = uri.to_s[separation+1..-1]
         @gen_prefix = @gen_prefix ? @gen_prefix.succ : "ns0"
-        add_debug "create prefix definition for #{uri}"
+        @uri_to_prefix[base_uri] = @gen_prefix
         prefix(@gen_prefix, base_uri)
-        add_debug "get_qname(tmp_ns): #{@gen_prefix}:#{suffix}"
-        return @uri_to_qname[uri] = [@gen_prefix.to_sym, suffix.to_sym]
+        "#{@gen_prefix}:#{suffix}"
       end
       
-      @uri_to_qname[uri]
-    rescue Addressable::URI::InvalidURIError
-       @uri_to_qname[uri] = nil
+      add_debug "qname(#{resource.inspect}): #{qname.inspect}"
+      @uri_to_qname[uri] = qname
+    rescue Addressable::URI::InvalidURIError => e
+      raise RDF::WriterError, "Invalid URI #{uri.inspect}: #{e.message}"
     end
     
     protected
@@ -261,6 +276,19 @@ module RDF::RDFXML
     
     # Perform any preprocessing of statements required
     def preprocess
+      default_namespace = @options[:default_namespace] || prefix(nil)
+
+      # 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
+
+      if default_namespace
+        add_debug("preprocess: default_namespace: #{default_namespace}")
+        prefix(nil, default_namespace) 
+      end
+
       @graph.each {|statement| preprocess_statement(statement)}
     end
     
@@ -307,11 +335,10 @@ module RDF::RDFXML
         end
 
         rdf_type, *rest = properties.fetch(RDF.type.to_s, [])
-        qname = get_qname_string(rdf_type, :with_default => true)
-        add_debug "=> qname: #{qname.inspect}"
+        qname = get_qname(rdf_type, :with_default => true)
         if rdf_type.is_a?(RDF::Node)
           # Must serialize with an element
-          rdf_type = nil
+          qname = rdf_type = nil
         elsif rest.empty?
           properties.delete(RDF.type.to_s)
         else
@@ -319,7 +346,6 @@ module RDF::RDFXML
         end
         prop_list = order_properties(properties)
         add_debug "=> property order: #{prop_list.to_sentence}"
-        
 
         if qname
           rdf_type = nil
@@ -374,7 +400,7 @@ module RDF::RDFXML
     def predicate(prop, object, node, is_unique)
       as_attr = predicate_as_attribute?(prop, object) && is_unique
       
-      qname = get_qname_string(prop, :with_default => !as_attr)
+      qname = get_qname(prop, :with_default => !as_attr)
       raise RDF::WriterError, "No qname generated for <#{prop}>" unless qname
 
       add_debug "predicate: #{qname}, as_attr: #{as_attr}, object: #{object.inspect}, done: #{is_done?(object)}, subject: #{@subjects.include?(object)}"
@@ -475,8 +501,8 @@ module RDF::RDFXML
     def order_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.is_a?(RDF::URI) && get_qname(a) && get_qname(a).to_s =~ /:_\d+$/ ? a.to_i : a.to_s
+          b_li = b.is_a?(RDF::URI) && get_qname(b) && get_qname(b).to_s =~ /:_\d+$/ ? b.to_i : b.to_s
           
           a_li <=> b_li
         end
@@ -525,24 +551,9 @@ module RDF::RDFXML
     #
     # @param [String] message::
     def add_debug(message)
-      STDERR.puts ("    " * @depth) + message if ::RDF::RDFXML.debug?
-      @debug << message if @debug.is_a?(Array)
-    end
-
-    # Return string representation of QName pair
-    #
-    # @option [Boolean] :with_default (false) If a default mapping exists, use it, otherwise if a prefixed mapping exists, use it
-    def get_qname_string(uri, options = {})
-      if qname = get_qname(uri)
-        if options[:with_default]
-          qname[0] = nil if !qname.first.nil? && prefix(qname.first).to_s == prefix(nil).to_s
-        elsif qname.first.nil?
-          prefix = nil
-          prefixes.each_pair {|k, v| prefix = k if !k.nil? && v.to_s == prefix(nil).to_s}
-          qname[0] = prefix if prefix
-        end
-        qname.first == nil ? qname.last.to_s : qname.map(&:to_s).join(":")
-      end
+      msg = "#{indent}#{message}"
+      STDERR.puts msg if ::RDF::RDFXML.debug?
+      @debug << msg if @debug.is_a?(Array)
     end
   end
 end

data/lib/rdf/rdfxml.rb

@@ -29,7 +29,21 @@ module RDF
     autoload :Writer,  'rdf/rdfxml/writer'
     autoload :VERSION, 'rdf/rdfxml/version'
     autoload :XML,     'rdf/rdfxml/vocab'
-    
+
+    # Regexp matching an NCName.
+    NC_REGEXP = Regexp.new(
+      %{^
+        (?!\\\\u0301)             # ́ is a non-spacing acute accent.
+                                  # It is legal within an XML Name, but not as the first character.
+        (  [a-zA-Z_]
+         | \\\\u[0-9a-fA-F]
+        )
+        (  [0-9a-zA-Z_\.-]
+         | \\\\u([0-9a-fA-F]{4})
+        )*
+      $},
+      Regexp::EXTENDED)
+  
     def self.debug?; @debug; end
     def self.debug=(value); @debug = value; end
   end

data/rdf-rdfxml.gemspec

@@ -5,24 +5,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.3.2.1"
+  s.version = "0.3.3"
 
   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.description = %q{RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.}
+  s.date = %q{2011-04-25}
+  s.description = %q{RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.}
   s.email = %q{gregg@kellogg-assoc.com}
   s.extra_rdoc_files = [
     "AUTHORS",
     "CONTRIBUTORS",
     "History.rdoc",
-    "README.md"
+    "README.md",
+    "UNLICENSE"
   ]
   s.files = [
     ".yardopts",
     "AUTHORS",
     "CONTRIBUTORS",
     "History.rdoc",
+    "README",
     "README.md",
     "Rakefile",
     "UNLICENSE",
@@ -58,7 +60,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfxml}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{RDF/XML reader/writer for RDF.rb.}
   s.test_files = [
     "spec/format_spec.rb",
@@ -75,31 +77,31 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdf>, [">= 0.3.1"])
+      s.add_runtime_dependency(%q<rdf>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_development_dependency(%q<open-uri-cached>, [">= 0"])
       s.add_development_dependency(%q<spira>, [">= 0.0.12"])
       s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<rdf-spec>, [">= 0.3.1"])
+      s.add_development_dependency(%q<rdf-spec>, [">= 0.3.3"])
       s.add_development_dependency(%q<rdf-isomorphic>, [">= 0.3.4"])
       s.add_development_dependency(%q<yard>, [">= 0.6.4"])
     else
-      s.add_dependency(%q<rdf>, [">= 0.3.1"])
+      s.add_dependency(%q<rdf>, [">= 0.3.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<open-uri-cached>, [">= 0"])
       s.add_dependency(%q<spira>, [">= 0.0.12"])
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<rdf-spec>, [">= 0.3.1"])
+      s.add_dependency(%q<rdf-spec>, [">= 0.3.3"])
       s.add_dependency(%q<rdf-isomorphic>, [">= 0.3.4"])
       s.add_dependency(%q<yard>, [">= 0.6.4"])
     end
   else
-    s.add_dependency(%q<rdf>, [">= 0.3.1"])
+    s.add_dependency(%q<rdf>, [">= 0.3.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<open-uri-cached>, [">= 0"])
     s.add_dependency(%q<spira>, [">= 0.0.12"])
     s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<rdf-spec>, [">= 0.3.1"])
+    s.add_dependency(%q<rdf-spec>, [">= 0.3.3"])
     s.add_dependency(%q<rdf-isomorphic>, [">= 0.3.4"])
     s.add_dependency(%q<yard>, [">= 0.6.4"])
   end

data/script/tc

@@ -2,7 +2,7 @@
 require 'rubygems'
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
 require 'rdf/rdfxml'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'rdfa_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'rdf_helper'))
 require 'getoptlong'
 
 def run_tc(tc)

data/spec/format_spec.rb

@@ -4,15 +4,15 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe RDF::RDFXML::Format do
   context "discovery" do
     {
-      "rdf" => RDF::Format.for(:rdf),
-      "rdfxml" => RDF::Format.for(:rdfxml),
-      "etc/foaf.xml" => RDF::Format.for("etc/foaf.xml"),
-      "etc/foaf.rdf" => RDF::Format.for("etc/foaf.rdf"),
-      "foaf.xml" => RDF::Format.for(:file_name      => "foaf.xml"),
-      "foaf.rdf" => RDF::Format.for(:file_name      => "foaf.xml"),
-      ".xml" => RDF::Format.for(:file_extension => "xml"),
-      ".rdf" => RDF::Format.for(:file_extension => "rdf"),
-      "application/xml" => RDF::Format.for(:content_type   => "application/xml"),
+      "rdf"                 => RDF::Format.for(:rdf),
+      "rdfxml"              => RDF::Format.for(:rdfxml),
+      "etc/foaf.xml"        => RDF::Format.for("etc/foaf.xml"),
+      "etc/foaf.rdf"        => RDF::Format.for("etc/foaf.rdf"),
+      "foaf.xml"            => RDF::Format.for(:file_name      => "foaf.xml"),
+      "foaf.rdf"            => RDF::Format.for(:file_name      => "foaf.xml"),
+      ".xml"                => RDF::Format.for(:file_extension => "xml"),
+      ".rdf"                => RDF::Format.for(:file_extension => "rdf"),
+      "application/xml"     => RDF::Format.for(:content_type   => "application/xml"),
       "application/rdf+xml" => RDF::Format.for(:content_type   => "application/rdf+xml"),
     }.each_pair do |label, format|
       it "should discover '#{label}'" do