sparql-client 0.0.2 → 0.0.3

data/README

@@ -68,7 +68,7 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.5)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.7)
 * [JSON](http://rubygems.org/gems/json_pure) (>= 1.2.3)
 
 Installation

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/sparql/client/query.rb

@@ -1,3 +1,4 @@
+
 module SPARQL; class Client
   ##
   # A SPARQL query builder.
@@ -222,15 +223,19 @@ module SPARQL; class Client
         when :select
           buffer << 'DISTINCT' if options[:distinct]
           buffer << 'REDUCED'  if options[:reduced]
-          buffer << (variables.empty? ? '*' : variables.values.map(&:to_s).join(' '))
+          buffer << (variables.empty? ? '*' : variables.values.map { |v| serialize_value(v) }.join(' '))
         when :construct
           buffer << '{'
-          buffer += options[:template].map(&:to_s)
+          buffer += options[:template].map do |p|
+            p.to_triple.map { |v| serialize_value(v) }.join(' ') + " . "
+          end
           buffer << '}'
       end
 
       buffer << 'WHERE {'
-      buffer += patterns.map(&:to_s)
+      buffer += patterns.map do |p|
+        p.to_triple.map { |v| serialize_value(v) }.join(' ') + " . "
+      end
       if options[:filters]
         buffer += options[:filters].map { |filter| "FILTER(#{filter})" }
       end
@@ -263,5 +268,20 @@ module SPARQL; class Client
     def inspect
       sprintf("#<%s:%#0x(%s)>", self.class.name, __id__, to_s)
     end
+
+    ##
+    # Serializes an RDF::Value into a format appropriate for select, construct, and where clauses
+    #
+    # @param  [RDF::Value]
+    # @return [String]
+    # @private
+    def serialize_value(value)
+      # SPARQL queries are UTF-8, but support ASCII-style Unicode escapes, so
+      # the N-Triples serializer is fine unless it's a variable:
+      case
+        when value.variable? then "?#{value.name}"
+        else RDF::NTriples.serialize(value)
+      end
+    end
   end
 end; end

data/lib/sparql/client/version.rb

@@ -2,7 +2,7 @@ module SPARQL; class Client
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 7
+        version: 0.1.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency