rdf-rdfxml 0.2.3 → 0.3.0

data/rdf-rdfxml.gemspec

@@ -5,18 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-08-31}
-  s.description = %q{    RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.
-}
+  s.date = %q{2010-12-27}
+  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}
   s.extra_rdoc_files = [
     "AUTHORS",
      "CONTRIBUTORS",
-     "History.txt",
+     "History.rdoc",
      "README.rdoc"
   ]
   s.files = [
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
      ".yardopts",
      "AUTHORS",
      "CONTRIBUTORS",
-     "History.txt",
+     "History.rdoc",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -37,9 +36,6 @@ Gem::Specification.new do |s|
      "lib/rdf/rdfxml/patches/graph_properties.rb",
      "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/seq.rb",
-     "lib/rdf/rdfxml/patches/uri_hacks.rb",
      "lib/rdf/rdfxml/reader.rb",
      "lib/rdf/rdfxml/version.rb",
      "lib/rdf/rdfxml/vocab.rb",
@@ -415,7 +411,6 @@ Gem::Specification.new do |s|
      "spec/reader_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/uri_spec.rb",
      "spec/writer_spec.rb"
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfxml}
@@ -431,7 +426,6 @@ Gem::Specification.new do |s|
      "spec/rdf_helper.rb",
      "spec/reader_spec.rb",
      "spec/spec_helper.rb",
-     "spec/uri_spec.rb",
      "spec/writer_spec.rb"
   ]
 
@@ -440,25 +434,25 @@ 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.2.2"])
+      s.add_runtime_dependency(%q<rdf>, [">= 0.3.0"])
       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.2"])
+      s.add_development_dependency(%q<rspec>, [">= 2.1.0"])
+      s.add_development_dependency(%q<rdf-spec>, [">= 0"])
       s.add_development_dependency(%q<rdf-isomorphic>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<rdf>, [">= 0.2.2"])
+      s.add_dependency(%q<rdf>, [">= 0.3.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rdf-spec>, [">= 0.2.2"])
+      s.add_dependency(%q<rspec>, [">= 2.1.0"])
+      s.add_dependency(%q<rdf-spec>, [">= 0"])
       s.add_dependency(%q<rdf-isomorphic>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rdf>, [">= 0.2.2"])
+    s.add_dependency(%q<rdf>, [">= 0.3.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rdf-spec>, [">= 0.2.2"])
+    s.add_dependency(%q<rspec>, [">= 2.1.0"])
+    s.add_dependency(%q<rdf-spec>, [">= 0"])
     s.add_dependency(%q<rdf-isomorphic>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end

data/script/parse

@@ -1,22 +1,26 @@
-#!/usr/bin/env ruby -s
+#!/usr/bin/env ruby
 require 'rubygems'
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
 require 'rdf/rdfxml'
+require 'rdf/n3' rescue nil
 require 'getoptlong'
+require 'open-uri'
 
 def parse(input, base)
-  puts RDF::Writer.for($format.to_sym).buffer { |writer|
-    RDF::RDFXML::Reader.new(input, :base_uri => base, :strict => true).each do |statement|
+  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
+  puts writer_class.buffer { |writer|
+    reader_class.new(input, :base_uri => base, :validate => true).each do |statement|
       writer << statement
     end
   }
 end
 
-mode = ARGV.shift
-raise "Mode must be one of 'parse'" unless mode == "parse"
-
 $verbose = false
-$format = :ntriples
+$output_format = :ntriples
+$input_format = :rdfxml
 base_uri  = "http://example.com"
 input = nil
 
@@ -25,6 +29,7 @@ opts = GetoptLong.new(
   ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--quiet", GetoptLong::NO_ARGUMENT],
   ["--format", GetoptLong::REQUIRED_ARGUMENT],
+  ["--input-format", GetoptLong::REQUIRED_ARGUMENT],
   ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT],
   ["--uri", GetoptLong::REQUIRED_ARGUMENT]
 )
@@ -32,9 +37,10 @@ opts.each do |opt, arg|
   case opt
   when '--verbose' then $verbose = true
   when '--quiet' then $quiet = true
-  when '--debug' then $DEBUG = true
+  when '--debug' then ::RDF::RDFXML::debug = true
   when '--execute' then input = arg
-  when '--format' then $format = arg
+  when '--format' then $output_format = arg
+  when '--input-format' then $input_format = arg
   when '--uri' then base_uri = arg
   end
 end
@@ -44,6 +50,6 @@ if ARGV.empty?
   parse(StringIO.new(s), base_uri)
 else
   ARGV.each do |test_file|
-    parse(File.open(test_file), base_uri)
+    parse(Kernel.open(test_file), base_uri)
   end
 end

data/script/tc

@@ -2,38 +2,39 @@
 require 'rubygems'
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
 require 'rdf/rdfxml'
-require 'spec/rdf_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", 'spec', 'rdfa_helper'))
 require 'getoptlong'
 
 def run_tc(tc)
   puts "run #{tc.name}"
-  puts RDF::Writer.for($format.to_sym).buffer { |writer|
-    RDF::RDFXML::Reader.new(tc.input, :base_uri => tc.about, :strict => $strict).each do |statement|
+  puts tc.input if $verbose
+  puts RDF::Writer.for($output_format.to_sym).buffer { |writer|
+    RDF::RDFXML::Reader.new(tc.input, :base_uri => tc.about, :validate => $validate).each do |statement|
       writer << statement
     end
   }
 end
 
 $verbose = false
-$format = :ntriples
-$strict = false
+$output_format = :ntriples
+$validate = false
 suite = "rdfxml"
 opts = GetoptLong.new(
   ["--debug", GetoptLong::NO_ARGUMENT],
   ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--quiet", GetoptLong::NO_ARGUMENT],
   ["--suite", GetoptLong::OPTIONAL_ARGUMENT],
-  ["--strict", GetoptLong::NO_ARGUMENT],
+  ["--validate", GetoptLong::NO_ARGUMENT],
   ["--format", GetoptLong::REQUIRED_ARGUMENT]
 )
 opts.each do |opt, arg|
   case opt
   when '--verbose' then $verbose = true
   when '--quiet' then $quiet = true
-  when '--debug' then $DEBUG = true
-  when '--format' then $format = arg
+  when '--debug' then ::RDF::RDFXML::debug = true
+  when '--format' then $output_format = arg
   when '--suite' then suite = arg
-  when '--strict' then $strict = true
+  when '--validate' then $validate = true
   end
 end
 

data/spec/graph_spec.rb

@@ -1,7 +1,6 @@
 $:.unshift "."
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'rdf/rdfxml/patches/graph_properties'
-require 'rdf/rdfxml/patches/seq'
 
 class EX < RDF::Vocabulary("http://example.com/"); end
 
@@ -57,19 +56,4 @@ describe RDF::Graph do
       subject.type_of(EX.a).should == []
     end
   end
-
-  describe "rdf:_n sequences" do
-    subject {
-      g = RDF::Graph.new
-      g << [EX.Seq, RDF.type, RDF.Seq]
-      g << [EX.Seq, RDF._1, EX.john]
-      g << [EX.Seq, RDF._2, EX.jane]
-      g << [EX.Seq, RDF._3, EX.rick]
-      g
-    }
-    
-    it "should return object list" do
-      subject.seq(EX.Seq).should == [EX.john, EX.jane, EX.rick]
-    end
-  end
 end

data/spec/literal_spec.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 $:.unshift "."
 require File.join(File.dirname(__FILE__), 'spec_helper')
-require 'nokogiri'
 
 describe RDF::Literal do
   require 'nokogiri' rescue nil
@@ -73,7 +72,7 @@ describe RDF::Literal do
                       :dc => "http://purl.org/dc/terms/",
                     })
         }
-        it "should add namespace" do subject.to_s.should == "<svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\"></svg:svg>" end
+        it "should add namespace" do subject.to_s.should == "<svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:dc=\"http://purl.org/dc/terms/\"></svg:svg>" end
       end
 
       describe "and language with an existing language embedded" do
@@ -91,7 +90,7 @@ describe RDF::Literal do
     describe "with a default namespace" do
       subject {
         @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral,
-                      :namespaces => {:__default__ => RDF::DC.to_s})
+                      :namespaces => {"" => RDF::DC.to_s})
       }
 
       it "should add namespace" do subject.to_s.should == "foo <sup xmlns=\"http://purl.org/dc/terms/\">bar</sup> baz!" end

data/spec/rdf_helper.rb

@@ -36,24 +36,24 @@ module RdfHelper
         pred = statement.predicate.to_s.split(/[\#\/]/).last
         obj  = statement.object.is_a?(RDF::Literal) ? statement.object.value : statement.object.to_s
 
-        puts "#{pred}: #{obj}" if $DEBUG
+        puts "#{pred}: #{obj}" if ::RDF::RDFXML::debug?
         if statement.predicate == RDF.type
           self.rdf_type = obj.to_s.split(/[\#\/]/).last
           #puts statement.subject.to_s
         elsif pred =~ /Document\Z/i
-          puts "sub #{uri_prefix} in #{obj} for #{test_dir}" if $DEBUG
+          puts "sub #{uri_prefix} in #{obj} for #{test_dir}" if ::RDF::RDFXML::debug?
           about = obj.dup
           obj.sub!(uri_prefix, test_dir)
-          puts " => #{obj}" if $DEBUG
+          puts " => #{obj}" if ::RDF::RDFXML::debug?
           self.send("#{pred}=", obj)
           if pred == "inputDocument"
             self.about ||= about
             self.name ||= statement.subject.to_s.split(/[\#\/]/).last
           end
         elsif pred == "referenceOutput"
-          puts "referenceOutput: #{obj}" if $DEBUG
+          puts "referenceOutput: #{obj}" if ::RDF::RDFXML::debug?
           outputDocument = obj.sub(uri_prefix, test_dir)
-          puts "referenceOutput: " + self.send(pred) if $DEBUG
+          puts "referenceOutput: " + self.send(pred) if ::RDF::RDFXML::debug?
         elsif self.respond_to?("#{pred}=")
           self.send("#{pred}=", obj)
         end
@@ -96,7 +96,7 @@ module RdfHelper
       return unless output
 
       output_graph = RDF::Graph.load(self.outputDocument)
-      puts "result: #{CGI.escapeHTML(graph.to_ntriples)}" if $DEBUG
+      puts "result: #{CGI.escapeHTML(graph.to_ntriples)}" if ::RDF::RDFXML::debug?
       graph.should Matchers::be_equivalent_graph(output_graph, self)
     end
 

data/spec/reader_spec.rb

@@ -84,7 +84,7 @@ EOF
     it "should recognise and create single triple for empty non-RDF root" do
       sampledoc = %(<?xml version="1.0" ?>
         <NotRDF />)
-      graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       graph.size.should == 1
       statement = graph.statements.first
       statement.subject.class.should == RDF::Node
@@ -109,7 +109,7 @@ EOF
   </rdf:RDF>
 </GenericXML>
 EOF
-      graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       objects = graph.statements.map {|s| s.object.value}.sort
       objects.should == ["Bar", "Foo"]
     end
@@ -141,7 +141,7 @@ xmlns:ex="http://www.example.org/" xml:lang="en" xml:base="http://www.example.or
 </rdf:RDF>
 EOF
 
-      graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       #puts @debug
       graph.size.should == 10
       # print graph.to_ntriples
@@ -160,7 +160,7 @@ EOF
   </rdf:Bag>
 </rdf:RDF>
 EOF
-      graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       graph.predicates.map(&:to_s).should include("http://www.w3.org/1999/02/22-rdf-syntax-ns#_1", "http://www.w3.org/1999/02/22-rdf-syntax-ns#_2")
     end
   end
@@ -185,7 +185,7 @@ EOF
 EOF
   
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       end.should raise_error(RDF::ReaderError, /Obsolete attribute .*aboutEach/)
     end
 
@@ -208,7 +208,7 @@ EOF
 EOF
   
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       end.should raise_error(RDF::ReaderError, /Obsolete attribute .*aboutEachPrefix/)
     end
 
@@ -221,7 +221,7 @@ EOF
 EOF
   
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       end.should raise_error(RDF::ReaderError, /ID addtribute '.*' must be a NCName/)
     end
 
@@ -237,7 +237,7 @@ EOF
 EOF
   
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       end.should raise_error(RDF::ReaderError, /ID addtribute '.*' must be a NCName/)
     end
 
@@ -251,7 +251,7 @@ EOF
 EOF
   
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       end.should raise_error(RDF::ReaderError, "ID addtribute 'a/b' must be a NCName")
     end
   
@@ -264,7 +264,7 @@ EOF
 EOF
     
       lambda do
-        graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+        graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
         puts @debug
       end.should raise_error(RDF::ReaderError, /Obsolete attribute .*bagID/)
     end
@@ -291,7 +291,7 @@ EOF
 <http://example.org/triples/#triple1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> \"blah\" .
 EOF
 
-      graph = parse(sampledoc, :base_uri => "http://example.com", :strict => true)
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
       graph.should be_equivalent_graph(triples, :about => "http://example.com/", :trace => @debug)
     end
   end
@@ -299,7 +299,7 @@ EOF
   context "parsing rdf files" do
     def test_file(filepath, uri)
       rdf_string = File.read(filepath)
-      graph = parse(rdf_string, :base_uri => uri, :strict => true)
+      graph = parse(rdf_string, :base_uri => uri, :validate => true)
 
       nt_string = File.read(filepath.sub('.rdf', '.nt'))
       nt_graph = RDF::Graph.new
@@ -381,7 +381,7 @@ EOF
 EOF
       uri = "http://www.w3.org/2000/10/rdf-tests/rdfcore/xmlbase/Manifest.rdf#test001"
 
-      graph = parse(sampledoc, :base_uri => uri, :strict => true)
+      graph = parse(sampledoc, :base_uri => uri, :validate => true)
       graph.should be_equivalent_graph(triples, :about => uri, :trace => @debug)
     end
   
@@ -398,14 +398,14 @@ EOF
               g = RDF::Graph.new
               @reader.new(rdf_string,
                   :base_uri => t.about,
-                  :strict => true,
+                  :validate => false,
                   :debug => t.debug).each do |statement|
                 g << statement
               end
               g
             end
-          rescue Spec::Expectations::ExpectationNotMetError => e
-            if t.inputDocument =~ %r(rdfms-xml-literal-namespaces/test001.rdf)
+          rescue RSpec::Expectations::ExpectationNotMetError => e
+            if t.inputDocument =~ %r(xml-literal|xml-canon)
               pending("XMLLiteral canonicalization not implemented yet")
             else
               raise
@@ -426,7 +426,7 @@ EOF
               g = RDF::Graph.new
               @reader.new(rdf_string,
                   :base_uri => t.about,
-                  :strict => true).each do |statement|
+                  :validate => true).each do |statement|
                 g << statement
               end
               g.should be_empty

data/spec/spec_helper.rb

@@ -3,12 +3,13 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'rdf-n3', 'lib'))
 $:.unshift File.dirname(__FILE__)
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'matchers'
 require 'bigdecimal'  # XXX Remove Me
 require 'rdf/rdfxml'
 require 'rdf/ntriples'
 require 'rdf/spec'
+require 'rdf/spec/matchers'
 require 'rdf/isomorphic'
 
 include Matchers
@@ -28,8 +29,14 @@ module RDF
   end
 end
 
-Spec::Runner.configure do |config|
-  config.include(RDF::Spec::Matchers)
+::RSpec.configure do |c|
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
+  c.exclusion_filter = {
+    :ruby => lambda { |version| !(RUBY_VERSION.to_s =~ /^#{version.to_s}/) },
+  }
+  c.include(Matchers)
+  c.include(RDF::Spec::Matchers)
 end
 
 # Heuristically detect the input stream
@@ -45,7 +52,7 @@ def detect_format(stream)
   case string
   when /<\w+:RDF/ then RDF::RDFXML::Reader
   when /<RDF/     then RDF::RDFXML::Reader
-  when /<html/i   then RDF::RDFa::Reader
+  #when /<html/i   then RDF::RDFa::Reader
   when /@prefix/i then RDF::N3::Reader
   else                 RDF::NTriples::Reader
   end