rdf-rdfxml 0.2.2.1 → 0.2.3

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.2.3
+* Fixed QName generation in Writer based on RDF/XML Processing recommendations
+
 === 0.2.2.1
 * Ruby 1.9.2 support.
 * Added script/tc to run test cases

data/VERSION

@@ -1 +1 @@
-0.2.2.1
+0.2.3

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

@@ -5,4 +5,12 @@ class Nokogiri::XML::Node
     ns = self.namespace ? self.namespace.href : RDF::XML.to_s
     RDF::URI.intern(ns + self.node_name)
   end
-end unless Nokogiri::XML::Node.method_defined?(:uri)
+
+  def display_path
+    @display_path ||= case self
+    when Nokogiri::XML::Document then ""
+    when Nokogiri::XML::Element then parent ? "#{parent.display_path}/#{name}" : name
+    when Nokogiri::XML::Attr then "#{parent.display_path}@#{name}"
+    end
+  end
+end

data/lib/rdf/rdfxml/reader.rb

@@ -208,9 +208,8 @@ module RDF::RDFXML
     # Figure out the document path, if it is a Nokogiri::XML::Element or Attribute
     def node_path(node)
       case node
-      when Nokogiri::XML::Element, Nokogiri::XML::Attr then "#{node_path(node.parent)}/#{node.name}"
-      when String then node
-      else ""
+      when Nokogiri::XML::Node then node.display_path
+      else node.to_s
       end
     end
     

data/lib/rdf/rdfxml/version.rb

@@ -1,8 +1,8 @@
 module RDF::RDFXML::VERSION
   MAJOR = 0
   MINOR = 2
-  TINY  = 2
-  EXTRA = 1
+  TINY  = 3
+  EXTRA = nil
 
   STRING = [MAJOR, MINOR, TINY].join('.')
   STRING << ".#{EXTRA}" if EXTRA

data/lib/rdf/rdfxml/writer.rb

@@ -393,21 +393,15 @@ module RDF::RDFXML
         
         # No vocabulary found, invent one
         # Add bindings for predicates not already having bindings
-        # short_name of URI for creating QNames.
-        #   "#{base_uri]{#short_name}}" == uri
-        local_name = uri.fragment
-        local_name ||= begin
-          path = uri.path.split("/")
-          unless path &&
-              path.length > 1 &&
-              path.last.class == String &&
-              path.last.length > 0 &&
-              path.last.index("/") != 0
-            return false
-          end
-          path.last
-        end
-        base_uri = uri.to_s[0..-(local_name.length + 1)]
+        # From RDF/XML Syntax and Processing:
+        #   An XML namespace-qualified name (QName) has restrictions on the legal characters such that not all property URIs can be expressed
+        #   as these names. It is recommended that implementors of RDF serializers, 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_])})
+        return nil unless separation
+        base_uri = uri.to_s[0..separation]
+        local_name = uri.to_s[separation+1..-1]
         @tmp_ns = @tmp_ns ? @tmp_ns.succ : "ns0"
         add_debug "create namespace definition for #{uri}"
         uri.vocab = RDF::Vocabulary(base_uri)

data/rdf-rdfxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.2.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-08-11}
+  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.email = %q{gregg@kellogg-assoc.com}

data/spec/uri_spec.rb

@@ -99,6 +99,12 @@ describe RDF::URI do
     end
   end
   
+  context "Invalid Formats" do
+    it "should detect invalid URI formats" do
+      lambda {Addressable::URI.parse("_:test")}.should raise_error(Addressable::URI::InvalidURIError)
+    end
+  end
+  
   context "vocab" do
     RDF::Vocabulary.each do |v|
       specify {v.foo.vocab.should == v}

data/spec/writer_spec.rb

@@ -323,11 +323,11 @@ describe "RDF::RDFXML::Writer" do
   describe "with bnodes" do
     it "should not generate nodeID attribute unless node is referenced as an object" do
       @graph << [RDF::Node.new("a"), RDF::DC.title, "foo"]
-        check_xpaths(
-          serialize(:attributes => :untyped, :base => "http://release/"),
-          "/rdf:RDF/rdf:Description/@dc:title" => "foo",
-          "/rdf:RDF/rdf:Description/@rdf:nodeID" => false
-        )
+      check_xpaths(
+        serialize(:attributes => :untyped, :base => "http://release/"),
+        "/rdf:RDF/rdf:Description/@dc:title" => "foo",
+        "/rdf:RDF/rdf:Description/@rdf:nodeID" => false
+      )
     end
     
     it "should generate a nodeID attribute if node is referenced as an object" do
@@ -343,7 +343,6 @@ describe "RDF::RDFXML::Writer" do
     end
     
     it "should replicate rdfcore/rdfms-seq-representation" do
-      $verbose = true
       graph_expect = 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)

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version 
-  hash: 85
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  - 1
-  version: 0.2.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -43,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 3
@@ -59,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -73,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -89,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -103,7 +96,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -532,7 +524,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -541,7 +532,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"