sparql-client 3.1.1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b464200c11f2c711f8fae5cb6d75a2deea216a2d682246b7b74ba8316c515404
-  data.tar.gz: 63822682605b809841d008beee3599c81caa72df9d6d7c1004f9e7e1f136ed34
+  metadata.gz: cfca146902f11c4799f6b955e97deecf31873afc3c05309234cab948f34afd0c
+  data.tar.gz: 63cbaafab09deeddf3cbbcb23fe013c27ff82b759fa681a32219eebf24a771ba
 SHA512:
-  metadata.gz: da4608ed0bc2c17af4bc7eba4c9c82f0be8095174fb18e8ec455441622a7efd3782e375f85eb8200b51617472fa0a6a94d0c7352e21e00e07dc21b1ec2709e23
-  data.tar.gz: 1c78bbf4de5d7c6a30126938813991175598084ef19ebd38b3bd20d941ea8ab1b94cc347f3a7a1a2d7238745c2589ef173974e300edbb581f53e072c9b637724
+  metadata.gz: 3aa86e2182d70ab4ca0472c2ae4f5a6c645a95a848dbb6f74f38c4406c298e15a8e704d321d42b3d5a8186f607dcf5ad1304755a575e75e295ce81fa26eecdd8
+  data.tar.gz: 495bd5bcfed2a73e47c0a890ccce100551befd249216328209f0bf20a920a6d8db1efb6e4691172adbae7aeff58496bf5434f875987f61f7d2c0068116b762b5

data/README.md

@@ -2,7 +2,7 @@
 
 This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
-* <https://ruby-rdf.github.com/sparql-client/>
+* <https://ruby-rdf.github.io/sparql-client/>
 
 [![Gem Version](https://badge.fury.io/rb/sparql-client.png)](https://badge.fury.io/rb/sparql-client)
 [![Build Status](https://github.com/ruby-rdf/sparql-client/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/sparql-client/actions?query=workflow%3ACI)
@@ -44,7 +44,7 @@ sparql = SPARQL::Client.new("http://dbpedia.org/sparql", headers: {'User-Agent'
 
 ```ruby
 require 'sparql/client'
-sparql = SPARQL::Client.new("http://dbpedia.org/sparql", { graph: "http://dbpedia.org" })
+sparql = SPARQL::Client.new("http://dbpedia.org/sparql", graph: "http://dbpedia.org")
 ```
 
 
@@ -117,18 +117,18 @@ sparql.delete_data(data)
 
 ## Documentation
 
-* [SPARQL::Client](https://www.rubydoc.info/github/ruby-rdf/sparql-client/SPARQL/Client)
-  * [SPARQL::Client::Query](https://www.rubydoc.info/github/ruby-rdf/sparql-client/SPARQL/Client/Query)
-  * [SPARQL::Client::Repository](https://www.rubydoc.info/github/ruby-rdf/sparql-client/SPARQL/Client/Repository)
-  * [SPARQL::Client::Update](https://www.rubydoc.info/github/ruby-rdf/sparql-client/SPARQL/Client/Update)
+* [SPARQL::Client](https://ruby-rdf.github.io/sparql-client/SPARQL/Client)
+  * [SPARQL::Client::Query](https://ruby-rdf.github.io/sparql-client/SPARQL/Client/Query)
+  * [SPARQL::Client::Repository](https://ruby-rdf.github.io/sparql-client/SPARQL/Client/Repository)
+  * [SPARQL::Client::Update](https://ruby-rdf.github.io/sparql-client/SPARQL/Client/Update)
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.4)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
-* [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent) (~> 3.1)
-* Soft dependency on [SPARQL](https://rubygems.org/gems/sparql) (~> 3.1)
-* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.10)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
+* [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent) (~> 4.0, >= 4.0.1)
+* Soft dependency on [SPARQL](https://rubygems.org/gems/sparql) (~> 3.2)
+* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.12)
 
 ## Installation
 
@@ -191,7 +191,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 
 ## Resources
 
-* <https://ruby-rdf.github.com/sparql-client/>
+* <https://ruby-rdf.github.io/sparql-client/>
 * <https://github.com/ruby-rdf/sparql-client>
 * <https://rubygems.org/gems/sparql-client>
 * <https://raa.ruby-lang.org/project/sparql-client/>
@@ -207,7 +207,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [SPARQL]:          https://en.wikipedia.org/wiki/SPARQL
 [SPARQL JSON]:     https://www.w3.org/TR/rdf-sparql-json-res/
 [RDF.rb]:          https://rubygems.org/gems/rdf
-[RDF::Repository]: https://rubydoc.info/github/ruby-rdf/rdf/RDF/Repository
+[RDF::Repository]: https://ruby-rdf.github.io/rdf/RDF/Repository
 [DSL]:             https://en.wikipedia.org/wiki/Domain-specific_language
                    "domain-specific language"
 [YARD]:            https://yardoc.org/

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.2.1

data/lib/sparql/client.rb

@@ -102,7 +102,7 @@ module SPARQL
         @http = http_klass(@url.scheme)
 
         # Close the http connection when object is deallocated
-        ObjectSpace.define_finalizer(self, proc {@http.shutdown if @http.respond_to?(:shutdown)})
+        ObjectSpace.define_finalizer(self, self.class.finalize(@http))
       end
 
       if block_given?
@@ -113,6 +113,20 @@ module SPARQL
       end
     end
 
+    # Close the http connection when object is deallocated
+    def self.finalize(klass)
+      proc do
+        if klass.respond_to?(:shutdown)
+          begin
+            # Attempt asynchronous shutdown
+            Thread.new {klass.shutdown}
+          rescue ThreadError
+            klass.shutdown
+          end
+        end
+      end
+    end
+
     ##
     # Closes a client instance by finishing the connection.
     # The client is unavailable for any further data operations; an IOError is raised if such an attempt is made. I/O streams are automatically closed when they are claimed by the garbage collector.
@@ -416,7 +430,13 @@ module SPARQL
             end
             RDF::Query::Solution.new(row)
           end
-          RDF::Query::Solutions.new(solutions)
+          solns = RDF::Query::Solutions.new(solutions)
+
+          # Set variable names explicitly
+          if json.fetch('head', {}).has_key?('vars')
+            solns.variable_names = json['head']['vars'].map(&:to_sym)
+          end
+          solns
       end
     end
 
@@ -435,6 +455,11 @@ module SPARQL
           RDF::Literal.new(value['value'], datatype: value['datatype'], language: value['xml:lang'])
         when :'typed-literal'
           RDF::Literal.new(value['value'], datatype: value['datatype'])
+        when :triple
+          s = parse_json_value(value['value']['subject'], nodes)
+          p = parse_json_value(value['value']['predicate'], nodes)
+          o = parse_json_value(value['value']['object'], nodes)
+          RDF::Statement(s, p, o)
         else nil
       end
     end
@@ -472,20 +497,23 @@ module SPARQL
       vars = tsv.shift.map {|h| h.sub(/^\?/, '')}
       solutions = RDF::Query::Solutions.new
       tsv.each do |row|
+        # Flesh out columns which may be missing
+        vars.each_with_index do |_, i|
+          row[i] ||= ""
+        end
         solution = RDF::Query::Solution.new
         row.each_with_index do |v, i|
-          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
+          term = case v
+          when ""                           then RDF::Literal("")
+          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::NTriples.unserialize(v) || RDF::Literal(v)
           end
+          nodes[term.id] = term if term.is_a? RDF::Node
+          solution[vars[i].to_sym] = term
         end
         solutions << solution
       end
@@ -494,45 +522,57 @@ module SPARQL
 
     ##
     # @param  [String, IO, Nokogiri::XML::Node, REXML::Element] xml
+    # @param  [Symbol] library (:nokogiri)
+    #   One of :nokogiri or :rexml.
     # @return [<RDF::Query::Solutions>]
     # @see    https://www.w3.org/TR/rdf-sparql-json-res/#results
-    def self.parse_xml_bindings(xml, nodes = {})
+    def self.parse_xml_bindings(xml, nodes = {}, library: :nokogiri)
       xml.force_encoding(::Encoding::UTF_8) if xml.respond_to?(:force_encoding)
 
-      if defined?(::Nokogiri)
+      if defined?(::Nokogiri) && library == :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)
+        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::Solutions.new(solutions)
+            RDF::Query::Solution.new(row)
+          end
+          solns = RDF::Query::Solutions.new(solutions)
+
+          # Set variable names explicitly
+          var_names = xml.xpath("//sparql:head/sparql:variable/@name", XMLNS)
+          solns.variable_names = var_names.map(&:to_s)
+          solns
         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)
+        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::Solutions.new(solutions)
+            RDF::Query::Solution.new(row)
+          end
+          solns = RDF::Query::Solutions.new(solutions)
+
+          # Set variable names explicitly
+          var_names = xml.elements['head'].elements.map {|e| e.attributes['name']}
+          solns.variable_names = var_names.map(&:to_sym)
+          solns
         end
       end
     end
@@ -551,6 +591,11 @@ module SPARQL
           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)
+        when :triple
+          # Note, this is order dependent
+          res = value.elements.map {|e| e.elements.to_a}.
+            flatten.map {|e| parse_xml_value(e, nodes)}
+          RDF::Statement(*res)
         else nil
       end
     end
@@ -561,7 +606,7 @@ module SPARQL
     # @return [RDF::Enumerable]
     def parse_rdf_serialization(response, **options)
       options = {content_type: response.content_type} unless options[:content_type]
-      if reader = RDF::Reader.for(options)
+      if reader = RDF::Reader.for(**options)
         reader.new(response.body)
       else
         raise RDF::ReaderError, "no RDF reader was found for #{options}."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,14 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -33,6 +39,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,34 +49,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +156,15 @@ files:
 - lib/sparql/client/repository.rb
 - lib/sparql/client/update.rb
 - lib/sparql/client/version.rb
-homepage: https://github.com/ruby-rdf/sparql-client/
+homepage: https://github.com/ruby-rdf/sparql-client
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/sparql-client
+  bug_tracker_uri: https://github.com/ruby-rdf/sparql-client/issues
+  homepage_uri: https://github.com/ruby-rdf/sparql-client
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/sparql-client
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -156,14 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: SPARQL client for RDF.rb.