activerdf 1.6.6 → 1.6.8

data/CHANGELOG

@@ -1,3 +1,12 @@
+== activerdf (1.6.8) Thu, 01 Nov 2007 15:55:38 +0100
+  * no need for ObjectManager.construct_classes (done during namespace registration)
+  * small fix to running form source on jruby
+  * added spaces to query2sparql query creation
+  * sparql queries with a context now have a graph keyword
+
+== activerdf (1.6.7) Fri, 21 Sep 2007 12:56:09 +0100
+  * updated bnode handling to SPARQL spec
+
 == activerdf (1.6.6) Fri, 21 Sep 2007 10:06:17 +0100
   * parse bnodes in SPARQL queries
   * bugfix when using RDFS classes in queries

data/lib/active_rdf.rb

@@ -1,5 +1,9 @@
+
+require 'rubygems'
+
 # ActiveRDF loader
 
+# determine the directory in which we are running depending on cruby or jruby
 if RUBY_PLATFORM =~ /java/
   # jruby can not follow symlinks, because java does not know the symlink concept
   this_dir = File.dirname(File.expand_path(__FILE__))
@@ -7,9 +11,15 @@ else
   file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
   this_dir = File.dirname(File.expand_path(file))  
 end
-$: << this_dir + '/'
-$: << this_dir + '/active_rdf/'
 
+# set the load path, which uses the running directory, but has to be different if running on jruby directly from source. 
+if RUBY_PLATFORM =~ /java/ and Gem::cache.search(/^activerdf$/).empty?
+  $: << this_dir + '/activerdf/lib/'
+  $: << this_dir + '/activerdf/lib/active_rdf/'
+else
+  $: << this_dir + '/'
+  $: << this_dir + '/active_rdf/'
+end
 
 require 'active_rdf_helpers'
 require 'active_rdf_log'
@@ -33,7 +43,7 @@ def load_adapter s
   end
 end
 
-require 'rubygems'
+
 # determine whether activerdf is installed as a gem:
 if Gem::cache.search(/^activerdf$/).empty?
 	# we are not running as a gem
@@ -48,7 +58,7 @@ if Gem::cache.search(/^activerdf$/).empty?
   	load_adapter this_dir + '/../activerdf-rdflite/lib/activerdf_rdflite/suggesting'
   	load_adapter this_dir + '/../activerdf-redland/lib/activerdf_redland/redland'
   	load_adapter this_dir + '/../activerdf-sparql/lib/activerdf_sparql/sparql'
-  	load_adapter this_dir + '/../activerdf-yars/lib/activerdf_yars/jars2'	  
+  	#load_adapter this_dir + '/../activerdf-yars/lib/activerdf_yars/jars2'	  
   end
   
 else

data/lib/active_rdf/objectmanager/bnode.rb

@@ -1,5 +1,5 @@
 class BNode < RDFS::Resource
   def to_s
-    "_:#{uri}"
+    "<_:#{uri}>"
   end
 end

data/lib/active_rdf/objectmanager/namespace.rb

@@ -32,7 +32,7 @@ class Namespace
       end
 
       def const_missing(klass)
-        Namespace.lookup(self.to_s.downcase.to_sym, klass)
+        ObjectManager.construct_class(Namespace.lookup(self.to_s.downcase.to_sym, klass))
       end
 
       # make some builtin methods private because lookup doesn't work otherwise 
@@ -80,11 +80,9 @@ class Namespace
 
   # returns local-part of URI
   def self.localname(resource)
+    raise ActiveRdfError, "localname called on something that doesn't respond to uri" unless resource.respond_to? :uri
     # get string representation of resource uri
-    uri = case resource
-    when RDFS::Resource: resource.uri
-    else resource.to_s
-    end
+    uri = resource.uri
 
     delimiter = uri.rindex(/#|\//)
     if delimiter.nil? or delimiter == uri.size-1

data/lib/active_rdf/objectmanager/object_manager.rb

@@ -75,7 +75,7 @@ class ObjectManager
 			# otherwise: create it, inside that module, as subclass of RDFS::Resource
 			# (using toplevel Class.new to prevent RDFS::Class.new from being called)
 			klass = _module.module_eval("#{klassname} = Object::Class.new(RDFS::Resource)")
-			klass.class_uri = RDFS::Resource.new(resource.uri)
+			klass.class_uri = resource
 			klass
 		end
 	end

data/lib/active_rdf/objectmanager/resource.rb

@@ -25,8 +25,13 @@ module RDFS
     # creates new resource representing an RDF resource
     def initialize uri
       @uri = case uri
+            # allow Resource.new(other_resource)
             when RDFS::Resource
              uri.uri
+            # allow Resource.new(<uri>) by stripping out <>
+            when /^<([^>]*)>$/
+              $1
+            # allow Resource.new('uri')
             when String
               uri
             else 
@@ -44,6 +49,7 @@ module RDFS
     def self.==(other)
       other.respond_to?(:uri) ? other.uri == self.uri : false
     end
+    def self.localname; Namespace.localname(self); end
 
     #####                        ######
     ##### start of instance-level code
@@ -372,9 +378,10 @@ module RDFS
 			"<#{uri}>"
 		end
 
-    def Resource.to_s
-      "<#{uri}>"
-    end
+    ## TODO: ensure that we don't use this anywhere before removing it!!
+    #def Resource.to_s
+    #  "<#{uri}>"
+    #end
 
 		private
 

data/lib/active_rdf/queryengine/query2sparql.rb

@@ -14,10 +14,10 @@ class Query2SPARQL
 
       str << "SELECT #{distinct}#{select_clauses.join(' ')} "
       str << "WHERE { #{where_clauses(query)} #{filter_clauses(query)}} "
-      str << "LIMIT #{query.limits}" if query.limits and sparql_engine != :yars2
-      str << "OFFSET #{query.offsets}" if query.offsets and sparql_engine !=:yars2
+      str << "LIMIT #{query.limits} " if query.limits
+      str << "OFFSET #{query.offsets} " if query.offsets
     elsif query.ask?
-      str << "ASK { #{where_clauses(query)} }"
+      str << "ASK { #{where_clauses(query)} } "
     end
     
     return str
@@ -45,8 +45,12 @@ class Query2SPARQL
     end
 
 		where_clauses = query.where_clauses.collect do |s,p,o,c|
-			# ignore context parameter
-			[s,p,o].collect {|term| construct_clause(term) }.join(' ')
+      # does there where clause use a context ? 
+		  if c.nil?
+  			[s,p,o].collect {|term| construct_clause(term) }.join(' ')
+  		else
+  		  "GRAPH #{construct_clause(c)} { #{construct_clause(s)} #{construct_clause(p)} #{construct_clause(o)} }"
+		  end
 		end
 
     "#{where_clauses.join(' . ')} ."

data/test/common.rb

@@ -1,25 +1,24 @@
 def get_adapter
 	types = ConnectionPool.adapter_types
 	if types.include?(:rdflite)
-		ConnectionPool.add :type => :rdflite
+    get_rdflite
 	elsif types.include?(:redland)
-		ConnectionPool.add :type => :redland
+    get_redland
 	elsif types.include?(:sparql)
-		ConnectionPool.add(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people", :results => :sparql_xml)
+    get_sparql
 	elsif types.include?(:yars)
-		ConnectionPool.add :type => :yars
+    get_yars
 	elsif types.include?(:jars2)
-		ConnectionPool.add :type => :jars2
+    get_jars2
 	else
 		raise ActiveRdfError, "no suitable adapter found for test"
 	end
 end
 
 def get_read_only_adapter
-	types = ConnectionPool.adapter_types
-  if types.include?(:sparql)
-		ConnectionPool.add(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people", :results => :sparql_xml)
-	else
+	if ConnectionPool.adapter_types.include?(:sparql)
+    get_sparql
+  else
 		raise ActiveRdfError, "no suitable read-only adapter found for test"
 	end
 end
@@ -31,16 +30,16 @@ def get_different_adapter(existing_adapter)
     if existing_adapter.class == RDFLite
       ConnectionPool.add :type => :rdflite, :unique => true
     else
-      ConnectionPool.add :type => :rdflite
+      get_rdflite
     end
 	elsif types.include?(:redland) and existing_adapter.class != RedlandAdapter
-		ConnectionPool.add :type => :redland
+    get_rdflite
 	elsif types.include?(:sparql) and existing_adapter.class != SparqlAdapter
-		ConnectionPool.add(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people", :results => :sparql_xml)
+    get_sparql
 	elsif types.include?(:yars) and existing_adapter.class != YarsAdapter
-		ConnectionPool.add :type => :yars
+    get_yars
 	elsif types.include?(:jars2) and existing_adapter.class != Jars2Adapter
-		ConnectionPool.add :type => :jars2
+    get_jars2
 	else
 		raise ActiveRdfError, "only one adapter on this system, or no suitable adapter found for test"
 	end
@@ -48,32 +47,26 @@ end
 
 def get_all_read_adapters
 	types = ConnectionPool.adapter_types
-	adapters = types.collect {|type| 
-		if type == :sparql
-			ConnectionPool.add(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people", :results => :sparql_xml)
-		else
-			ConnectionPool.add :type => type 
-		end
-	}
+	adapters = types.collect {|type| self.send("get_#{type}") }
 	adapters.select {|adapter| adapter.reads?}
 end
 
 def get_all_write_adapters
 	types = ConnectionPool.adapter_types
-	adapters = types.collect {|type| ConnectionPool.add :type => type }
+	adapters = types.collect {|type| self.send("get_#{type}") }
 	adapters.select {|adapter| adapter.writes?}
 end
 
 def get_write_adapter
 	types = ConnectionPool.adapter_types
 	if types.include?(:rdflite)
-		ConnectionPool.add :type => :rdflite
+    get_rdflite
 	elsif types.include?(:redland)
-		ConnectionPool.add :type => :redland
+    get_redland
 	elsif types.include?(:yars)
-		ConnectionPool.add :type => :yars
+    get_yars
 	elsif types.include?(:jars2)
-		ConnectionPool.add :type => :jars2
+    get_jars2
 	else
 		raise ActiveRdfError, "no suitable adapter found for test"
 	end
@@ -86,13 +79,26 @@ def get_different_write_adapter(existing_adapter)
     if existing_adapter.class == RDFLite
       ConnectionPool.add :type => :rdflite, :unique => true
     else
-      ConnectionPool.add :type => :rdflite
+      get_rdflite
     end
 	elsif types.include?(:redland) and existing_adapter.class != RedlandAdapter
-		ConnectionPool.add :type => :redland
+    get_redland
 	elsif types.include?(:yars) and existing_adapter.class != YarsAdapter
-		ConnectionPool.add :type => :yars
+    get_yars
 	else
 		raise ActiveRdfError, "only one write adapter on this system, or no suitable write adapter found for test"
 	end
 end
+
+private
+def get_sparql
+  ConnectionPool.add(:type => :sparql, :url => "http://sparql.org/books",
+                     :engine => :joseki, :results => :sparql_xml)
+end
+
+def get_fetching; ConnectionPool.add(:type => :fetching); end
+def get_suggesting; ConnectionPool.add(:type => :suggesting); end
+def get_rdflite; ConnectionPool.add(:type => :rdflite); end
+def get_redland; ConnectionPool.add(:type => :redland); end
+def get_yars; ConnectionPool.add(:type => :yars); end
+def get_jars2; ConnectionPool.add(:type => :jars2); end

data/test/objectmanager/test_literal.rb

@@ -9,7 +9,7 @@ require "#{File.dirname(__FILE__)}/../common"
 class TestLiteral < Test::Unit::TestCase
   def setup
 		ConnectionPool.clear
-    @adapter = get_read_only_adapter
+    @adapter = get_adapter
   end
 
   def teardown

data/test/objectmanager/test_namespace.rb

@@ -53,10 +53,10 @@ class TestNamespace < Test::Unit::TestCase
   end
 
   def test_class_localname
-		assert_equal 'type', Namespace.localname(Namespace.lookup(:rdf, :type))
+		assert_equal 'type', Namespace.lookup(:rdf, :type).localname
 		assert_equal 'type', RDF::type.localname
 
-		assert_equal 'Class', Namespace.localname(Namespace.lookup(:rdfs, :Class))
+		assert_equal 'Class', Namespace.lookup(:rdfs, :Class).localname
 		assert_equal 'Class', RDFS::Class.localname
   end
 

data/test/objectmanager/test_object_manager.rb

@@ -20,6 +20,8 @@ class TestObjectManager < Test::Unit::TestCase
     r1 = RDFS::Resource.new('abc')
     r2 = RDFS::Resource.new('cde')
     r3 = RDFS::Resource.new('cde')
+    assert_equal r3, RDFS::Resource.new(r3)
+    assert_equal r3, RDFS::Resource.new(r3.to_s)
 
     assert_equal 'abc', r1.uri
     assert_equal 'cde', r2.uri
@@ -31,24 +33,27 @@ class TestObjectManager < Test::Unit::TestCase
 		adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
 
 		Namespace.register(:test, 'http://activerdf.org/test/')
-		ObjectManager.construct_classes
 
-		assert(defined? TEST)
-		assert(defined? RDFS)
-		assert(defined? TEST::Person)
-		assert(defined? RDFS::Class)
-  end
+		assert_equal RDFS::Resource.new('http://activerdf.org/test/Person'), TEST::Person
+    assert_kind_of Class, TEST::Person
+    assert TEST::Person.ancestors.include?(RDFS::Resource)
+    assert_instance_of TEST::Person, TEST::Person.new('')
+    assert TEST::Person.new('').respond_to?(:uri)
 
-	def test_class_construct_class
-		adapter = get_write_adapter
-		adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
+		assert_equal RDFS::Resource.new('http://www.w3.org/2000/01/rdf-schema#Class'), RDFS::Class
+    assert RDFS::Class.ancestors.include?(RDFS::Resource)
+    assert_kind_of Class, RDFS::Class
+    assert_instance_of RDFS::Resource, RDFS::Class.new('')
+    assert RDFS::Class.new('').respond_to?(:uri)
+  end
 
+  def test_custom_code
 		Namespace.register(:test, 'http://activerdf.org/test/')
-		person_resource = Namespace.lookup(:test, :Person)
-		person_class = ObjectManager.construct_class(person_resource)
-		assert_instance_of Class, person_class
-		assert_equal person_resource.uri, person_class.class_uri.uri
-	end
+
+    TEST::Person.module_eval{ def hello; 'world'; end }
+    assert_respond_to TEST::Person.new(''), :hello
+    assert_equal 'world', TEST::Person.new('').hello
+  end
 
   def test_class_uri
 		adapter = get_write_adapter

data/test/queryengine/test_query.rb

@@ -19,7 +19,7 @@ class TestQuery < Test::Unit::TestCase
     query.select(:s)
     query.where(:s, RDFS::Resource.new('predicate'), '30')
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . }"
+    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . } "
     assert_equal expected, generated
 
     query = Query.new
@@ -27,7 +27,7 @@ class TestQuery < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     query.where(:a, RDFS::Resource.new('rdf:type'), RDFS::Resource.new('xsd:int'))
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a. ?a <rdf:type> <xsd:int> . }"
+    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a . ?a <rdf:type> <xsd:int> . } "
     assert_equal expected, generated
 	end
 
@@ -36,7 +36,7 @@ class TestQuery < Test::Unit::TestCase
     query.distinct(:s)
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT DISTINCT ?s WHERE { ?s <foaf:age> ?a . }"
+    expected = "SELECT DISTINCT ?s WHERE { ?s <foaf:age> ?a . } "
     assert_equal expected, generated
   end
 

data/test/queryengine/test_query2jars2.rb

@@ -23,7 +23,7 @@ class TestQuery2Jars2 < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('predicate'), '30')
 
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . }"
+    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . } "
     assert_equal expected, generated
 
     query = Query.new
@@ -31,7 +31,7 @@ class TestQuery2Jars2 < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     query.where(:a, RDFS::Resource.new('rdf:type'), RDFS::Resource.new('xsd:int'))
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a. ?a <rdf:type> <xsd:int> . }"
+    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a . ?a <rdf:type> <xsd:int> . } "
     assert_equal expected, generated
 
     #		query = Query.new

data/test/queryengine/test_query2sparql.rb

@@ -23,7 +23,7 @@ class TestQuery2Sparql < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('predicate'), '30')
 
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . }"
+    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . } "
     assert_equal expected, generated
 
     query = Query.new
@@ -31,7 +31,7 @@ class TestQuery2Sparql < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     query.where(:a, RDFS::Resource.new('rdf:type'), RDFS::Resource.new('xsd:int'))
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a. ?a <rdf:type> <xsd:int> . }"
+    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a . ?a <rdf:type> <xsd:int> . } "
     assert_equal expected, generated
 
     #		query = Query.new

data/test/queryengine/test_query_engine.rb

@@ -24,7 +24,7 @@ class TestQueryEngine < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('predicate'), '30')
 
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . }"
+    expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . } "
     assert_equal expected, generated
 
     query = Query.new
@@ -32,7 +32,7 @@ class TestQueryEngine < Test::Unit::TestCase
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     query.where(:a, RDFS::Resource.new('rdf:type'), RDFS::Resource.new('xsd:int'))
     generated = Query2SPARQL.translate(query)
-    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a. ?a <rdf:type> <xsd:int> . }"
+    expected = "SELECT ?s WHERE { ?s <foaf:age> ?a . ?a <rdf:type> <xsd:int> . } "
     assert_equal expected, generated
 
     #		query = Query.new

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.6.6
-date: 2007-09-21 00:00:00 +01:00
+  version: 1.6.8
+date: 2007-11-01 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib