sparql-client 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25fd44467b4b7014096fea7c336164c863b3da501ee747466ed486bdfab2f93d
-  data.tar.gz: f44d3e424e8c3fb13b0a323403212134c34e8fa7fb7ebaba562ded69a9d02fd7
+  metadata.gz: b464200c11f2c711f8fae5cb6d75a2deea216a2d682246b7b74ba8316c515404
+  data.tar.gz: 63822682605b809841d008beee3599c81caa72df9d6d7c1004f9e7e1f136ed34
 SHA512:
-  metadata.gz: 404e7f204b5bda734f531b29133705dcdf236a4bc7f348f32f6034595e43cd7e78814cb2d8cf66c696a9fd548496fd50b245b5bf2e705a551ef6e5012321c7d6
-  data.tar.gz: 4764b49167f0bd23e16455d9e1cf9ede6193db3dcd96eb17fd9ed4245557906dd5195424dbe88f098c8381e580ffc433f577e558b5472cb4f8f2a1756de3f911
+  metadata.gz: da4608ed0bc2c17af4bc7eba4c9c82f0be8095174fb18e8ec455441622a7efd3782e375f85eb8200b51617472fa0a6a94d0c7352e21e00e07dc21b1ec2709e23
+  data.tar.gz: 1c78bbf4de5d7c6a30126938813991175598084ef19ebd38b3bd20d941ea8ab1b94cc347f3a7a1a2d7238745c2589ef173974e300edbb581f53e072c9b637724

data/README.md

@@ -2,11 +2,12 @@
 
 This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 
-* <http://ruby-rdf.github.com/sparql-client/>
+* <https://ruby-rdf.github.com/sparql-client/>
 
-[![Gem Version](https://badge.fury.io/rb/sparql-client.png)](http://badge.fury.io/rb/sparql-client)
-[![Build Status](https://travis-ci.org/ruby-rdf/sparql-client.png?branch=master)](http://travis-ci.org/ruby-rdf/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)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/sparql-client/badge.svg?branch=master&service=github)](https://coveralls.io/github/ruby-rdf/sparql-client?branch=master)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Features
 
@@ -18,7 +19,7 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 * Supports tuple result sets in both XML, JSON, CSV and TSV formats, with JSON being
   the preferred default for content-negotiation purposes.
 * Supports graph results in any RDF serialization format understood by RDF.rb.
-* Returns results using the [RDF.rb object model][RDF.rb model].
+* Returns results using the RDF.rb object model.
 * Supports accessing endpoints as read/write [`RDF::Repository`][RDF::Repository]
   instances {SPARQL::Client::Repository}.
 
@@ -123,15 +124,15 @@ sparql.delete_data(data)
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.4)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
-* [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (~> 3.1)
-* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (~> 3.1)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10)
+* [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)
 
 ## Installation
 
-The recommended installation method is via [RubyGems](http://rubygems.org/).
+The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of the `SPARQL::Client` gem, do:
 
     % [sudo] gem install sparql-client
@@ -145,31 +146,31 @@ To get a local working copy of the development repository, do:
 Alternatively, download the latest development version as a tarball as
 follows:
 
-    % wget http://github.com/ruby-rdf/sparql-client/tarball/master
+    % wget https://github.com/ruby-rdf/sparql-client/tarball/master
 
 ## Mailing List
 
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 ## Authors
 
-* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
-* [Ben Lavender](http://github.com/bhuga) - <http://bhuga.net/>
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Arto Bendiken](https://github.com/artob) - <https://ar.to/>
+* [Ben Lavender](https://github.com/bhuga) - <https://bhuga.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
 
 ## Contributors
 
-* [Christoph Badura](http://github.com/bad) - <http://github.com/bad>
-* [James Hetherington](http://github.com/jamespjh) - <http://twitter.com/jamespjh>
-* [Gabriel Horner](http://github.com/cldwalker) - <http://tagaholic.me/>
-* [Nicholas Humfrey](http://github.com/njh) - <http://www.aelius.com/njh/>
-* [Fumihiro Kato](http://github.com/fumi) - <http://fumi.me/>
-* [David Nielsen](http://github.com/drankard) - <http://github.com/drankard>
-* [Thamaraiselvan Poomalai](http://github.com/selvan) - <http://softonaut.blogspot.com/>
-* [Michael Sokol](http://github.com/mikaa123) - <http://sokolmichael.com/>
-* [Yves Raimond](http://github.com/moustaki) - <http://moustaki.org/>
-* [Thomas Feron](http://github.com/thoferon) - <http://github.com/thoferon>
-* [Nick Gottlieb](http://github.com/ngottlieb) - <http://www.nicholasgottlieb.com>
+* [Christoph Badura](https://github.com/bad) - <https://github.com/bad>
+* [James Hetherington](https://github.com/jamespjh) - <https://twitter.com/jamespjh>
+* [Gabriel Horner](https://github.com/cldwalker) - <https://tagaholic.me/>
+* [Nicholas Humfrey](https://github.com/njh) - <https://www.aelius.com/njh/>
+* [Fumihiro Kato](https://github.com/fumi) - <https://fumi.me/>
+* [David Nielsen](https://github.com/drankard) - <https://github.com/drankard>
+* [Thamaraiselvan Poomalai](https://github.com/selvan) - <https://softonaut.blogspot.com/>
+* [Michael Sokol](https://github.com/mikaa123) - <https://sokolmichael.com/>
+* [Yves Raimond](https://github.com/moustaki) - <https://moustaki.org/>
+* [Thomas Feron](https://github.com/thoferon) - <https://github.com/thoferon>
+* [Nick Gottlieb](https://github.com/ngottlieb) - <https://www.nicholasgottlieb.com>
 
 ## Contributing
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -184,31 +185,32 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   list in the the `README`. Alphabetical order applies.
 * Do note that in order for us to merge any non-trivial changes (as a rule
   of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
 ## Resources
 
-* <http://ruby-rdf.github.com/sparql-client/>
-* <http://github.com/ruby-rdf/sparql-client>
-* <http://rubygems.org/gems/sparql-client>
-* <http://raa.ruby-lang.org/project/sparql-client/>
-* <http://www.ohloh.net/p/rdf>
+* <https://ruby-rdf.github.com/sparql-client/>
+* <https://github.com/ruby-rdf/sparql-client>
+* <https://rubygems.org/gems/sparql-client>
+* <https://raa.ruby-lang.org/project/sparql-client/>
+* <https://www.ohloh.net/p/rdf>
 
 ## License
 
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
-
-[Ruby]:            http://ruby-lang.org/
-[RDF]:             http://www.w3.org/RDF/
-[SPARQL]:          http://en.wikipedia.org/wiki/SPARQL
-[SPARQL JSON]:     http://www.w3.org/TR/rdf-sparql-json-res/
-[RDF.rb]:          http://rubygems.org/gems/rdf
-[RDF.rb model]:    http://blog.datagraph.org/2010/03/rdf-for-ruby
-[RDF::Repository]: http://rubydoc.info/github/ruby-rdf/rdf/RDF/Repository
-[DSL]:             http://en.wikipedia.org/wiki/Domain-specific_language
+see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+
+[Ruby]:            https://ruby-lang.org/
+[RDF]:             https://www.w3.org/RDF/
+[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
+[DSL]:             https://en.wikipedia.org/wiki/Domain-specific_language
                    "domain-specific language"
-[YARD]:            http://yardoc.org/
-[YARD-GS]:         http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:             http://unlicense.org/#unlicensing-contributions
-[Backports]:       http://rubygems.org/gems/backports
+[YARD]:            https://yardoc.org/
+[YARD-GS]:         https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:             https://unlicense.org/#unlicensing-contributions
+[Backports]:       https://rubygems.org/gems/backports

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/sparql/client.rb

@@ -1,6 +1,6 @@
-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
+require 'net/http/persistent' # @see https://rubygems.org/gems/net-http-persistent
+require 'rdf'                 # @see https://rubygems.org/gems/rdf
+require 'rdf/ntriples'        # @see https://rubygems.org/gems/rdf
 begin
   require 'nokogiri'
 rescue LoadError
@@ -11,10 +11,10 @@ module SPARQL
   ##
   # A SPARQL 1.0/1.1 client for RDF.rb.
   #
-  # @see http://www.w3.org/TR/sparql11-query/
-  # @see http://www.w3.org/TR/sparql11-protocol/
-  # @see http://www.w3.org/TR/sparql11-results-json/
-  # @see http://www.w3.org/TR/sparql11-results-csv-tsv/
+  # @see https://www.w3.org/TR/sparql11-query/
+  # @see https://www.w3.org/TR/sparql11-protocol/
+  # @see https://www.w3.org/TR/sparql11-results-json/
+  # @see https://www.w3.org/TR/sparql11-results-csv-tsv/
   class Client
     autoload :Query,      'sparql/client/query'
     autoload :Repository, 'sparql/client/repository'
@@ -185,7 +185,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @option options [RDF::URI, String] :graph
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#insertData
+    # @see    https://www.w3.org/TR/sparql11-update/#insertData
     def insert_data(data, **options)
       self.update(Update::InsertData.new(data, **options))
     end
@@ -206,7 +206,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @option options [RDF::URI, String] :graph
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#deleteData
+    # @see    https://www.w3.org/TR/sparql11-update/#deleteData
     def delete_data(data, **options)
       self.update(Update::DeleteData.new(data, **options))
     end
@@ -222,7 +222,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @option options [RDF::URI, String] :graph
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#deleteInsert
+    # @see    https://www.w3.org/TR/sparql11-update/#deleteInsert
     def delete_insert(delete_graph, insert_graph = nil, where_graph = nil, **options)
       self.update(Update::DeleteInsert.new(delete_graph, insert_graph, where_graph, **options))
     end
@@ -239,7 +239,7 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @option options [Boolean] :silent
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#clear
+    # @see    https://www.w3.org/TR/sparql11-update/#clear
     def clear_graph(graph_uri, **options)
       self.clear(:graph, graph_uri, **options)
     end
@@ -274,7 +274,7 @@ module SPARQL
     #   @option options [Boolean] :silent
     #   @return [void] `self`
     #
-    # @see    http://www.w3.org/TR/sparql11-update/#clear
+    # @see    https://www.w3.org/TR/sparql11-update/#clear
     def clear(what, *arguments)
       self.update(Update::Clear.new(what, *arguments))
     end
@@ -307,7 +307,7 @@ module SPARQL
     # @option options [Hash] :headers
     # @return [Array<RDF::Query::Solution>]
     # @raise [IOError] if connection is closed
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-operation
     def query(query, **options)
       @op = :query
       @alt_endpoint = options[:endpoint]
@@ -315,7 +315,7 @@ module SPARQL
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
         begin
-          SPARQL.execute(query, @url, **options)
+          SPARQL.execute(query, @url, optimize: true, **options)
         rescue SPARQL::MalformedQuery
           $stderr.puts "error running #{query}: #{$!}"
           raise
@@ -335,14 +335,14 @@ module SPARQL
     # @option options [Hash] :headers
     # @return [void] `self`
     # @raise [IOError] if connection is closed
-    # @see    http://www.w3.org/TR/sparql11-protocol/#update-operation
+    # @see    https://www.w3.org/TR/sparql11-protocol/#update-operation
     def update(query, **options)
       @op = :update
       @alt_endpoint = options[:endpoint]
       case @url
       when RDF::Queryable
         require 'sparql' unless defined?(::SPARQL::Grammar)
-        SPARQL.execute(query, @url, update: true, **options)
+        SPARQL.execute(query, @url, update: true, optimize: true, **options)
       else
         response(query, **options)
       end
@@ -402,7 +402,7 @@ module SPARQL
     ##
     # @param  [String, Hash] json
     # @return [<RDF::Query::Solutions>]
-    # @see    http://www.w3.org/TR/rdf-sparql-json-res/#results
+    # @see    https://www.w3.org/TR/rdf-sparql-json-res/#results
     def self.parse_json_bindings(json, nodes = {})
       require 'json' unless defined?(::JSON)
       json = JSON.parse(json.to_s) unless json.is_a?(Hash)
@@ -423,8 +423,8 @@ module SPARQL
     ##
     # @param  [Hash{String => String}] value
     # @return [RDF::Value]
-    # @see    http://www.w3.org/TR/sparql11-results-json/#select-encode-terms
-    # @see    http://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
+    # @see    https://www.w3.org/TR/sparql11-results-json/#select-encode-terms
+    # @see    https://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
     def self.parse_json_value(value, nodes = {})
       case value['type'].to_sym
         when :bnode
@@ -442,7 +442,7 @@ module SPARQL
     ##
     # @param  [String, Array<Array<String>>] csv
     # @return [<RDF::Query::Solutions>]
-    # @see    http://www.w3.org/TR/sparql11-results-csv-tsv/
+    # @see    https://www.w3.org/TR/sparql11-results-csv-tsv/
     def self.parse_csv_bindings(csv, nodes = {})
       require 'csv' unless defined?(::CSV)
       csv = CSV.parse(csv.to_s) unless csv.is_a?(Array)
@@ -466,7 +466,7 @@ module SPARQL
     ##
     # @param  [String, Array<Array<String>>] tsv
     # @return [<RDF::Query::Solutions>]
-    # @see    http://www.w3.org/TR/sparql11-results-csv-tsv/
+    # @see    https://www.w3.org/TR/sparql11-results-csv-tsv/
     def self.parse_tsv_bindings(tsv, nodes = {})
       tsv = tsv.lines.map {|l| l.chomp.split("\t")} unless tsv.is_a?(Array)
       vars = tsv.shift.map {|h| h.sub(/^\?/, '')}
@@ -495,7 +495,7 @@ module SPARQL
     ##
     # @param  [String, IO, Nokogiri::XML::Node, REXML::Element] xml
     # @return [<RDF::Query::Solutions>]
-    # @see    http://www.w3.org/TR/rdf-sparql-json-res/#results
+    # @see    https://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)
 
@@ -540,7 +540,7 @@ module SPARQL
     ##
     # @param  [Nokogiri::XML::Element, REXML::Element] value
     # @return [RDF::Value]
-    # @see    http://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
+    # @see    https://www.w3.org/TR/rdf-sparql-json-res/#variable-binding-results
     def self.parse_xml_value(value, nodes = {})
       case value.name.to_sym
         when :bnode
@@ -699,7 +699,7 @@ module SPARQL
     # @yieldparam [Net::HTTPResponse] response
     # @return [Net::HTTPResponse]
     # @raise [IOError] if connection is closed
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-operation
     def request(query, headers = {}, &block)
       # Make sure an appropriate Accept header is present
       headers['Accept'] ||= if (query.respond_to?(:expects_statements?) ?
@@ -747,7 +747,7 @@ module SPARQL
     # @param  [String, #to_s]          query
     # @param  [Hash{String => String}] headers
     # @return [Net::HTTPRequest]
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-via-get
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-via-get
     def make_get_request(query, headers = {})
       url = self.url.dup
       url.query_values = (url.query_values || {}).merge(query: query.to_s)
@@ -762,8 +762,8 @@ module SPARQL
     # @param  [String, #to_s]          query
     # @param  [Hash{String => String}] headers
     # @return [Net::HTTPRequest]
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-via-post-direct
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-via-post-urlencoded
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-via-post-direct
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-via-post-urlencoded
     def make_post_request(query, headers = {})
       if @alt_endpoint.nil?
         url = self.url.dup

data/lib/sparql/client/query.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 class SPARQL::Client
   ##
   # A SPARQL query builder.
@@ -10,7 +12,7 @@ class SPARQL::Client
     # The form of the query.
     #
     # @return [:select, :ask, :construct, :describe]
-    # @see    http://www.w3.org/TR/sparql11-query/#QueryForms
+    # @see    https://www.w3.org/TR/sparql11-query/#QueryForms
     attr_reader :form
 
     ##
@@ -25,7 +27,7 @@ class SPARQL::Client
     #
     # @param  [Hash{Symbol => Object}] options (see {#initialize})
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#ask
+    # @see    https://www.w3.org/TR/sparql11-query/#ask
     def self.ask(**options)
       self.new(:ask, **options)
     end
@@ -33,13 +35,13 @@ class SPARQL::Client
     ##
     # Creates a tuple `SELECT` query.
     #
-    # @example SELECT * WHERE { ?s ?p ?o . }
+    # @example `SELECT * WHERE { ?s ?p ?o . }`
     #   Query.select.where([:s, :p, :o])
     #
-    # @example SELECT ?s WHERE {?s ?p ?o .}
+    # @example `SELECT ?s WHERE {?s ?p ?o .}`
     #   Query.select(:s).where([:s, :p, :o])
     #
-    # @example SELECT COUNT(?uri as ?c) WHERE {?uri a owl:Class}
+    # @example `SELECT COUNT(?uri as ?c) WHERE {?uri a owl:Class}`
     #   Query.select(count: {uri: :c}).where([:uri, RDF.type, RDF::OWL.Class])
     #
     # @param  [Array<Symbol>]          variables
@@ -49,7 +51,7 @@ class SPARQL::Client
     #   @param  [Array<Symbol>]          variables
     #   @param  [Hash{Symbol => Object}] options (see {#initialize})
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#select
+    # @see    https://www.w3.org/TR/sparql11-query/#select
     def self.select(*variables, **options)
       self.new(:select, **options).select(*variables)
     end
@@ -67,7 +69,7 @@ class SPARQL::Client
     #   @param  [Array<Symbol, RDF::URI>] variables
     #   @param  [Hash{Symbol => Object}] options (see {#initialize})
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#describe
+    # @see    https://www.w3.org/TR/sparql11-query/#describe
     def self.describe(*variables, **options)
       self.new(:describe, **options).describe(*variables)
     end
@@ -85,7 +87,7 @@ class SPARQL::Client
     #   @param  [Array<RDF::Query::Pattern, Array>] patterns
     #   @param  [Hash{Symbol => Object}] options (see {#initialize})
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#construct
+    # @see    https://www.w3.org/TR/sparql11-query/#construct
     def self.construct(*patterns, **options)
       self.new(:construct, **options).construct(*patterns) # FIXME
     end
@@ -112,25 +114,25 @@ class SPARQL::Client
     #   query.ask.where([:s, :p, :o])
     #
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#ask
+    # @see    https://www.w3.org/TR/sparql11-query/#ask
     def ask
       @form = :ask
       self
     end
 
     ##
-    # @example SELECT * WHERE { ?s ?p ?o . }
+    # @example `SELECT * WHERE { ?s ?p ?o . }`
     #   query.select.where([:s, :p, :o])
     #
-    # @example SELECT ?s WHERE {?s ?p ?o .}
+    # @example `SELECT ?s WHERE {?s ?p ?o .}`
     #   query.select(:s).where([:s, :p, :o])
     #
-    # @example SELECT COUNT(?uri as ?c) WHERE {?uri a owl:Class}
+    # @example `SELECT COUNT(?uri as ?c) WHERE {?uri a owl:Class}`
     #   query.select(count: {uri: :c}).where([:uri, RDF.type, RDF::OWL.Class])
     #
     # @param  [Array<Symbol>, Hash{Symbol => RDF::Query::Variable}] variables
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#select
+    # @see    https://www.w3.org/TR/sparql11-query/#select
     def select(*variables)
       @values = if variables.length == 1 && variables.first.is_a?(Hash)
         variables.to_a
@@ -146,7 +148,7 @@ class SPARQL::Client
     #
     # @param  [Array<Symbol>] variables
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#describe
+    # @see    https://www.w3.org/TR/sparql11-query/#describe
     def describe(*variables)
       @values = variables.map { |var|
         [var, var.is_a?(RDF::URI) ? var : RDF::Query::Variable.new(var)]
@@ -160,7 +162,7 @@ class SPARQL::Client
     #
     # @param  [Array<RDF::Query::Pattern, Array>] patterns
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#construct
+    # @see    https://www.w3.org/TR/sparql11-query/#construct
     def construct(*patterns)
       options[:template] = build_patterns(patterns)
       self
@@ -172,7 +174,7 @@ class SPARQL::Client
     #
     # @param [RDF::URI] uri
     # @return [Query]
-    # @see http://www.w3.org/TR/sparql11-query/#specifyingDataset
+    # @see https://www.w3.org/TR/sparql11-query/#specifyingDataset
     def from(uri)
       options[:from] = uri
       self
@@ -205,7 +207,7 @@ class SPARQL::Client
     #   Yield form with or without argument; without an argument, evaluates within the query.
     # @yieldparam [SPARQL::Client::Query] query Actually a delegator to query. Methods other than `#select` are evaluated against `self`. For `#select`, a new Query is created, and the result added as a subquery.
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#GraphPattern
+    # @see    https://www.w3.org/TR/sparql11-query/#GraphPattern
     def where(*patterns_queries, &block)
       subqueries, patterns = patterns_queries.partition {|pq| pq.is_a? SPARQL::Client::Query}
       @patterns += build_patterns(patterns)
@@ -245,7 +247,7 @@ class SPARQL::Client
     #
     # @param  [Array<Symbol, String>] variables
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modOrderBy
+    # @see    https://www.w3.org/TR/sparql11-query/#modOrderBy
     def order(*variables)
       options[:order_by] = variables
       self
@@ -260,7 +262,7 @@ class SPARQL::Client
     #
     # @param  [Array<Symbol, String>] var
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modOrderBy
+    # @see    https://www.w3.org/TR/sparql11-query/#modOrderBy
     def asc(var)
       (options[:order_by] ||= []) << {var => :asc}
       self
@@ -273,7 +275,7 @@ class SPARQL::Client
     #
     # @param  [Array<Symbol, String>] var
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modOrderBy
+    # @see    https://www.w3.org/TR/sparql11-query/#modOrderBy
     def desc(var)
       (options[:order_by] ||= []) << {var => :desc}
       self
@@ -285,7 +287,7 @@ class SPARQL::Client
     #
     # @param  [Array<Symbol, String>] variables
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#groupby
+    # @see    https://www.w3.org/TR/sparql11-query/#groupby
     def group(*variables)
       options[:group_by] = variables
       self
@@ -298,7 +300,7 @@ class SPARQL::Client
     #   query.select(:s).distinct.where([:s, :p, :o])
     #
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modDuplicates
+    # @see    https://www.w3.org/TR/sparql11-query/#modDuplicates
     def distinct(state = true)
       options[:distinct] = state
       self
@@ -309,7 +311,7 @@ class SPARQL::Client
     #   query.select(:s).reduced.where([:s, :p, :o])
     #
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modDuplicates
+    # @see    https://www.w3.org/TR/sparql11-query/#modDuplicates
     def reduced(state = true)
       options[:reduced] = state
       self
@@ -320,7 +322,7 @@ class SPARQL::Client
     #   query.select.graph(:g).where([:s, :p, :o])
     # @param  [RDF::Value] graph_uri_or_var
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#queryDataset
+    # @see    https://www.w3.org/TR/sparql11-query/#queryDataset
     def graph(graph_uri_or_var)
       options[:graph] = case graph_uri_or_var
         when Symbol then RDF::Query::Variable.new(graph_uri_or_var)
@@ -337,7 +339,7 @@ class SPARQL::Client
     #
     # @param  [Integer, #to_i] start
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modOffset
+    # @see    https://www.w3.org/TR/sparql11-query/#modOffset
     def offset(start)
       slice(start, nil)
     end
@@ -348,7 +350,7 @@ class SPARQL::Client
     #
     # @param  [Integer, #to_i] length
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#modResultLimit
+    # @see    https://www.w3.org/TR/sparql11-query/#modResultLimit
     def limit(length)
       slice(nil, length)
     end
@@ -387,7 +389,7 @@ class SPARQL::Client
     #
     #   @param [string] string
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#prefNames
+    # @see    https://www.w3.org/TR/sparql11-query/#prefNames
     def prefix(val)
       options[:prefixes] ||= []
       if val.kind_of? String
@@ -420,7 +422,7 @@ class SPARQL::Client
     #   Yield form with or without argument; without an argument, evaluates within the query.
     # @yieldparam [SPARQL::Client::Query] query used for creating filters on the optional patterns.
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#optionals
+    # @see    https://www.w3.org/TR/sparql11-query/#optionals
     def optional(*patterns, &block)
       (options[:optionals] ||= []) << build_patterns(patterns)
 
@@ -466,7 +468,7 @@ class SPARQL::Client
     #   Yield form with or without argument; without an argument, evaluates within the query.
     # @yieldparam [SPARQL::Client::Query] query used for adding select clauses.
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#optionals
+    # @see    https://www.w3.org/TR/sparql11-query/#optionals
     def union(*patterns, &block)
       options[:unions] ||= []
 
@@ -519,7 +521,7 @@ class SPARQL::Client
     #   Yield form with or without argument; without an argument, evaluates within the query.
     # @yieldparam [SPARQL::Client::Query] query used for adding select clauses.
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#optionals
+    # @see    https://www.w3.org/TR/sparql11-query/#optionals
     def minus(*patterns, &block)
       options[:minuses] ||= []
 
@@ -601,7 +603,7 @@ class SPARQL::Client
           case nil_literal_or_term
           when nil then nil
           when String then RDF::Literal(nil_literal_or_term)
-          when RDF::Value then graph_uri_or_var
+          when RDF::Value then nil_literal_or_term
           else raise ArgumentError
           end
         end

data/lib/sparql/client/repository.rb

@@ -179,9 +179,7 @@ class SPARQL::Client
         binding[:count].value.to_i rescue 0
       rescue SPARQL::Client::MalformedQuery => e
         # SPARQL 1.0 does not include support for aggregate functions:
-        count = 0
-        each_statement { count += 1 } # TODO: optimize this
-        count
+        each_statement.count
       end
     end
 
@@ -264,7 +262,9 @@ class SPARQL::Client
     # @see    RDF::Query#execute
     def query_execute(query, **options, &block)
       return nil unless block_given?
-      q = SPARQL::Client::Query.select(query.variables, **{}).where(*query.patterns)
+      q = SPARQL::Client::Query.
+        select(query.variables, **{}).
+        where(*query.patterns)
       client.query(q, **options).each do |solution|
         yield solution
       end

data/lib/sparql/client/update.rb

@@ -155,7 +155,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#insertData
+    # @see https://www.w3.org/TR/sparql11-update/#insertData
     class InsertData < Operation
       # @return [RDF::Enumerable]
       attr_reader :data
@@ -205,7 +205,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#deleteData
+    # @see https://www.w3.org/TR/sparql11-update/#deleteData
     class DeleteData < Operation
       # @return [RDF::Enumerable]
       attr_reader :data
@@ -247,7 +247,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#deleteInsert
+    # @see https://www.w3.org/TR/sparql11-update/#deleteInsert
     class DeleteInsert < Operation
       attr_reader :insert_graph
       attr_reader :delete_graph
@@ -301,7 +301,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#load
+    # @see https://www.w3.org/TR/sparql11-update/#load
     class Load < Operation
       attr_reader :from
       attr_reader :into
@@ -350,7 +350,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#clear
+    # @see https://www.w3.org/TR/sparql11-update/#clear
     class Clear < Operation
       attr_reader :uri
 
@@ -414,7 +414,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#create
+    # @see https://www.w3.org/TR/sparql11-update/#create
     class Create < Operation
       attr_reader :uri
 
@@ -433,7 +433,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#drop
+    # @see https://www.w3.org/TR/sparql11-update/#drop
     class Drop < Clear
       def to_s
         query_text = 'DROP '
@@ -450,7 +450,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#copy
+    # @see https://www.w3.org/TR/sparql11-update/#copy
     class Copy < Operation
       def to_s
         # TODO
@@ -458,7 +458,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#move
+    # @see https://www.w3.org/TR/sparql11-update/#move
     class Move < Operation
       def to_s
         # TODO
@@ -466,7 +466,7 @@ class SPARQL::Client
     end
 
     ##
-    # @see http://www.w3.org/TR/sparql11-update/#add
+    # @see https://www.w3.org/TR/sparql11-update/#add
     class Add < Operation
       def to_s
         # TODO

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -102,28 +102,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
 description: |-
   Executes SPARQL queries and updates against a remote SPARQL 1.0 or 1.1 endpoint,
                               or against a local repository. Generates SPARQL queries using a simple DSL.
@@ -144,11 +144,11 @@ files:
 - lib/sparql/client/repository.rb
 - lib/sparql/client/update.rb
 - lib/sparql/client/version.rb
-homepage: http://ruby-rdf.github.com/sparql-client/
+homepage: https://github.com/ruby-rdf/sparql-client/
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,8 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: SPARQL client for RDF.rb.
 test_files: []