sparql-client 3.0.1 → 3.2.0

data/lib/sparql/client/update.rb

@@ -12,12 +12,12 @@ class SPARQL::Client
     #   insert_data(data)
     #
     # @example INSERT DATA \{ GRAPH <http://example.org/> \{\}\}
-    #   insert_data(RDF::Graph.new, :graph => 'http://example.org/')
+    #   insert_data(RDF::Graph.new, graph: 'http://example.org/')
     #   insert_data(RDF::Graph.new).graph('http://example.org/')
     #
     # @param (see InsertData#initialize)
-    def self.insert_data(*arguments)
-      InsertData.new(*arguments)
+    def self.insert_data(*arguments, **options)
+      InsertData.new(*arguments, **options)
     end
 
     ##
@@ -30,12 +30,12 @@ class SPARQL::Client
     #   delete_data(data)
     #
     # @example DELETE DATA \{ GRAPH <http://example.org/> \{\}\}
-    #   delete_data(RDF::Graph.new, :graph => 'http://example.org/')
+    #   delete_data(RDF::Graph.new, graph: 'http://example.org/')
     #   delete_data(RDF::Graph.new).graph('http://example.org/')
     #
     # @param (see DeleteData#initialize)
-    def self.delete_data(*arguments)
-      DeleteData.new(*arguments)
+    def self.delete_data(*arguments, **options)
+      DeleteData.new(*arguments, **options)
     end
 
     ##
@@ -53,8 +53,8 @@ class SPARQL::Client
     #   load(RDF::URI(http://example.org/data.rdf), into: RDF::URI(http://example.org/data.rdf))
     #
     # @param (see Load#initialize)
-    def self.load(*arguments)
-      Load.new(*arguments)
+    def self.load(*arguments, **options)
+      Load.new(*arguments, **options)
     end
 
     ##
@@ -81,8 +81,8 @@ class SPARQL::Client
     #   clear(:all, silent: true)
     #
     # @param (see Clear#initialize)
-    def self.clear(*arguments)
-      Clear.new(*arguments)
+    def self.clear(*arguments, **options)
+      Clear.new(*arguments, **options)
     end
 
     ##
@@ -96,8 +96,8 @@ class SPARQL::Client
     #   create(RDF::URI(http://example.org/data.rdf), silent: true)
     #
     # @param (see Create#initialize)
-    def self.create(*arguments)
-      Create.new(*arguments)
+    def self.create(*arguments, **options)
+      Create.new(*arguments, **options)
     end
 
     ##
@@ -124,15 +124,15 @@ class SPARQL::Client
     #   drop(:all, silent: true)
     #
     # @param (see Drop#initialize)
-    def self.drop(*arguments)
-      Drop.new(*arguments)
+    def self.drop(*arguments, **options)
+      Drop.new(*arguments, **options)
     end
 
     class Operation
       attr_reader :options
 
-      def initialize(*arguments)
-        @options = arguments.last.is_a?(Hash) ? arguments.pop.dup : {}
+      def initialize(*arguments, **options)
+        @options = options.dup
         unless arguments.empty?
           send(arguments.shift, *arguments)
         end
@@ -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
@@ -171,9 +171,9 @@ class SPARQL::Client
       #   
       # @param [Array<RDF::Statement>, RDF::Enumerable] data
       # @param  [Hash{Symbol => Object}] options
-      def initialize(data, options = {})
+      def initialize(data, **options)
         @data = data
-        super(options)
+        super(**options)
       end
 
       ##
@@ -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
@@ -221,9 +221,9 @@ class SPARQL::Client
       #   
       # @param [Array<RDF::Statement>, RDF::Enumerable] data
       # @param  [Hash{Symbol => Object}] options
-      def initialize(data, options = {})
+      def initialize(data, **options)
         @data = data
-        super(options)
+        super(**options)
       end
 
       ##
@@ -247,17 +247,17 @@ 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
       attr_reader :where_graph
 
-      def initialize(_delete_graph, _insert_graph = nil, _where_graph = nil, options = {})
+      def initialize(_delete_graph, _insert_graph = nil, _where_graph = nil, **options)
         @delete_graph = _delete_graph
         @insert_graph = _insert_graph
         @where_graph = _where_graph
-        super(options)
+        super(**options)
       end
 
       ##
@@ -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
@@ -324,11 +324,10 @@ class SPARQL::Client
       # @param  [Hash{Symbol => Object}] options
       # @option [RDF::URI] :into
       # @option [Boolean] :silent
-      def initialize(from, options = {})
-        options = options.dup
+      def initialize(from, into: nil,**options)
         @from = RDF::URI(from)
-        @into = RDF::URI(options.delete(:into)) if options[:into]
-        super(options)
+        @into = RDF::URI(into) if into
+        super(**options)
       end
 
       ##
@@ -351,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
 
@@ -415,14 +414,14 @@ 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
 
       # @param  [Hash{Symbol => Object}] options
-      def initialize(uri, options = {})
+      def initialize(uri, **options)
         @uri = RDF::URI(uri)
-        super(options)
+        super(**options)
       end
 
       def to_s
@@ -434,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 '
@@ -451,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
@@ -459,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
@@ -467,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

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'
@@ -86,8 +86,13 @@ module SPARQL
     # @option options [Symbol] :method (DEFAULT_METHOD)
     # @option options [Number] :protocol (DEFAULT_PROTOCOL)
     # @option options [Hash] :headers
+    #   HTTP Request headers
+    #
+    #   Defaults `Accept` header based on available reader content types if triples are expected and to SPARQL result types otherwise, to allow for content negotiation based on available readers.
+    #
+    #   Defaults  `User-Agent` header, unless one is specified.
     # @option options [Hash] :read_timeout
-    def initialize(url, options = {}, &block)
+    def initialize(url, **options, &block)
       case url
       when RDF::Queryable
         @url, @options = url, options.dup
@@ -95,6 +100,9 @@ module SPARQL
         @url, @options = RDF::URI.new(url.to_s), options.dup
         @headers = @options.delete(:headers) || {}
         @http = http_klass(@url.scheme)
+
+        # Close the http connection when object is deallocated
+        ObjectSpace.define_finalizer(self, self.class.finalize(@http))
       end
 
       if block_given?
@@ -105,13 +113,30 @@ module SPARQL
       end
     end
 
+    # Close the http connection when object is deallocated
+    def self.finalize(klass)
+      proc do
+        klass.shutdown if klass.respond_to?(:shutdown)
+      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.
+    # @return [void] `self`
+    def close
+      @http.shutdown if @http
+      @http = nil
+      self
+    end
+
     ##
     # Executes a boolean `ASK` query.
     #
     # @param (see Query.ask)
     # @return [Query]
-    def ask(*args)
-      call_query_method(:ask, *args)
+    def ask(*args, **options)
+      call_query_method(:ask, *args, **options)
     end
 
     ##
@@ -119,8 +144,8 @@ module SPARQL
     #
     # @param (see Query.select)
     # @return [Query]
-    def select(*args)
-      call_query_method(:select, *args)
+    def select(*args, **options)
+      call_query_method(:select, *args, **options)
     end
 
     ##
@@ -128,8 +153,8 @@ module SPARQL
     #
     # @param (see Query.describe)
     # @return [Query]
-    def describe(*args)
-      call_query_method(:describe, *args)
+    def describe(*args, **options)
+      call_query_method(:describe, *args, **options)
     end
 
     ##
@@ -137,8 +162,8 @@ module SPARQL
     #
     # @param (see Query.construct)
     # @return [Query]
-    def construct(*args)
-      call_query_method(:construct, *args)
+    def construct(*args, **options)
+      call_query_method(:construct, *args, **options)
     end
 
     ##
@@ -161,15 +186,15 @@ module SPARQL
     #   client.insert_data(data)
     #
     # @example Inserting data into a named graph
-    #   client.insert_data(data, :graph => "http://example.org/")
+    #   client.insert_data(data, graph: "http://example.org/")
     #
     # @param  [RDF::Enumerable] data
     # @param  [Hash{Symbol => Object}] options
     # @option options [RDF::URI, String] :graph
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#insertData
-    def insert_data(data, options = {})
-      self.update(Update::InsertData.new(data, options))
+    # @see    https://www.w3.org/TR/sparql11-update/#insertData
+    def insert_data(data, **options)
+      self.update(Update::InsertData.new(data, **options))
     end
 
     ##
@@ -182,15 +207,15 @@ module SPARQL
     #   client.delete_data(data)
     #
     # @example Deleting data from a named graph
-    #   client.delete_data(data, :graph => "http://example.org/")
+    #   client.delete_data(data, graph: "http://example.org/")
     #
     # @param  [RDF::Enumerable] data
     # @param  [Hash{Symbol => Object}] options
     # @option options [RDF::URI, String] :graph
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#deleteData
-    def delete_data(data, options = {})
-      self.update(Update::DeleteData.new(data, options))
+    # @see    https://www.w3.org/TR/sparql11-update/#deleteData
+    def delete_data(data, **options)
+      self.update(Update::DeleteData.new(data, **options))
     end
 
     ##
@@ -204,9 +229,9 @@ 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
-    def delete_insert(delete_graph, insert_graph = nil, where_graph = nil, options = {})
-      self.update(Update::DeleteInsert.new(delete_graph, insert_graph, where_graph, options))
+    # @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
 
     ##
@@ -221,9 +246,9 @@ module SPARQL
     # @param  [Hash{Symbol => Object}] options
     # @option options [Boolean] :silent
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-update/#clear
-    def clear_graph(graph_uri, options = {})
-      self.clear(:graph, graph_uri, options)
+    # @see    https://www.w3.org/TR/sparql11-update/#clear
+    def clear_graph(graph_uri, **options)
+      self.clear(:graph, graph_uri, **options)
     end
 
     ##
@@ -249,23 +274,23 @@ module SPARQL
     #   @option options [Boolean] :silent
     #   @return [void] `self`
     #
-    # @overload clear(what, *arguments, options = {})
+    # @overload clear(what, *arguments, **options)
     #   @param  [Symbol, #to_sym] what
     #   @param  [Array] arguments splat of other arguments to {Update::Clear}.
     #   @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(what, *arguments)
       self.update(Update::Clear.new(what, *arguments))
     end
 
     ##
     # @private
-    def call_query_method(meth, *args)
+    def call_query_method(meth, *args, **options)
       client = self
-      result = Query.send(meth, *args)
+      result = Query.send(meth, *args, **options)
       (class << result; self; end).send(:define_method, :execute) do
         client.query(self)
       end
@@ -288,21 +313,22 @@ module SPARQL
     # @option options [String] :content_type
     # @option options [Hash] :headers
     # @return [Array<RDF::Query::Solution>]
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
-    def query(query, options = {})
+    # @raise [IOError] if connection is closed
+    # @see    https://www.w3.org/TR/sparql11-protocol/#query-operation
+    def query(query, **options)
       @op = :query
       @alt_endpoint = options[:endpoint]
       case @url
       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
         end
       else
-        parse_response(response(query, options), options)
+        parse_response(response(query, **options), **options)
       end
     end
 
@@ -315,16 +341,17 @@ module SPARQL
     # @option options [String] :content_type
     # @option options [Hash] :headers
     # @return [void] `self`
-    # @see    http://www.w3.org/TR/sparql11-protocol/#update-operation
-    def update(query, options = {})
+    # @raise [IOError] if connection is closed
+    # @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, options.merge(update: true))
+        SPARQL.execute(query, @url, update: true, optimize: true, **options)
       else
-        response(query, options)
+        response(query, **options)
       end
       self
     end
@@ -338,8 +365,9 @@ module SPARQL
     # @option options [String] :content_type
     # @option options [Hash] :headers
     # @return [String]
-    def response(query, options = {})
-      headers = options[:headers] || {}
+    # @raise [IOError] if connection is closed
+    def response(query, **options)
+      headers = options[:headers] || @headers
       headers['Accept'] = options[:content_type] if options[:content_type]
       request(query, headers) do |response|
         case response
@@ -359,7 +387,7 @@ module SPARQL
     # @param  [Net::HTTPSuccess] response
     # @param  [Hash{Symbol => Object}] options
     # @return [Object]
-    def parse_response(response, options = {})
+    def parse_response(response, **options)
       case options[:content_type] || response.content_type
         when NilClass
           response.body
@@ -374,14 +402,14 @@ module SPARQL
         when RESULT_TSV
           self.class.parse_tsv_bindings(response.body, nodes)
         else
-          parse_rdf_serialization(response, options)
+          parse_rdf_serialization(response, **options)
       end
     end
 
     ##
     # @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)
@@ -402,8 +430,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
@@ -411,9 +439,14 @@ module SPARQL
         when :uri
           RDF::URI.new(value['value'])
         when :literal
-          RDF::Literal.new(value['value'], :datatype => value['datatype'], :language => value['xml:lang'])
+          RDF::Literal.new(value['value'], datatype: value['datatype'], language: value['xml:lang'])
         when :'typed-literal'
-          RDF::Literal.new(value['value'], :datatype => value['datatype'])
+          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
@@ -421,7 +454,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)
@@ -445,7 +478,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(/^\?/, '')}
@@ -474,7 +507,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)
 
@@ -519,7 +552,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
@@ -529,7 +562,12 @@ module SPARQL
         when :literal
           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)
+          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
@@ -538,8 +576,8 @@ module SPARQL
     # @param  [Net::HTTPSuccess] response
     # @param  [Hash{Symbol => Object}] options
     # @return [RDF::Enumerable]
-    def parse_rdf_serialization(response, options = {})
-      options = {:content_type => response.content_type} unless options[:content_type]
+    def parse_rdf_serialization(response, **options)
+      options = {content_type: response.content_type} unless options[:content_type]
       if reader = RDF::Reader.for(options)
         reader.new(response.body)
       else
@@ -615,7 +653,7 @@ module SPARQL
           RDF::Statement.from(pattern).to_triple.each_with_index.map do |v, i|
             if i == 1
               SPARQL::Client.serialize_predicate(v)
-           else
+            else
               SPARQL::Client.serialize_value(v, use_vars)
             end
           end
@@ -658,11 +696,7 @@ module SPARQL
           value = ENV['https_proxy']
           proxy_url = URI.parse(value) unless value.nil? || value.empty?
       end
-      klass = if Net::HTTP::Persistent::VERSION >= '3.0'
-        Net::HTTP::Persistent.new(name: self.class.to_s, proxy: proxy_url)
-      else
-        Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
-      end
+      klass = Net::HTTP::Persistent.new(name: self.class.to_s, proxy: proxy_url)
       klass.keep_alive =  @options[:keep_alive] || 120
       klass.read_timeout = @options[:read_timeout] || 60
       klass
@@ -673,10 +707,16 @@ module SPARQL
     #
     # @param  [String, #to_s]          query
     # @param  [Hash{String => String}] headers
+      #   HTTP Request headers
+      #
+      #   Defaults `Accept` header based on available reader content types if triples are expected and to SPARQL result types otherwise, to allow for content negotiation based on available readers.
+      #
+      #   Defaults  `User-Agent` header, unless one is specified.
     # @yield  [response]
     # @yieldparam [Net::HTTPResponse] response
     # @return [Net::HTTPResponse]
-    # @see    http://www.w3.org/TR/sparql11-protocol/#query-operation
+    # @raise [IOError] if connection is closed
+    # @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?) ?
@@ -686,6 +726,7 @@ module SPARQL
       else
         RESULT_ALL
       end
+      headers['User-Agent'] ||= "Ruby SPARQL::Client/#{SPARQL::Client::VERSION}"
 
       request = send("make_#{request_method(query)}_request", query, headers)
 
@@ -693,6 +734,7 @@ module SPARQL
 
       pre_http_hook(request) if respond_to?(:pre_http_hook)
 
+      raise IOError, "Client has been closed" unless @http
       response = @http.request(::URI.parse(url.to_s), request)
 
       post_http_hook(response) if respond_to?(:post_http_hook)
@@ -722,10 +764,10 @@ 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)
+      url.query_values = (url.query_values || {}).merge(query: query.to_s)
       set_url_default_graph url unless @options[:graph].nil?
       request = Net::HTTP::Get.new(url.request_uri, self.headers.merge(headers))
       request
@@ -737,8 +779,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