activerdf_sesame 0.2.1 → 0.2.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+== activerdf_sesame (0.2.2) Tue, 13 Feb 2007 20:38:16 +0000
+  * gems published automatically from Rakefile 
+  * updated readme
+
+== activerdf_sesame (0.2.1)
+  * included readme and licenses

data/README

@@ -1,26 +1,33 @@
+The Sesame2 adapter for ActiveRDF connects ActiveRDF with the Sesame2 RDF store. 
 
-This is the sesame 2 adapter for ActiveRDF. 
+== Benefits and disadvantages
+Using Sesame2 through this adapter has the following benefits :
+ * Good performance, because java code is used for all communication
+ * Support for RDF Schema inferencing
+ * Support for quads/named graphs (as soon as I get around to implementing them in the adapter)
 
-currently the major benefits of using ActiveRDF with the Sesame Adapter are:
- * good speed, because java code is used for all the heavy lifting of a triple store
- * rdf schema inferencing
- * support for quads/named graphs (as soon as I get around to implementing them in the adapter)
+The disadvantages currently are:
+ * Requires installation of jruby and manual setting of the Java CLASSPATH
+ * No OWL inferencing (but on other ActiveRDF adapter currently has this anyway)
+ * No support for a database backend (Sesame2 uses its own native storage 
+ interanlly, which is recommended anyway)
 
-disadvantages:
- * installation of jruby and manual setting of the java CLASSPATH are required
- * no owl inferencing (but all the other adapters also dont have this)
- * no support for a database backend
+The adapter uses Sesame 2 Alpha 4, which is distributed as a jar inside this gem. 
 
-It uses Sesame 2 Alpha 4, which is distributed as a jar together with this gem. 
+== License
+The adapter is distributed under LGPL, the Sesame2 jar is under the Aduna 
+license. See LICENSE for more information.
 
+== Installation
 For installation instructions visit: http://wiki.activerdf.org/ActiveRDF_and_RoR_and_Sesame
 
+== More info
 For more information about ActiveRDF visit: 
-http://www.activerdf.org/
-http://wiki.activerdf.org/ActiveRDF
+* http://www.activerdf.org/
+* http://wiki.activerdf.org/ActiveRDF
 
-For more information about Sesame 2, visit: 
-http://www.openrdf.org/
-
-This ruby gem was created by Benjamin Heitmann <benjamin.heitmann@deri.org>
+For more information about Sesame 2, visit:
+* http://www.openrdf.org/
 
+== Athors
+* Benjamin Heitmann <benjamin.heitmann@deri.org>

data/Rakefile

@@ -1,55 +1,75 @@
+require 'meta_project'
 require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require '../tools/rakehelp'
+require 'rake/contrib/xforge'
+require 'rubygems'
 require 'fileutils'
-include FileUtils
+require '../tools/rakehelp'
 
-setup_tests
-setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
+$version  = IO.read('VERSION').strip
+$name     = 'activerdf_sesame'
+$project  = MetaProject::Project::XForge::RubyForge.new('activerdf')
 
-desc "test and package gem"
-task :default => [:test, :package]
+# setup tests
+setup_tests
+setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
 
-# get @VERSION from commandline
-@VERSION =  '0.2.1'
-NAME="activerdf_sesame"
-GEMNAME="#{NAME}-#{@VERSION}.gem"
+# setup rdoc 
+Rake::RDocTask.new do |rdoc|
+	rdoc.rdoc_dir = 'doc/rdoc'
+	rdoc.options << '--line-numbers'
+	rdoc.rdoc_files.add ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
+end
 
-# which files should go into the gem?
-PKG_FILES = FileList[
-  'ext/*.jar',
-  '[A-Z]*',
-  'lib/**/*.rb',
-  'test/**/*',
-]
+desc "Does a full compile, test run"
+task :default => [:test, :package]
 
 # define package task
-setup_gem(NAME,@VERSION) do |spec|
-  spec.summary = "an RDF database for usage in ActiveRDF (based on sesame2)" 
+setup_gem($name, $version) do |spec|
+  spec.summary = "jruby adapter to sesame2 datastore (for usage in ActiveRDF)" 
   spec.description = spec.summary
   spec.author="Benjamin Heitmann <benjamin.heitmann@deri.org>"
   spec.add_dependency('gem_plugin', '>= 0.2.1')
   spec.add_dependency('activerdf', '>= 1.2')
-  spec.files = PKG_FILES.to_a
-  
+  spec.files = FileList[ 'ext/*.jar', '[A-Z]*', 'lib/**/*.rb', 'test/**/*' ].to_a
 end
 
-
-
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{@VERSION}.gem}
+task :verify_rubyforge do
+  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
+  raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
 end
 
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
+desc "Release files on RubyForge."
+task :release_files => [:clean, :verify_rubyforge, :package ] do
+  release_files = FileList["pkg/#$name-#$version.gem"]
+
+  Rake::XForge::Release.new($project) do |release|
+    release.user_name     = ENV['RUBYFORGE_USER']
+    release.password      = ENV['RUBYFORGE_PASSWORD']
+    release.files         = release_files.to_a
+    release.release_name  = "#$name #$version"
+    release.package_name  = "activerdf-sesame"
+		release.release_notes = ""
 
-task :reinstall => [:uninstall, :install]
+    changes = []
+    File.open("CHANGELOG") do |file|
+      current = true
 
-task :upload => :package do |task|
-  sh "scp pkg/#{GEMNAME} eyal@activerdf.org:/home/eyal/webs/activerdf/gems/"
+      file.each do |line|
+        line.chomp!
+				if current and line =~ /^==/
+					current = false; next 
+				end
+        break if line.empty? and not current
+        changes << line
+      end
+    end
+    release.release_changes = changes.join("\n")
+  end
 end
 
+desc "Release the latest version."
+task :release => [ :verify_rubyforge, :release_files, :rdoc ]

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/lib/activerdf_sesame/sesame.rb

@@ -119,69 +119,30 @@ class SesameAdapter < ActiveRdfAdapter
 	# 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)
-    if s.class == RDFS::Resource then
-      sesameSubject = @valueFactory.createURI(s.uri)
-    elsif s == :s
-      sesameSubject = nil
-    else
-      raise ActiveRdfError, "the Sesame Adapter tried to delete a subject which was not of type RDFS::Resource, but of type #{s.class}"
-    end
-    if p.class == RDFS::Resource then
-      sesamePredicate = @valueFactory.createURI(p.uri)
-    elsif p == :p 
-      sesamePredicate = nil
-    else
-      raise ActiveRdfError, "the Sesame Adapter tried to delete a predicate which was not of type RDFS::Resource, but of type #{p.class}"
-    end
-    if o.class == RDFS::Resource then
-      sesameObject = @valueFactory.createURI(o.uri)
-    elsif o == :o
-      sesameObject = nil
-    else
-      sesameObject = @valueFactory.createLiteral(o.to_s)
-    end	
-	
-    # TODO contexts
-    candidateStatements = @db.getStatements(sesameSubject, sesamePredicate, sesameObject, false)
-    
+		params = activerdf_to_sesame(s, p, o, c)
+
+		# TODO: handle context
+    candidateStatements = @db.getStatements(params[0], params[1], params[2], false)
     @db.remove(candidateStatements)
-    
     candidateStatements.close
-    return @db
+
+    @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)
-
-    if s.class == RDFS::Resource then
-      sesameSubject = @valueFactory.createURI(s.uri)
-    else
-      raise ActiveRdfError, "the Sesame Adapter tried to add a subject which was not of type RDFS::Resource, but of type #{s.class}"
-    end
-    if p.class == RDFS::Resource then
-      sesamePredicate = @valueFactory.createURI(p.uri)
-    else
-      raise ActiveRdfError, "the Sesame Adapter tried to add a predicate which was not of type RDFS::Resource, but of type #{p.class}"
-    end
-    if o.class == RDFS::Resource then
-      sesameObject = @valueFactory.createURI(o.uri)
-    else
-      sesameObject = @valueFactory.createLiteral(o.to_s)
-    end
-
     # TODO: handle context, especially if it is null
-
-    @db.add(sesameSubject, sesamePredicate, sesameObject)
-    # for contexts, just add 4th parameter
-
     # TODO: do we need to handle errors from the java side ? 
+		
+		check_input = [s,p,o]
+		raise ActiveRdfError, "cannot add triple with nil subject, predicate, or object" if check_input.any? {|r| r.nil? || r.is_a?(Symbol) }
 
-    return @db
+		params = activerdf_to_sesame(s, p, o, c)
+    @db.add(params[0], params[1], params[2])
+    @db
 	end
 
-
-
   # flushing is done automatically, because we run sesame2 in autocommit mode
 	def flush
 		true
@@ -203,18 +164,17 @@ class SesameAdapter < ActiveRdfAdapter
     # a to a RDFHandler, which we supply, by constructing a NTriplesWriter, which writes to StringWriter, 
     # and we kindly ask that StringWriter to make a string for us. Note, you have to use stringy.to_s, 
     # somehow stringy.toString does not work. yes yes, those wacky jruby guys ;) 
-    stringy = StringWriter.new
-    sesameWriter = NTriplesWriter.new(stringy)
+    _string = StringWriter.new
+    sesameWriter = NTriplesWriter.new(_string)
     @db.export(sesameWriter)
-    return stringy.to_s
+    return _string.to_s
 	end
 
 	# loads triples from file in ntriples format
 	def load(file)
     reader = FileReader.new(file)
     @db.add(reader, "", RDFFormat::NTRIPLES)
-    
-    return @db
+    @db
 	end
 
 	# executes ActiveRDF query on the sesame triple store associated with this adapter
@@ -308,5 +268,28 @@ class SesameAdapter < ActiveRdfAdapter
       raise ActiveRdfError, "the Sesame Adapter tried to return something which is neither a URI nor a Literal, but is instead a #{input.java_class.name}"
     end	
 	end
-	
+
+	# converts spoc input into sesame objects (RDFS::Resource into 
+	# valueFactory.createURI etc.)
+	def activerdf_to_sesame(s, p, o, c)
+		# TODO: manage contexts
+		params = []
+
+		# construct sesame parameters from s,p,o,c
+		[s,p,o].each_with_index do |r,i|
+			params[i] = case r
+							 when RDFS::Resource
+								 @valueFactory.createURI(s.uri)
+							 when Symbol
+								 nil
+							 else
+								 if i < 2 # subject or predicate
+									 raise ActiveRdfError, "trying to add or delete a subject, predicate, or object of type #{r.class}"
+								 else
+									 @valueFactory.createLiteral(o.to_s)
+								 end
+							 end
+		end
+		params << c
+	end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf_sesame
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-02-08 00:00:00 +00:00
-summary: an RDF database for usage in ActiveRDF (based on sesame2)
+  version: 0.2.2
+date: 2007-02-13 00:00:00 +00:00
+summary: jruby adapter to sesame2 datastore (for usage in ActiveRDF)
 require_paths: 
 - lib
 email: 
 homepage: 
 rubyforge_project: 
-description: an RDF database for usage in ActiveRDF (based on sesame2)
+description: jruby adapter to sesame2 datastore (for usage in ActiveRDF)
 autorequire: 
 default_executable: 
 bindir: bin
@@ -29,18 +29,20 @@ post_install_message:
 authors: 
 - Benjamin Heitmann <benjamin.heitmann@deri.org>
 files: 
-- ext/wrapper-sesame2.jar
 - ext/openrdf-sesame-2.0-alpha4-onejar.jar
+- ext/wrapper-sesame2.jar
 - LICENSE
-- README
-- Rakefile
 - LICENSE-aduna
 - LICENSE-lgpl
+- README
+- Rakefile
+- VERSION
+- CHANGELOG
 - lib/activerdf_sesame/init.rb
 - lib/activerdf_sesame/sesame.rb
 - test/eyal-foaf.nt
-- test/test_sesame_adapter.rb
 - test/eyal-foaf.rdf
+- test/test_sesame_adapter.rb
 test_files: []
 
 rdoc_options: []