activerdf_rdflite 1.2.2 → 1.2.3

data/CHANGELOG

@@ -0,0 +1,17 @@
+== activerdf_rdflite (1.2.3) Tue, 13 Feb 2007 20:07:01 +0000
+  * gems published automatically from Rakefile 
+  * changing rapper invocation in fetching adapter
+  * prevent failing unit tests if ferret not installed
+  * bumped dependency of sqlite
+
+== activerdf_rdflite (1.2.2)
+  * use same bnode function in rdflite.load (same bnodes from one file get same uri)
+
+== activerdf_rdflite (1.2.1)
+  * bugfix in multijoins
+
+== activerdf_rdflite (1.2)
+  * speed up rdflite.load using precompiled SQL
+
+== activerdf_rdflite (1.1)
+  * added rdfs:subPropertyOf reasoning

data/lib/activerdf_rdflite/fetching.rb

@@ -4,17 +4,16 @@
 
 # FetchingAdapter is an extension to rdflite for fetching RDF from online sources.
 class FetchingAdapter < RDFLite
-  ConnectionPool.register_adapter(:fetching,self)
+  ConnectionPool.register_adapter(:fetching, self)
+
+	# TODO: check that rapper is installed
 
 	# fetches RDF/XML data from given url and adds it to the datastore, using the 
 	# source url as context identifier.
   def fetch url
+    # check if url starts with http://
 		return unless url.match(/http:\/\/(.*)/)
 
-		# remove fragment identifier from url
-		hashidx = url.rindex('#')
-		url = url[0..url.rindex('#')-1] unless hashidx.nil?
-
 		$activerdflog.debug "fetching from #{url}"
 
 		#model = Redland::Model.new
@@ -33,17 +32,3 @@ 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,7 +5,7 @@
 require 'sqlite3'
 require 'active_rdf'
 require 'federation/connection_pool'
-require_gem 'uuidtools'
+require 'uuidtools'
 
 $activerdflog.info "loading RDFLite adapter"
 
@@ -35,7 +35,7 @@ class RDFLite < ActiveRdfAdapter
 
 		@reads = true
 		@writes = true
-	
+
 		# if no file-location given, we use in-memory store
 		file = params[:location] || ':memory:'
 		@db = SQLite3::Database.new(file) 
@@ -53,7 +53,7 @@ class RDFLite < ActiveRdfAdapter
 			# we setup the fields not to store object's contents
 			infos.add_field(:subject, :store => :yes, :index => :no, :term_vector => :no)
 			infos.add_field(:object, :store => :no) #, :index => :omit_norms)
-			
+
 			@ferret = if params[:location]
 									Ferret::I.new(:path => params[:location] + '.ferret', :field_infos => infos)
 								else
@@ -96,15 +96,15 @@ class RDFLite < ActiveRdfAdapter
 		# 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)
+		# construct where clause for deletion (for all non-nil input)
 		where_clauses = []
 		conditions = []		
-    quad.each_with_index do |r,i|
-      unless r.nil?
-			 conditions << r
-			 where_clauses << "#{SPOC[i]} = ?"
-		  end
-    end
+		quad.each_with_index do |r,i|
+			unless r.nil?
+				conditions << r
+				where_clauses << "#{SPOC[i]} = ?"
+			end
+		end
 
 		# construct delete string
 		ds = 'delete from triple'
@@ -122,7 +122,7 @@ class RDFLite < ActiveRdfAdapter
 
 		@db
 	end
-	
+
 	# adds triple(s,p,o) to datastore
 	# s,p must be resources, o can be primitive data or resource
 	def add(s,p,o,c=nil)

data/test/test_fetching.rb

@@ -0,0 +1,33 @@
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006
+# License:: LGPL
+
+require 'rubygems'
+require 'test/unit'
+require 'active_rdf'
+
+class TestFetchingAdapter < Test::Unit::TestCase
+  def setup
+    ConnectionPool.clear
+    @adapter = ConnectionPool.add(:type => :fetching)
+  end
+
+  def teardown
+  end
+
+  def test_parse_foaf    
+    @adapter.fetch("http://eyaloren.org/foaf.rdf#me")
+    assert @adapter.size > 0
+  end
+  
+  def test_sioc_schema
+    @adapter.fetch("http://rdfs.org/sioc/ns#")
+    assert_equal 461, @adapter.size 
+  end
+    
+  def test_foaf_schema
+    @adapter.fetch("http://xmlns.com/foaf/0.1/")
+    # foaf contains 563 triples but with two duplicates
+    assert_equal 561, @adapter.size    
+  end
+end

data/test/test_rdflite.rb

@@ -19,7 +19,8 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
   def test_registration
     adapter = ConnectionPool.add_data_source(:type => :rdflite)
 		assert_instance_of RDFLite, adapter
-		assert adapter.keyword_search?
+		# we cant garantuee that the rdflite adapter can do keyword search
+		# assert adapter.keyword_search?
 	end
 
 	def test_initialise
@@ -190,9 +191,13 @@ 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(: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)
+    
+    # we cant garantuee that ferret is installed
+    if adapter.keyword_search?
+  		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
 	end
 
 	def test_bnodes

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf_rdflite
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-01-30 00:00:00 +00:00
+  version: 1.2.3
+date: 2007-02-13 00:00:00 +00:00
 summary: an RDF database for usage in ActiveRDF (based on sqlite3)
 require_paths: 
 - lib
@@ -31,14 +31,15 @@ authors:
 files: 
 - LICENSE
 - README
-- Rakefile
-- test/test_rdflite.rb
-- test/test_data.nt
+- CHANGELOG
 - test/test_bnode_data.nt
+- test/test_data.nt
+- test/test_fetching.rb
+- test/test_rdflite.rb
 - lib/activerdf_rdflite
+- lib/activerdf_rdflite/fetching.rb
 - lib/activerdf_rdflite/init.rb
 - lib/activerdf_rdflite/rdflite.rb
-- lib/activerdf_rdflite/fetching.rb
 - lib/activerdf_rdflite/suggesting.rb
 test_files: []
 
@@ -87,5 +88,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0.1
+        version: 1.2.1
     version: 

data/Rakefile

@@ -1,45 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require '../tools/rakehelp'
-require 'fileutils'
-include FileUtils
-
-setup_tests
-setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
-
-desc "test and package gem"
-task :default => [:test, :package]
-
-# get @VERSION from commandline
-@VERSION =  '1.2.2'
-NAME="activerdf_rdflite"
-GEMNAME="#{NAME}-#{@VERSION}.gem"
-
-# define package task
-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('uuidtools')
-  spec.add_dependency('activerdf', '>= 1.2')
-  spec.add_dependency('sqlite3-ruby', '>= 1.1.0.1')
-end
-
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{name}-#{version}.gem}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{name}}
-end
-
-task :reinstall => [:uninstall, :install]
-
-task :upload => :package do |task|
-  sh "scp pkg/#{GEMNAME} eyal@activerdf.org:/home/eyal/webs/activerdf/gems/"
-end
-