lightrdf 0.2.6 → 0.3.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.0 2011-03-17
+
+* Recursive addition of nodes to a graph
+* merge and merge! for both nodes and graphs
+
 === 0.2.6 2011-03-16
 
 * Fix in graph consistency when building a graph from triples

data/lib/lightrdf/graph.rb

@@ -1,6 +1,7 @@
 module RDF
   class Graph < Hash
     include Parser
+    alias :get :[]
     
     # Namespace set stored when parsing a file. Can be used for reference
     attr_accessor :ns
@@ -16,24 +17,28 @@ module RDF
     end
 
     def << node
-      self[node.id] = node
+      node.graph.each do |subid, subnode|
+        subnode.graph = self
+        old_subnode = get(subid)
+        self[subid] = old_subnode ? old_subnode.merge!(subnode) : subnode
+      end
+      old_node = get(node.id)
+      self[node.id] = old_node ? old_node.merge!(node) : node
     end
 
     def [] id
       super(ID(id)) || Node.new(id, self)
     end
-    def []= id, node
-      node.graph = self
-      super ID(id), node
-    end
     def nodes; values; end
     def inspect
       "{" + (values.map{|v| v.inspect} * ", ") + "}"
     end
+    def merge! graph
+      graph.values.each { |node| self << node }
+      self
+    end
     def merge graph
-      new_graph = Graph.new
-      new_graph.triples = triples + graph.triples
-      new_graph
+      RDF::Graph.new(triples + graph.triples)
     end
     def triples
       triples = []; values.each { |n| triples += n.triples }

data/lib/lightrdf/node.rb

@@ -30,7 +30,7 @@ module RDF
     def initialize id=nil, graph=nil
       @id = ID(id)
       @graph = graph || Graph.new
-      @graph << self
+      @graph[@id] = self
     end
 
     def method_missing method, *args
@@ -66,26 +66,25 @@ module RDF
       triples
     end
     
-    def all_triples done=[]
-      return [] if done.include?(self)
-      done << self
-      triples = self.triples
-      triples.map { |s,p,o| [s,o] }.flatten.uniq.each { |node| triples += graph[node].all_triples(done) }
-      triples
+    def all_triples
+      graph.triples
     end
     
     def merge node
-      new_node = clone
+      new_node = Node(id)
       (self.keys + node.keys).uniq.each do |k|
         new_node[k] = (node[k] + self[k]).uniq
       end
       new_node
     end
-
-    def clone
-      Node.new self
+    
+    def merge! node
+      (self.keys + node.keys).uniq.each do |k|
+        self[k] = (node[k] + self[k]).uniq
+      end
+      self
     end
-
+    
     def bnode?
       ID.bnode?(id)
     end    

data/lib/lightrdf.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RDF
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end
 
 require 'rubygems'

data/lightrdf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightrdf}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-03-17}
   s.default_executable = %q{yarfp}
   s.description = %q{RDF library}
   s.email = %q{joseignacio.fernandez@gmail.com}

data/test/test_lightrdf.rb

@@ -97,7 +97,67 @@ class TestLightRDF < Test::Unit::TestCase
     assert g[Node('ex:bob')].foaf::weblog?(Node('http://www.awesomeweblogfordummies.com'))
     assert_equal 1, [g[Node('ex:bob')].graph.object_id, g[Node('ex:bob')].foaf::weblog.map(&:graph).map(&:object_id)].flatten.uniq.size
   end
+
+  def test_node_merge
+    a = Node('ex:alice')
+    a.foaf::name = "Alice"
+    b = Node('ex:alice')
+    b.foaf::age = "23"
+
+    c = a.merge(b)
+
+    assert_not_same ["Alice"], b.foaf::name
+    assert_not_same ["23"], a.foaf::age
+    assert_equal ["Alice"], c.foaf::name
+    assert_equal ["23"], c.foaf::age
+  end
+
+  def test_node_merge!
+    a = Node('ex:alice')
+    a.foaf::name = "Alice"
+    b = Node('ex:alice')
+    b.foaf::age = "23"
+
+    a.merge!(b)
+
+    assert_equal ["Alice"], a.foaf::name
+    assert_equal ["23"], a.foaf::age
+  end
+
+  def test_recursive_add
+    a = Node('ex:alice')
+    a.foaf::name = "Alice"
+    b = Node("ex:bob", a.graph)
+    b.foaf::age = "26"
+    a.foaf::knows = b
+
+    g = RDF::Graph.new
+    g << a
+
+    assert_equal ["Alice"], g[Node("ex:alice")].foaf::name
+    assert_equal [Node("ex:bob")], g[Node("ex:alice")].foaf::knows
+    assert_equal ["26"], g[Node("ex:bob")].foaf::age
+  end
   
+  def test_graph_merge!
+    a = Node('ex:bob')
+    a.foaf::name = "Bob"
+
+    b = Node('ex:alice')
+    b.foaf::name = "Alice"
+
+    g1 = RDF::Graph.new
+    g2 = RDF::Graph.new
+    g1 << a
+    g2 << b
+
+    g2.merge!(g1)
+
+    assert_equal ["Alice"], g2[Node('ex:alice')].foaf::name
+    assert_equal ["Bob"], g2[Node('ex:bob')].foaf::name
+    assert_equal 2, g2.triples.size
+  end
+
   def test_graph_merge
     a = Node('ex:bob')
     a.foaf::name = "Bob"
@@ -112,8 +172,10 @@ class TestLightRDF < Test::Unit::TestCase
 
     g3 = g1.merge(g2)
 
-    assert ["Alice"], g3[Node('ex:Alice')].foaf::name
-    assert ["Bob"], g3[Node('ex:bob')].foaf::name
+    assert_equal ["Alice"], g3[Node('ex:alice')].foaf::name
+    assert_equal ["Bob"], g3[Node('ex:bob')].foaf::name
+    assert_equal g1, a.graph
+    assert_equal g2, b.graph
     assert_equal 2, g3.triples.size
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
+date: 2011-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency