activerdf 1.2.1 → 1.2.2

data/CHANGELOG

@@ -0,0 +1,11 @@
+== activerdf (1.2.2) Tue, 13 Feb 2007 19:40:19 +0000
+  * gems published automatically from Rakefile 
+  * added support for namespaced attributes:
+    eyal.foaf::name or eyal.foaf.name (do not require predicate lookup)
+  * minor changes to activerdf loader and documentation
+
+== activerdf (1.2.1) Tue, 30 Jan 2007 19:09:59 +0000
+  * added ancestors when looking at domain/range in Resource#method_missing
+    (makes foaf.name='eyal' work without reasoning because foaf:name defined in 
+    superclass, but does not work when reasoning enabled)
+  * activerdf loader uses 'gem' instead of deprecated 'require_gem'

data/lib/active_rdf/federation/federation_manager.rb

@@ -52,21 +52,17 @@ class FederationManager
       # to prevent unnecessarily nested array [[eyal],[renaud],...]
       results.flatten! if q.select_clauses.size == 1 or q.ask?
 
-      # and remove array (return single value) unless asked not to
+      # remove array (return single value or nil) if asked to
       if options[:flatten] or q.count?
         case results.size
         when 0
-          final_results = nil
+          results = nil
         when 1
-          final_results = results.first
-        else
-          final_results = results
-        end
-      else
-        final_results = results
-      end
+          results = results.first
+				end
+			end
     end
     
-    final_results
+    results
   end
 end

data/lib/active_rdf/objectmanager/namespace.rb

@@ -64,6 +64,11 @@ class Namespace
       uri[delimiter+1..-1]
     end
   end
+
+	# returns currently registered namespace abbreviations (e.g. :foaf, :rdf)
+	def self.abbreviations
+		@@namespaces.keys
+	end
 end
 
 Namespace.register(:rdf, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')

data/lib/active_rdf/objectmanager/resource.rb

@@ -149,6 +149,11 @@ module RDFS
 			# 5. eyal.age is registered abbreviation 
 			# evidence: age in @predicates
 			# action: return object from triple (eyal, @predicates[age], ?o)
+			#
+			# 6. eyal.foaf::name, where foaf is a registered abbreviation
+			# evidence: foaf in Namespace.
+			# action: return namespace proxy that handles 'name' invocation, by 
+			# rewriting into predicate lookup (similar to case (5)
 
       # maybe change order in which to check these, checking (4) is probably
       # cheaper than (1)-(2) but (1) and (2) are probably more probable (getting
@@ -172,6 +177,20 @@ module RDFS
 				return predicate_invocation(@predicates[methodname], args, update)
 			end
 
+			# check possibility (6)
+			if Namespace.abbreviations.include?(method)
+				namespace = Object.new	
+				@@uri = method
+				@@subject = self
+				class <<namespace
+					def method_missing(localname, *args)
+						predicate = Namespace.lookup(@@uri, localname)
+						Query.new.distinct(:o).where(@@subject, predicate, :o).execute(:flatten => true)
+					end
+				end
+				return namespace
+			end
+
       candidates = if update
                       (class_level_predicates + direct_predicates).compact.uniq
                     else
@@ -241,6 +260,13 @@ module RDFS
 			end
 		end
 
+		# returns all rdf:type of this instance, e.g. [RDFS::Resource, 
+		# FOAF::Person]
+		#
+		# Note: this method performs a database lookup for { self rdf:type ?o }. For 
+		# simple type-checking (to know if you are handling an ActiveRDF object, use 
+		# self.class, which does not do a database query, but simply returns 
+		# RDFS::Resource.
 		def type
 			types.collect do |type|
 				ObjectManager.construct_class(type)
@@ -323,7 +349,8 @@ module RDFS
 			query.execute(:flatten => flatten_results)
 		end  
 
-		# returns all rdf:types of this resource
+		# returns all rdf:types of this resource but without a conversion to 
+		# Ruby classes (it returns an array of RDFS::Resources)
 		def types
 			type = Namespace.lookup(:rdf, :type)
 

data/lib/active_rdf.rb

@@ -21,8 +21,8 @@ require 'federation/active_rdf_adapter'
 def load_adapter s
   begin
     require s
-  rescue StandardError => e
-    $activerdflog.info "could not load adapter #{s}: #{e}"
+  rescue Exception => e
+    $activerdflog.warn "could not load adapter #{s}: #{e}"
   end
 end
 
@@ -37,6 +37,7 @@ if Gem::cache.search(/^activerdf$/).empty?
 	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-sesame/lib/activerdf_sesame/sesame'
 else
 	# we are running as a gem
 	require 'gem_plugin'

data/lib/active_rdf_log.rb

@@ -2,6 +2,7 @@ require 'logger'
 
 # use either $ACTIVE_RDF_LOG for logging or current directory
 location = ENV['ACTIVE_RDF_LOG'] || "#{Dir.pwd}/activerdf.log"
+location = $stdout if location == "STDOUT"
 $activerdflog = Logger.new(location, 1, 100*1024)
     
 # if user has specified loglevel we use that, otherwise we use default level

data/test/common.rb

@@ -20,9 +20,8 @@ def get_read_only_adapter
   if types.include?(:sparql)
 		ConnectionPool.add(:type => :sparql, :url => "http://m3pe.org:8080/repositories/test-people", :results => :sparql_xml)
 	else
-		raise ActiveRdfError, "no suitable read only adapter found for test"
+		raise ActiveRdfError, "no suitable read-only adapter found for test"
 	end
-	
 end
 
 # TODO make this work with a list of existing adapters, not only one

data/test/queryengine/test_query.rb

@@ -45,5 +45,11 @@ class TestQuery < Test::Unit::TestCase
     q1 = Query.new.select(:s,:a)
     q2 = Query.new.select(:s).select(:a)
     assert_equal Query2SPARQL.translate(q1),Query2SPARQL.translate(q2)
+  end
+
+	def test_query_refuses_string_in_where_clause_subject_or_predicate
+    assert_raises ActiveRdfError do
+      Query.new.select(:s).where("http://test.org/uri",:p, :o).execute
+    end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2007-01-30 00:00:00 +00:00
+  version: 1.2.2
+date: 2007-02-13 00:00:00 +00:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -31,7 +31,7 @@ authors:
 files: 
 - LICENSE
 - README
-- Rakefile
+- CHANGELOG
 - test/federation
 - test/objectmanager
 - test/queryengine
@@ -48,23 +48,22 @@ files:
 - test/queryengine/test_query2jars2.rb
 - test/queryengine/test_query2sparql.rb
 - test/queryengine/test_query_engine.rb
-- lib/active_rdf.rb
-- lib/active_rdf_log.rb
 - lib/active_rdf
+- lib/active_rdf.rb
 - lib/active_rdf_helpers.rb
+- lib/active_rdf_log.rb
 - lib/active_rdf/federation
 - lib/active_rdf/objectmanager
 - lib/active_rdf/queryengine
+- lib/active_rdf/federation/active_rdf_adapter.rb
 - lib/active_rdf/federation/connection_pool.rb
 - lib/active_rdf/federation/federation_manager.rb
-- lib/active_rdf/federation/active_rdf_adapter.rb
 - lib/active_rdf/objectmanager/namespace.rb
 - lib/active_rdf/objectmanager/object_manager.rb
 - lib/active_rdf/objectmanager/resource.rb
 - lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2jars2.rb
 - lib/active_rdf/queryengine/query2sparql.rb
-- tools/rakehelp.rb
 test_files: []
 
 rdoc_options: []
@@ -87,3 +86,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerdf_sparql
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 

data/Rakefile

@@ -1,81 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'tools/rakehelp'
-require 'rubygems'
-require 'fileutils'
-include FileUtils
-
-# setup tests and rdoc files
-setup_tests
-setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
-
-# setup rdoc task
-#setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb']
-Rake::RDocTask.new do |rdoc|
-	files = ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc', 'test/*.rb']
-	files << 'activerdf-*/lib/**/*.rb'
-	rdoc.rdoc_files.add(files)
-	rdoc.main = "README" # page to start on
-	rdoc.title = "ActiveRDF documentation"
-	rdoc.template = "tools/allison/allison.rb"
-	rdoc.rdoc_dir = 'doc' # rdoc output folder
-	rdoc.options << '--line-numbers' << '--inline-source'
-end
-
-# default task: install
-desc 'test and package gem'
-task :default => :install
-
-# get ActiveRdfVersion from commandline
-ActiveRdfVersion = '1.2.1'
-NAME="activerdf"
-GEMNAME="#{NAME}-#{ActiveRdfVersion}.gem"
-
-# define package task
-setup_gem(NAME,ActiveRdfVersion) do |spec|
-  spec.summary = 'Offers object-oriented access to RDF (with adapters to several datastores).'
-  spec.description = spec.summary
-  spec.author = 'Eyal Oren'
-  spec.email = 'eyal.oren@deri.org'
-  spec.homepage = 'http://www.activerdf.org'
-  spec.platform = Gem::Platform::RUBY
-  spec.autorequire = 'active_rdf'
-  spec.add_dependency('gem_plugin', '>= 0.2.1')
-end
-
-# define upload task
-task :upload => :package do |task|
-  sh "scp pkg/#{GEMNAME} eyal@m3pe.org:/home/eyal/webs/activerdf/gems/"
-  #sh "scp activerdf-*/pkg/*.gem eyal@m3pe.org:/home/eyal/webs/activerdf/gems/"
-end
-
-task :install => [:package] do
-  sh "sudo gem install pkg/#{GEMNAME}"
-end
-
-task :uninstall => [:clean] do
-  sh "sudo gem uninstall #{NAME}"
-end
-
-task :reinstall => [:uninstall, :install]
-
-# define task rcov
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList["activerdf-*/test/**/*.rb"]
-    t.verbose = true
-    # t.rcov_opts << "--test-unit-only "
-  end
-rescue LoadError
-  # rcov not installed
-end
-
-# define test_all task
-Rake::TestTask.new do |t|
-  t.name = :test_all
-  t.test_files = FileList["test/**/*.rb", "activerdf-*/test/**/*.rb"]
-end

data/tools/rakehelp.rb

@@ -1,103 +0,0 @@
-
-def make(makedir)
-  Dir.chdir(makedir) do
-    sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
-  end
-end
-
-
-def extconf(dir)
-  Dir.chdir(dir) do ruby "extconf.rb" end
-end
-
-
-def setup_tests
-  Rake::TestTask.new do |t|
-    t.test_files = FileList['test/**/*.rb']
-  end
-end
-
-
-def setup_clean otherfiles
-  files = ['build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log'] + otherfiles
-  CLEAN.include(files)
-end
-
-
-def setup_rdoc files
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'doc/rdoc'
-    rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.add(files)
-  end
-end
-
-
-def setup_extension(dir, extension)
-  ext = "ext/#{dir}"
-  ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-  ext_files = FileList[
-    "#{ext}/*.c",
-    "#{ext}/*.h",
-    "#{ext}/extconf.rb",
-    "#{ext}/Makefile",
-    "lib"
-  ]
-
-  task "lib" do
-    directory "lib"
-  end
-
-  desc "Builds just the #{extension} extension"
-  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
-
-file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
-  extconf "#{ext}"
-end
-
-file ext_so => ext_files do
-  make "#{ext}"
-  cp ext_so, "lib"
-end
-end
-
-
-def base_gem_spec(pkg_name, pkg_version)
-pkg_version = pkg_version
-pkg_name    = pkg_name
-pkg_file_name = "#{pkg_name}-#{pkg_version}"
-Gem::Specification.new do |s|
-  s.name = pkg_name
-  s.version = pkg_version
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = [ "README" ]
-
-  s.files = %w(LICENSE README Rakefile) +
-  Dir.glob("{bin,doc/rdoc,test,lib}/**/*") +
-  Dir.glob("ext/**/*.{h,c,rb}") +
-  Dir.glob("examples/**/*.rb") +
-  Dir.glob("tools/*.rb")
-
-  s.require_path = "lib"
-  s.extensions = FileList["ext/**/extconf.rb"].to_a
-  s.bindir = "bin"
-end
-end
-
-def setup_gem(pkg_name, pkg_version)
-spec = base_gem_spec(pkg_name, pkg_version)
-yield spec if block_given?
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = false
-end
-end
-
-def setup_win32_gem(pkg_name, pkg_version)
-spec = base_gem_spec(pkg_name, pkg_version)
-yield spec if block_given?
-
-Gem::Builder.new(spec).build
-end