lightrdf 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.9 2011-02-18
+
+* Simplified design with much better performance
+
 === 0.1.8 2011-02-09
 
 * Added support for RDF abbreviated syntax

data/Manifest

@@ -8,6 +8,6 @@ lib/lightrdf/graph.rb
 lib/lightrdf/node.rb
 lib/lightrdf/parser.rb
 lib/lightrdf/repository.rb
-lib/lightrdf/quri.rb
+lib/lightrdf/id.rb
 test/test_helper.rb
 test/test_lightrdf.rb

data/README.rdoc

@@ -56,7 +56,7 @@ If you want to get the property, an array will be returned, as many foaf::name's
 Therefore, we can add multiple values to a property:
 
   user.foaf::weblog = Node('http://www.awesomeweblogfordummies.com')
-  user.foaf::weblog << Node('http://www.anotherawesomeweblogfordummies.com')
+  user.foaf::weblog += [Node('http://www.anotherawesomeweblogfordummies.com')]
   user.foaf::weblog.size # => 2
   user.foaf::weblog?(Node('http://www.awesomeweblogfordummies.com'))  # => true
 

data/lib/lightrdf/graph.rb

@@ -10,7 +10,7 @@ module RDF
     end
 
     def << node
-      self[node] = node
+      self[node.id] = node
     end
 
     def [] id
@@ -35,18 +35,31 @@ module RDF
     end
     def triples= triples
       self.clear
-      triples.each { |s, p, o| self[s][p] = self[s][p] + [o] }
+      triples.each { |s, p, o| self[s][p] += [o] }
+    end
+    def select &block
+      values.select &block
     end
     
     def find subject, predicate, object
-      matches = triples.select { |s,p,o| (subject.nil? or subject==[] or s==subject) and
+      # Convert nodes into IDs
+      subject   = subject.id   if subject.is_a?(Node)
+      predicate = predicate.id if predicate.is_a?(Node)
+      object    = object.id    if object.is_a?(Node)
+
+      # Find nodes
+      matches = triples.select { |s,p,o| (subject.nil?   or subject  ==[] or s==subject)   and
                                          (predicate.nil? or predicate==[] or p==predicate) and
-                                         (object.nil? or object==[] or o==object) }
+                                         (object.nil?    or object   ==[] or o==object) }
+
+      # Build results
       result = []
       result += matches.map {|t| t[0] } if subject.nil?
       result += matches.map {|t| t[1] } if predicate.nil?
       result += matches.map {|t| t[2] } if object.nil?
-      result.uniq
+      
+      # Return nodes, not IDs
+      result.uniq.map { |id| id.is_a?(Symbol) ? Node(id, self) : id }
     end
   end
 end

data/lib/lightrdf/id.rb

@@ -0,0 +1,47 @@
+module RDF
+  module ID
+    @count = 0
+    @ns = { :rdf  => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+            :rdfs => 'http://www.w3.org/2000/01/rdf-schema#',
+            :dc   => 'http://purl.org/dc/elements/1.1/',
+            :owl  => 'http://www.w3.org/2002/07/owl#' }
+    def self.ns;      @ns;      end
+    def self.count;   @count;   end
+    def self.count=c; @count=c; end
+
+    def self.bnode? id
+      id.to_s[0..0] == '_'
+    end
+    def self.uri? id
+      !bnode?(id)
+    end
+
+    def self.parse id, ns={}
+      if id.to_s[0..6]!='http://' and id.to_s[0..7]!='https://' and id.to_s[0..0]!='_' and id.to_s =~ /(\w+):(\w.*)/
+        :"#{RDF::ID.ns.merge(ns)[$1.to_sym]}#{$2}"
+      elsif id == '*' or !id
+        :"_:bnode#{@count+=1}"
+      else
+        id.to_sym
+      end
+    end
+  
+    def self.compress uri, ns={}
+      RDF::ID.ns.merge(ns).map.sort_by{|k,v| -v.to_s.size}.each do |k,v|
+        if uri.to_s.index(v) == 0
+          return "#{k}:#{uri.to_s[v.size..-1]}"
+        end
+      end
+      uri.to_s
+    end
+  end
+end
+
+# Shortcut to parse IDs
+def ID id, ns={}
+  RDF::ID.parse id, ns
+end
+# Shortcut to declare namespaces
+def Namespace prefix, uri
+  RDF::ID.ns[prefix.to_sym] = uri
+end

data/lib/lightrdf/node.rb

@@ -19,36 +19,36 @@ module RDF
       end
     end
   end
-
+  
   class Node < Hash
     include Parser
     attr_accessor :graph, :id
 
     def initialize id=nil, graph=nil
-      @id = ID::parse(id)
+      @id = ID(id)
       @graph = graph || Graph.new
       @graph << self
     end
 
     def method_missing method, *args
-      QURI.ns[method] ? NsProxy.new(method, self) : super
+      ID.ns[method] ? NsProxy.new(method, self) : super
     end
     def inspect; "<#{self.class} #{id} #{super}>"; end
-    def to_s; id.to_s; end
+    def to_s;   id.to_s; end
+    def to_sym; id;      end
 
     def [] name
-      self[Node(name)] = [] if super(Node(name)).nil?
-      super(Node(name)).map! {|n| n.is_a?(Node) ? @graph[n] : n}
+      ( super(ID(name)) || [] ).clone
     end
     def []= name, values
-      super(Node(name), [values].flatten.map { |node| node.is_a?(Node) ? @graph[node] : node })
+      super(ID(name), [values].flatten.map { |node| node.is_a?(Node) ? @graph[node] : node })
     end
 
-    def == b
-      eql? b
+    def == node
+      eql? node
     end
-    def eql? b
-      b.is_a?(Node) and self.id == b.id
+    def eql? node
+      self.class == node.class and self.id == node.id
     end
     def hash # Hack for Ruby 1.8.6
       id.hash ^ self.class.hash
@@ -59,7 +59,7 @@ module RDF
     end
 
     def triples
-      triples = []; each { |k, v| v.each { |o| triples << [self, Node(k), o] } }
+      triples = []; each { |p, v| v.each { |o| triples << [id, p, o.is_a?(Node) ? o.id : o] } }
       triples
     end
     
@@ -76,11 +76,11 @@ module RDF
     end
 
     def bnode?
-      id.is_a?(BNodeID)
+      ID.bnode?(id)
     end    
   end
 end
 
 def Node id, graph=nil
-  graph.nil? ? RDF::Node.new(id, graph) : graph[id]
+  graph ? graph[id] : RDF::Node.new(id)
 end

data/lib/lightrdf/parser.rb

@@ -11,9 +11,9 @@ module RDF
 
       case format.to_sym
       when :ntriples
-        triples.map { |s,p,o| "#{serialize_chunk_ntriples(s)} #{serialize_chunk_ntriples(p)} #{serialize_chunk_ntriples(o)} ." } * "\n"
+        triples.map { |s,p,o| "#{serialize_chunk_ntriples(s)} #{serialize_chunk_ntriples(p)} #{serialize_chunk_ntriples(o)} .\n" } * ''
       when :yarf
-        ns = respond_to?(:ns) ? QURI.ns.merge(self.ns) : QURI.ns
+        ns = respond_to?(:ns) ? ID.ns.merge(self.ns) : ID.ns
         if header
           (ns.map{|k,v| "#{k}: #{v}\n"} * '') + serialize_yarf(nodes, ns)
         else
@@ -26,7 +26,7 @@ module RDF
         stdout.read
       when :png
         dot = serialize(:dot)
-        ns = respond_to?(:ns) ? QURI.ns.merge(self.ns) : QURI.ns
+        ns = respond_to?(:ns) ? ID.ns.merge(self.ns) : ID.ns
         ns.each { |k,v| dot.gsub!(v, "#{k}:") }
         dot.gsub!(/label=\"\\n\\nModel:.*\)\";/, '')
         stdin, stdout, stderr = Open3.popen3("dot -o/dev/stdout -Tpng")
@@ -37,7 +37,7 @@ module RDF
         serialize(:'rdfxml-abbrev')
       else
         namespaces = if [:rdfxml, :'rdfxml-abbrev'].include?(format)
-          QURI.ns.map {|k,v| "-f 'xmlns:#{k}=#{v.inspect}'" } * " "
+          ID.ns.map {|k,v| "-f 'xmlns:#{k}=#{v.inspect}'" } * " "
         end
         tmpfile = File.join(Dir.tmpdir, "rapper#{$$}#{Thread.current.object_id}")
         File.open(tmpfile, 'w') { |f| f.write(serialize(:ntriples)) }
@@ -134,7 +134,7 @@ module RDF
       [i, relations]
     end
 
-    def serialize_yarf nodes, ns=QURI.ns, level=0, already_serialized=[]
+    def serialize_yarf nodes, ns=ID.ns, level=0, already_serialized=[]
       text = ""
 
       for node in nodes
@@ -148,7 +148,7 @@ module RDF
           text += ":\n"
           node.predicates.each do |p, o| # Predicate and object
             text += " " *(level+1)*2
-            text += p.id.compressed(ns)
+            text += ID.compress(p.id, ns)
             text += ":"
             if o.size == 1 and (already_serialized.include?(o.first) or !o.first.is_a?(Node) or o.first.triples.size==0)
               text += " " + serialize_chunk_yarf(o.first, ns)
@@ -162,7 +162,7 @@ module RDF
       text
     end
     
-    def serialize_chunk_yarf node, ns=QURI.ns
+    def serialize_chunk_yarf node, ns=ID.ns
       if node.is_a?(Node)
         if node.bnode?
           if node.graph.find(nil, [], node).size > 1 # Only use a bnode-id if it appears again as object
@@ -171,7 +171,7 @@ module RDF
             "*"
           end
         else
-          node.id.compressed ns
+          ID.compress(node.id, ns)
         end
       else
         ActiveSupport::JSON.encode(node)
@@ -202,8 +202,8 @@ module RDF
     end
 
     def serialize_chunk_ntriples n
-      if n.is_a? Node 
-        n.bnode? ? n.to_s : "<#{n}>"
+      if n.is_a? Symbol 
+        ID.bnode?(n) ? n.to_s : "<#{n}>"
       else
         ActiveSupport::JSON.encode(n)
       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.1.8'
+  VERSION = '0.1.9'
 end
 
 require 'rubygems'
@@ -16,7 +16,7 @@ require 'yaml'
 require 'monitor'
 require 'nokogiri'
 
-require "lightrdf/quri"
+require "lightrdf/id"
 require "lightrdf/parser"
 require "lightrdf/graph"
 require "lightrdf/node"

data/lightrdf.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightrdf}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-18}
   s.default_executable = %q{yarfp}
   s.description = %q{RDF library}
   s.email = %q{joseignacio.fernandez@gmail.com}
   s.executables = ["yarfp"]
-  s.extra_rdoc_files = ["README.rdoc", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/quri.rb"]
-  s.files = ["History.txt", "Manifest", "README.rdoc", "Rakefile", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/quri.rb", "test/test_helper.rb", "test/test_lightrdf.rb", "lightrdf.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/id.rb"]
+  s.files = ["History.txt", "Manifest", "README.rdoc", "Rakefile", "bin/yarfp", "lib/lightrdf.rb", "lib/lightrdf/graph.rb", "lib/lightrdf/node.rb", "lib/lightrdf/parser.rb", "lib/lightrdf/repository.rb", "lib/lightrdf/id.rb", "test/test_helper.rb", "test/test_lightrdf.rb", "lightrdf.gemspec"]
   s.homepage = %q{http://github.com/josei/lighrdf}
   s.post_install_message = %q{**Remember to install raptor RDF tools and (optionally for RDF PNG output) Graphviz**}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Lightrdf", "--main", "README.rdoc"]

data/test/test_lightrdf.rb

@@ -14,14 +14,19 @@ class TestLightRDF < Test::Unit::TestCase
    assert Node('_:2') == Node('_:2')
   end
 
-  def test_type
-    assert ID('rdf:type').is_a?(RDF::ID)
-    assert ID('_:bnode').is_a?(RDF::ID)
-    assert ID('http://www.google.com').is_a?(RDF::ID)
-    assert URI.parse('http://www.google.com').is_a?(RDF::ID)
-    assert ID('*').is_a?(RDF::ID)
+  def test_ids
+    assert ID('rdf:type') == :'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'
+    assert ID('_:bnode') == :'_:bnode'
+    assert ID('http://www.google.com') == :'http://www.google.com'
   end
 
+  def test_type
+    assert RDF::ID.uri?(ID('rdf:type'))
+    assert RDF::ID.uri?(ID('http://www.google.com'))
+    assert RDF::ID.bnode?(ID('*'))
+    assert RDF::ID.bnode?(ID('_:bnode'))
+  end
+  
   def test_random_node
     assert Node(nil).is_a?(RDF::Node)
   end
@@ -58,14 +63,14 @@ class TestLightRDF < Test::Unit::TestCase
     g << a
     g << b
 
-    assert_equal 1, g.find(nil, Node('foaf:age'), "22").size
-    assert_equal 2, g.find(Node('ex:bob'), nil, []).size
+    assert_equal [Node('ex:alice')], g.find(nil, Node('foaf:age'), "22")
+    assert_equal [Node('foaf:age'), Node('foaf:name')], g.find(Node('ex:bob'), nil, []).sort_by {|node| node.to_s}
   end
 
   def test_addition
     a = Node('ex:bob')
     a.foaf::weblog = Node('http://www.awesomeweblogfordummies.com')
-    a.foaf::weblog << Node('http://www.anotherawesomeweblogfordummies.com')
+    a.foaf::weblog += [Node('http://www.anotherawesomeweblogfordummies.com')]
     assert_equal 2, a.foaf::weblog.size
     assert a.foaf::weblog?(Node('http://www.awesomeweblogfordummies.com'))
   end
@@ -108,7 +113,6 @@ foaf: http://xmlns.com/foaf/0.1/
   end
 
   def test_parsing_raptor
-    # Very naive testing -- it only helps to check that rapper is being executed
     assert RDF::Parser.parse(:rdf, open('http://planetrdf.com/guide/rss.rdf').read).serialize(:ntriples).split("\n").size > 10
   end
 
@@ -123,6 +127,20 @@ foaf: http://xmlns.com/foaf/0.1/
     assert 2, g.to_ntriples.split("\n").size
   end
 
+  def test_serialization_raptor
+    a = Node('ex:bob')
+    a.foaf::name   = "Bob"
+    a.foaf::age    = "23"
+    a.ex::location = Node(nil)
+
+    g = RDF::Graph.new
+    g << a
+
+    assert_equal 3, RDF::Parser.parse(:yarf,   g.serialize(:yarf)  ).triples.size
+    assert_equal 3, RDF::Parser.parse(:rdfxml, g.serialize(:rdfxml)).triples.size
+    assert_equal 3, RDF::Parser.parse(:rdf,    g.serialize(:rdf)   ).triples.size
+  end
+  
   def test_repository
     repository = RDF::Repository.new
     triple = [Node("http://testuri.org"), Node('rdf:type'), Node('rdf:Class')]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ extra_rdoc_files:
 - lib/lightrdf/node.rb
 - lib/lightrdf/parser.rb
 - lib/lightrdf/repository.rb
-- lib/lightrdf/quri.rb
+- lib/lightrdf/id.rb
 files: 
 - History.txt
 - Manifest
@@ -85,7 +85,7 @@ files:
 - lib/lightrdf/node.rb
 - lib/lightrdf/parser.rb
 - lib/lightrdf/repository.rb
-- lib/lightrdf/quri.rb
+- lib/lightrdf/id.rb
 - test/test_helper.rb
 - test/test_lightrdf.rb
 - lightrdf.gemspec

data/lib/lightrdf/quri.rb

@@ -1,81 +0,0 @@
-module RDF
-  module QURI
-    @ns = { :rdf  => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-            :rdfs => 'http://www.w3.org/2000/01/rdf-schema#',
-            :dc   => 'http://purl.org/dc/elements/1.1/',
-            :owl  => 'http://www.w3.org/2002/07/owl#' }
-    def self.ns; @ns; end
-
-    def self.parse uri, ns={}
-      URI.parse( (uri.to_s =~ /(\w+):(.*)/ and uri.to_s[0..6]!='http://' and uri.to_s[0..7]!='https://') ?
-                  "#{QURI.ns.merge(ns)[$1.to_sym]}#{$2}" :
-                  uri.to_s )
-    end
-
-    def self.compress uri, ns={}
-      QURI.ns.merge(ns).map.sort_by{|k,v| -v.to_s.size}.each do |k,v|
-        if uri.to_s.index(v) == 0
-          return "#{k}:#{uri.to_s[v.size..-1]}"
-        end
-      end
-      uri.to_s
-    end
-  end
-
-  module ID
-    def self.ns; QURI.ns; end
-
-    def compressed ns={}
-      RDF::ID.compress self, ns
-    end
-
-    def self.compress id, ns={}
-      bnode?(id) ? id.to_s : RDF::QURI.compress(id, ns)
-    end
-
-    def self.parse id, ns={}
-      bnode?(id) ? RDF::BNodeID.parse(id) : RDF::QURI.parse(id, ns)
-    end
-
-    def self.bnode?(id)
-      id.nil? or id == '*' or id.to_s[0..0] == '_'
-    end
-  end
-
-  class BNodeID
-    include RDF::ID
-    @count = 0
-    def self.count; @count; end
-    def self.count=c; @count=c; end
-
-    attr_reader :id
-    def initialize id=nil
-      @id = (id || "_:bnode#{RDF::BNodeID.count+=1}").to_s
-    end
-    def self.parse id
-      new(id=='*' ? nil : id)
-    end
-    def to_s; id.to_s; end
-
-    def == b
-      eql? b
-    end
-    def eql? b
-      b.is_a?(BNodeID) and self.id == b.id
-    end
-    def hash # Hack for Ruby 1.8.6
-      id.hash + self.class.hash
-    end
-  end
-end
-
-class URI::Generic
-  include RDF::ID # URIs are RDF IDs
-end
-
-def ID uri, ns={} # Shortcut to parse IDs
-  RDF::ID.parse uri, ns
-end
-def Namespace prefix, uri
-  RDF::QURI.ns[prefix.to_sym] = uri
-end