activerdf 1.2.3 → 1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+== activerdf (1.3) Sun, 18 Feb 2007 15:09:35 +0000
+  * added support for datatyped literals in SPARQL queries
+
 == activerdf (1.2.3) Wed, 14 Feb 2007 16:07:41 +0000
   * namespaced properties are first-class citizens: FOAF::name or RDFS::domain
 

data/lib/active_rdf/objectmanager/literal.rb

@@ -0,0 +1,39 @@
+require 'active_rdf'
+
+# Represents an RDF literal, optionally datatyped.
+# TODO: language tags
+class Literal
+  Namespace.register :xsd, 'http://www.w3.org/2001/XMLSchema#'
+
+  attr_reader :value, :type
+  @value, @type = nil, nil
+
+  # Constructs literal with given datatype. If no datatype is given, automatic 
+  # conversion from Ruby to XSD datatype is tried.
+  def initialize(value, type=nil)
+    @value = value
+    @type = type
+
+    if @type.nil?
+      @type = case value
+             when String
+               XSD::string
+             when Date, Time, DateTime
+               XSD::date
+             when TrueClass, FalseClass
+               XSD::boolean
+             when Fixnum
+               XSD::integer
+             end
+    end
+  end
+
+  # returns string serialisation of literal, e.g. "test"^^xsd:string
+  def to_s
+    if type
+      "\"#{value}\"^^#{type.to_s}"
+    else
+      "\"value\""
+    end
+  end
+end

data/lib/active_rdf/queryengine/query.rb

@@ -95,10 +95,10 @@ class Query
 			# if you construct this query manually, you shouldn't! if your select 
 			# variable happens to be in one of the removed clauses: tough luck.
 
-			unless s.respond_to?(:uri) or s.class == Symbol
+			unless [RDFS::Resource, Symbol].include?(s.class)
 				raise(ActiveRdfError, "cannot add a where clause with s #{s}: s must be a resource or a variable")
 			end
-			unless p.respond_to?(:uri) or p.class == Symbol
+			unless [RDFS::Resource, Symbol].include?(s.class)
 				raise(ActiveRdfError, "cannot add a where clause with p #{p}: p must be a resource or a variable")
 			end
 
@@ -157,11 +157,12 @@ class Query
     case s
     when Symbol
 			s
-      #'?' + s.to_s
     when RDFS::Resource
       s
 		when nil
 			nil
+    when Literal
+      s
     else
       '"' + s.to_s + '"'
     end

data/lib/active_rdf.rb

@@ -13,6 +13,7 @@ $activerdflog.info "ActiveRDF started, logging level: #{$activerdflog.level}"
 
 # load standard classes that need to be loaded at startup
 require 'objectmanager/resource'
+require 'objectmanager/literal'
 require 'objectmanager/namespace'
 require 'federation/connection_pool'
 require 'queryengine/query'

data/test/objectmanager/test_literal.rb

@@ -0,0 +1,35 @@
+# Author:: Eyal Oren
+# Copyright:: (c) 2005-2006
+# License:: LGPL
+
+require 'test/unit'
+require 'active_rdf'
+require "#{File.dirname(__FILE__)}/../common"
+
+class TestLiteral < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_xsd_string
+    # test with explicit datatype
+    test = Literal.new('test', XSD::string)
+    assert_equal '"test"^^<http://www.w3.org/2001/XMLSchema#string>', test.to_s
+  end
+
+  def test_automatic_conversion
+    # infer string
+    test = Literal.new('test')
+    assert_equal '"test"^^<http://www.w3.org/2001/XMLSchema#string>', test.to_s
+
+    # infer integer
+    test = Literal.new(18)
+    assert_equal '"18"^^<http://www.w3.org/2001/XMLSchema#integer>', test.to_s
+
+    # infer boolean
+    test = Literal.new(true)
+    assert_equal '"true"^^<http://www.w3.org/2001/XMLSchema#boolean>', test.to_s
+  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.3
-date: 2007-02-14 00:00:00 +00:00
+  version: "1.3"
+date: 2007-02-18 00:00:00 +00:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -44,6 +44,7 @@ files:
 - test/objectmanager/test_object_manager.rb
 - test/objectmanager/test_resource_reading.rb
 - test/objectmanager/test_resource_writing.rb
+- test/objectmanager/test_literal.rb
 - test/queryengine/test_query.rb
 - test/queryengine/test_query2jars2.rb
 - test/queryengine/test_query2sparql.rb
@@ -62,6 +63,7 @@ files:
 - lib/active_rdf/objectmanager/namespace.rb
 - lib/active_rdf/objectmanager/object_manager.rb
 - lib/active_rdf/objectmanager/resource.rb
+- lib/active_rdf/objectmanager/literal.rb
 - lib/active_rdf/queryengine/query.rb
 - lib/active_rdf/queryengine/query2jars2.rb
 - lib/active_rdf/queryengine/query2sparql.rb