activerdf 1.2.2 → 1.2.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+== activerdf (1.2.3) Wed, 14 Feb 2007 16:07:41 +0000
+  * namespaced properties are first-class citizens: FOAF::name or RDFS::domain
+
 == activerdf (1.2.2) Tue, 13 Feb 2007 19:40:19 +0000
   * gems published automatically from Rakefile 
   * added support for namespaced attributes:

data/README

@@ -25,7 +25,7 @@ people found in the data source:
  people = FOAF::Person.find_all
 
 == License
-ActiveRDF is distributed under the LGPL[link:http://www.gnu.org/licenses/lgpl.html] license.
+ActiveRDF is distributed under the LGPL[http://www.gnu.org/licenses/lgpl.html] license.
 
 == Authors
 * Eyal Oren

data/lib/active_rdf/federation/federation_manager.rb

@@ -7,6 +7,7 @@ class FederationManager
   # add triple s,p,o to the currently selected write-adapter
   def FederationManager.add(s,p,o)
     # TODO: allow addition of full graphs
+    raise ActiveRdfError, "cannot write without a write-adapter" unless ConnectionPool.write_adapter
     ConnectionPool.write_adapter.add(s,p,o)
   end
 

data/lib/active_rdf/objectmanager/namespace.rb

@@ -13,6 +13,30 @@ class Namespace
 		$activerdflog.info "Namespace: registering #{fullURI} to #{prefix}"
     @@namespaces[prefix.to_sym] = fullURI.to_s
     @@inverted_namespaces[fullURI.to_s] = prefix.to_sym
+
+    # enable namespace lookups through FOAF::name
+    # if FOAF defined, add to it
+    if Object.const_defined?(prefix.to_s.upcase)
+      ns = Object.const_get(prefix.to_s.upcase)
+    else
+      # otherwise create a new module for it
+      ns = Module.new  
+      Object.const_set(prefix.to_s.upcase, ns)
+    end
+
+    # catch FOAF::name or all other lookups 
+    class << ns
+      def method_missing(method, *args)
+        Namespace.lookup(self.to_s.downcase.to_sym, method)
+      end
+
+      # make some builtin methods private because lookup doesn't work otherwise 
+      # on e.g. RDF::type and FOAF::name
+      [:type, :name].each {|m| private(m) }
+    end
+
+    # return the namespace proxy object
+    ns
   end
 
   # returns a resource whose URI is formed by concatenation of prefix and localname

data/lib/active_rdf/queryengine/ntriples_parser.rb

@@ -0,0 +1,57 @@
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006 Eyal Oren
+# License:: LGPL
+require 'active_rdf'
+require 'uuidtools'
+
+# ntriples parser
+class NTriplesParser
+  # parses an input string of ntriples and returns a nested array of [s, p, o] 
+  # (which are in turn ActiveRDF objects)
+  def self.parse(input)
+
+		# need unique identifier for this batch of triples (to detect occurence of 
+		# same bnodes _:#1
+		uuid = UUID.random_create.to_s
+
+    input.collect do |triple|
+			nodes = triple.scan(Node)
+
+			# handle bnodes if necessary (bnodes need to have uri generated)
+			subject = case nodes[0]
+								when BNode
+									RDFS::Resource.new("http://www.activerdf.org/bnode/#{uuid}/#$1")
+								else
+									RDFS::Resource.new(nodes[0])
+								end
+
+			predicate = RDFS::Resource.new(nodes[1])
+
+			# handle bnodes and literals if necessary (literals need unicode fixing)
+			object = case nodes[2]
+							 when BNode
+								 RDFS::Resource.new("http://www.activerdf.org/bnode/#{uuid}/#$1")
+							 when Literal
+								 fix_unicode(nodes[2])
+							 else
+								 RDFS::Resourec.new(nodes[2])
+							 end
+
+      # collect s, p, o into array to be returned
+      [subject, predicate, object]
+    end
+  end
+
+	private
+	# constants for extracting resources/literals from sql results
+	Node = Regexp.union(/_:\S*/,/<[^>]*>/,/"[^"]*"/)
+	BNode = /_:(\S*)/
+	Resource = /<([^>]*)>/
+	Literal = /"([^"]*)"/
+
+	# fixes unicode characters in literals (because we parse them wrongly somehow)
+	def self.fix_unicode(str)
+		tmp = str.gsub(/\\\u([0-9a-fA-F]{4,4})/u){ "U+#$1" }
+    tmp.gsub(/U\+([0-9a-fA-F]{4,4})/u){["#$1".hex ].pack('U*')}
+	end
+end

data/test/federation/test_federation_manager.rb

@@ -42,12 +42,9 @@ class TestFederationManager < Test::Unit::TestCase
 
   def test_class_add_no_write_adapter
     # zero write, one read -> must raise error
-
     adapter = get_read_only_adapter
-    assert(!(adapter.writes?))
-    assert_raises NoMethodError do
-      FederationManager.add(@@eyal, @@age, @@age_number)
-    end
+    assert (not adapter.writes?)
+    assert_raises(ActiveRdfError) { FederationManager.add(@@eyal, @@age, @@age_number) }
   end
 
   def test_class_add_one_write_one_read

data/test/objectmanager/test_namespace.rb

@@ -62,4 +62,16 @@ class TestNamespace < Test::Unit::TestCase
 
 		assert_equal abc, Namespace.expand(:test, :abc)
   end
+
+  def test_attributes
+    assert_nothing_raised { RDFS::domain }
+    assert_nothing_raised { RDF::type }
+    assert_raise(NameError) { FOAF::type }
+
+    foaf = 'http://xmlns.com/foaf/0.1/'
+    Namespace.register :foaf, foaf
+
+    foafname = RDFS::Resource.new(foaf + 'name')
+    assert_equal foafname, FOAF::name
+  end
 end

data/test/objectmanager/test_resource_reading.rb

@@ -12,6 +12,8 @@ class TestResourceReading < Test::Unit::TestCase
 		ConnectionPool.clear
     @adapter = get_read_only_adapter
     Namespace.register(:ar, 'http://activerdf.org/test/')
+    ObjectManager.construct_classes
+
     @eyal = RDFS::Resource.new 'http://activerdf.org/test/eyal'
   end
 
@@ -75,9 +77,6 @@ class TestResourceReading < Test::Unit::TestCase
 
   # test for writing if no write adapter is defined (like only sparqls)
   def test_write_without_write_adapter
-    assert_raises NoMethodError do
-      @eyal.age = 18
-    end
+    assert_raises(ActiveRdfError) { @eyal.age = 18 }
   end
-
 end

data/test/queryengine/test_ntriples_parser.rb

@@ -0,0 +1,31 @@
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006
+# License:: LGPL
+
+require 'test/unit'
+require 'active_rdf'
+require 'queryengine/ntriples_parser'
+require "#{File.dirname(__FILE__)}/../common"
+
+class TestNTriplesParser < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_the_parser
+    str = <<EOF
+<http://www.johnbreslin.com/blog/author/cloud/#foaf> <http://xmlns.com/foaf/0.1/surname> "Breslin" .
+<http://www.johnbreslin.com/blog/author/cloud/#foaf> <http://xmlns.com/foaf/0.1/firstName> "John" .
+<http://www.johnbreslin.com/blog/author/cloud/> <http://purl.org/dc/terms/created> "1999-11-30T00:00:00" .  				
+EOF
+    
+    results = NTriplesParser.parse(str)
+    assert_equal 9, results.flatten.size
+    assert_equal 3, results[0].size
+
+    assert_equal RDFS::Resource, results[0][0].class
+    assert_equal String, results[0][2].class
+  end
+end

data/test/queryengine/test_query.rb

@@ -48,7 +48,7 @@ class TestQuery < Test::Unit::TestCase
   end
 
 	def test_query_refuses_string_in_where_clause_subject_or_predicate
-    assert_raises ActiveRdfError do
+    assert_raises(ActiveRdfError)do
       Query.new.select(:s).where("http://test.org/uri",:p, :o).execute
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: activerdf
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-02-13 00:00:00 +00:00
+  version: 1.2.3
+date: 2007-02-14 00:00:00 +00:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -48,6 +48,7 @@ files:
 - test/queryengine/test_query2jars2.rb
 - test/queryengine/test_query2sparql.rb
 - test/queryengine/test_query_engine.rb
+- test/queryengine/test_ntriples_parser.rb
 - lib/active_rdf
 - lib/active_rdf.rb
 - lib/active_rdf_helpers.rb
@@ -64,6 +65,7 @@ files:
 - lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2jars2.rb
 - lib/active_rdf/queryengine/query2sparql.rb
+- lib/active_rdf/queryengine/ntriples_parser.rb
 test_files: []
 
 rdoc_options: []