dagger 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5942c147bb4bcf52ad8d1aa04cb5a44010eb15a6c85877a71b68872d745710c2
-  data.tar.gz: 14654c7a309a5719f0b23d136f62f67a6e995b9ac0d6dff0e697b628acf57f35
+  metadata.gz: 10733130d8f24aa8ba7fb7e27837fdc34ab854348aed2e82a09347c039689b2d
+  data.tar.gz: 9e3c600a111cdd1cf7090b8b48aa1103fa48e1f763588623902a9bb9daa704b6
 SHA512:
-  metadata.gz: 4f71ee8900cc198365cb0ec64176b0861ebe9e8c295a407b048d6c712806f80453770f336e0b518a3f87338b34be4a110963bfb978fdaafec80b54a885d79466
-  data.tar.gz: ec8bc6f7f374466b4d73fdb5cca061b2cab17918818d72e28c7b03b728cdfe5328e04a79584c483a223dbec2ec767dc10a9e0e562152d561f55c24db3b08bd0e
+  metadata.gz: c1d486fd374676a0f1892dfc98e89048729941a4ba10c0f207ebc87fefc100fe3ed172b31a3ba9d238124c1d8d8dfd01d3deda79b06eb93e7a60c04d67fbf7c6
+  data.tar.gz: fefd2e08f939a0dcfe8ba1c52c8e07c20eda4cdf921d120393cd4e52ade3002180ef29329ce2f9f1085ad27e2785cf76dc00a90cc499ba3724ac057a487c46b4

data/.gitignore

@@ -1 +1,3 @@
 pkg
+.ruby-version
+Gemfile.lock

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/connection_manager.rb

@@ -1,3 +1,5 @@
+# unused (we're using Net::HTTP::Persistent again)
+
 module Dagger
 
   class ConnectionManager
@@ -41,7 +43,7 @@ module Dagger
 
     # Executes an HTTP request to the given URI with the given method. Also
     # allows a request body, headers, and query string to be specified.
-    def send_request(uri, request)
+    def request(uri, request)
       connection = connection_for(uri)
       @mutex.synchronize do
         begin

data/lib/dagger/version.rb

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

data/lib/dagger.rb

@@ -1,7 +1,8 @@
 require 'dagger/version'
 require 'dagger/response'
 require 'dagger/parsers'
-require 'dagger/connection_manager'
+require 'net/http/persistent'
+# require 'dagger/connection_manager' # unused
 require 'net/https'
 require 'base64'
 require 'erb'
@@ -47,6 +48,7 @@ module Dagger
     end
 
     def self.encode_body(obj, opts = {})
+      return if obj.nil? || obj.empty?
       if obj.is_a?(String)
         obj
       elsif opts[:json]
@@ -78,25 +80,20 @@ module Dagger
 
   class Client
 
-    def self.init_persistent(opts = {})
-      # this line below forces one connection manager between multiple threads
-      # @persistent ||= Dagger::ConnectionManager.new(opts)
-
-      # here we initialize a connection manager for each thread
-      Thread.current[:dagger_persistent] ||= begin
-        Dagger::ConnectionManager.new(opts)
-      end
-    end
-
     def self.init_connection(uri, opts = {})
-      http = Net::HTTP.new(opts[:ip] || uri.host, uri.port)
+      http = if opts.delete(:persistent)
+        pool_size = opts[:pool_size] || Net::HTTP::Persistent::DEFAULT_POOL_SIZE
+        Net::HTTP::Persistent.new(name: DAGGER_NAME, pool_size: pool_size)
+      else
+        Net::HTTP.new(opts[:ip] || uri.host, uri.port)
+      end
 
       if uri.port == 443 || uri.scheme == 'https'
         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
 
-      [:keep_alive_timeout, :open_timeout, :read_timeout, :ssl_version, :ciphers].each do |key|
+      [:open_timeout, :read_timeout, :ssl_version, :ciphers].each do |key|
         http.send("#{key}=", opts[key] || DEFAULTS[key]) if (opts.has_key?(key) || DEFAULTS.has_key?(key))
       end
 
@@ -105,12 +102,7 @@ module Dagger
 
     def self.init(uri, opts)
       uri  = Utils.parse_uri(uri)
-
-      http = if opts.delete(:persistent)
-        init_persistent(opts)
-      else
-        init_connection(uri, opts)
-      end
+      http = init_connection(uri, opts)
 
       new(http, uri.scheme_and_host)
     end
@@ -129,22 +121,24 @@ module Dagger
       opts[:follow] = 10 if opts[:follow] == true
       headers = opts[:headers] || {}
       headers['Accept'] = 'application/json' if opts[:json] && headers['Accept'].nil?
-      headers['Content-Type'] = 'application/json' if opts[:json] && opts[:body]
+      headers['Content-Type'] = 'application/json' if opts[:json] && opts[:body] && opts[:body].size > 0
 
       if opts[:ip]
         headers['Host'] = uri.host
         uri = opts[:ip]
       end
 
+      debug { "Sending GET request to #{uri.request_uri} with headers #{headers.inspect} -- #{opts[:body]}" }
+
       request = Net::HTTP::Get.new(uri, DEFAULT_HEADERS.merge(headers))
       request.basic_auth(opts.delete(:username), opts.delete(:password)) if opts[:username]
-      request.body = Utils.encode_body(opts[:body], opts) if opts[:body]
+      request.body = Utils.encode_body(opts[:body], opts) if opts[:body] && opts[:body].size > 0
 
       if @http.respond_to?(:started?) # regular Net::HTTP
         @http.start unless @http.started?
         resp, data = @http.request(request)
       else # persistent
-        resp, data = @http.send_request(uri, request)
+        resp, data = @http.request(uri, request)
       end
 
       if REDIRECT_CODES.include?(resp.code.to_i) && resp['Location'] && (opts[:follow] && opts[:follow] > 0)
@@ -209,7 +203,7 @@ module Dagger
       end
 
       start = Time.now
-      debug { "Sending #{method} request to #{uri.request_uri} with headers #{headers.inspect} -- #{query}" }
+      debug { "Sending #{method} request to #{uri.request_uri} with headers #{headers.inspect} -- #{data}" }
 
       if @http.respond_to?(:started?) # regular Net::HTTP
         args = [method.to_s.downcase, uri.request_uri, body, headers]
@@ -220,7 +214,7 @@ module Dagger
       else # Net::HTTP::Persistent
         req = Kernel.const_get("Net::HTTP::#{method.capitalize}").new(uri.request_uri, headers)
         req.body = body
-        resp, data = @http.send_request(uri, req)
+        resp, data = @http.request(uri, req)
       end
 
       debug { "Got response #{resp.code} in #{(Time.now - start).round(2)}s: #{data || resp.body}" }
@@ -244,7 +238,7 @@ module Dagger
     end
 
     def open(&block)
-      if @http.is_a?(Dagger::ConnectionManager)
+      if @http.is_a?(Net::HTTP::Persistent)
         instance_eval(&block)
       else
         @http.start do
@@ -254,7 +248,7 @@ module Dagger
     end
 
     def close
-      if @http.is_a?(Dagger::ConnectionManager)
+      if @http.is_a?(Net::HTTP::Persistent)
         @http.shutdown # calls finish on pool connections
       else
         @http.finish if @http.started?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dagger
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-12-01 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