sparql-client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b9057801f8220049ffc8bc3c95646228bd6a4f
-  data.tar.gz: 1aa7bd26e8eb4fcac61b7816711ab974eab95895
+  metadata.gz: 251df215fdb211b37f325950b2d6f64d37639558
+  data.tar.gz: f07ba6ef756c9bf6306b496a0626661638ee6af3
 SHA512:
-  metadata.gz: b25feef617faf432f395a94da83ad0f6e4a39778f833aed8d481a1f27dffb31f3f60582a072693eee0057271dc2e183465fecdba33fa0e9fde585633972ebbd7
-  data.tar.gz: 83ef87f783a2e662bdf163d8ceb7c439db993aadd6ecf24498ebf07c3e9077ed7620ad60bb557fd491eeae454a5538d1ea39630ad14a04d14a274212215783e4
+  metadata.gz: 281f97c225fc2a75aadd4483699043562a784aee163ebb899c8baa57e7118852950706ea939456c9c13f8d01e887d13517b3e14dc4de3b1d01c7b7e21a7ff431
+  data.tar.gz: c6c0b441502b862d6abde67a6933aa2eb4633b1cba6c2685eae3eca2a42a1f6829218d9fa1f6c91a16bdcf58bdb76263c941ecc53bb0df0de13d150f3ecd8375

data/README

@@ -78,6 +78,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
 * [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
 * Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (>= 1.1)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5)
 
 ##Installation
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/sparql/client.rb

@@ -1,6 +1,11 @@
 require 'net/http/persistent' # @see http://rubygems.org/gems/net-http-persistent
 require 'rdf'                 # @see http://rubygems.org/gems/rdf
 require 'rdf/ntriples'        # @see http://rubygems.org/gems/rdf
+begin
+  require 'nokogiri'
+rescue LoadError
+  require 'rexml/document'
+end
 
 module SPARQL
   ##
@@ -35,6 +40,8 @@ module SPARQL
     DEFAULT_PROTOCOL = 1.0
     DEFAULT_METHOD   = :post
 
+    XMLNS = {'sparql' => 'http://www.w3.org/2005/sparql-results#'}.freeze
+
     ##
     # The SPARQL endpoint URL, or an RDF::Queryable instance, to use the native SPARQL engine.
     #
@@ -64,6 +71,7 @@ module SPARQL
     # @option options [Symbol] :method (DEFAULT_METHOD)
     # @option options [Number] :protocol (DEFAULT_PROTOCOL)
     # @option options [Hash] :headers
+    # @option options [Hash] :read_timeout
     def initialize(url, options = {}, &block)
       case url
       when RDF::Queryable
@@ -314,7 +322,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @return [Object]
     def parse_response(response, options = {})
-      case content_type = options[:content_type] || response.content_type
+      case options[:content_type] || response.content_type
         when RESULT_BOOL # Sesame-specific
           response.body == 'true'
         when RESULT_JSON
@@ -343,7 +351,7 @@ module SPARQL
         when json.has_key?('results')
           solutions = json['results']['bindings'].map do |row|
             row = row.inject({}) do |cols, (name, value)|
-              cols.merge(name.to_sym => parse_json_value(value))
+              cols.merge(name.to_sym => parse_json_value(value, nodes))
             end
             RDF::Query::Solution.new(row)
           end
@@ -404,15 +412,18 @@ module SPARQL
       tsv.each do |row|
         solution = RDF::Query::Solution.new
         row.each_with_index do |v, i|
-          term = RDF::NTriples.unserialize(v) || case v
-          when /^\d+\.\d*[eE][+-]?[0-9]+$/  then RDF::Literal::Double.new(v)
-          when /^\d*\.\d+[eE][+-]?[0-9]+$/  then RDF::Literal::Double.new(v)
-          when /^\d*\.\d+$/                 then RDF::Literal::Decimal.new(v)
-          when /^\d+$/                      then RDF::Literal::Integer.new(v)
-          else
-            RDF::Literal(v)
+          if !v.empty?
+            term = RDF::NTriples.unserialize(v) || case v
+            when /^\d+\.\d*[eE][+-]?[0-9]+$/  then RDF::Literal::Double.new(v)
+            when /^\d*\.\d+[eE][+-]?[0-9]+$/  then RDF::Literal::Double.new(v)
+            when /^\d*\.\d+$/                 then RDF::Literal::Decimal.new(v)
+            when /^\d+$/                      then RDF::Literal::Integer.new(v)
+            else
+              RDF::Literal(v)
+            end
+            nodes[term.id] = term if term.is_a? RDF::Node
+            solution[vars[i].to_sym] = term
           end
-          solution[vars[i].to_sym] = term
         end
         solutions << solution
       end
@@ -420,33 +431,52 @@ module SPARQL
     end
 
     ##
-    # @param  [String, REXML::Element] xml
+    # @param  [String, IO, Nokogiri::XML::Node, REXML::Element] xml
     # @return [<RDF::Query::Solutions>]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#results
     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)
 
-      case
-        when boolean = xml.elements['boolean']
-          boolean.text == 'true'
-        when results = xml.elements['results']
-          solutions = results.elements.map do |result|
-            row = {}
-            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, nodes)
+      if defined?(::Nokogiri)
+        xml = Nokogiri::XML(xml).root unless xml.is_a?(Nokogiri::XML::Document)
+        case
+          when boolean = xml.xpath("//sparql:boolean", XMLNS)[0]
+            boolean.text == 'true'
+          when results = xml.xpath("//sparql:results", XMLNS)[0]
+            solutions = results.elements.map do |result|
+              row = {}
+              result.elements.each do |binding|
+                name  = binding.attr('name').to_sym
+                value = binding.elements.first
+                row[name] = parse_xml_value(value, nodes)
+              end
+              RDF::Query::Solution.new(row)
             end
-            RDF::Query::Solution.new(row)
-          end
-          RDF::Query::Solutions.new(solutions)
+            RDF::Query::Solutions.new(solutions)
+        end
+      else
+        # REXML
+        xml = REXML::Document.new(xml).root unless xml.is_a?(REXML::Element)
+        case
+          when boolean = xml.elements['boolean']
+            boolean.text == 'true'
+          when results = xml.elements['results']
+            solutions = results.elements.map do |result|
+              row = {}
+              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, nodes)
+              end
+              RDF::Query::Solution.new(row)
+            end
+            RDF::Query::Solutions.new(solutions)
+        end
       end
     end
 
     ##
-    # @param  [REXML::Element] value
+    # @param  [Nokogiri::XML::Element, REXML::Element] value
     # @return [RDF::Value]
     # @see    http://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
     def self.parse_xml_value(value, nodes = {})
@@ -456,10 +486,9 @@ module SPARQL
         when :uri
           RDF::URI.new(value.text)
         when :literal
-          RDF::Literal.new(value.text, {
-            :language => value.attributes['xml:lang'],
-            :datatype => value.attributes['datatype'],
-          })
+          lang     = value.respond_to?(:attr) ? value.attr('xml:lang') : value.attributes['xml:lang']
+          datatype = value.respond_to?(:attr) ? value.attr('datatype') : value.attributes['datatype']
+          RDF::Literal.new(value.text, :language => lang, :datatype => datatype)
         else nil
       end
     end
@@ -540,6 +569,7 @@ module SPARQL
       end
       klass = Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
       klass.keep_alive = 120 # increase to 2 minutes
+      klass.read_timeout = @options[:read_timeout] || 60
       klass
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf