typhoeus 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a6b0485477d252e7eb99852bec27994e9c23aa54e7d376cd24bc07d3639d5c
-  data.tar.gz: d2dbaf34e81e7a906dbf254d0d1aa1d6028c10a08605b6dc6261c282bfc39abd
+  metadata.gz: '09cda92cc81622180d5611b30234ea35c382779dcac43716ed3acaa041f41c31'
+  data.tar.gz: 739ebbdbffe74d7a72e2ef2c07f85585e62bc38f9e44c3926ed0c6635797e63b
 SHA512:
-  metadata.gz: 711db47d856f75d5eb730e11161e02a6a6f6c6d9e966aeec3ace577d250d57a790c2d0d5ade86fda425bff6b5f6d5c77079107a3f41a2379d4bff9cd802ca712
-  data.tar.gz: 52cfa55fe418b64ed16e094a497d6fc72092b8d5745d81860aead9e35a6dba403fb2375674ca652ba6bb8e5acac29ed5ce03161c2c68dc0f1de9d44ad65ac277
+  metadata.gz: 89ec1a6d9c2d8f9a1e74688507961e14d97742049df617baa3141311ef9951cb1ae9bce20d29f41ab371f97ea1022f1062a6ae07b9838fd27551513161faf0c8
+  data.tar.gz: aedfec09b2f08c34c279574ec34637a0f8262b1a00be8a36c18918ebf7d9ea9ed9e962fc0f8851f312f96bf588dc77830ce4636f34b43d92434c825832e1e13b

data/CHANGELOG.md

@@ -2,12 +2,54 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.4.1...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.5.0...master)
+
+## 1.5.0
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.4.1...v1.5.0)
+
+* Update gemspec with metadata and remove extra files from the bundled gem.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#734](https://github.com/typhoeus/typhoeus/pull/734))
+* Require Ruby 2.6+ and simplify Gemfile.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#733](https://github.com/typhoeus/typhoeus/pull/733))
+* Add support for URI objects in `Typhoeus.stub()`.
+  ([Katelyn Schiesser](https://github.com/slowbro), [#732](https://github.com/typhoeus/typhoeus/pull/732))
+* Add explicit require for logger and ostruct gems for Ruby 3.5+ compatibility.
+  ([Felipe Mesquita](https://github.com/felipedmesquita), [#729](https://github.com/typhoeus/typhoeus/pull/729))
+* Add Ruby 3.4 to CI matrix.
+  ([y-yagi](https://github.com/y-yagi), [#728](https://github.com/typhoeus/typhoeus/pull/728))
+* Support curl 8.9 error message changes in tests.
+  ([Mamoru TASAKA](https://github.com/mtasaka), [#724](https://github.com/typhoeus/typhoeus/pull/724))
+* Add Ruby 3.2 and 3.3 to CI, drop Ruby 2.5, lock ethon < 0.16.0.
+  ([y-yagi](https://github.com/y-yagi), [#716](https://github.com/typhoeus/typhoeus/pull/716))
+* Fix typo in comment: "reponse" → "response".
+  ([George Brocklehurst](https://github.com/georgebrock), [#700](https://github.com/typhoeus/typhoeus/pull/700))
 
 ## 1.4.1
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.4.0...v1.4.1)
 
+* Fix to run CI with Ruby 3.0.
+  ([mishina](https://github.com/mishina2228), [#699](https://github.com/typhoeus/typhoeus/pull/699))
+* Replace CI status badge from Travis to GH Actions.
+  ([mishina](https://github.com/mishina2228), [#698](https://github.com/typhoeus/typhoeus/pull/698))
+* Added getter for `redirect_url` attribute.
+  ([Adrien Rey-Jarthon](https://github.com/jarthod), [#697](https://github.com/typhoeus/typhoeus/pull/697))
+* CI: Adjust ruby versions and MacOS runs.
+  ([Holger Arndt](https://github.com/Kjarrigan), [#696](https://github.com/typhoeus/typhoeus/pull/696))
+* Allow performing `curl --upload-file`.
+  ([Arian Faurtosh](https://github.com/arianf), [#695](https://github.com/typhoeus/typhoeus/pull/695))
+* Add getter for size_upload, size_download, speed_upload, speed_download values.
+  ([Ryo Nakano](https://github.com/ryonkn), [#692](https://github.com/typhoeus/typhoeus/pull/692))
+* Use bundle add instead.
+  ([Glauco Custodio](https://github.com/glaucocustodio), [#691](https://github.com/typhoeus/typhoeus/pull/691))
+* Travis -> Github actions.
+  ([John Mortlock](https://github.com/jmortlock), [#689](https://github.com/typhoeus/typhoeus/pull/689))
+* Add global timeout and connecttimeout to config.
+  ([Teck Wan Wong](https://github.com/teckwan), [#685](https://github.com/typhoeus/typhoeus/pull/685))
+* Update README.md.
+  ([Hussain Akram](https://github.com/hussainakram), [#677](https://github.com/typhoeus/typhoeus/pull/677))
+
 ## 1.4.0
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.1.2...v1.4.0)

data/lib/typhoeus/expectation.rb

@@ -204,9 +204,11 @@ module Typhoeus
     def url_match?(request_url)
       case base_url
       when String
-        base_url == request_url
+        base_url == request_url.to_s
       when Regexp
-        base_url === request_url
+        base_url === request_url.to_s
+      when defined?(URI) && URI
+        base_url.to_s == request_url.to_s
       when nil
         true
       else

data/lib/typhoeus/request/responseable.rb

@@ -1,7 +1,7 @@
 module Typhoeus
   class Request
 
-    # This module contains logic for having a reponse
+    # This module contains logic for having a response
     # getter and setter.
     module Responseable
 

data/lib/typhoeus/version.rb

@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

data/typhoeus.gemspec

@@ -14,12 +14,22 @@ Gem::Specification.new do |s|
   s.summary      = "Parallel HTTP library on top of libcurl multi."
   s.description  = %q{Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.}
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version = ">= 2.6"
   s.license = 'MIT'
+  s.metadata = {
+    'bug_tracker_uri'       => 'https://github.com/typhoeus/typhoeus/issues',
+    'changelog_uri'         => "https://github.com/typhoeus/typhoeus/blob/v#{s.version}/CHANGELOG.md",
+    'documentation_uri'     => "https://www.rubydoc.info/gems/typhoeus/#{s.version}",
+    'rubygems_mfa_required' => 'true',
+    'source_code_uri'       => "https://github.com/typhoeus/typhoeus/tree/v#{s.version}"
+  }
 
-  s.add_dependency('ethon', [">= 0.9.0"])
+  s.add_dependency('ethon', [">= 0.9.0", "< 0.16.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 perf spec])
+    end
+  end
   s.require_path = 'lib'
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - David Balatero
 - Paul Dix
 - Hans Hasselberg
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -19,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 description: Like a modern code version of the mythical beast with 100 serpent heads,
   Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 email:
@@ -34,17 +39,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".github/workflows/experimental.yml"
-- ".gitignore"
-- ".rspec"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
-- Guardfile
 - LICENSE
 - README.md
-- Rakefile
 - UPGRADE.md
 - lib/rack/typhoeus.rb
 - lib/rack/typhoeus/middleware/params_decoder.rb
@@ -89,53 +87,16 @@ files:
 - lib/typhoeus/response/informations.rb
 - lib/typhoeus/response/status.rb
 - lib/typhoeus/version.rb
-- perf/profile.rb
-- perf/vs_nethttp.rb
-- spec/rack/typhoeus/middleware/params_decoder/helper_spec.rb
-- spec/rack/typhoeus/middleware/params_decoder_spec.rb
-- spec/spec_helper.rb
-- spec/support/localhost_server.rb
-- spec/support/memory_cache.rb
-- spec/support/server.rb
-- spec/typhoeus/adapters/faraday_spec.rb
-- spec/typhoeus/cache/dalli_spec.rb
-- spec/typhoeus/cache/redis_spec.rb
-- spec/typhoeus/config_spec.rb
-- spec/typhoeus/easy_factory_spec.rb
-- spec/typhoeus/errors/no_stub_spec.rb
-- spec/typhoeus/expectation_spec.rb
-- spec/typhoeus/hydra/addable_spec.rb
-- spec/typhoeus/hydra/before_spec.rb
-- spec/typhoeus/hydra/block_connection_spec.rb
-- spec/typhoeus/hydra/cacheable_spec.rb
-- spec/typhoeus/hydra/memoizable_spec.rb
-- spec/typhoeus/hydra/queueable_spec.rb
-- spec/typhoeus/hydra/runnable_spec.rb
-- spec/typhoeus/hydra/stubbable_spec.rb
-- spec/typhoeus/hydra_spec.rb
-- spec/typhoeus/pool_spec.rb
-- spec/typhoeus/request/actions_spec.rb
-- spec/typhoeus/request/before_spec.rb
-- spec/typhoeus/request/block_connection_spec.rb
-- spec/typhoeus/request/cacheable_spec.rb
-- spec/typhoeus/request/callbacks_spec.rb
-- spec/typhoeus/request/marshal_spec.rb
-- spec/typhoeus/request/memoizable_spec.rb
-- spec/typhoeus/request/operations_spec.rb
-- spec/typhoeus/request/responseable_spec.rb
-- spec/typhoeus/request/stubbable_spec.rb
-- spec/typhoeus/request_spec.rb
-- spec/typhoeus/response/header_spec.rb
-- spec/typhoeus/response/informations_spec.rb
-- spec/typhoeus/response/status_spec.rb
-- spec/typhoeus/response_spec.rb
-- spec/typhoeus_spec.rb
 - typhoeus.gemspec
 homepage: https://github.com/typhoeus/typhoeus
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/typhoeus/typhoeus/issues
+  changelog_uri: https://github.com/typhoeus/typhoeus/blob/v1.5.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/typhoeus/1.5.0
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/typhoeus/typhoeus/tree/v1.5.0
 rdoc_options: []
 require_paths:
 - lib
@@ -143,54 +104,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.3.7
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Parallel HTTP library on top of libcurl multi.
-test_files:
-- spec/rack/typhoeus/middleware/params_decoder/helper_spec.rb
-- spec/rack/typhoeus/middleware/params_decoder_spec.rb
-- spec/spec_helper.rb
-- spec/support/localhost_server.rb
-- spec/support/memory_cache.rb
-- spec/support/server.rb
-- spec/typhoeus/adapters/faraday_spec.rb
-- spec/typhoeus/cache/dalli_spec.rb
-- spec/typhoeus/cache/redis_spec.rb
-- spec/typhoeus/config_spec.rb
-- spec/typhoeus/easy_factory_spec.rb
-- spec/typhoeus/errors/no_stub_spec.rb
-- spec/typhoeus/expectation_spec.rb
-- spec/typhoeus/hydra/addable_spec.rb
-- spec/typhoeus/hydra/before_spec.rb
-- spec/typhoeus/hydra/block_connection_spec.rb
-- spec/typhoeus/hydra/cacheable_spec.rb
-- spec/typhoeus/hydra/memoizable_spec.rb
-- spec/typhoeus/hydra/queueable_spec.rb
-- spec/typhoeus/hydra/runnable_spec.rb
-- spec/typhoeus/hydra/stubbable_spec.rb
-- spec/typhoeus/hydra_spec.rb
-- spec/typhoeus/pool_spec.rb
-- spec/typhoeus/request/actions_spec.rb
-- spec/typhoeus/request/before_spec.rb
-- spec/typhoeus/request/block_connection_spec.rb
-- spec/typhoeus/request/cacheable_spec.rb
-- spec/typhoeus/request/callbacks_spec.rb
-- spec/typhoeus/request/marshal_spec.rb
-- spec/typhoeus/request/memoizable_spec.rb
-- spec/typhoeus/request/operations_spec.rb
-- spec/typhoeus/request/responseable_spec.rb
-- spec/typhoeus/request/stubbable_spec.rb
-- spec/typhoeus/request_spec.rb
-- spec/typhoeus/response/header_spec.rb
-- spec/typhoeus/response/informations_spec.rb
-- spec/typhoeus/response/status_spec.rb
-- spec/typhoeus/response_spec.rb
-- spec/typhoeus_spec.rb
+test_files: []

data/.github/workflows/ci.yml

@@ -1,30 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  build:
-    env:
-      BUNDLE_GEMFILE: Gemfile
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', truffleruby]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install libcurl header
-        run: |
-          if ${{ matrix.os == 'macos' }}
-          then
-            brew install curl
-          else
-            sudo apt update && sudo apt install -y --no-install-recommends libcurl4-openssl-dev
-          fi
-      - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-      - name: Run tests
-        run: |
-          bundle exec rake

data/.github/workflows/experimental.yml

@@ -1,33 +0,0 @@
-name: Experimental
-on: [push, pull_request]
-jobs:
-  build:
-    env:
-      BUNDLE_GEMFILE: Gemfile
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        ruby-version:
-          - ruby-head
-          - jruby-head
-          - truffleruby-head
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install libcurl header
-        run: |
-          if ${{ matrix.os == 'macos' }}
-          then
-            brew install curl
-          else
-            sudo apt update && sudo apt install -y --no-install-recommends libcurl4-openssl-dev
-          fi
-      - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-      - name: Run tests
-        run: |
-          bundle exec rake

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-Gemfile.lock
-doc/
-.yardoc
-.rvmrc
-coverage
-check.sh
-tags

data/.rspec

@@ -1,4 +0,0 @@
---tty
---color
---format documentation
---backtrace

data/Gemfile

@@ -1,36 +0,0 @@
-source "https://rubygems.org"
-gemspec
-
-if Gem.ruby_version < Gem::Version.new("2.0.0")
-  gem "rake", "< 11"
-  gem "json", "< 2"
-else
-  gem "json"
-  gem "rake"
-end
-
-group :development, :test do
-  gem "rspec", "~> 3.0"
-
-  gem "sinatra", "~> 1.3"
-
-  if Gem.ruby_version >= Gem::Version.new("1.9.0")
-    gem "faraday", ">= 0.9", "< 2.0"
-    gem "dalli", "~> 2.0"
-  end
-
-  if Gem.ruby_version >= Gem::Version.new("3.0.0")
-    gem 'webrick'
-  end
-
-  gem "redis", "~> 3.0"
-
-  if RUBY_PLATFORM == "java"
-    gem "spoon"
-  end
-
-  unless ENV["CI"]
-    gem "guard-rspec", "~> 0.7"
-    gem 'rb-fsevent', '~> 0.9.1'
-  end
-end

data/Guardfile

@@ -1,9 +0,0 @@
-# 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,38 +0,0 @@
-require "bundler"
-Bundler.setup
-
-require "rake"
-require "rspec/core/rake_task"
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "typhoeus/version"
-
-task :gem => :build
-task :build do
-  system "gem build typhoeus.gemspec"
-end
-
-task :install => :build do
-  system "gem install typhoeus-#{Typhoeus::VERSION}.gem"
-end
-
-task :release => :build do
-  system "git tag -a v#{Typhoeus::VERSION} -m 'Tagging #{Typhoeus::VERSION}'"
-  system "git push --tags"
-  system "gem push typhoeus-#{Typhoeus::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/perf/profile.rb

@@ -1,14 +0,0 @@
-require 'typhoeus'
-require 'ruby-prof'
-
-calls = 50
-base_url = "http://127.0.0.1:3000/"
-
-RubyProf.start
-calls.times do |i|
-  Typhoeus::Request.get(base_url+i.to_s)
-end
-result = RubyProf.stop
-
-printer = RubyProf::FlatPrinter.new(result)
-printer.print(STDOUT)

data/perf/vs_nethttp.rb

@@ -1,64 +0,0 @@
-require 'typhoeus'
-require 'net/http'
-require 'open-uri'
-require 'benchmark'
-
-URL = "http://localhost:300"
-hydra = Typhoeus::Hydra.new(max_concurrency: 3)
-
-if defined? require_relative
-  require_relative '../spec/support/localhost_server.rb'
-  require_relative '../spec/support/server.rb'
-else
-  require '../spec/support/localhost_server.rb'
-  require '../spec/support/server.rb'
-end
-LocalhostServer.new(TESTSERVER.new, 3000)
-LocalhostServer.new(TESTSERVER.new, 3001)
-LocalhostServer.new(TESTSERVER.new, 3002)
-
-def url_for(i)
-  "#{URL}#{i%3}/"
-end
-
-Benchmark.bm do |bm|
-
-  [1000].each do |calls|
-    puts "[ #{calls} requests ]"
-
-    bm.report("net/http        ") do
-      calls.times do |i|
-        uri = URI.parse(url_for(i))
-        Net::HTTP.get_response(uri)
-      end
-    end
-
-    bm.report("open            ") do
-      calls.times do |i|
-        open(url_for(i))
-      end
-    end
-
-    bm.report("request         ") do
-      calls.times do |i|
-        Typhoeus::Request.get(url_for(i))
-      end
-    end
-
-    bm.report("hydra           ") do
-      calls.times do |i|
-        hydra.queue(Typhoeus::Request.new(url_for(i)))
-      end
-      hydra.run
-    end
-
-    bm.report("hydra memoize   ") do
-      Typhoeus::Config.memoize = true
-      calls.times do |i|
-        hydra.queue(Typhoeus::Request.new(url_for(i)))
-      end
-      hydra.run
-      Typhoeus::Config.memoize = false
-    end
-  end
-end