activerdf 1.6 → 1.6.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+== activerdf (1.6.1) Thu, 19 Apr 2007 22:57:01 +0100
+  * fix bug 107280: add support for full query options (including context) in dynamic finders
+
 == activerdf (1.6) Thu, 12 Apr 2007 23:12:40 +0100
   * no need for ObjectManager.construct_classes anymore (classes exist automagically after Namespace.register)
   * added resource.localname (alias for Namespace.localname(resource))

data/lib/active_rdf/objectmanager/resource.rb

@@ -129,7 +129,15 @@ module RDFS
       if options.include? :where
         raise ActiveRdfError, "where clause should be hash of predicate => object" unless options[:where].is_a? Hash
         options[:where].each do |p,o|
-          query.where(:s, p, o)
+          if options.include? :context
+            query.where(:s, p, o, options[:context])
+          else
+            query.where(:s, p, o)
+          end
+        end
+      else
+        if options[:context]
+          query.where(:s, :p, :o, options[:context])
         end
       end
 
@@ -402,6 +410,7 @@ class DynamicFinderProxy
   @where = nil
   @value = nil
   attr_reader :value
+  private(:type)
 
   # construct proxy from find_by text
   # foaf::name
@@ -457,18 +466,44 @@ class DynamicFinderProxy
 
   # construct and execute finder query
   def query(*args)
+    # extract options from args or use an empty hash (no options given)
+    options = args.last.is_a?(Hash) ? args.last : {}
+
+    # build query 
     query = Query.new.distinct(:s)
     @where.each_with_index do |predicate, i|
-      query.where(:s, predicate, args[i])
+      # specify where clauses, use context if given
+      if options[:context]
+        query.where(:s, predicate, args[i], options[:context])
+      else
+        query.where(:s, predicate, args[i])
+      end
     end
 
+    # use sort order if given
+    if options.include? :order
+      sort_predicate = options[:order]
+      query.sort(:sort_value)
+      # add sort predicate where clause unless we have it already
+      query.where(:s, sort_predicate, :sort_value) unless @where.include? sort_predicate
+    end
+
+    if options.include? :reverse_order
+      sort_predicate = options[:reverse_order]
+      query.reverse_sort(:sort_value)
+      query.where(:s, sort_predicate, :sort_value) unless @where.include? sort_predicate
+    end
+
+    query.limit(options[:limit]) if options[:limit]
+    query.offset(options[:offset]) if options[:offset]
+
     $activerdflog.debug "executing dynamic finder: #{query.to_sp}"
 
     # store the query results so that caller (Resource.method_missing) can 
     # retrieve them (we cannot return them here, since we were invoked from 
     # the initialize method so all return values are ignored, instead the proxy 
     # itself is returned)
-    @value = query.execute(:flatten => true)
+    @value = query.execute
     return value
   end
 end

data/test/objectmanager/test_resource_reading.rb

@@ -88,16 +88,16 @@ class TestResourceReading < Test::Unit::TestCase
   end
 
   def test_find_methods
-    assert_equal @eyal, RDFS::Resource.find_by_eye('blue')
-    assert_equal @eyal, RDFS::Resource.find_by_test::eye('blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_eye('blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_test::eye('blue')
 
-    assert_equal @eyal, RDFS::Resource.find_by_age(27)
-    assert_equal @eyal, RDFS::Resource.find_by_test::age(27)
+    assert_equal [@eyal], RDFS::Resource.find_by_age(27)
+    assert_equal [@eyal], RDFS::Resource.find_by_test::age(27)
 
-    assert_equal @eyal, RDFS::Resource.find_by_age_and_eye(27, 'blue')
-    assert_equal @eyal, RDFS::Resource.find_by_test::age_and_test::eye(27, 'blue')
-    assert_equal @eyal, RDFS::Resource.find_by_test::age_and_eye(27, 'blue')
-    assert_equal @eyal, RDFS::Resource.find_by_age_and_test::eye(27, 'blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_age_and_eye(27, 'blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_test::age_and_test::eye(27, 'blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_test::age_and_eye(27, 'blue')
+    assert_equal [@eyal], RDFS::Resource.find_by_age_and_test::eye(27, 'blue')
   end
 
   # test for writing if no write adapter is defined (like only sparqls)
@@ -106,4 +106,32 @@ class TestResourceReading < Test::Unit::TestCase
     get_read_only_adapter
     assert_raises(ActiveRdfError) { @eyal.test::age = 18 }
   end
+
+  def test_finders_with_options
+		ConnectionPool.clear
+    adapter = get_adapter
+    file_one = "#{File.dirname(__FILE__)}/../small-one.nt"
+    file_two = "#{File.dirname(__FILE__)}/../small-two.nt"
+    adapter.load file_one
+    adapter.load file_two
+
+    one = RDFS::Resource.new("file:#{file_one}")
+    two = RDFS::Resource.new("file:#{file_two}")
+
+    assert_equal 2, RDFS::Resource.find.size
+    assert_equal 2, RDFS::Resource.find(:all).size
+    assert_equal 2, RDFS::Resource.find(:all, :limit => 10).size
+    assert_equal 1, RDFS::Resource.find(:all, :limit => 1).size
+    assert_equal 1, RDFS::Resource.find(:all, :context => one).size
+    assert_equal 1, RDFS::Resource.find(:all, :context => one, :limit => 1).size
+    assert_equal 0, RDFS::Resource.find(:all, :context => one, :limit => 0).size
+
+    assert_equal 1, RDFS::Resource.find_by_eye('blue').size
+    assert_equal 1, RDFS::Resource.find_by_eye('blue', :context => one).size
+    assert_equal 0, RDFS::Resource.find_by_eye('blue', :context => two).size
+
+    assert_equal 2, RDFS::Resource.find_by_rdf::type(RDFS::Resource).size
+    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
 end

data/test/small-one.nt

@@ -0,0 +1,2 @@
+<eyal> <eye> "blue" .
+<eyal> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .

data/test/small-two.nt

@@ -0,0 +1,2 @@
+<ron> <eye> "green" .
+<ron> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: "1.6"
-date: 2007-04-12 00:00:00 +01:00
+  version: 1.6.1
+date: 2007-04-19 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -38,6 +38,8 @@ files:
 - test/common.rb
 - test/test_adapters.rb
 - test/test_person_data.nt
+- test/small-one.nt
+- test/small-two.nt
 - test/federation/test_federation_manager.rb
 - test/federation/test_connection_pool.rb
 - test/objectmanager/test_resource_reading.rb