activerdf 1.3 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== activerdf (1.3.1) Mon, 19 Feb 2007 17:04:57 +0000
+  * fixed type-checking bug in query.rb
+  * added language support to literals
+
 == activerdf (1.3) Sun, 18 Feb 2007 15:09:35 +0000
   * added support for datatyped literals in SPARQL queries
 

data/lib/active_rdf/objectmanager/literal.rb

@@ -5,33 +5,42 @@ require 'active_rdf'
 class Literal
   Namespace.register :xsd, 'http://www.w3.org/2001/XMLSchema#'
 
-  attr_reader :value, :type
-  @value, @type = nil, nil
+  attr_reader :value, :type, :language
+  @value, @type, @language = nil, 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)
+  def initialize(value, type_or_language=nil)
     @value = value
-    @type = type
-
-    if @type.nil?
+    
+    if type_or_language.nil?
+      # deduce type from the given value
       @type = case value
-             when String
-               XSD::string
-             when Date, Time, DateTime
-               XSD::date
-             when TrueClass, FalseClass
-               XSD::boolean
-             when Fixnum
-               XSD::integer
-             end
-    end
+               when String
+                 XSD::string
+               when Date, Time, DateTime
+                 XSD::date
+               when TrueClass, FalseClass
+                 XSD::boolean
+               when Fixnum
+                 XSD::integer
+        end
+    elsif type_or_language[0..0] == "@"
+      # a language tag has been given
+      @language = type_or_language[1..type_or_language.length]
+    else
+      # the type_or_language was not empty and did not start with a @ so it must be a data type
+      @type = type_or_language
+    end  
+
   end
 
   # returns string serialisation of literal, e.g. "test"^^xsd:string
   def to_s
     if type
       "\"#{value}\"^^#{type.to_s}"
+    elsif language
+      "\"#{value}\"@#{language}"
     else
       "\"value\""
     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 [RDFS::Resource, Symbol].include?(s.class)
+			unless s.is_a?(RDFS::Resource) or s.is_a?(Symbol)
 				raise(ActiveRdfError, "cannot add a where clause with s #{s}: s must be a resource or a variable")
 			end
-			unless [RDFS::Resource, Symbol].include?(s.class)
+			unless p.is_a?(RDFS::Resource) or p.is_a?(Symbol)
 				raise(ActiveRdfError, "cannot add a where clause with p #{p}: p must be a resource or a variable")
 			end
 

data/test/objectmanager/test_literal.rb

@@ -8,6 +8,8 @@ require "#{File.dirname(__FILE__)}/../common"
 
 class TestLiteral < Test::Unit::TestCase
   def setup
+		ConnectionPool.clear
+    @adapter = get_read_only_adapter
   end
 
   def teardown
@@ -32,4 +34,20 @@ class TestLiteral < Test::Unit::TestCase
     test = Literal.new(true)
     assert_equal '"true"^^<http://www.w3.org/2001/XMLSchema#boolean>', test.to_s
   end
+  
+  def test_equality
+    test1 = Literal.new('test')
+    test2 = Literal.new('test', XSD::string)  
+    assert_equal test2.to_s, test1.to_s
+  end
+  
+  def test_language_tag
+    cat = Literal.new('cat')
+    cat_en = Literal.new('cat', '@en')
+    assert_equal '"cat"@en', cat_en.to_s
+    assert_not_equal cat.to_s, cat_en.to_s
+
+    assert_equal '"dog"@en-GB', Literal.new('dog', '@en-GB').to_s
+    assert_equal '"dog"@en@test', Literal.new('dog', '@en@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.3"
-date: 2007-02-18 00:00:00 +00:00
+  version: 1.3.1
+date: 2007-02-19 00:00:00 +00:00
 summary: Offers object-oriented access to RDF (with adapters to several datastores).
 require_paths: 
 - lib
@@ -90,12 +90,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: activerdf_sparql
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: