activerdf_rdflite 1.1 → 1.2

data/Rakefile

@@ -13,19 +13,20 @@ setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "test and package gem"
 task :default => [:test, :package]
 
-# get ActiveRdfVersion from commandline
-ActiveRdfVersion = ENV['REL'] || '1.0'
+# get VERSION from commandline
+VERSION =  '1.2'
 NAME="activerdf_rdflite"
-GEMNAME="#{NAME}-#{ActiveRdfVersion}.gem"
+GEMNAME="#{NAME}-#{VERSION}.gem"
 
 # define package task
-setup_gem(NAME,ActiveRdfVersion) do |spec|
+setup_gem(NAME,VERSION) do |spec|
   spec.summary = "an RDF database for usage in ActiveRDF (based on sqlite3)" 
   spec.description = spec.summary
   spec.author="Eyal Oren <eyal.oren@deri.org"
   spec.add_dependency('gem_plugin', '>= 0.2.1')
-  spec.add_dependency('activerdf', '>= 0.9.2')
-  spec.add_dependency('sqlite3-ruby', '>= 1.1.0')
+  spec.add_dependency('uuidtools')
+  spec.add_dependency('activerdf', '>= 1.2')
+  spec.add_dependency('sqlite3-ruby', '>= 1.1.0.1')
 end
 
 task :install => [:package] do
@@ -39,6 +40,6 @@ end
 task :reinstall => [:uninstall, :install]
 
 task :upload => :package do |task|
-  sh "scp pkg/#{GEMNAME} eyal@m3pe.org:/home/eyal/webs/activerdf/gems/"
+  sh "scp pkg/#{GEMNAME} eyal@activerdf.org:/home/eyal/webs/activerdf/gems/"
 end
 

data/lib/activerdf_rdflite/fetching.rb

@@ -1,16 +1,8 @@
-#class String
-#  alias _match match
-#  def match(*args)
-#    m = _match(args.first)
-#    if m && m.length > 1
-#      args[1..-1].each_with_index do |name, index|
-#        m.instance_eval "def #{name}; self[#{index+1}] end"
-#      end
-#    end
-#    m
-#  end
-#end
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006 Eyal Oren
+# License:: LGPL
 
+# FetchingAdapter is an extension to rdflite for fetching RDF from online sources.
 class FetchingAdapter < RDFLite
   ConnectionPool.register_adapter(:fetching,self)
 
@@ -41,3 +33,17 @@ class FetchingAdapter < RDFLite
 		add_ntriples(triples, context)
   end
 end
+
+#class String
+#  alias _match match
+#  def match(*args)
+#    m = _match(args.first)
+#    if m && m.length > 1
+#      args[1..-1].each_with_index do |name, index|
+#        m.instance_eval "def #{name}; self[#{index+1}] end"
+#      end
+#    end
+#    m
+#  end
+#end
+

data/lib/activerdf_rdflite/rdflite.rb

@@ -5,6 +5,7 @@
 require 'sqlite3'
 require 'active_rdf'
 require 'federation/connection_pool'
+require_gem 'uuidtools'
 
 $activerdflog.info "loading RDFLite adapter"
 
@@ -91,9 +92,9 @@ class RDFLite < ActiveRdfAdapter
 	# symbol parameters match anything: delete(:s,:p,:o) will delete all triples
 	# you can specify a context to limit deletion to that context: 
 	# delete(:s,:p,:o, 'http://context') will delete all triples with that context
-	def delete(s,p,o,c=nil)
-		# convert input to internal format
-		quad = [s,p,o,c].collect {|r| internalise(r) }
+	def delete(s, p, o, c=nil)
+		# convert non-nil input to internal format
+		quad = [s,p,o,c].collect {|r| r.nil? ? nil : internalise(r) }
 
     # construct where clause for deletion (for all non-nil input)
 		where_clauses = []
@@ -132,8 +133,11 @@ class RDFLite < ActiveRdfAdapter
 		# get internal representation (array)
 		quad = [s,p,o,c].collect {|r| internalise(r) }
 
-		# add triple to database
-		add_internal(@db,*quad)
+		# insert the triple into the datastore
+		@db.execute('insert into triple values (?,?,?,?)', *quad)
+
+		# if keyword-search available, insert the object into keyword search
+		@ferret << {:subject => s, :object => o} if keyword_search?
 	end
 
 	# flushes openstanding changes to underlying sqlite3
@@ -148,48 +152,48 @@ class RDFLite < ActiveRdfAdapter
 		ntriples = File.readlines(file)
 		$activerdflog.debug "read #{ntriples.size} triples from file #{file}"
 
-		context = "<file:#{file}>"
-		add_ntriples(ntriples, context)
-	end
-
-	# adds string of ntriples from given context to database
-	def add_ntriples(ntriples, context=nil)
-		# convert context to internal format if RDFS::Resource
-		context = internalise(context)
+		# use filename as context
+		context = internalise(RDFS::Resource.new("file:#{file}"))
 
 		# need unique identifier for this batch of triples (to detect occurence of 
 		# same bnodes _:#1
-		uuid = `uuidgen`
+		uuid = UUID.random_create.to_s
 
 		# add each triple to db
-		@db.transaction do |tr|
-			ntriples.each do |triple|
-				nodes = triple.scan(Node)
-
-				# handle bnodes if necessary (bnodes need to have uri generated)
-				subject = case nodes[0]
-									when BNode
-										"<http://www.activerdf.org/bnode/#$1/#{uuid}>"
-									else
-										nodes[0]
-									end
-
-				predicate = nodes[1]
-
-				# handle bnodes and literals if necessary (literals need unicode fixing)
-				object = case nodes[2]
-								 when BNode
-									 "<http://www.activerdf.org/bnode/#$1/#{uuid}>"
-								 when Literal
-									 fix_unicode(nodes[2])
-								 else
-									 nodes[2]
-								 end
-
-				add_internal(tr, subject, predicate, object, context)
-			end
+		@db.transaction
+		insert = @db.prepare('insert into triple values (?,?,?,?);')
+
+		ntriples.each do |triple|
+			nodes = triple.scan(Node)
+
+			# handle bnodes if necessary (bnodes need to have uri generated)
+			subject = case nodes[0]
+								when BNode
+									"<http://www.activerdf.org/bnode/#{uuid}/#$1>"
+								else
+									nodes[0]
+								end
+
+			predicate = nodes[1]
+
+			# handle bnodes and literals if necessary (literals need unicode fixing)
+			object = case nodes[2]
+							 when BNode
+								 "<http://www.activerdf.org/bnode/#$1/#{uuid}>"
+							 when Literal
+								 fix_unicode(nodes[2])
+							 else
+								 nodes[2]
+							 end
+
+			# insert triple into database
+			insert.execute(subject, predicate, object, context)
+
+			# if keyword-search available, insert the object into keyword search
+			@ferret << {:subject => subject, :object => object} if keyword_search?
 		end
 
+		@db.commit
 		@db
 	end
 
@@ -200,9 +204,6 @@ class RDFLite < ActiveRdfAdapter
 
 		# executing query, passing all where-clause values as parameters (so that 
 		# sqlite will encode quotes correctly)
-		#constraints = right_hand_sides.collect { |value| value.to_s }
-
-		# executing query
 		results = @db.execute(sql, *conditions)
 
 		# if ASK query, we check whether we received a positive result count
@@ -230,16 +231,6 @@ class RDFLite < ActiveRdfAdapter
 	Node = Regexp.union(/_:\S*/,/<[^>]*>/,/"[^"]*"/)
 	SPOC = ['s','p','o','c']
 
-	# adds s,p,o into sqlite and ferret
-	# s,p,o should be in internal format: <uri> and "literal"
-	def add_internal(db, s, p, o, c)
-		# insert the triple into the datastore
-		db.execute('insert into triple values (?,?,?,?)', s,p,o,c)
-
-		# if keyword-search available, insert the object into keyword search
-		@ferret << {:subject => s, :object => o} if keyword_search?
-	end
-
 	# construct select clause
 	def construct_select(query)
 		# ASK queries counts the results, and return true if results > 0
@@ -375,7 +366,7 @@ class RDFLite < ActiveRdfAdapter
 			raise ActiveRdfError, "where clause #{clause} is not a triple" unless clause.is_a?(Array)
 			clause.each_with_index do |subclause, i|
 				# dont add where clause for variables
-				unless subclause.is_a?(Symbol)
+				unless subclause.is_a?(Symbol) || subclause.nil?
 					conditions = compute_where_condition(i, subclause, query.reasoning? && reasoning?)
 					if conditions.size == 1
 						where << "t#{level}.#{SPOC[i]} = ?"

data/lib/activerdf_rdflite/suggesting.rb

@@ -1,9 +1,20 @@
-require 'pp'
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006 Eyal Oren
+# License:: LGPL
+
+# The SuggestingAdapter is an extension to rdflite that can recommand
+# additional predicates for a given resource, based on usage statistics in the
+# whole dataset. E.g. given a dataset with FOAF data, one can ask a suggestion
+# for a person and get a recommendation for this person to also use
+# foaf:birthday. You can use this adapter in any collaborative editing setting:
+# it leads the community to converge on terminology (everybody will use the
+# same foaf:birthday to define somebody's birthday).
 class SuggestingAdapter < FetchingAdapter
   ConnectionPool.register_adapter(:suggesting,self)
 
 	alias _old_initialize initialize
 	
+	# initialises the adapter, see RDFLite for description of possible parameters.
 	def initialize params
 		_old_initialize(params)
 		@db.execute('drop view if exists occurrence')
@@ -13,6 +24,7 @@ class SuggestingAdapter < FetchingAdapter
 		@db.execute('create view cooccurrence as select t0.p as p1,t1.p as p2, count(distinct t0.s) as count from triple as t0 join triple as t1 on t0.s=t1.s and t0.p!=t1.p group by t0.p, t1.p')
 	end
 
+  # suggests additional predicates that might be applicable for the given resource
 	def suggest(resource)
 		$activerdflog.debug "starting suggestions for #{size} triples"
 		time = Time.now
@@ -29,6 +41,7 @@ class SuggestingAdapter < FetchingAdapter
 
 		# fetch all predicates co-occurring with our predicates
 		candidates = predicates.collect {|p| cooccurring(p) }
+		return nil if candidates.empty?
 
 		# perform set intersection
 		candidates = candidates.inject {|intersect, n| intersect & n }.flatten
@@ -44,6 +57,7 @@ class SuggestingAdapter < FetchingAdapter
 		suggestions
 	end
 
+	private
 	def construct_occurrence_matrix
 		@occurrence = {}
 		@db.execute('select * from occurrence where count > 1') do |p,count|

data/test/test_bnode_data.nt

@@ -0,0 +1,5 @@
+_:1  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://activerdf.org/test/Person> .
+_:1  <http://activerdf.org/test/age> "27" .
+_:1  <http://activerdf.org/test/name> "Eyal Oren" .
+_:2  <http://activerdf.org/test/age> "27" .
+_:2  <http://activerdf.org/test/eye> "blue" .

data/test/test_rdflite.rb

@@ -19,6 +19,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
   def test_registration
     adapter = ConnectionPool.add_data_source(:type => :rdflite)
 		assert_instance_of RDFLite, adapter
+		assert adapter.keyword_search?
 	end
 
 	def test_initialise
@@ -48,7 +49,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 
     adapter.add(eyal, age, test)
 
-    result = Query.new.distinct(:s).where(:s, :p, :o).execute
+    result = Query.new.distinct(:s).where(:s, :p, :o).execute(:flatten => true)
     assert_instance_of RDFS::Resource, result
     assert_equal 'eyaloren.org', result.uri
   end
@@ -66,7 +67,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
     adapter2.add(eyal, age, test2)
 
     # assert only one distinct subject is found (same one in both adapters)
-    assert_equal 1, Query.new.distinct(:s).where(:s, :p, :o).execute(:flatten=>false).size
+    assert_equal 1, Query.new.distinct(:s).where(:s, :p, :o).execute.size
 
     # assert two distinct objects are found
     results = Query.new.distinct(:o).where(:s, :p, :o).execute
@@ -83,7 +84,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
     test = RDFS::Resource.new 'test'
 
     adapter.add(eyal, age, test)
-    Query.new.select(:s,:p).where(:s,:p,:o).execute do |s,p|
+    Query.new.select(:s,:p).where(:s,:p,:o).execute(:flatten => false) do |s,p|
       assert_equal 'eyaloren.org', s.uri
       assert_equal 'foaf:age', p.uri
     end
@@ -95,6 +96,24 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		assert_equal 32, adapter.size
 	end
 
+	def test_load_bnodes
+    adapter = ConnectionPool.add_data_source :type => :rdflite
+		adapter.load(File.dirname(File.expand_path(__FILE__)) + '/test_bnode_data.nt')
+
+		# loaded five triples in total
+		assert_equal 5, adapter.size
+
+		# triples contain two distinct bnodes
+		assert_equal 2, Query.new.count.distinct(:s).where(:s,:p,:o).execute
+
+		# collecting the bnodes
+		bnodes = Query.new.distinct(:s).where(:s,:p,:o).execute
+		# assert that _:#1 occurs in three triples
+		assert_equal 3, Query.new.select(:p,:o).where(bnodes[0], :p, :o).execute.size
+		# assert that _:#2 occurs in two triples
+		assert_equal 2, Query.new.select(:p,:o).where(bnodes[1], :p, :o).execute.size
+	end
+
 	def test_count_query
     adapter = ConnectionPool.add_data_source :type => :rdflite
 		adapter.load(File.dirname(File.expand_path(__FILE__)) + '/test_data.nt')
@@ -107,7 +126,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		file = File.dirname(File.expand_path(__FILE__)) + '/test_data.nt'
 		adapter.load(file)
 
-		context = Query.new.distinct(:c).where(:s,:p,:o,:c).execute
+		context = Query.new.distinct(:c).where(:s,:p,:o,:c).execute(:flatten => true)
 		assert_instance_of RDFS::Resource, context
 		assert_equal RDFS::Resource.new("file:#{file}"), context
 	end
@@ -127,8 +146,8 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		assert_equal file_context, context[0]
 		assert_equal '', context[1]
 
-		n1 = Query.new.distinct(:s).where(:s,:p,:o,'').execute(:flatten => false)
-		n2 = Query.new.distinct(:s).where(:s,:p,:o,file_context).execute(:flatten => false)
+		n1 = Query.new.distinct(:s).where(:s, :p, :o, '').execute
+		n2 = Query.new.distinct(:s).where(:s, :p, :o, file_context).execute
 		assert_equal 1, n1.size
 		assert_equal 9, n2.size
 	end
@@ -144,7 +163,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
     type = Namespace.lookup(:rdf, :type)
     resource = Namespace.lookup(:rdfs,:resource)
 
-    color = Query.new.select(:o).where(eyal, eye,:o).execute
+    color = Query.new.select(:o).where(eyal, eye,:o).execute(:flatten => true)
     assert 'blue', color
     assert_instance_of String, color
 
@@ -162,7 +181,7 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		adapter.delete(eyal, nil, nil)
 		assert_equal 27, adapter.size
 
-		adapter.delete(nil,nil,nil)
+		adapter.delete(nil, nil, nil)
 		assert_equal 0, adapter.size
 	end
 
@@ -171,9 +190,9 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		adapter.load(File.dirname(File.expand_path(__FILE__)) + '/test_data.nt')
 
     eyal = RDFS::Resource.new('http://activerdf.org/test/eyal')
-		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"blue").execute
-		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"27").execute
-		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"eyal oren").execute
+		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"blue").execute(:flatten => true)
+		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"27").execute(:flatten => true)
+		assert_equal eyal, Query.new.distinct(:s).where(:s,:keyword,"eyal oren").execute(:flatten => true)
 	end
 
 	def test_bnodes

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerdf_rdflite
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-12-08 00:00:00 +00:00
+  version: "1.2"
+date: 2006-12-21 00:00:00 +01:00
 summary: an RDF database for usage in ActiveRDF (based on sqlite3)
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - Rakefile
 - test/test_rdflite.rb
 - test/test_data.nt
+- test/test_bnode_data.nt
 - lib/activerdf_rdflite
 - lib/activerdf_rdflite/init.rb
 - lib/activerdf_rdflite/rdflite.rb
@@ -61,6 +62,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activerdf
   version_requirement: 
@@ -68,7 +78,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: "1.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -77,5 +87,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.1.0.1
     version: