rdfobjects 0.5.0 → 0.6.0

data/lib/rdf_objects/collection.rb

@@ -0,0 +1,29 @@
+module RDFObject
+  class Collection < Hash
+    def uris
+      return self.keys
+    end
+    def find_by_type(type)
+      self.find_all {|r| r}
+    end
+
+    def find_or_create(uri)
+      if uri.could_be_a_safe_curie?
+        uri = Curie.parse uri
+      end
+      self[uri] = Resource.new(uri) unless self[uri]
+      self[uri]
+    end  
+    
+    def remove(resource)
+      self.delete(resource.uri)
+    end
+    
+    def parse(data, format=nil)
+      parser = Parser.init_parser(data, format)
+      parser.collection = self
+      parser.parse
+      nil
+    end
+  end
+end

data/lib/rdf_objects/parsers.rb

@@ -58,26 +58,15 @@ class UTF8Parser < StringScanner
     raise StandardError, "Caught #{e.class}: #{e}"
   end  
 end
-module RDFObject 
-  class Collection < Hash
-    attr_accessor :objects
-    def initialize(subjects=true)
-      @objects = Collection.new(false) if subjects
-    end
-    def uris
-      return self.keys
-    end
-    def find_by_type(type)
-      self.find_all {|r| r}
-    end
-    def resources
-      self.merge(@objects)
-    end
-  end
-  
+module RDFObject   
   class Parser
     # Choose the best format parser from an admittedly small group of choices.
     def self.parse(rdf, format=nil)
+      parser = init_parser(rdf, format)
+      parser.parse 
+    end
+    
+    def self.init_parser(rdf, format=nil)
       if format
         parser = case format
         when 'rdfxml' then XMLParser.new(rdf)
@@ -112,17 +101,17 @@ module RDFObject
           end
         end
       end
-      parser.parse 
-    end
+      parser
+    end 
+         
     attr_reader :collection
     def initialize(data=nil)
       @collection = Collection.new
       self.data=(data) if data
     end
-         
-    def find_or_create(uri)
-      return @collection.resources[uri] if @collection.resources[uri]
-      Resource.new(uri)
+    def collection=(collection)
+      raise ArgumentError unless collection.is_a?(RDFObject::Collection)
+      @collection = collection
     end
   end  
   class NTriplesParser < RDFObject::Parser
@@ -142,8 +131,7 @@ module RDFObject
         tmp_object = scanner.scan_until(/>\s?\.\s*\n?$/)
         tmp_object.sub!(/^</,'')
         tmp_object.sub!(/>\s?\.\s*\n?$/,'')
-        object = find_or_create(tmp_object)
-        @collection[object.uri] = object
+        object = @collection.find_or_create(tmp_object)
       else
         language = nil
         data_type = nil
@@ -185,9 +173,8 @@ module RDFObject
       @ntriples.each do | assertion |
         next if assertion[0, 1] == "#" # Ignore comments
         triple = parse_ntriple(assertion)
-        resource = find_or_create(triple[0])
+        resource = @collection.find_or_create(triple[0])
         resource.assert(triple[1], triple[2])
-        @collection[resource.uri] = resource
       end
       @collection
     end
@@ -202,11 +189,10 @@ module RDFObject
     #
     
     def parse
-      namespaces = @rdfxml.namespaces
-      if namespaces.index("http://purl.org/rss/1.0/")
+      if @rdfxml.namespaces.values.index("http://purl.org/rss/1.0/")
         fix_rss10
       end
-      if namespaces.index("http://www.w3.org/2005/sparql-results#")
+      if @rdfxml.namespaces.values.index("http://www.w3.org/2005/sparql-results#")
         raise "Sorry, SPARQL not yet supported"
       else
         parse_rdfxml
@@ -223,17 +209,16 @@ module RDFObject
     end
   
     def parse_resource_node(resource_node, collection)
-      resource = find_or_create(resource_node.attribute_with_ns('about', "http://www.w3.org/1999/02/22-rdf-syntax-ns#").value)
+      resource = @collection.find_or_create(resource_node.attribute_with_ns('about', "http://www.w3.org/1999/02/22-rdf-syntax-ns#").value)
       unless (resource_node.name == "Description" and resource_node.namespace.href == "http://www.w3.org/1999/02/22-rdf-syntax-ns#")
-        resource.assert("[rdf:type]", find_or_create("#{resource_node.namespace.href}#{resource_node.name}"))
+        resource.assert("[rdf:type]", @collection.find_or_create("#{resource_node.namespace.href}#{resource_node.name}"))
       end
       resource_node.children.each do | child |
         next if child.text?
         predicate = "#{child.namespace.href}#{child.name}"
         if object_uri = child.attribute_with_ns("resource", "http://www.w3.org/1999/02/22-rdf-syntax-ns#")
-          obj_resource = find_or_create(object_uri.value)
+          obj_resource = @collection.find_or_create(object_uri.value)
           resource.assert(predicate, obj_resource)
-          @collection[obj_resource.uri] = obj_resource
         elsif all_text?(child)
           opts = {}
           if lang = child.attribute_with_ns("lang", "http://www.w3.org/XML/1998/namespace")
@@ -245,13 +230,11 @@ module RDFObject
           resource.assert(predicate, Literal.new(child.content.strip,opts))
         end
         child.xpath("./*[@rdf:about]").each do | grandchild |
-          gc_resource = find_or_create(grandchild.attribute_with_ns('about', "http://www.w3.org/1999/02/22-rdf-syntax-ns#").value)
+          gc_resource = @collection.find_or_create(grandchild.attribute_with_ns('about', "http://www.w3.org/1999/02/22-rdf-syntax-ns#").value)
           resource.assert(predicate, gc_resource)
-          @collection[gc_resource.uri] = gc_resource
           parse_resource_node(grandchild, collection)
         end
       end
-      @collection[resource.uri] = resource
     end
   
     def all_text?(node)
@@ -305,8 +288,7 @@ module RDFObject
     
     def parse
       @json.each_pair do |subject, assertions|
-        resource = find_or_create(subject)
-        @collection[resource.uri] = resource
+        resource = @collection.find_or_create(subject)
         assertions.each_pair do |predicate, objects|
           objects.each do | object |
             if object['type'] == 'literal'
@@ -320,13 +302,11 @@ module RDFObject
               literal = Literal.new(object['value'],opts)
               resource.assert(predicate, literal)
             elsif object['type'] == 'uri'
-              o = find_or_create(object['value'])
+              o = @collection.find_or_create(object['value'])
               resource.assert(predicate, o)
-              @collection[o.uri] = o
             elsif object['type'] == 'bnode' # For now, we're going to treat a blank node like a URI resource.
-              o = find_or_create(object['value'])
+              o = @collection.find_or_create(object['value'])
               resource.assert(predicate, o)
-              @collection[o.uri] = o            
             end
           end
         end

data/lib/rdf_objects/rdf_resource.rb

@@ -5,42 +5,6 @@ require 'weakref'
 
 module RDFObject
   class Resource < OpenStruct
-    class << self
-      def instances
-        instances = {}
-        ObjectSpace.each_object(self) { | rdf_object |
-          next unless rdf_object.uri
-          instances[rdf_object.uri] = rdf_object
-        }        
-        instances
-      end
-
-      def reset!
-      #  @instances = {}
-        ObjectSpace.each_object(self) { | rdf_object |
-          rdf_object.uri = nil
-          Curie.get_mappings.each do | prefix, uri |
-            if rdf_object.respond_to?(prefix.to_sym)
-              rdf_object.send("#{prefix}=".to_sym, nil)
-            end
-          end
-        }
-        ObjectSpace.garbage_collect        
-      end
-
-      def remove(resource)
-        to_del = instances[resource.uri]      
-        to_del.uri = nil
-      end
-    
-      def exists?(uri)
-        ObjectSpace.each_object(self) { | rdf_object |
-          return true if rdf_object.uri == uri
-        }
-        false
-      end
-    end
-
     def initialize(uri)        
       if uri.could_be_a_safe_curie?
         uri = Curie.parse uri
@@ -121,18 +85,6 @@ module RDFObject
       end
       return true
     end
-   
-    def self.new(uri, *opts)
-      #if self.exists?(uri)
-      #  return self.instances[uri]
-      #end
-      if exists = self.instances[uri]
-        unless opts.index(:force)
-          return exists
-        end
-      end
-      super(uri)
-    end   
   end
   
   class ResourceReference

data/lib/rdf_objects.rb

@@ -6,6 +6,7 @@ module RDFObject
   require File.dirname(__FILE__) + '/rdf_objects/rdf_resource'
   require File.dirname(__FILE__) + '/rdf_objects/curies'
   require File.dirname(__FILE__) + '/rdf_objects/data_types'
-  require File.dirname(__FILE__) + '/rdf_objects/http_client'    
+  require File.dirname(__FILE__) + '/rdf_objects/http_client' 
+  require File.dirname(__FILE__) + '/rdf_objects/collection'      
   Curie.remove_prefixes!(:http)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdfobjects
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ross Singer
@@ -55,12 +55,12 @@ files:
 - LICENSE
 - README
 - lib/rdf_objects.rb
+- lib/rdf_objects/collection.rb
 - lib/rdf_objects/curies.rb
 - lib/rdf_objects/data_types.rb
 - lib/rdf_objects/http_client.rb
 - lib/rdf_objects/parsers.rb
 - lib/rdf_objects/rdf_resource.rb
-- lib/rdf_objects/rdfxml_parser.rb
 - lib/rdf_objects/serializers.rb
 - lib/xsl/RDFa2RDFXML.xsl
 - lib/xsl/rdf2nt.xsl

data/lib/rdf_objects/rdfxml_parser.rb

@@ -1,29 +0,0 @@
-require 'nokogiri'
-
-module RDFObject
-  
-  class XMLParser
-    def self.parse(doc)
-      parser = Nokogiri::XML::SAX::Parser.new(RDFXMLDocument.new())
-      parser.parse(doc.to_s)
-      return parser.document.collection.uniq
-    end
-  end
-  class RDFXMLDocument < Nokogiri::XML::SAX::Document
-    attr_reader :collection
-    def initialize
-      @collection = []
-      @resource_path = []
-      @predicate_path = []
-    end
-    
-    def start_element_namespace name, attributes = [], prefix = nil, uri = nil, ns = {}
-      attributes.each do | attribute |
-        if attribute.localname == "about" && attribute.uri == "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-          resource = Resource.new(attribute.value)
-          @collection << resource
-        end
-      end
-    end    
-  end
-end