activerdf 1.5 → 1.6

data/CHANGELOG

@@ -1,5 +1,6 @@
-== activerdf (1.6)
-  * TODO: remove ObjectManager.construct_classes (classes exist automagically after Namespace.register)
+== 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))
 
 == activerdf (1.5) Thu, 12 Apr 2007 22:42:28 +0100
   * allows directly using classes in query: where(:s, RDF::type, SIOC::Post)

data/lib/active_rdf/objectmanager/namespace.rb

@@ -31,6 +31,10 @@ class Namespace
         Namespace.lookup(self.to_s.downcase.to_sym, method)
       end
 
+      def const_missing(klass)
+        Namespace.lookup(self.to_s.downcase.to_sym, klass)
+      end
+
       # make some builtin methods private because lookup doesn't work otherwise 
       # on e.g. RDF::type and FOAF::name
       [:type, :name, :id].each {|m| private(m) }

data/lib/active_rdf/objectmanager/resource.rb

@@ -145,6 +145,10 @@ module RDFS
       end
     end
 
+    def localname
+      Namespace.localname(self)
+    end
+
     # manages invocations such as eyal.age
     def method_missing(method, *args)
       # possibilities:

data/test/objectmanager/test_namespace.rb

@@ -9,9 +9,9 @@ require "#{File.dirname(__FILE__)}/../common"
 
 class TestNamespace < Test::Unit::TestCase
   Rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-  RdfType = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'
-  RdfsResource = 'http://www.w3.org/2000/01/rdf-schema#Resource'
   Rdfs = 'http://www.w3.org/2000/01/rdf-schema#'
+  RdfType = RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
+  RdfsResource = RDFS::Resource.new('http://www.w3.org/2000/01/rdf-schema#Resource')
 
   def setup
   end
@@ -23,23 +23,25 @@ class TestNamespace < Test::Unit::TestCase
     rdftype = RdfType
     rdfsresource = RdfsResource
 
-    assert_equal rdftype, Namespace.expand(:rdf, :type)
-    assert_equal rdftype, Namespace.expand(:rdf, 'type')
-    assert_equal rdftype, Namespace.expand('rdf', :type)
-    assert_equal rdftype, Namespace.expand('rdf', 'type')
+    assert_equal rdftype, RDF::type
+    assert_equal rdftype, Namespace.lookup(:rdf, :type)
+    assert_equal rdftype, Namespace.lookup(:rdf, 'type')
+    assert_equal rdftype, Namespace.lookup('rdf', :type)
+    assert_equal rdftype, Namespace.lookup('rdf', 'type')
 
-    assert_equal rdfsresource, Namespace.expand(:rdfs, :Resource)
-    assert_equal rdfsresource, Namespace.expand(:rdfs, 'Resource')
-    assert_equal rdfsresource, Namespace.expand('rdfs', :Resource)
-    assert_equal rdfsresource, Namespace.expand('rdfs', 'Resource')
+    assert_equal rdfsresource, RDFS::Resource
+    assert_equal rdfsresource, Namespace.lookup(:rdfs, :Resource)
+    assert_equal rdfsresource, Namespace.lookup(:rdfs, 'Resource')
+    assert_equal rdfsresource, Namespace.lookup('rdfs', :Resource)
+    assert_equal rdfsresource, Namespace.lookup('rdfs', 'Resource')
   end
 
-  def test_default_ns_lookup
+  def test_registration_of_rdf_and_rdfs
     rdftype = RDFS::Resource.new RdfType
     rdfsresource = RDFS::Resource.new RdfsResource
 
-    assert_equal rdftype, Namespace.lookup(:rdf, :type)
-    assert_equal rdfsresource, Namespace.lookup(:rdfs, :Resource)
+    assert_equal rdftype, RDF::type
+    assert_equal rdfsresource, RDFS::Resource
   end
 
   def test_find_prefix
@@ -52,15 +54,19 @@ class TestNamespace < Test::Unit::TestCase
 
   def test_class_localname
 		assert_equal 'type', Namespace.localname(Namespace.lookup(:rdf, :type))
+		assert_equal 'type', RDF::type.localname
+
 		assert_equal 'Class', Namespace.localname(Namespace.lookup(:rdfs, :Class))
+		assert_equal 'Class', RDFS::Class.localname
   end
 
   def test_class_register
 		test = 'http://test.org/'
-		abc = "#{test}abc"
+		abc = RDFS::Resource.new("#{test}abc")
 		Namespace.register :test, test
 
-		assert_equal abc, Namespace.expand(:test, :abc)
+		assert_equal abc, Namespace.lookup(:test, :abc)
+		assert_equal abc, TEST::abc
   end
 
   def test_attributes

data/test/objectmanager/test_object_manager.rb

@@ -54,7 +54,6 @@ class TestObjectManager < Test::Unit::TestCase
 		adapter = get_write_adapter
 		adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
 		Namespace.register(:test, 'http://activerdf.org/test/')
-		ObjectManager.construct_classes
 
     assert_equal RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), RDF::type
     assert_equal RDF::type, RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')

data/test/objectmanager/test_resource_reading.rb

@@ -13,7 +13,6 @@ class TestResourceReading < Test::Unit::TestCase
     @adapter = get_adapter
     @adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
     Namespace.register(:test, 'http://activerdf.org/test/')
-    ObjectManager.construct_classes
 
     @eyal = RDFS::Resource.new 'http://activerdf.org/test/eyal'
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: "1.5"
+  version: "1.6"
 date: 2007-04-12 00:00:00 +01:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: