dagger 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a24eae2c885b03f8f211c0ef2ec2d15e0e8aebce60338069376c0e6227a7cb
-  data.tar.gz: 33bebffa563c1731c41fe5a9f50d94dacaf782f5bb61bdb831904234c7f86571
+  metadata.gz: 85a53a6a5acd40ecd63cfbdf54a876d2d341626e9f5dcd2daffef6c223e89cdb
+  data.tar.gz: b18df51d7d507d68686cff2b4d08a204511f92a812aed2ba60c3f4833d3c7d27
 SHA512:
-  metadata.gz: ba8239c876e311a2e675941fe819dc4dc97e0174511d57444c8f42ce2b72681679bc652cb6b6b0b0748bfd53bec03f10b0c27f37258dfa11598273fc7de6fccd
-  data.tar.gz: afc2b9d3c96eec74db16887604afe200feb6060fe8e6c31d6dff2e380c4fa2f59ce73bd0e21f5aa735586174bbc7e8d5ae904129800239c0df59b7902de31e89
+  metadata.gz: fde76bd91f86ee78737bc428073f944c5fd2f9e585c50c92a65037b1ece4a424a5851635f30b86ecfdda4db6a072e9a0a20d6b27dc50ab4b286dafd14ca2c047
+  data.tar.gz: 64737c64a0a60fad0b01b3624725ce09aa264e5d582a616520be304277da817e23317ed88081162435057dd27d585a6c4b2b5bab76c78e4719fd68780ab0d830

data/.github/workflows/ruby.yml

@@ -0,0 +1,18 @@
+name: Ruby
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rspec

data/dagger.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-mocks"
   s.add_development_dependency "rspec-expectations"
 
+  s.add_runtime_dependency "net-http-persistent", "~> 3.0"
   s.add_runtime_dependency "oj", "~> 2.1"
   s.add_runtime_dependency "ox", "~> 2.4"
 

data/lib/dagger.rb

@@ -2,16 +2,24 @@ require 'dagger/version'
 require 'dagger/response'
 require 'dagger/parsers'
 
+require 'net/http/persistent'
 require 'net/https'
 require 'base64'
 
+class URI::HTTP
+  def scheme_and_host
+    [scheme, host].join('://')
+  end
+end
+
 module Dagger
 
+  DAGGER_NAME     = "Dagger/#{VERSION}"
   REDIRECT_CODES  = [301, 302, 303].freeze
   DEFAULT_RETRY_WAIT = 5.freeze # seconds
   DEFAULT_HEADERS = {
     'Accept'     => '*/*',
-    'User-Agent' => "Dagger/#{VERSION} (Ruby Net::HTTP Wrapper, like curl)"
+    'User-Agent' => "#{DAGGER_NAME} (Ruby Net::HTTP Wrapper, like curl)"
   }
 
   module Utils
@@ -25,6 +33,13 @@ module Dagger
       uri
     end
 
+    def self.resolve_uri(uri, host = nil, query = nil)
+      uri = host + uri if uri.to_s['//'].nil? && host
+      uri = parse_uri(uri.to_s)
+      uri.path.sub!(/\?.*|$/, '?' + Utils.encode(query)) if query and query.any?
+      uri
+    end
+
     def self.encode(obj, key = nil)
       if key.nil? && obj.is_a?(String) # && obj['=']
         return obj
@@ -49,10 +64,14 @@ module Dagger
 
     def self.init(uri, opts)
       uri  = Utils.parse_uri(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
+      http = if opts.delete(:persistent)
+        Net::HTTP::Persistent.new(name: DAGGER_NAME)
+      else
+        Net::HTTP.new(uri.host, uri.port)
+      end
 
       if uri.port == 443
-        http.use_ssl = true
+        http.use_ssl = true if http.respond_to?(:use_ssl) # persistent does it automatically
         http.verify_mode = opts[:verify_ssl] === false ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
       end
 
@@ -60,27 +79,31 @@ module Dagger
         http.send("#{key}=", opts[key]) if opts.has_key?(key)
       end
 
-      new(http)
+      # new(http, [uri.scheme, uri.host].join('://'))
+      new(http, uri.scheme_and_host)
     end
 
-    def initialize(http)
-      @http = http
+    def initialize(http, host = nil)
+      @http, @host = http, host
     end
 
     def get(uri, opts = {})
-      opts[:follow] = 10 if opts[:follow] == true
-
-      path = uri[0] == '/' ? uri : Utils.parse_uri(uri).request_uri
-      path.sub!(/\?.*|$/, '?' + Utils.encode(opts[:query])) if opts[:query] and opts[:query].any?
+      uri = Utils.resolve_uri(uri, @host, opts[:query])
+      raise ArgumentError.new("#{uri.scheme_and_host} does not match #{@host}") if @host != uri.scheme_and_host
 
+      opts[:follow] = 10 if opts[:follow] == true
       headers = opts[:headers] || {}
       headers['Accept'] = 'application/json' if opts[:json]
 
-      request = Net::HTTP::Get.new(path, DEFAULT_HEADERS.merge(headers))
+      request = Net::HTTP::Get.new(uri, DEFAULT_HEADERS.merge(headers))
       request.basic_auth(opts.delete(:username), opts.delete(:password)) if opts[:username]
 
-      @http.start unless @http.started?
-      resp, data = @http.request(request)
+      if @http.respond_to?(:started?) # regular Net::HTTP
+        @http.start unless @http.started?
+        resp, data = @http.request(request)
+      else # persistent
+        resp, data = @http.request(uri, request)
+      end
 
       if REDIRECT_CODES.include?(resp.code.to_i) && resp['Location'] && (opts[:follow] && opts[:follow] > 0)
         opts[:follow] -= 1
@@ -124,7 +147,8 @@ module Dagger
         return get(uri, opts.merge(query: query))
       end
 
-      uri     = Utils.parse_uri(uri)
+      uri = Utils.resolve_uri(uri, @host)
+      raise ArgumentError.new("#{uri.scheme_and_host} does not match #{@host}") if @host != uri.scheme_and_host
       headers = DEFAULT_HEADERS.merge(opts[:headers] || {})
 
       query = if data.is_a?(String)
@@ -138,21 +162,29 @@ module Dagger
 
       if opts[:username] # opts[:password] is optional
         str = [opts[:username], opts[:password]].compact.join(':')
-        headers['Authorization'] = "Basic " + Base64.encode64(str)
+        headers['Authorization'] = 'Basic ' + Base64.encode64(str)
       end
 
-      args = [method.to_s.downcase, uri.path, query, headers]
-      args.delete_at(2) if args[0] == 'delete' # Net::HTTP's delete does not accept data
+      if @http.respond_to?(:started?) # regular Net::HTTP
+        args = [method.to_s.downcase, uri.path, query, headers]
+        args.delete_at(2) if args[0] == 'delete' # Net::HTTP's delete does not accept data
+
+        @http.start unless @http.started?
+        resp, data = @http.send(*args)
+      else # Net::HTTP::Persistent
+        req = Kernel.const_get("Net::HTTP::#{method.capitalize}").new(uri.path, headers)
+        req.set_form_data(query)
+
+        resp, data = @http.request(uri, req)
+      end
 
-      @http.start unless @http.started?
-      resp, data = @http.send(*args)
       @response = build_response(resp, data || resp.body)
 
     rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EINVAL, Timeout::Error, \
       SocketError, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, OpenSSL::SSL::SSLError => e
 
       if method.to_s.downcase != 'get' && retries = opts[:retries] and retries.to_i > 0
-        puts "Got #{e.class}! Retrying in a sec (#{retries} retries left)"
+        puts "[#{DAGGER_NAME}] Got #{e.class}! Retrying in a sec (#{retries} retries left)"
         sleep (opts[:retry_wait] || DEFAULT_RETRY_WAIT)
         request(method, uri, data, opts.merge(retries: retries - 1))
       else
@@ -165,13 +197,21 @@ module Dagger
     end
 
     def open(&block)
-      @http.start do
+      if @http.is_a?(Net::HTTP::Persistent)
         instance_eval(&block)
+      else
+        @http.start do
+          instance_eval(&block)
+        end
       end
     end
 
     def close
-      @http.finish if @http.started?
+      if @http.is_a?(Net::HTTP::Persistent)
+        @http.shutdown # calls finish on pool connections
+      else
+        @http.finish if @http.started?
+      end
     end
 
     private
@@ -187,8 +227,11 @@ module Dagger
   class << self
 
     def open(uri, opts = {}, &block)
-      client = Client.init(uri, opts)
-      client.open(&block) if block_given?
+      client = Client.init(uri, opts.merge(persistent: true))
+      if block_given?
+        client.open(&block)
+        client.close
+      end
       client
     end
 

data/lib/dagger/version.rb

@@ -1,7 +1,7 @@
 module Dagger
   MAJOR = 1
-  MINOR = 3
-  PATCH = 1
+  MINOR = 4
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/spec/arguments_spec.rb

@@ -23,7 +23,7 @@ describe 'arguments' do
     describe 'invalid URL' do
 
       it 'raises error' do
-        expect { send_request('asd123.rewqw') }.to raise_error(SocketError)
+        expect { send_request('asd123.rewqw') }.to raise_error(ArgumentError)
       end
 
     end

data/spec/persistent_spec.rb

@@ -9,6 +9,7 @@ describe 'Persistent mode' do
     fake_client = double('Client')
     expect(Dagger::Client).to receive(:new).once.and_return(fake_client)
     expect(fake_client).to receive(:open).once #.and_return(fake_resp)
+    expect(fake_client).to receive(:close).once #.and_return(fake_resp)
 
     obj = Dagger.open('https://www.google.com') do
       get('/search?q=dagger+http+client')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dagger
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-24 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - README.md