rdfobjects 0.6.0 → 0.6.1

data/lib/rdf_objects/collection.rb

@@ -3,8 +3,15 @@ module RDFObject
     def uris
       return self.keys
     end
-    def find_by_type(type)
-      self.find_all {|r| r}
+    def find_by_predicate(predicate)
+      if predicate.could_be_a_safe_curie?
+        predicate = Curie.parse predicate
+      end      
+      self.find_all {|r| 
+        if r[1][predicate]
+          r[1]
+        end
+      }
     end
 
     def find_or_create(uri)

data/lib/rdf_objects/parsers.rb

@@ -131,7 +131,8 @@ module RDFObject
         tmp_object = scanner.scan_until(/>\s?\.\s*\n?$/)
         tmp_object.sub!(/^</,'')
         tmp_object.sub!(/>\s?\.\s*\n?$/,'')
-        object = @collection.find_or_create(tmp_object)
+        object = tmp_object
+        type = "uri"
       else
         language = nil
         data_type = nil
@@ -154,9 +155,10 @@ module RDFObject
           data_type = scanner.scan_until(/>/)
           data_type.sub!(/>$/,'')
         end
-        object = Literal.new(tmp_object,{:data_type=>data_type,:language=>language})      
+        object = Literal.new(tmp_object,{:data_type=>data_type,:language=>language})
+        type = "literal"      
       end
-      [subject, predicate, object]
+      {:subject=>subject, :predicate=>predicate, :object=>object, :type=>type}
     end
     
     def data=(ntriples)
@@ -173,8 +175,12 @@ module RDFObject
       @ntriples.each do | assertion |
         next if assertion[0, 1] == "#" # Ignore comments
         triple = parse_ntriple(assertion)
-        resource = @collection.find_or_create(triple[0])
-        resource.assert(triple[1], triple[2])
+        resource = @collection.find_or_create(triple[:subject])
+        object = case triple[:type]
+        when "literal" then triple[:object]
+        when "uri" then @collection.find_or_create(triple[:object])
+        end
+        resource.assert(triple[:predicate],object)
       end
       @collection
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdfobjects
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ross Singer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency