sparql-client 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a059f24774ca03ca4acab2ad37de9edcfbfcc8844ea0da0d7fe3d4b2a90849
-  data.tar.gz: 8aa709b83cab4ee290d3513ebb6fd90370d40587b58e8b06351b3df0f32973bb
+  metadata.gz: 91430f8e6c63118569f32b193b274fe8f19ca59728af08591177bdd5795ff05e
+  data.tar.gz: 3e0da28e7522a09004e2ac4bcd1b42e17cc943f02fd242d3a9e399597baa33e1
 SHA512:
-  metadata.gz: a7abad9a9c21cf0b8d88f9e1bf7ee98cc97ba8fa9a40c9eb06d29293202d16cb10aef0dc9edabe626709230e13511cae7a28af7bc0d48c5ece65ed7030c86022
-  data.tar.gz: fe927a99648a455a10494b839d994edae99b755512c69862e1a77418af0aad62d59132e663915ebea6f3f34c0fa6b057f7eab281fbb401bef8be30afecc63c2a
+  metadata.gz: 21e38994cd92126304d4a481a3ee471018c9dd99206d537340b2c91eb49bd853bd76fa3bf558e795ed18110b6d639f97cb5288d2b520f5196739d7bb9cc0f095
+  data.tar.gz: 75a14ccdce74d985fb83f541853e4e8d95edfeb9c8d59a5f5fbc988cf378c985623df574585480e30945791327ce9f99ab5da2178b5c886c8cc91152d7174442

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}.
 
@@ -30,11 +31,20 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 require 'sparql/client'
 sparql = SPARQL::Client.new("http://dbpedia.org/sparql")
 ```
+
+### Querying a remote SPARQL endpoint with a custom User-Agent
+By default, SPARQL::Client adds a `User-Agent` field to requests, but applications may choose to provide their own, using the `headers` option:
+
+```ruby
+require 'sparql/client'
+sparql = SPARQL::Client.new("http://dbpedia.org/sparql", headers: {'User-Agent' => 'MyBotName'})
+```
+
 ### Querying a remote SPARQL endpoint with a specified default graph
 
 ```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" })
 ```
 
 
@@ -114,15 +124,15 @@ sparql.delete_data(data)
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
-* [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
-* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (~> 3.0)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7)
+* [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
 
-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
@@ -136,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.
@@ -175,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.0.1
+3.2.0

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,34 +27,33 @@ class SPARQL::Client
     #
     # @param  [Hash{Symbol => Object}] options (see {#initialize})
     # @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#ask
-    def self.ask(options = {})
-      self.new(:ask, options)
+    # @see    https://www.w3.org/TR/sparql11-query/#ask
+    def self.ask(**options)
+      self.new(:ask, **options)
     end
 
     ##
     # 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
     # @return [Query]
     #
-    # @overload self.select(*variables, options)
+    # @overload self.select(*variables, **options)
     #   @param  [Array<Symbol>]          variables
     #   @param  [Hash{Symbol => Object}] options (see {#initialize})
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#select
-    def self.select(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:select, options).select(*variables)
+    # @see    https://www.w3.org/TR/sparql11-query/#select
+    def self.select(*variables, **options)
+      self.new(:select, **options).select(*variables)
     end
 
     ##
@@ -64,14 +65,13 @@ class SPARQL::Client
     # @param  [Array<Symbol, RDF::URI>] variables
     # @return [Query]
     #
-    # @overload self.describe(*variables, options)
+    # @overload self.describe(*variables, **options)
     #   @param  [Array<Symbol, RDF::URI>] variables
     #   @param  [Hash{Symbol => Object}] options (see {#initialize})
     #   @return [Query]
-    # @see    http://www.w3.org/TR/sparql11-query/#describe
-    def self.describe(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:describe, options).describe(*variables)
+    # @see    https://www.w3.org/TR/sparql11-query/#describe
+    def self.describe(*variables, **options)
+      self.new(:describe, **options).describe(*variables)
     end
 
     ##
@@ -83,19 +83,18 @@ class SPARQL::Client
     # @param  [Array<RDF::Query::Pattern, Array>] patterns
     # @return [Query]
     #
-    # @overload self.construct(*variables, options)
+    # @overload self.construct(*variables, **options)
     #   @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
-    def self.construct(*patterns)
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:construct, options).construct(*patterns) # FIXME
+    # @see    https://www.w3.org/TR/sparql11-query/#construct
+    def self.construct(*patterns, **options)
+      self.new(:construct, **options).construct(*patterns) # FIXME
     end
 
     ##
     # @param  [Symbol, #to_s]          form
-    # @overload self.construct(*variables, options)
+    # @overload self.construct(*variables, **options)
     #   @param  [Symbol, #to_s]          form
     #   @param  [Hash{Symbol => Object}] options (see {Client#initialize})
     #   @option options [Hash{Symbol => Symbol}] :count
@@ -104,10 +103,10 @@ class SPARQL::Client
     #     
     # @yield  [query]
     # @yieldparam [Query]
-    def initialize(form = :ask, options = {}, &block)
+    def initialize(form = :ask, **options, &block)
       @subqueries = []
       @form = form.respond_to?(:to_sym) ? form.to_sym : form.to_s.to_sym
-      super([], options, &block)
+      super([], **options, &block)
     end
 
     ##
@@ -115,27 +114,31 @@ 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>] variables
+    # @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 = variables.map { |var| [var, RDF::Query::Variable.new(var)] }
+      @values = if variables.length == 1 && variables.first.is_a?(Hash)
+        variables.to_a
+      else
+        variables.map { |var| [var, RDF::Query::Variable.new(var)] }
+      end
       self
     end
 
@@ -145,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)]
@@ -159,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
@@ -171,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
@@ -204,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)
@@ -240,11 +243,11 @@ class SPARQL::Client
     #   query.select.where([:s, :p, :o]).order_by(:o, :p)
     #
     # @example SELECT * WHERE { ?s ?p ?o . } ORDER BY ASC(?o) DESC(?p)
-    #   query.select.where([:s, :p, :o]).order_by(:o => :asc, :p => :desc)
+    #   query.select.where([:s, :p, :o]).order_by(o: :asc, p: :desc)
     #
     # @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
@@ -259,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
@@ -272,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
@@ -284,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
@@ -297,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
@@ -308,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
@@ -319,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)
@@ -336,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
@@ -347,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
@@ -386,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
@@ -419,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)
 
@@ -465,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] ||= []
 
@@ -518,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] ||= []
 
@@ -600,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
@@ -727,7 +730,7 @@ class SPARQL::Client
         buffer << 'ORDER BY'
         options[:order_by].map { |elem|
           case elem
-            # .order_by({ :var1 => :asc, :var2 => :desc})
+            # .order_by({ var1: :asc, var2: :desc})
             when Hash
               elem.each { |key, val|
                 # check provided values

data/lib/sparql/client/repository.rb

@@ -14,9 +14,9 @@ class SPARQL::Client
     def initialize(uri: nil, **options, &block)
       raise ArgumentError, "uri is a required parameter" unless uri
       @options = options.merge(uri: uri)
-      @update_client = SPARQL::Client.new(options.delete(:update_endpoint), options) if options[:update_endpoint]
-      @client  = SPARQL::Client.new(uri, options)
-      super(@options, &block)
+      @update_client = SPARQL::Client.new(options.delete(:update_endpoint), **options) if options[:update_endpoint]
+      @client  = SPARQL::Client.new(uri, **options)
+      super(**@options, &block)
     end
 
     ##
@@ -115,7 +115,7 @@ class SPARQL::Client
     # @see    RDF::Repository#each_subject?
     def each_subject(&block)
       if block_given?
-        client.select(:s, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:s]) }
+        client.select(:s, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:s]) }
       end
       enum_subject
     end
@@ -129,7 +129,7 @@ class SPARQL::Client
     # @see    RDF::Repository#each_predicate?
     def each_predicate(&block)
       if block_given?
-        client.select(:p, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:p]) }
+        client.select(:p, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:p]) }
       end
       enum_predicate
     end
@@ -143,7 +143,7 @@ class SPARQL::Client
     # @see    RDF::Repository#each_object?
     def each_object(&block)
       if block_given?
-        client.select(:o, :distinct => true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:o]) }
+        client.select(:o, distinct: true).where([:s, :p, :o]).each_solution { |solution| block.call(solution[:o]) }
       end
       enum_object
     end
@@ -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
 
@@ -262,10 +260,12 @@ class SPARQL::Client
     # @return [void] ignored
     # @see    RDF::Queryable#query
     # @see    RDF::Query#execute
-    def query_execute(query, options = {}, &block)
+    def query_execute(query, **options, &block)
       return nil unless block_given?
-      q = SPARQL::Client::Query.select(query.variables).where(*query.patterns)
-      client.query(q, options).each do |solution|
+      q = SPARQL::Client::Query.
+        select(query.variables, **{}).
+        where(*query.patterns)
+      client.query(q, **options).each do |solution|
         yield solution
       end
     end
@@ -275,7 +275,7 @@ class SPARQL::Client
     #
     # @example
     #     repository.query([nil, RDF::DOAP.developer, nil])
-    #     repository.query(:predicate => RDF::DOAP.developer)
+    #     repository.query({predicate: RDF::DOAP.developer})
     #
     # @todo This should use basic SPARQL query mechanism.
     #
@@ -284,7 +284,7 @@ class SPARQL::Client
     # @yield  [statement]
     # @yieldparam [Statement]
     # @return [Enumerable<Statement>]
-    def query_pattern(pattern, options = {}, &block)
+    def query_pattern(pattern, **options, &block)
       pattern = pattern.dup
       pattern.subject   ||= RDF::Query::Variable.new
       pattern.predicate ||= RDF::Query::Variable.new