activerdf_rdflite 1.2.1 → 1.2.2

data/Rakefile

@@ -14,7 +14,7 @@ desc "test and package gem"
 task :default => [:test, :package]
 
 # get @VERSION from commandline
-@VERSION =  '1.2.1'
+@VERSION =  '1.2.2'
 NAME="activerdf_rdflite"
 GEMNAME="#{NAME}-#{@VERSION}.gem"
 

data/lib/activerdf_rdflite/fetching.rb

@@ -25,7 +25,7 @@ class FetchingAdapter < RDFLite
 		#parser.parse_into_model(model, url)
 		#triples = Redland::Serializer.ntriples.model_to_string(nil, model)
 
-		triples = `rapper --scan "#{url}"`
+		triples = `rapper --scan --quiet "#{url}"`
 		lines = triples.split($/)
 		$activerdflog.debug "found #{lines.size} triples"
 

data/lib/activerdf_rdflite/rdflite.rb

@@ -127,8 +127,8 @@ class RDFLite < ActiveRdfAdapter
 	# s,p must be resources, o can be primitive data or resource
 	def add(s,p,o,c=nil)
 		# check illegal input
-		raise(ActiveRdfError, "adding non-resource #{s}") unless s.respond_to?(:uri)
-		raise(ActiveRdfError, "adding non-resource #{p}") unless p.respond_to?(:uri)
+		raise(ActiveRdfError, "adding non-resource #{s} while adding (#{s},#{p},#{o},#{c})") unless s.respond_to?(:uri)
+		raise(ActiveRdfError, "adding non-resource #{p} while adding (#{s},#{p},#{o},#{c})") unless p.respond_to?(:uri)
 
 		# get internal representation (array)
 		quad = [s,p,o,c].collect {|r| internalise(r) }
@@ -155,6 +155,12 @@ class RDFLite < ActiveRdfAdapter
 		# use filename as context
 		context = internalise(RDFS::Resource.new("file:#{file}"))
 
+		add_ntriples(ntriples, context)
+	end
+
+	# adds ntriples from given context into datastore
+	def add_ntriples(ntriples, context)
+
 		# need unique identifier for this batch of triples (to detect occurence of 
 		# same bnodes _:#1
 		uuid = UUID.random_create.to_s
@@ -179,7 +185,7 @@ class RDFLite < ActiveRdfAdapter
 			# handle bnodes and literals if necessary (literals need unicode fixing)
 			object = case nodes[2]
 							 when BNode
-								 "<http://www.activerdf.org/bnode/#$1/#{uuid}>"
+								 "<http://www.activerdf.org/bnode/#{uuid}/#$1>"
 							 when Literal
 								 fix_unicode(nodes[2])
 							 else

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerdf_rdflite
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2006-12-21 00:00:00 +01:00
+  version: 1.2.2
+date: 2007-01-30 00:00:00 +00:00
 summary: an RDF database for usage in ActiveRDF (based on sqlite3)
 require_paths: 
 - lib