Merge pull request #77 from cbeer/net-http-persistent

Add support for net-http-persistent 3.x
ruby-rdf · Nov 22, 2016 · 1ab8f58 · 1ab8f58
2 parents ddc0edc + 0a0ab9a
commit 1ab8f58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/sparql/client.rb b/lib/sparql/client.rb
@@ -658,7 +658,11 @@ def http_klass(scheme)
           value = ENV['https_proxy']
           proxy_url = URI.parse(value) unless value.nil? || value.empty?
       end
-      klass = Net::HTTP::Persistent.new(self.class.to_s, proxy_url)
+      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.keep_alive =  @options[:keep_alive] || 120
       klass.read_timeout = @options[:read_timeout] || 60
       klass

diff --git a/sparql-client.gemspec b/sparql-client.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version      = '>= 2.2.2'
   gem.requirements               = []
   gem.add_runtime_dependency     'rdf',       '~> 2.0'
-  gem.add_runtime_dependency     'net-http-persistent', '~> 2.9'
+  gem.add_runtime_dependency     'net-http-persistent', '>= 2.9', '< 4'
   gem.add_development_dependency 'sparql',    '~> 2.0'
   gem.add_development_dependency 'rdf-spec',  '~> 2.0'
   gem.add_development_dependency 'rspec',     '~> 3.4'