activerdf 1.1 → 1.2

data/README

@@ -9,15 +9,16 @@ See http://www.activerdf.org for more information.
 
 == Getting Started
 
-See http://wiki.activerdf.org/GettingStartedGuide for information on how to install 
-ActiveRDF, get it running with some data sources, and start using it.
+See http://wiki.activerdf.org/GettingStartedGuide for information on how to
+install ActiveRDF, point to data sources, and use it. In brief: "gem install
+activerdf_sparql".
 
 == Simple Example
 
 The following example uses a SPARQL endpoint with FOAF data and displays all 
 people found in the data source:
 
- require 'active_rdf'
+ require 'activerdf'
  ConnectionPool.add_data_source :type => :sparql, :host => '...'
  Namespace.register :foaf, 'http://xmlns.com/foaf/0.1/'
  ObjectManager.construct_classes

data/Rakefile

@@ -30,7 +30,7 @@ desc 'test and package gem'
 task :default => :install
 
 # get ActiveRdfVersion from commandline
-ActiveRdfVersion = ENV['REL'] || '1.0'
+ActiveRdfVersion = '1.2'
 NAME="activerdf"
 GEMNAME="#{NAME}-#{ActiveRdfVersion}.gem"
 

data/lib/active_rdf/federation/federation_manager.rb

@@ -53,7 +53,7 @@ class FederationManager
       results.flatten! if q.select_clauses.size == 1 or q.ask?
 
       # and remove array (return single value) unless asked not to
-      if options[:flatten]
+      if options[:flatten] or q.count?
         case results.size
         when 0
           final_results = nil

data/lib/active_rdf/objectmanager/resource.rb

@@ -290,10 +290,10 @@ module RDFS
     "<#{uri}>"
   end
 
-	# label of resource (rdfs:label if available, uri otherwise)
-  def label
-    get_property_value(Namespace.lookup(:rdfs,:label)) || uri
-  end
+#	# label of resource (rdfs:label if available, uri otherwise)
+#  def label
+#    get_property_value(Namespace.lookup(:rdfs,:label)) || uri
+#  end
 
   private
   def get_property_value(predicate, args=[])

data/lib/active_rdf/queryengine/query.rb

@@ -102,7 +102,7 @@ class Query
 				raise(ActiveRdfError, "cannot add a where clause with p #{p}: p must be a resource or a variable")
 			end
 
-			@where_clauses << [s,p,o,c].collect{|arg| parametrise(arg)}.compact
+			@where_clauses << [s,p,o,c].collect{|arg| parametrise(arg)}
 		end
     self
   end

data/lib/active_rdf/queryengine/query2sparql.rb

@@ -23,8 +23,9 @@ class Query2SPARQL
   # concatenate each where clause using space (e.g. 's p o')
   # and concatenate the clauses using dot, e.g. 's p o . s2 p2 o2 .'
   def self.where_clauses(query)
-		where_clauses = query.where_clauses.collect do |triple|
-			triple.collect {|term| construct_clause(term)}.join(' ')
+		where_clauses = query.where_clauses.collect do |s,p,o,c|
+			# ignore context parameter
+			[s,p,o].collect {|term| construct_clause(term) }.join(' ')
 		end
     "#{where_clauses.join('. ')} ."
   end
@@ -43,5 +44,4 @@ class Query2SPARQL
   #declare the class level methods as private with these directives
   private_class_method :where_clauses
   private_class_method :construct_clause
-	
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2006-12-08 00:00:00 +00:00
+  version: "1.2"
+date: 2006-12-21 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib