rdf-rdfxml 0.3.0 → 0.3.1

data/script/parse

@@ -11,7 +11,7 @@ def parse(input, base)
   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|
+  puts writer_class.buffer(:standard_prefixes => true) { |writer|
     reader_class.new(input, :base_uri => base, :validate => true).each do |statement|
       writer << statement
     end

data/script/yard-to-rubyforge

@@ -0,0 +1,2 @@
+#!/bin/env sh
+rsync -azv doc/yard/ gkellogg@rubyforge.org:/var/www/gforge-projects/rdf/rdfxml/

data/spec/writer_spec.rb

@@ -113,7 +113,7 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://example/seq"), RDF._1, RDF::URI.new("http://example/first")]
         @graph << [RDF::URI.new("http://example/seq"), RDF._2, RDF::URI.new("http://example/second")]
         check_xpaths(
-          serialize(:max_depth => 1, :attributes => :untyped),
+          serialize(:max_depth => 1, :attributes => :none),
           "/rdf:RDF/rdf:Seq/@rdf:about" => "http://example/seq",
           %(/rdf:RDF/rdf:Seq/rdf:_1[@rdf:resource="http://example/first"]) => true,
           %(/rdf:RDF/rdf:Seq/rdf:_2[@rdf:resource="http://example/second"]) => true
@@ -125,7 +125,7 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://example/seq"), RDF._2, RDF::URI.new("http://example/second")]
         @graph << [RDF::URI.new("http://example/seq"), RDF._1, RDF::URI.new("http://example/first")]
         check_xpaths(
-          serialize(:max_depth => 1, :attributes => :untyped),
+          serialize(:max_depth => 1, :attributes => :none),
           "/rdf:RDF/rdf:Seq/@rdf:about" => "http://example/seq",
           %(/rdf:RDF/rdf:Seq/rdf:_1[@rdf:resource="http://example/first"]) => true,
           %(/rdf:RDF/rdf:Seq/rdf:_2[@rdf:resource="http://example/second"]) => true
@@ -137,19 +137,19 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://example/seq"), RDF._2, RDF::URI.new("http://example/second")]
         @graph << [RDF::URI.new("http://example/seq"), RDF._1, RDF::URI.new("http://example/first")]
         check_xpaths(
-          serialize(:max_depth => 1, :attributes => :untyped),
+          serialize(:max_depth => 1, :attributes => :none),
           "/rdf:RDF/rdf:Bag/@rdf:about" => "http://example/seq",
           %(/rdf:RDF/rdf:Bag/rdf:_1[@rdf:resource="http://example/first"]) => true,
           %(/rdf:RDF/rdf:Bag/rdf:_2[@rdf:resource="http://example/second"]) => true
         )
       end
 
-      it "should serialize rdf:Alt with multiple rdf:_2" do
+      it "should serialize rdf:Alt with rdf:_n" do
         @graph << [RDF::URI.new("http://example/seq"), RDF.type, RDF.Alt]
         @graph << [RDF::URI.new("http://example/seq"), RDF._2, RDF::URI.new("http://example/second")]
         @graph << [RDF::URI.new("http://example/seq"), RDF._1, RDF::URI.new("http://example/first")]
         check_xpaths(
-          serialize(:max_depth => 1, :attributes => :untyped),
+          serialize(:max_depth => 1, :attributes => :none),
           "/rdf:RDF/rdf:Alt/@rdf:about" => "http://example/seq",
           %(/rdf:RDF/rdf:Alt/rdf:_1[@rdf:resource="http://example/first"]) => true,
           %(/rdf:RDF/rdf:Alt/rdf:_2[@rdf:resource="http://example/second"]) => true
@@ -178,7 +178,7 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://example/seq"), RDF._2, RDF::URI.new("http://example/second")]
         @graph << [RDF::URI.new("http://example/seq"), RDF._1, RDF::URI.new("http://example/first")]
         check_xpaths(
-          serialize(:max_depth => 1, :attributes => :untyped),
+          serialize(:max_depth => 1, :attributes => :none),
           "/rdf:RDF/rdf:Seq/@rdf:about" => "http://example/seq",
           %(/rdf:RDF/rdf:Seq/rdf:_1[@rdf:resource="http://example/first"]) => true,
           %(/rdf:RDF/rdf:Seq/rdf:_2[@rdf:resource="http://example/second"]) => true
@@ -283,7 +283,8 @@ describe "RDF::RDFXML::Writer" do
         check_xpaths(
           serialize(:attributes => :typed),
           "/rdf:RDF/rdf:Description/@rdf:about" => "http://release/",
-          "/rdf:RDF/rdf:Description/@dc:title" => "foo"
+          "/rdf:RDF/rdf:Description/@dc:title" => "foo",
+          :reparse => false
         )
       end
   
@@ -305,7 +306,7 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://release/"), RDF::DC.title, "foo"]
         @graph << [RDF::URI.new("http://release/"), FOO.pred, FOO.obj]
     
-        xml = serialize(:max_depth => 1, :attributes => :untyped,
+        xml = serialize(:max_depth => 1, :attributes => :none,
                         :default_namespace => FOO.to_s,
                         :prefixes => {:foo => FOO.to_s})
         xml.should =~ /<Release/
@@ -319,7 +320,7 @@ describe "RDF::RDFXML::Writer" do
         @graph << [RDF::URI.new("http://release/"), RDF::DC.title, "foo"]
         @graph << [RDF::URI.new("http://release/"), FOO.pred, FOO.obj]
     
-        xml = serialize(:max_depth => 1, :attributes => :untyped,
+        xml = serialize(:max_depth => 1, :attributes => :none,
                         :prefixes => {nil => FOO.to_s, :foo => FOO.to_s})
         xml.should =~ /<Release/
         xml.should =~ /<pred/
@@ -362,11 +363,27 @@ describe "RDF::RDFXML::Writer" do
       end
     
       it "should replicate rdfcore/rdfms-seq-representation" do
-        graph_expect = parse(%(
+        @graph = parse(%(
           <http://example.org/eg#eric> a [ <http://example.org/eg#intersectionOf> (<http://example.org/eg#Person> <http://example.org/eg#Male>)] .
         ), :reader => RDF::N3::Reader)
         graph_check = parse(serialize(:format => :rdfxml)).should be_equivalent_graph(@graph, :trace => @debug.join("\n"))
       end
+      
+      it "should not generate extraneous BNode" do
+        @graph = parse(%(
+        <part_of> a <http://www.w3.org/2002/07/owl#ObjectProperty> .
+        <a> a <http://www.w3.org/2002/07/owl#Class> .
+        <b> a <http://www.w3.org/2002/07/owl#Class> .
+         [ a <http://www.w3.org/2002/07/owl#Class>;
+            <http://www.w3.org/2002/07/owl#intersectionOf> (<b> [ a <http://www.w3.org/2002/07/owl#Class>,
+                <http://www.w3.org/2002/07/owl#Restriction>;
+                <http://www.w3.org/2002/07/owl#onProperty> <part_of>;
+                <http://www.w3.org/2002/07/owl#someValuesFrom> <a>])] .
+         [ a <http://www.w3.org/2002/07/owl#Class>;
+            <http://www.w3.org/2002/07/owl#intersectionOf> (<a> <b>)] .
+        ), :reader => RDF::N3::Reader)
+        graph_check = parse(serialize(:format => :rdfxml)).should be_equivalent_graph(@graph, :trace => @debug.join("\n"))
+      end
     end
   
     describe "w3c rdfcore tests" do
@@ -394,6 +411,7 @@ describe "RDF::RDFXML::Writer" do
       doc.should be_a(Nokogiri::XML::Document)
       doc.root.should be_a(Nokogiri::XML::Element)
       paths.each_pair do |path, value|
+        next if path.is_a?(Symbol)
         @debug <<  doc.root.at_xpath(path, doc.namespaces).to_s if ::RDF::RDFXML::debug?
         case value
         when false
@@ -410,9 +428,11 @@ describe "RDF::RDFXML::Writer" do
       end
     
       # Parse generated graph and compare to source
-      #graph = RDF::Graph.new
-      #RDF::RDFXML::Reader.new(doc, :base_uri => "http://release/", :format => :rdfxml).each {|st| graph << st}
-      #graph.should be_equivalent_graph(@graph, :about => "http://release/", :trace => @debug.join("\n"))
+      if paths[:reparse]
+        graph = RDF::Graph.new
+        RDF::RDFXML::Reader.new(doc, :base_uri => "http://release/", :format => :rdfxml).each {|st| graph << st}
+        graph.should be_equivalent_graph(@graph, :about => "http://release/", :trace => @debug.join("\n"))
+      end
     end
 
     require 'rdf/n3'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -08:00
+date: 2011-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+        version: 1.4.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+        version: 2.5.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,10 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 0.3.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -88,10 +65,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 0.3.4
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -102,10 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 0.6.4
   type: :development
   version_requirements: *id006
 description: RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.
@@ -118,15 +89,15 @@ extra_rdoc_files:
 - AUTHORS
 - CONTRIBUTORS
 - History.rdoc
-- README.rdoc
+- README.md
 files: 
-- .gitignore
 - .yardopts
 - AUTHORS
 - CONTRIBUTORS
 - History.rdoc
-- README.rdoc
+- README.md
 - Rakefile
+- UNLICENSE
 - VERSION
 - etc/doap.nt
 - etc/doap.xml
@@ -145,6 +116,7 @@ files:
 - script/console
 - script/parse
 - script/tc
+- script/yard-to-rubyforge
 - spec/format_spec.rb
 - spec/graph_spec.rb
 - spec/literal_spec.rb
@@ -518,8 +490,8 @@ homepage: http://github.com/gkellogg/rdf-rdfxml
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -527,23 +499,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: RDF/XML reader/writer for RDF.rb.

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-/doc
-/pkg
-/.yardoc
-/user-test-cases

data/README.rdoc

@@ -1,77 +0,0 @@
-= RDF::RDFXML reader/writer
-
-RDF/XML parser for RDF.rb.
-
-== DESCRIPTION
-
-RDF::RDFXML is an RDF/XML reader/writer for Ruby using the RDF.rb library suite.
-
-== FEATURES
-RDF::RDFXML parses RDF/XML into statements or triples and serializes triples, statements or graphs.
-
-* Fully compliant 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/foaf.xml") do |reader|
-    reader.each_statement do |statement|
-      puts statement.inspect
-    end
-  end
-
-== Dependencies
-  * [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
-  * [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.3.3)
-
-== TODO
-* Add support for LibXML and REXML bindings, and use the best available
-* Consider a SAX-based parser for improved performance
-* Add generic RDF/XML Writer
-
-== Resources
-* Distiller[http://kellogg-assoc/distiller]
-* RDoc[http://rdoc.info/projects/gkellogg/rdf-rdfxml]
-* History[http://github.com/gkellogg/rdf-rdfxml/blob/master/History.txt]
-* "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
-* Gregg Kellogg <gregg@kellogg-assoc.com>
-
-== CONTRIBUTORS
-* Nicholas Humfrey <nicholas.humfrey@bbc.co.uk>
-
-== 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.
-
-== FEEDBACK
-
-* gregg@kellogg-assoc.com
-* http://rubygems.org/rdf-rdfxml
-* http://github.com/gkellogg/rdf-rdfxml
-* public-rdf-ruby mailing list on w3.org