lightrdf 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.2 2011-03-22
+
+* Added RDF::Graph#== and RDF::Graph#contains methods that disambiguate bnodes
+
 === 0.3.1 2011-03-18
 
 * Fix in Node#all_triples method

data/lib/lightrdf/graph.rb

@@ -52,6 +52,34 @@ module RDF
       values.select &block
     end
     
+    # Returns true if the graph is contained into this one.
+    # It appropriately disambiguates blank nodes.
+    def contains? graph2
+      triples  = self.triples
+      triples2 = graph2.triples
+      return false if triples2.size > triples.size
+      
+      bnodes  = self.keys.select   { |node| ID::bnode?(node) }
+      bnodes2 = graph2.keys.select { |node| ID::bnode?(node) }
+
+      # Tries all the mappings between blank nodes
+      mappings = bnodes2.mappings(bnodes)
+
+      mappings.each do |mapping|
+        new_triples = triples2.map { |s,p,o| [ ID::bnode?(s) ? mapping[s] : s,
+                                               ID::bnode?(p) ? mapping[p] : p,
+                                               ID::bnode?(o) ? mapping[o] : o ]}
+        diff = triples - new_triples
+        return true if diff.size == triples.size - new_triples.size
+      end
+      
+      false
+    end
+    
+    def == graph2
+      triples.size == graph2.triples.size and contains?(graph2)
+    end
+    
     # This is equivalent to [], but tries to return a NodeProxy
     # It stores created objects in a pool
     def node id, type=nil

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.3.1'
+  VERSION = '0.3.2'
 end
 
 require 'rubygems'
@@ -21,3 +21,22 @@ require "lightrdf/graph"
 require "lightrdf/node"
 require "lightrdf/node_proxy"
 require "lightrdf/repository"
+
+class Array
+  # Returns an array of hashes with the possible mappings
+  # between the elements in both arrays
+  def mappings array2
+    return [{}] if self.empty? or array2.empty?
+    mappings = []
+    each do |item|
+      mapping = {}
+      array2.each do |item2|
+        mapping[item] = item2
+        (self - [item]).mappings(array2 - [item2]).each do |submapping|
+          mappings << mapping.merge(submapping)
+        end
+      end
+    end
+    mappings.uniq
+  end
+end

data/lightrdf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightrdf}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   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-18}
+  s.date = %q{2011-03-22}
   s.default_executable = %q{yarfp}
   s.description = %q{RDF library}
   s.email = %q{joseignacio.fernandez@gmail.com}

data/test/test_lightrdf.rb

@@ -309,4 +309,23 @@ foaf: http://xmlns.com/foaf/0.1/
     person2 = Foaf::Person.new(node)
     assert_equal person1.id, person2.id
   end
+  
+  def test_graph_contains
+    graph1 = RDF::Graph.new [ [Node('ex:alice'), Node('foaf:age'), "24"]]
+    graph2 = RDF::Graph.new [ [Node('ex:alice'), Node('foaf:knows'), Node('_:bnode392')],
+                              [Node('_:bnode392'), Node('foaf:name'), "Bob"] ]
+    graph3 = RDF::Graph.new [ [Node('ex:alice'), Node('foaf:knows'), Node('_:bnode965')],
+                              [Node('_:bnode965'), Node('foaf:name'), "Bob"] ]
+    graph4 = RDF::Graph.new [ [Node('ex:alice'), Node('foaf:knows'), Node('_:bnode392')],
+                              [Node('_:bnode392'), Node('foaf:name'), "Robert"] ]
+    graph5 = RDF::Graph.new [ [Node('ex:alice'), Node('foaf:knows'), Node('_:bnode390')],
+                              [Node('_:bnode390'), Node('foaf:name'), "Robert"],
+                              [Node('ex:alice'), Node('foaf:knows'), Node('_:bnode967')],
+                              [Node('_:bnode967'), Node('foaf:name'), "Bob"]]
+    assert !graph1.contains?(graph2)
+    assert graph2.contains?(graph3)
+    assert !graph2.contains?(graph4)
+    assert graph2 != graph4
+    assert graph5.contains?(graph2)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency