rdfobjects 0.11.0 → 0.11.1

data/lib/rdf_objects/parsers.rb

@@ -347,7 +347,7 @@ module RDFObject
     def add_layer name, attributes, prefix, uri, ns
       layer = {:name=>"#{uri}#{name}"}
       if attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#about'] or 
-        attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#nodeID']
+        (attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#nodeID'] && (@hierarchy.length == 1 || @hierarchy.last[:predicate]))
         id = attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#about'] || 
           attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#nodeID']
         id = sanitize_uri(id) if attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#about']
@@ -358,8 +358,10 @@ module RDFObject
         if !@hierarchy.empty? && @hierarchy.last[:predicate]
           self.current_resource.relate(self.current_predicate, layer[:resource])
         end
-      elsif attributes["http://www.w3.org/1999/02/22-rdf-syntax-ns#resource"] 
-        self.current_resource.assert("#{uri}#{name}", @collection.find_or_create(sanitize_uri(attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#resource'])))    
+      elsif attributes["http://www.w3.org/1999/02/22-rdf-syntax-ns#resource"] or 
+          (attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#nodeID'] && @hierarchy.length > 1 && @hierarchy.last[:predicate].nil?)
+          res = attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#resource'] || attributes['http://www.w3.org/1999/02/22-rdf-syntax-ns#nodeID']
+        self.current_resource.assert("#{uri}#{name}", @collection.find_or_create(sanitize_uri(res)))    
         layer[:predicate] = layer[:name]
       else
         unless layer[:name] == "http://www.w3.org/1999/02/22-rdf-syntax-ns#RDF"
@@ -371,7 +373,7 @@ module RDFObject
         layer[:language] = attributes["http://www.w3.org/XML/1998/namespace/lang"].to_sym if attributes["http://www.w3.org/XML/1998/namespace/lang"]        
       end    
       layer[:base_uri] = Addressable::URI.parse(attributes["http://www.w3.org/XML/1998/namespace/base"]).normalize if attributes["http://www.w3.org/XML/1998/namespace/base"]  
-      @hierarchy << layer  
+      @hierarchy << layer
       attributes_as_assertions(attributes)
     end
     
@@ -420,6 +422,7 @@ module RDFObject
     def start_element_namespace name, attributes = [], prefix = nil, uri = nil, ns = {}
       check_for_default_ns(ns)
       attributes = attributes_to_hash(attributes, ns, name, prefix)
+      
       add_layer(name, attributes, prefix, uri, ns)
     end
 
@@ -439,7 +442,7 @@ module RDFObject
     end
 
     def end_element_namespace name, prefix = nil, uri = nil
-      remove_layer("#{uri}#{name}")      
+      remove_layer("#{uri}#{name}")
     end  
   end  
   

data/lib/rdf_objects/rdf_resource.rb

@@ -196,8 +196,8 @@ module RDFObject
                 if depth == 0
                   rdf << " #{object.xml_object_attribute} />"
                 else
-                  rdf << ">"
-                  ns, rdf_data = object.resource.rdf_description_block(depth-1)
+                  rdf << ">"                  
+                  ns, rdf_data = object.rdf_description_block(depth-1)
                   namespaces.merge!(ns)
                   rdf << rdf_data
                   rdf << "</#{key}:#{predicate}>"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Ross Singer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency