ethon 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b0080762fbe70bea3b3d5717749a8afb60feb1d843543fc313705dc245b2b8
-  data.tar.gz: fab2787f5a0eebd10ed2d6004ba9b6e3cdc5b60f776e9e5ee0d811529a9a50c6
+  metadata.gz: c8540ddcb77af693ed5b18a89ebcd126dd1e73e1c0d6f748d3ee2deec929fd7d
+  data.tar.gz: 62c1f741fb9bf87f914bb769a6e512bf01cf4e91b0f2393b6e63d3674bed12b7
 SHA512:
-  metadata.gz: c8d9d0214408c48e702b0d8256d5d6c9d62540d57b9ce142c4a90ff667bbf4db4661e9423ce372d0652c9df4b0147110c3dcc2f317418d3b0e33fe245b4b876b
-  data.tar.gz: 1d351ae5e4b45e736a7eef6d4068cec779bfba6a71097c102a3998315aa391789d86725b173eafc5f15d55e587730334ec6c1eb60d4c5eb63b3cacbd11ddddb1
+  metadata.gz: 85604eb698147db21a2e20d83b2cbdca48d0beea0d8485a9aa992450a5dc13b3033faa1f8fa14f33faefbc71ceea317945211b116e13dd4a189b9a60963aa5fa
+  data.tar.gz: ed6a4381cafd5acfc1a9c5c3482e0f7b7edbf9f757aa548e16e29a76670b8b7b08b53388f52c8df76b6afa8072974311341e5acbc4c78df07092c5eb14d492de

data/CHANGELOG.md

@@ -2,7 +2,35 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.15.0...master)
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.17.0...master)
+
+## 0.17.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.16.0...v0.17.0)
+
+* Require Ruby 2.6+ and simplify Gemfile.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#255](https://github.com/typhoeus/ethon/pull/255))
+* Fixed mismatched libcurl error codes in `easy_codes` array.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#253](https://github.com/typhoeus/ethon/pull/253))
+* Add Ruby 3.3 and 3.4, remove Ruby 2.5 from CI matrix.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#252](https://github.com/typhoeus/ethon/pull/252))
+* Skip test due to libcurl 8.7.x bug in CURLINFO_REQUEST_SIZE.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#251](https://github.com/typhoeus/ethon/pull/251))
+* Use `Rackup::Handler.default` for Rack 3 compatibility.
+  ([Vít Ondruch](https://github.com/voxik), [#244](https://github.com/typhoeus/ethon/pull/244))
+* Add Ruby 3.1 and 3.2 to the test matrix.
+  ([Orien Madgwick](https://github.com/orien), [#228](https://github.com/typhoeus/ethon/pull/228))
+* Remove development and test files from the gem package.
+  ([Orien Madgwick](https://github.com/orien), [#227](https://github.com/typhoeus/ethon/pull/227))
+* Fix missing parenthesis in example.
+  ([Aleksey Tsalolikhin](https://github.com/atsalolikhin-spokeo), [#226](https://github.com/typhoeus/ethon/pull/226))
+
+## 0.16.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.15.0...v0.16.0)
+
+* Added `redirect_url` value to available informations and `Easy::Mirror`.
+  ([Adrien Rey-Jarthon](https://github.com/jarthod)
 
 ## 0.15.0
 

data/README.md

@@ -70,6 +70,29 @@ easy.perform
 This is really handy when making requests since you don't have to care about setting
 everything up correctly.
 
+## Http2
+Standard http2 servers require the client to connect once and create a session (multi) and then add simple requests to the multi handler.
+The `perform` method then takes all the requests in the multi handler and sends them to the server.
+
+See the following example
+```ruby
+multi = Ethon::Multi.new
+easy = Ethon::Easy.new
+
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_0 })
+
+# Sending a request with http version 2 will send an Upgrade header to the server, which many older servers will not support
+# See below for more info: https://everything.curl.dev/http/http2
+# If this is a problem, send the below:
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_prior_knowledge })
+
+# To set the server to use http2 with https and http1 with http, send the following:
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_tls })
+
+multi.add(easy)
+multi.perform
+```
+
 ##  LICENSE
 
 (The MIT License)

data/ethon.gemspec

@@ -15,12 +15,15 @@ Gem::Specification.new do |s|
   s.summary      = "Libcurl wrapper."
   s.description  = "Very lightweight libcurl wrapper."
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version = ">= 2.6"
   s.license = 'MIT'
 
   s.add_dependency('ffi', ['>= 1.15.0'])
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |file|
+      file.start_with?(*%w[. Gemfile Guardfile Rakefile profile spec])
+    end
+  end
   s.require_path = 'lib'
 end

data/lib/ethon/curls/classes.rb

@@ -32,8 +32,18 @@ module Ethon
 
         def clear; self[:fd_count] = 0; end
       else
-        # FD Set size.
-        FD_SETSIZE = ::Ethon::Libc.getdtablesize
+        # https://github.com/typhoeus/ethon/issues/182
+        FD_SETSIZE = begin
+          # Allow to override the (new) default cap
+          if ENV['ETHON_FD_SIZE']
+            ENV['ETHON_FD_SIZE']
+
+          # auto-detect ulimit, but cap at 2^16
+          else
+            [::Ethon::Libc.getdtablesize, 65_536].min
+          end
+        end
+
         layout :fds_bits, [:long, FD_SETSIZE / ::FFI::Type::LONG.size]
 
         # :nodoc:

data/lib/ethon/curls/codes.rb

@@ -26,7 +26,7 @@ module Ethon
           :ftp_weird_pasv_reply,
           :ftp_weird_227_format,
           :ftp_cant_get_host,
-          :obsolete16,
+          :http2,
           :ftp_couldnt_set_type,
           :partial_file,
           :ftp_couldnt_retr_file,
@@ -61,7 +61,7 @@ module Ethon
           :unknown_option,
           :telnet_option_syntax ,
           :obsolete50,
-          :peer_failed_verification,
+          :obsolete51,
           :got_nothing,
           :ssl_engine_notfound,
           :ssl_engine_setfailed,
@@ -70,6 +70,7 @@ module Ethon
           :obsolete57,
           :ssl_certproblem,
           :ssl_cipher,
+          :peer_failed_verification,
           :bad_content_encoding,
           :ldap_invalid_url,
           :filesize_exceeded,

data/lib/ethon/curls/options.rb

@@ -307,6 +307,7 @@ module Ethon
       option :easy, :port, :int, 3
       option :easy, :tcp_nodelay, :bool, 121
       option :easy, :address_scope, :int, 171
+      option :easy, :tcp_fastopen, :bool, 212
       option :easy, :tcp_keepalive, :bool, 213
       option :easy, :tcp_keepidle, :int, 214
       option :easy, :tcp_keepintvl, :int, 215
@@ -352,7 +353,7 @@ module Ethon
       option :easy, :cookiesession, :bool, 96
       option :easy, :cookielist, :string, 135
       option :easy, :httpget, :bool, 80
-      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0]
+      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0, :httpv2_tls, :httpv2_prior_knowledge]
       option :easy, :ignore_content_length, :bool, 136
       option :easy, :http_content_decoding, :bool, 158
       option :easy, :http_transfer_decoding, :bool, 157
@@ -440,7 +441,7 @@ module Ethon
       option_alias :easy, :keypasswd, :sslkeypasswd
       option :easy, :sslengine, :string, 89
       option :easy, :sslengine_default, :none, 90
-      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2]
+      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2, :tlsv1_3]
       option :easy, :ssl_verifypeer, :bool, 64
       option :easy, :cainfo, :string, 65
       option :easy, :issuercert, :string, 170
@@ -463,7 +464,7 @@ module Ethon
       option :easy, :proxy_capath, :string, 247
       option :easy, :proxy_ssl_verifypeer, :bool, 248
       option :easy, :proxy_ssl_verifyhost, :int, 249
-      option :easy, :proxy_sslversion, :enum, 250, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2]
+      option :easy, :proxy_sslversion, :enum, 250, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2, :tlsv1_3]
       option :easy, :proxy_tlsauth_username, :string, 251
       option :easy, :proxy_tlsauth_password, :string, 252
       option :easy, :proxy_tlsauth_type, :enum, 253, [:none, :srp]

data/lib/ethon/easy/callbacks.rb

@@ -52,8 +52,9 @@ module Ethon
       # @return [ Proc ] The callback.
       def header_write_callback
         @header_write_callback ||= proc {|stream, size, num, object|
+          result = headers
           @response_headers << stream.read_string(size * num)
-          size * num
+          result != :abort ? size * num : -1
         }
       end
 

data/lib/ethon/easy/informations.rb

@@ -73,6 +73,9 @@ module Ethon
         # actually followed.
         :redirect_count => :long,
 
+        # URL a redirect would take you to, had you enabled redirects (Added in 7.18.2)
+        :redirect_url => :string,
+
         # Return the bytes, the total amount of bytes that were uploaded
         :size_upload => :double,
 

data/lib/ethon/easy/response_callbacks.rb

@@ -43,7 +43,12 @@ module Ethon
         return if @headers_called
         @headers_called = true
         if defined?(@on_headers) and not @on_headers.nil?
-          @on_headers.each{ |callback| callback.call(self) }
+          result = nil
+          @on_headers.each do |callback|
+            result = callback.call(self)
+            break if result == :abort
+          end
+          result
         end
       end
 

data/lib/ethon/version.rb

@@ -2,5 +2,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.15.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Hans Hasselberg
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,15 +30,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
-- ".gitignore"
-- ".rspec"
 - CHANGELOG.md
-- Gemfile
-- Guardfile
 - LICENSE
 - README.md
-- Rakefile
 - ethon.gemspec
 - lib/ethon.rb
 - lib/ethon/curl.rb
@@ -95,49 +88,10 @@ files:
 - lib/ethon/multi/options.rb
 - lib/ethon/multi/stack.rb
 - lib/ethon/version.rb
-- profile/benchmarks.rb
-- profile/memory_leaks.rb
-- profile/perf_spec_helper.rb
-- profile/support/memory_test_helpers.rb
-- profile/support/os_memory_leak_tracker.rb
-- profile/support/ruby_object_leak_tracker.rb
-- spec/ethon/curl_spec.rb
-- spec/ethon/easy/callbacks_spec.rb
-- spec/ethon/easy/debug_info_spec.rb
-- spec/ethon/easy/features_spec.rb
-- spec/ethon/easy/form_spec.rb
-- spec/ethon/easy/header_spec.rb
-- spec/ethon/easy/http/custom_spec.rb
-- spec/ethon/easy/http/delete_spec.rb
-- spec/ethon/easy/http/get_spec.rb
-- spec/ethon/easy/http/head_spec.rb
-- spec/ethon/easy/http/options_spec.rb
-- spec/ethon/easy/http/patch_spec.rb
-- spec/ethon/easy/http/post_spec.rb
-- spec/ethon/easy/http/put_spec.rb
-- spec/ethon/easy/http_spec.rb
-- spec/ethon/easy/informations_spec.rb
-- spec/ethon/easy/mirror_spec.rb
-- spec/ethon/easy/operations_spec.rb
-- spec/ethon/easy/options_spec.rb
-- spec/ethon/easy/queryable_spec.rb
-- spec/ethon/easy/response_callbacks_spec.rb
-- spec/ethon/easy/util_spec.rb
-- spec/ethon/easy_spec.rb
-- spec/ethon/libc_spec.rb
-- spec/ethon/loggable_spec.rb
-- spec/ethon/multi/operations_spec.rb
-- spec/ethon/multi/options_spec.rb
-- spec/ethon/multi/stack_spec.rb
-- spec/ethon/multi_spec.rb
-- spec/spec_helper.rb
-- spec/support/localhost_server.rb
-- spec/support/server.rb
 homepage: https://github.com/typhoeus/ethon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -145,47 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Libcurl wrapper.
-test_files:
-- spec/ethon/curl_spec.rb
-- spec/ethon/easy/callbacks_spec.rb
-- spec/ethon/easy/debug_info_spec.rb
-- spec/ethon/easy/features_spec.rb
-- spec/ethon/easy/form_spec.rb
-- spec/ethon/easy/header_spec.rb
-- spec/ethon/easy/http/custom_spec.rb
-- spec/ethon/easy/http/delete_spec.rb
-- spec/ethon/easy/http/get_spec.rb
-- spec/ethon/easy/http/head_spec.rb
-- spec/ethon/easy/http/options_spec.rb
-- spec/ethon/easy/http/patch_spec.rb
-- spec/ethon/easy/http/post_spec.rb
-- spec/ethon/easy/http/put_spec.rb
-- spec/ethon/easy/http_spec.rb
-- spec/ethon/easy/informations_spec.rb
-- spec/ethon/easy/mirror_spec.rb
-- spec/ethon/easy/operations_spec.rb
-- spec/ethon/easy/options_spec.rb
-- spec/ethon/easy/queryable_spec.rb
-- spec/ethon/easy/response_callbacks_spec.rb
-- spec/ethon/easy/util_spec.rb
-- spec/ethon/easy_spec.rb
-- spec/ethon/libc_spec.rb
-- spec/ethon/loggable_spec.rb
-- spec/ethon/multi/operations_spec.rb
-- spec/ethon/multi/options_spec.rb
-- spec/ethon/multi/stack_spec.rb
-- spec/ethon/multi_spec.rb
-- spec/spec_helper.rb
-- spec/support/localhost_server.rb
-- spec/support/server.rb
+test_files: []

data/.github/workflows/ruby.yml

@@ -1,41 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        ruby-version: [2.5, 2.6, 2.7, 3.0, head, debug, truffleruby, truffleruby-head]
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install libcurl header
-      run: |
-        if ${{ matrix.os == 'macos' }}
-        then
-          brew install curl
-        else
-          sudo apt install -y libcurl4-openssl-dev
-        fi
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-.DS_Store
-.yardoc
-doc
-coverage
-.idea

data/.rspec

@@ -1,3 +0,0 @@
---tty
---color
---format documentation

data/Gemfile

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-source "https://rubygems.org"
-gemspec
-
-if Gem.ruby_version < Gem::Version.new("1.9.3")
-  gem "rake", "< 11"
-else
-  gem "rake"
-end
-
-group :development, :test do
-  gem "rspec", "~> 3.4"
-
-  gem "sinatra"
-
-  if Gem.ruby_version < Gem::Version.new("2.0.0")
-    gem "json", "< 2"
-  else
-    gem "json"
-  end
-
-  if Gem.ruby_version >= Gem::Version.new("2.0.0")
-    gem "mime-types", "~> 1.18"
-  end
-
-  if Gem.ruby_version >= Gem::Version.new("2.2.0")
-    gem "mustermann"
-  elsif Gem.ruby_version >= Gem::Version.new("2.1.0")
-    gem "mustermann", "0.4.0"
-  elsif Gem.ruby_version >= Gem::Version.new("2.0.0")
-    gem "mustermann", "0.3.1"
-  end
-
-  if Gem.ruby_version >= Gem::Version.new("3.0.0")
-    gem "webrick"
-  end
-end
-
-group :perf do
-  gem "benchmark-ips"
-  gem "patron"
-  gem "curb"
-end

data/Guardfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-# vim:set filetype=ruby:
-guard(
-  "rspec",
-  :all_after_pass => false,
-  :cli => "--fail-fast --tty --format documentation --colour") do
-
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |match| "spec/#{match[1]}_spec.rb" }
-end

data/Rakefile

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-require "bundler"
-Bundler.setup
-
-require "rake"
-require "rspec/core/rake_task"
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "ethon/version"
-
-task :gem => :build
-task :build do
-  system "gem build ethon.gemspec"
-end
-
-task :install => :build do
-  system "gem install ethon-#{Ethon::VERSION}.gem"
-end
-
-task :release => :build do
-  system "git tag -a v#{Ethon::VERSION} -m 'Tagging #{Ethon::VERSION}'"
-  system "git push --tags"
-  system "gem push ethon-#{Ethon::VERSION}.gem"
-end
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-  t.ruby_opts = "-W -I./spec -rspec_helper"
-end
-
-desc "Start up the test servers"
-task :start do
-  require_relative 'spec/support/boot'
-  begin
-    Boot.start_servers(:rake)
-  rescue Exception
-  end
-end
-
-task :default => :spec
-

data/profile/benchmarks.rb

@@ -1,104 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-require 'ethon'
-require 'open-uri'
-require 'patron'
-require 'curb'
-require 'net/http'
-require 'cgi'
-require 'benchmark/ips'
-
-require_relative '../spec/support/server'
-require_relative '../spec/support/localhost_server'
-
-LocalhostServer.new(TESTSERVER.new, 3000)
-LocalhostServer.new(TESTSERVER.new, 3001)
-LocalhostServer.new(TESTSERVER.new, 3002)
-
-url = 'http://localhost:3000/'.freeze
-uri = URI.parse('http://localhost:3000/').freeze
-ethon = Ethon::Easy.new(url: url)
-patron = Patron::Session.new
-patron_url = Patron::Session.new(base_url: url)
-curb = Curl::Easy.new(url)
-
-puts '[Creation]'
-Benchmark.ips do |x|
-  x.report('String.new') { '' }
-  x.report('Easy.new') { Ethon::Easy.new }
-end
-
-puts '[Escape]'
-Benchmark.ips do |x|
-  x.report('CGI.escape') { CGI.escape("まつもと") }
-  x.report('Easy.escape') { ethon.escape("まつもと") }
-end
-
-puts '[Requests]'
-Benchmark.ips do |x|
-  x.report('net/http') { Net::HTTP.get_response(uri) }
-  x.report('open-uri') { open url }
-
-  x.report('patron') do
-    patron.base_url = url
-    patron.get('/')
-  end
-
-  x.report('patron reuse') { patron_url.get('/') }
-
-  x.report('curb') do
-    curb.url = url
-    curb.perform
-  end
-
-  x.report('curb reuse') { curb.perform }
-
-  x.report('Easy.perform') do
-    ethon.url = url
-    ethon.perform
-  end
-
-  x.report('Easy.perform reuse') { ethon.perform }
-end
-
-puts "[ 4 delayed Requests ]"
-Benchmark.ips do |x|
-  x.report('net/http') do
-    3.times do |i|
-      uri = URI.parse("http://localhost:300#{i}/?delay=1")
-      Net::HTTP.get_response(uri)
-    end
-  end
-
-  x.report("open-uri") do
-    3.times do |i|
-      open("http://localhost:300#{i}/?delay=1")
-    end
-  end
-
-  x.report("patron") do
-    sess = Patron::Session.new
-    3.times do |i|
-      sess.base_url = "http://localhost:300#{i}/?delay=1"
-      sess.get("/")
-    end
-  end
-
-  x.report("Easy.perform") do
-    easy = Ethon::Easy.new
-    3.times do |i|
-      easy.url = "http://localhost:300#{i}/?delay=1"
-      easy.perform
-    end
-  end
-
-  x.report("Multi.perform") do
-    multi = Ethon::Multi.new
-    3.times do |i|
-      easy = Ethon::Easy.new
-      easy.url = "http://localhost:300#{i}/?delay=1"
-      multi.add(easy)
-    end
-    multi.perform
-  end
-end