sparql-client 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/sparql/client.rb

@@ -89,13 +89,31 @@ module SPARQL
     end
 
     ##
-    # Executes a SPARQL query.
+    # A mapping of blank node results for this client
+    # @private
+    def nodes
+      @nodes ||= {}
+    end
+
+    ##
+    # Executes a SPARQL query and returns parsed results.
     #
     # @param  [String, #to_s]          url
     # @param  [Hash{Symbol => Object}] options
     # @option options [String] :content_type
     # @return [Array<RDF::Query::Solution>]
     def query(query, options = {})
+      parse_response(response(query, options), options)
+    end
+
+    ##
+    # Executes a SPARQL query and returns the Net::HTTP::Response of the result.
+    #
+    # @param [String, #to_s]   url
+    # @param  [Hash{Symbol => Object}] options
+    # @option options [String] :content_type
+    # @return [String]
+    def response(query, options = {})
       @headers['Accept'] = options[:content_type] if options[:content_type]
       get(query) do |response|
         case response
@@ -106,9 +124,10 @@ module SPARQL
           when Net::HTTPServerError # 5xx
             raise ServerError.new(response.body)
           when Net::HTTPSuccess     # 2xx
-            parse_response(response, options)
+            response
         end
       end
+
     end
 
     ##
@@ -120,9 +139,9 @@ module SPARQL
         when RESULT_BOOL # Sesame-specific
           response.body == 'true'
         when RESULT_JSON
-          parse_json_bindings(response.body)
+          self.class.parse_json_bindings(response.body, nodes)
         when RESULT_XML
-          parse_xml_bindings(response.body)
+          self.class.parse_xml_bindings(response.body, nodes)
         else
           parse_rdf_serialization(response, options)
       end
@@ -132,7 +151,7 @@ module SPARQL
     # @param  [String, Hash] json
     # @return [Enumerable<RDF::Query::Solution>]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#results
-    def parse_json_bindings(json)
+    def self.parse_json_bindings(json, nodes = {})
       require 'json' unless defined?(::JSON)
       json = JSON.parse(json.to_s) unless json.is_a?(Hash)
 
@@ -153,11 +172,10 @@ module SPARQL
     # @param  [Hash{String => String}] value
     # @return [RDF::Value]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
-    def parse_json_value(value)
+    def self.parse_json_value(value, nodes = {})
       case value['type'].to_sym
         when :bnode
-          @nodes ||= {}
-          @nodes[id = value['value']] ||= RDF::Node.new(id)
+          nodes[id = value['value']] ||= RDF::Node.new(id)
         when :uri
           RDF::URI.new(value['value'])
         when :literal
@@ -172,8 +190,8 @@ module SPARQL
     # @param  [String, REXML::Element] xml
     # @return [Enumerable<RDF::Query::Solution>]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#results
-    def parse_xml_bindings(xml)
-      xml.force_encoding(encoding) if xml.respond_to?(:force_encoding)
+    def self.parse_xml_bindings(xml, nodes = {})
+      xml.force_encoding(::Encoding::UTF_8) if xml.respond_to?(:force_encoding)
       require 'rexml/document' unless defined?(::REXML::Document)
       xml = REXML::Document.new(xml).root unless xml.is_a?(REXML::Element)
 
@@ -186,7 +204,7 @@ module SPARQL
             result.elements.each do |binding|
               name  = binding.attributes['name'].to_sym
               value = binding.select { |node| node.kind_of?(::REXML::Element) }.first
-              row[name] = parse_xml_value(value)
+              row[name] = parse_xml_value(value, nodes)
             end
             RDF::Query::Solution.new(row)
           end
@@ -197,11 +215,10 @@ module SPARQL
     # @param  [REXML::Element] value
     # @return [RDF::Value]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
-    def parse_xml_value(value)
+    def self.parse_xml_value(value, nodes = {})
       case value.name.to_sym
         when :bnode
-          @nodes ||= {}
-          @nodes[id = value.text] ||= RDF::Node.new(id)
+          nodes[id = value.text] ||= RDF::Node.new(id)
         when :uri
           RDF::URI.new(value.text)
         when :literal
@@ -224,12 +241,6 @@ module SPARQL
       end
     end
 
-    ##
-    # @return [Encoding]
-    def encoding
-      @encoding ||= ::Encoding::UTF_8
-    end
-
     ##
     # Outputs a developer-friendly representation of this object to `stderr`.
     #

data/lib/sparql/client/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: rdf
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -50,6 +52,7 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,6 +67,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -78,6 +82,7 @@ dependencies:
   name: rdf-spec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -117,6 +122,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -126,6 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 1
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -135,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sparql
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: SPARQL client for RDF.rb.