activerdf 1.6.10 → 1.6.11

data/CHANGELOG

@@ -1,3 +1,7 @@
+== activerdf (1.6.11) Thu, 27 Nov 2008 11:27:24 +0100
+  * added support for enabling/disabling adapters (Samur Saraujo)
+  * RDFS::Resource accepts block (Aleksander Pohl)
+
 == activerdf (1.6.10) Wed, 23 Apr 2008 10:43:44 +0200
   * convert float <-> xsd:double (Richard Dale)
   * fix #202979: superclass mismatch in literal.rb (Slava Kravchenko)

data/lib/active_rdf/federation/active_rdf_adapter.rb

@@ -5,7 +5,11 @@ require 'queryengine/query2sparql'
 
 class ActiveRdfAdapter
 	# indicate if adapter can read and write
-	bool_accessor :reads, :writes
+	bool_accessor :reads, :writes, :enabled
+
+  def initialize
+    @enabled = true
+  end
 
 	# translate a query to its string representation
 	def translate(query)

data/lib/active_rdf/federation/connection_pool.rb

@@ -54,11 +54,11 @@ class ConnectionPool
 
   # returns the set of currently registered read-access datasources
   def ConnectionPool.read_adapters
-    @@adapter_pool.select {|adapter| adapter.reads? }
+    @@adapter_pool.select {|adapter| adapter.reads? && adapter.enabled?}
   end
 
   def ConnectionPool.write_adapters
-    @@adapter_pool.select {|adapter| adapter.writes? }
+    @@adapter_pool.select {|adapter| adapter.writes? && adapter.enabled?}
   end
 
   # returns adapter-instance for given parameters (either existing or new)

data/lib/active_rdf/objectmanager/namespace.rb

@@ -10,7 +10,7 @@ class Namespace
   # e.g. :rdf and 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
   def self.register(prefix, fullURI)
 		raise ActiveRdfError, 'prefix nor uri can be empty' if (prefix.to_s.empty? or fullURI.to_s.empty?)
-    raise ActiveRdfError, "namespace uri should end with # or /" unless /\/|#/ =~ fullURI.to_s[-1..-1]
+    #raise ActiveRdfError, "namespace uri should end with # or /" unless /\/|#/ =~ fullURI.to_s[-1..-1]
 		$activerdflog.info "Namespace: registering #{fullURI} to #{prefix}"
     @@namespaces[prefix.to_sym] = fullURI.to_s
     @@inverted_namespaces[fullURI.to_s] = prefix.to_sym

data/lib/active_rdf/objectmanager/resource.rb

@@ -194,7 +194,7 @@ module RDFS
     end
 
     # manages invocations such as eyal.age
-    def method_missing(method, *args)
+    def method_missing(method, *args,&block)
       # possibilities:
       # 1. eyal.age is a property of eyal (triple exists <eyal> <age> "30")
       # evidence: eyal age ?a, ?a is not nil (only if value exists)
@@ -250,7 +250,7 @@ module RDFS
         if update
           return set_predicate(@predicates[methodname], args)
         else
-          return get_predicate(@predicates[methodname])
+          return get_predicate(@predicates[methodname],false,&block)
         end
 			end
 
@@ -263,7 +263,7 @@ module RDFS
 
         # catch the invocation on the namespace
         class <<namespace
-          def method_missing(localname, *values)
+          def method_missing(localname, *values,&block)
             update = localname.to_s[-1..-1] == '='
             predicate = if update 
                           Namespace.lookup(@@uri, localname.to_s[0..-2])
@@ -274,7 +274,7 @@ module RDFS
             if update
               @@subject.set_predicate(predicate, values)
             else
-              @@subject.get_predicate(predicate, @@flatten)
+              @@subject.get_predicate(predicate, @@flatten,&block)
             end
           end
           private(:type)
@@ -294,7 +294,7 @@ module RDFS
           if update
             return set_predicate(pred, args)
           else
-            return get_predicate(pred, flatten)
+            return get_predicate(pred, flatten,&block)
           end
 				end
 			end
@@ -422,8 +422,12 @@ module RDFS
       values
     end
 
-    def get_predicate(predicate, flatten=false)
-      values = Query.new.distinct(:o).where(self, predicate, :o).execute(:flatten => flatten)
+    def get_predicate(predicate, flatten=false,&block)
+      query = Query.new.distinct(:o).where(self, predicate, :o)
+      if block_given?
+        yield query, :o
+      end
+      values = query.execute(:flatten => flatten)
 
       # TODO: fix '<<' for Fixnum values etc (we cannot use values.instance_eval 
       # because Fixnum cannot do instace_eval, they're not normal classes)

data/test/federation/test_federation_manager.rb

@@ -140,6 +140,6 @@ class TestFederationManager < Test::Unit::TestCase
     # in parallel for distinct data, actually gives same results as querying
     # only the one set
     uniq = Query.new.distinct(:s,:p,:o).where(:s,:p,:o).execute
-    assert_equal first, uniq
+    assert_equal first.sort, uniq.sort
   end
 end

data/test/objectmanager/test_object_manager.rb

@@ -82,13 +82,14 @@ class TestObjectManager < Test::Unit::TestCase
 </rdf:Description>
 </rdf:RDF>'
     assert eyal.to_xml.include?(snippet)
-
-
-    url = 'http://gollem.swi.psy.uva.nl/cgi-bin/rdf-parser'
+  
+    require 'net/http'
+    url = 'http://librdf.org/parse'
     uri = URI.parse(url)
     req = Net::HTTP::Post.new(url)
-    req.set_form_data('rdf' => eyal.to_xml)
-    res = Net::HTTP.new(uri.host, uri.port).start { |http| http.request(req) }
-    assert_match /RDF statement parsed successfully/, res.body, "SWI-Prolog failed to parse XML output"
+    req.set_form_data('content'=>eyal.to_xml, 'language'=>'rdfxml')
+    res = Net::HTTP.new(uri.host,uri.port).start {|http| http.request(req) }
+    result = res.body.match(/Found.*triples/)[0]
+    assert_equal "Found 4 triples", result, 'invalid XML generated (according to online parser at librdf.org'
   end
 end

data/test/objectmanager/test_resource_reading.rb

@@ -134,4 +134,12 @@ class TestResourceReading < Test::Unit::TestCase
     assert_equal 1, RDFS::Resource.find_by_rdf::type(RDFS::Resource, :context => one).size
     assert_equal 1, RDFS::Resource.find_by_eye_and_rdf::type('blue', RDFS::Resource, :context => one).size
   end
+
+  def test_reading_with_block
+    qs=<<EOF
+SELECT DISTINCT ?o WHERE { <http://activerdf.org/test/eyal> 
+<http://activerdf.org/test/age> ?o . FILTER (regex(lang(?o), '^nl$'))}
+EOF
+    @eyal.age {|query, obj| query.lang(obj, "nl"); assert_equal qs.gsub("\n",'').strip, query.to_sp.strip}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors: 
 - Eyal Oren
@@ -9,7 +9,7 @@ autorequire: active_rdf
 bindir: bin
 cert_chain: []
 
-date: 2008-04-23 00:00:00 +02:00
+date: 2008-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Offers object-oriented access to RDF (with adapters to several datastores).