activerdf_redland 1.1 → 1.2

data/CHANGELOG

@@ -0,0 +1,2 @@
+== activerdf_redland (1.2) Mon, 05 Mar 2007 20:40:55 +0000
+  * added loading from remote URL (Benno Blumenthal)

data/lib/activerdf_redland/redland.rb

@@ -14,8 +14,6 @@ class RedlandAdapter < ActiveRdfAdapter
 	
 	# instantiate connection to Redland database
 	def initialize(params = {})
-
-    # TODO: check if the given file exists, or at least look for an exception from redland
 		if params[:location] and params[:location] != :memory
 			# setup file locations for redland database
 			path, file = File.split(params[:location])
@@ -27,42 +25,52 @@ class RedlandAdapter < ActiveRdfAdapter
 		
 		$activerdflog.info "RedlandAdapter: initializing with type: #{type} file: #{file} path: #{path}"
 		
-		@store = Redland::HashStore.new(type, file, path, false)
-		@model = Redland::Model.new @store
-
-		@reads = true
-		@writes = true
+		begin
+			@store = Redland::HashStore.new(type, file, path, false)
+			@model = Redland::Model.new @store
+			@reads = true
+			@writes = true
+		rescue Redland::RedlandError => e
+			raise ActiveRdfError, "could not initialise Redland database: #{e.message}"
+		end
 	end	
 	
 	# load a file from the given location with the given syntax into the model.
 	# use Redland syntax strings, e.g. "ntriples" or "rdfxml", defaults to "ntriples"
 	def load(location, syntax="ntriples")
-    $activerdflog.debug "Redland: loading file with syntax: #{syntax} and location: #{location}" if $activerdflog.level == Logger::DEBUG
     parser = Redland::Parser.new(syntax, "", nil)
-    parser.parse_into_model(@model, "file:#{location}")
+    if location =~ /^http/
+      parser.parse_into_model(@model, location)
+    else
+      parser.parse_into_model(@model, "file:#{location}")
+    end
 	end
 
 	# yields query results (as many as requested in select clauses) executed on data source
 	def query(query)
 		qs = Query2SPARQL.translate(query)
-    $activerdflog.debug "RedlandAdapter: executing SPARQL query #{qs}" if $activerdflog.level == Logger::DEBUG
+    $activerdflog.debug "RedlandAdapter: executing SPARQL query #{qs}"
 		
 		clauses = query.select_clauses.size
 		redland_query = Redland::Query.new(qs, 'sparql')
 		query_results = @model.query_execute(redland_query)
+
+		# return Redland's answer without parsing if ASK query
+		return [[query_results.get_boolean?]] if query.ask?
 		
-		$activerdflog.debug "RedlandAdapter: found #{query_results.size} query results" if $activerdflog.level == Logger::DEBUG
+		$activerdflog.debug "RedlandAdapter: found #{query_results.size} query results"
 
 		# verify if the query has failed
 		if query_results.nil?
-		  $activerdflog.debug "RedlandAdapter: query has failed with nil result" if $activerdflog.level == Logger::DEBUG
+		  $activerdflog.debug "RedlandAdapter: query has failed with nil result"
 		  return false
 		end
 		if not query_results.is_bindings?
-		  $activerdflog.debug "RedlandAdapter: query has failed without bindings" if $activerdflog.level == Logger::DEBUG
+		  $activerdflog.debug "RedlandAdapter: query has failed without bindings"
 		  return false
 		end
 
+
 		# convert the result to array
 		#TODO: if block is given we should not parse all results into array first
 		results = query_result_to_array(query_results) 
@@ -109,16 +117,16 @@ class RedlandAdapter < ActiveRdfAdapter
 	
 	# add triple to datamodel
 	def add(s, p, o)
-    $activerdflog.debug "adding triple #{s} #{p} #{o}" if $activerdflog.level == Logger::DEBUG
+    $activerdflog.debug "adding triple #{s} #{p} #{o}"
 
 		# verify input
 		if s.nil? || p.nil? || o.nil?
-      $activerdflog.debug "cannot add triple with empty subject, exiting" if $activerdflog.level == Logger::DEBUG
+      $activerdflog.debug "cannot add triple with empty subject, exiting"
 		  return false
 		end 
 		
 		unless s.respond_to?(:uri) && p.respond_to?(:uri)
-      $activerdflog.debug "cannot add triple where s/p are not resources, exiting"		 if $activerdflog.level == Logger::DEBUG
+      $activerdflog.debug "cannot add triple where s/p are not resources, exiting"
 		  return false
 		end
 	
@@ -145,20 +153,22 @@ class RedlandAdapter < ActiveRdfAdapter
 		Redland::librdf_model_sync(@model.model).nil?
 	end
 	alias flush save
+
+	# returns all triples in the datastore
+	def dump
+		Redland.librdf_model_to_string(@model.model, nil, 'ntriples')
+	end
 	
 	# returns size of datasources as number of triples
-	#
 	# warning: expensive method as it iterates through all statements
 	def size
 		# we cannot use @model.size, because redland does not allow counting of 
 		# file-based models (@model.size raises an error if used on a file)
-		
 		# instead, we just dump all triples, and count them
-		stats = []
-    @model.statements{|s,p,o| stats << [s,p,o]}
-		stats.size
+    @model.triples.size
 	end
 	
+	private
 	################ helper methods ####################
 	#TODO: if block is given we should not parse all results into array first
 	def query_result_to_array(query_results)

data/test/test_redland_adapter.rb

@@ -34,7 +34,7 @@ class TestRedlandAdapter < Test::Unit::TestCase
     test = RDFS::Resource.new 'test'
 
     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)
 
     assert_instance_of RDFS::Resource, result
     assert_equal 'eyaloren.org', result.uri
@@ -53,7 +53,7 @@ class TestRedlandAdapter < 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
@@ -84,6 +84,12 @@ class TestRedlandAdapter < Test::Unit::TestCase
     assert_equal 28, adapter.size  
   end
 
+  def test_remote_load
+    adapter = ConnectionPool.add_data_source :type => :redland
+    adapter.load('http://www.eyaloren.org/foaf.rdf', 'rdfxml')
+    assert_equal 39, adapter.size
+  end
+
   def test_person_data
     ConnectionPool.add_data_source :type => :redland, :location => 'test/test-person'
     Namespace.register(:test, 'http://activerdf.org/test/')
@@ -116,7 +122,7 @@ class TestRedlandAdapter < 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
@@ -151,9 +157,7 @@ class TestRedlandAdapter < Test::Unit::TestCase
     type = Namespace.lookup(:rdf, :type)
     resource = Namespace.lookup(:rdfs,:resource)
 
-    color = Query.new.select(:o).where(eyal, eye,:o).execute
-    assert_equal 'blue', color
-    assert_instance_of String, color
+    assert_equal 'blue', eyal.test::eye
 
     ObjectManager.construct_classes
     assert eyal.instance_of?(TEST::Person)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf_redland
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-12-08 00:00:00 +00:00
+  version: "1.2"
+date: 2007-03-05 00:00:00 +00:00
 summary: ActiveRDF adapter to Redland RDF store
 require_paths: 
 - lib
@@ -31,12 +31,12 @@ authors:
 files: 
 - LICENSE
 - README
-- Rakefile
-- test/test_redland_adapter.rb
+- CHANGELOG
 - test/test_person_data.nt
+- test/test_redland_adapter.rb
 - lib/activerdf_redland
-- lib/activerdf_redland/redland.rb
 - lib/activerdf_redland/init.rb
+- lib/activerdf_redland/redland.rb
 test_files: []
 
 rdoc_options: []
@@ -67,5 +67,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: "1.3"
     version: 

data/Rakefile

@@ -1,40 +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_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
-
-setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
-
-desc "Does a full compile, test run"
-task :default => [:test, :package]
-
-version=ENV['REL']
-name="activerdf_redland"
-
-setup_gem(name, version) do |spec|
-  spec.summary = "ActiveRDF adapter to Redland RDF store" 
-  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.requirements << 'librdf0 (Redland)'
-	spec.requirements << 'librdf-ruby (Redland Ruby bindings)'
-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]