typhoeus 1.0.0 → 1.4.0

data/spec/typhoeus/hydra/before_spec.rb

@@ -3,13 +3,14 @@ require 'spec_helper'
 describe Typhoeus::Hydra::Before do
   let(:request) { Typhoeus::Request.new("") }
   let(:hydra) { Typhoeus::Hydra.new }
+  let(:receive_counter) { double :mark => :twain }
 
   describe "#add" do
     context "when before" do
       context "when one" do
         it "executes" do
-          Typhoeus.before { |r| String.new(r.base_url) }
-          expect(String).to receive(:new).and_return("")
+          Typhoeus.before { |r| receive_counter.mark }
+          expect(receive_counter).to receive(:mark)
           hydra.add(request)
         end
 
@@ -54,7 +55,7 @@ describe Typhoeus::Hydra::Before do
 
       context "when multi" do
         context "when all true" do
-          before { 3.times { Typhoeus.before { |r| String.new(r.base_url) } } }
+          before { 3.times { Typhoeus.before { |r| receive_counter.mark } } }
 
           it "calls super" do
             expect(Typhoeus::Expectation).to receive(:response_for)
@@ -62,16 +63,16 @@ describe Typhoeus::Hydra::Before do
           end
 
           it "executes all" do
-            expect(String).to receive(:new).exactly(3).times.and_return("")
+            expect(receive_counter).to receive(:mark).exactly(3).times
             hydra.add(request)
           end
         end
 
         context "when middle false" do
           before do
-            Typhoeus.before { |r| String.new(r.base_url) }
-            Typhoeus.before { |r| String.new(r.base_url); nil }
-            Typhoeus.before { |r| String.new(r.base_url) }
+            Typhoeus.before { |r| receive_counter.mark }
+            Typhoeus.before { |r| receive_counter.mark; nil }
+            Typhoeus.before { |r| receive_counter.mark }
           end
 
           it "doesn't call super" do
@@ -80,7 +81,7 @@ describe Typhoeus::Hydra::Before do
           end
 
           it "executes only two" do
-            expect(String).to receive(:new).exactly(2).times.and_return("")
+            expect(receive_counter).to receive(:mark).exactly(2).times
             hydra.add(request)
           end
         end

data/spec/typhoeus/hydra/cacheable_spec.rb

@@ -4,6 +4,7 @@ describe Typhoeus::Hydra::Cacheable do
   let(:base_url) { "localhost:3001" }
   let(:hydra) { Typhoeus::Hydra.new() }
   let(:request) { Typhoeus::Request.new(base_url, {:method => :get}) }
+  let(:response) { Typhoeus::Response.new }
   let(:cache) { MemoryCache.new }
 
   describe "add" do
@@ -24,7 +25,6 @@ describe Typhoeus::Hydra::Cacheable do
       end
 
       context "when request in memory" do
-        let(:response) { Typhoeus::Response.new }
         before { cache.memory[request] = response }
 
         it "returns response with cached status" do
@@ -53,6 +53,36 @@ describe Typhoeus::Hydra::Cacheable do
           end
         end
       end
+
+      context "when cache is specified on a request" do
+        before { Typhoeus::Config.cache = false }
+
+        context "when cache is false" do
+          let(:non_cached_request) { Typhoeus::Request.new(base_url, {:method => :get, :cache => false}) }
+
+          it "initiates an HTTP call" do
+            expect(Typhoeus::EasyFactory).to receive(:new).with(non_cached_request, hydra).and_call_original
+
+            hydra.add(non_cached_request)
+          end
+        end
+
+        context "when cache is defined" do
+          let(:cached_request) { Typhoeus::Request.new(base_url, {:method => :get, :cache => cache}) }
+
+          before { cache.memory[cached_request] = response }
+
+          it "uses the cache instead of making a new request" do
+            expect(Typhoeus::EasyFactory).not_to receive(:new)
+
+            hydra.add(cached_request)
+
+            expect(cached_request.response).to be_cached
+            expect(cached_request.response).to eq(response)
+          end
+        end
+      end
+
     end
   end
 end

data/spec/typhoeus/hydra/runnable_spec.rb

@@ -4,6 +4,7 @@ describe Typhoeus::Hydra::Runnable do
   let(:base_url) { "localhost:3001" }
   let(:options) { {} }
   let(:hydra) { Typhoeus::Hydra.new(options) }
+  let(:receive_counter) { double :mark => :twain }
 
   describe "#run" do
     let(:requests) { [] }
@@ -107,7 +108,7 @@ describe Typhoeus::Hydra::Runnable do
       let(:second) { Typhoeus::Request.new("localhost:3001/second") }
       let(:requests) { [first] }
 
-      before { Typhoeus.on_complete { |r| String.new(r.code) } }
+      before { Typhoeus.on_complete { |r| receive_counter.mark } }
       after { Typhoeus.on_complete.clear; Typhoeus.before.clear }
 
       context "when real request" do
@@ -115,7 +116,7 @@ describe Typhoeus::Hydra::Runnable do
           let(:options) { {} }
 
           it "calls on_complete callback once for every response" do
-            expect(String).to receive(:new).exactly(2).times
+            expect(receive_counter).to receive(:mark).exactly(2).times
             hydra.run
           end
         end
@@ -126,7 +127,7 @@ describe Typhoeus::Hydra::Runnable do
           before { Typhoeus.before{ |request|  request.finish(Typhoeus::Response.new) } }
 
           it "simulates real multi run and adds and finishes both requests" do
-            expect(String).to receive(:new).exactly(2).times
+            expect(receive_counter).to receive(:mark).exactly(2).times
             hydra.run
           end
         end

data/spec/typhoeus/pool_spec.rb

@@ -16,6 +16,45 @@ describe Typhoeus::Pool do
       Typhoeus::Pool.release(easy)
     end
 
+    it "flush cookies to disk" do
+      expect(easy).to receive(:cookielist=).with('flush')
+      expect(easy).to receive(:reset)
+      expect(easy).to receive(:cookielist=).with('all')
+      Typhoeus::Pool.release(easy)
+    end
+
+    it "writes cookies to disk" do
+      tempfile1 = Tempfile.new('cookies')
+      tempfile2 = Tempfile.new('cookies')
+
+      easy.cookiejar = tempfile1.path
+      easy.url = "localhost:3001/cookies-test"
+      easy.perform
+
+      Typhoeus::Pool.release(easy)
+
+      expect(File.zero?(tempfile1.path)).to be(false)
+      expect(File.read(tempfile1.path)).to match(/\s+foo\s+bar$/)
+      expect(File.read(tempfile1.path)).to match(/\s+bar\s+foo$/)
+
+      # do it again - and check if tempfile1 wasn't change
+      easy.cookiejar = tempfile2.path
+      easy.url = "localhost:3001/cookies-test2"
+      easy.perform
+
+      Typhoeus::Pool.release(easy)
+
+      # tempfile 1
+      expect(File.zero?(tempfile1.path)).to be(false)
+      expect(File.read(tempfile1.path)).to match(/\s+foo\s+bar$/)
+      expect(File.read(tempfile1.path)).to match(/\s+bar\s+foo$/)
+
+      # tempfile2
+      expect(File.zero?(tempfile2.path)).to be(false)
+      expect(File.read(tempfile2.path)).to match(/\s+foo2\s+bar$/)
+      expect(File.read(tempfile2.path)).to match(/\s+bar2\s+foo$/)
+    end
+
     it "puts easy back into pool" do
       Typhoeus::Pool.release(easy)
       expect(Typhoeus::Pool.send(:easies)).to include(easy)
@@ -49,12 +88,14 @@ describe Typhoeus::Pool do
 
       context "when threaded access" do
         it "creates correct number of easies" do
-          array = []
+          queue = Queue.new
           (0..9).map do |n|
             Thread.new do
-              array << Typhoeus::Pool.get
+              queue.enq(Typhoeus::Pool.get)
             end
           end.map(&:join)
+
+          array = Array.new(queue.size) { queue.pop }
           expect(array.uniq.size).to eq(10)
         end
       end

data/spec/typhoeus/request/before_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 
 describe Typhoeus::Request::Before do
   let(:request) { Typhoeus::Request.new("") }
+  let(:receive_counter) { double :mark => :twain }
 
   describe "#queue" do
     context "when before" do
       context "when one" do
         it "executes" do
-          Typhoeus.before { |r| String.new(r.base_url) }
-          expect(String).to receive(:new).and_return("")
+          Typhoeus.before { |r| receive_counter.mark }
+          expect(receive_counter).to receive(:mark)
           request.run
         end
 
@@ -49,7 +50,7 @@ describe Typhoeus::Request::Before do
 
       context "when multi" do
         context "when all true" do
-          before { 3.times { Typhoeus.before { |r| String.new(r.base_url) } } }
+          before { 3.times { Typhoeus.before { |r| receive_counter.mark } } }
 
           it "calls super" do
             expect(Typhoeus::Expectation).to receive(:response_for)
@@ -57,16 +58,16 @@ describe Typhoeus::Request::Before do
           end
 
           it "executes all" do
-            expect(String).to receive(:new).exactly(3).times.and_return("")
+            expect(receive_counter).to receive(:mark).exactly(3)
             request.run
           end
         end
 
         context "when middle false" do
           before do
-            Typhoeus.before { |r| String.new(r.base_url) }
-            Typhoeus.before { |r| String.new(r.base_url); nil }
-            Typhoeus.before { |r| String.new(r.base_url) }
+            Typhoeus.before { |r| receive_counter.mark }
+            Typhoeus.before { |r| receive_counter.mark; nil }
+            Typhoeus.before { |r| receive_counter.mark }
           end
 
           it "doesn't call super" do
@@ -75,7 +76,7 @@ describe Typhoeus::Request::Before do
           end
 
           it "executes only two" do
-            expect(String).to receive(:new).exactly(2).times.and_return("")
+            expect(receive_counter).to receive(:mark).exactly(2).times
             request.run
           end
         end

data/spec/typhoeus/request/cacheable_spec.rb

@@ -55,6 +55,30 @@ describe Typhoeus::Request::Cacheable do
           request.run
         end
       end
+
+      context "when cache is specified on a request" do
+        before { Typhoeus::Config.cache = false }
+
+        context "when cache is false" do
+          let(:options) { { :cache => false } }
+
+          it "finishes request" do
+            expect(request.response).to_not be(response)
+            request.run
+          end
+        end
+
+        context "when cache is defined" do
+          let(:options) { { :cache => cache } }
+
+          before { cache.memory[request] = response }
+
+          it "finishes request" do
+            expect(request).to receive(:finish).with(response)
+            request.run
+          end
+        end
+      end
     end
   end
 

data/spec/typhoeus/request/callbacks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Typhoeus::Request::Callbacks do
   let(:request) { Typhoeus::Request.new("fubar") }
 
-  [:on_complete, :on_success, :on_failure].each do |callback|
+  [:on_complete, :on_success, :on_failure, :on_progress].each do |callback|
     describe "##{callback}" do
       it "responds" do
         expect(request).to respond_to(callback)
@@ -33,7 +33,7 @@ describe Typhoeus::Request::Callbacks do
   end
 
   describe "#execute_callbacks" do
-    [:on_complete, :on_success, :on_failure].each do |callback|
+    [:on_complete, :on_success, :on_failure, :on_progress].each do |callback|
       context "when #{callback}" do
         context "when local callback" do
           before do

data/spec/typhoeus/request/marshal_spec.rb

@@ -5,7 +5,7 @@ describe Typhoeus::Request::Marshal do
   let(:request) { Typhoeus::Request.new(base_url) }
 
   describe "#marshal_dump" do
-    %w(on_complete on_success on_failure).each do |name|
+    %w(on_complete on_success on_failure on_progress).each do |name|
       context "when #{name} handler" do
         before { request.instance_variable_set("@#{name}", Proc.new{}) }
 

data/spec/typhoeus/request_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Typhoeus::Request do
   let(:base_url) { "localhost:3001" }
-  let(:options) { {:verbose => true, :headers => { 'User-Agent' => "Fubar" }, :maxredirs => 50} }
+  let(:options) { {:verbose => true, :headers => { 'User-Agent' => "Fubar", 'Expect' => "" }, :maxredirs => 50} }
   let(:request) { Typhoeus::Request.new(base_url, options) }
 
   describe ".url" do
@@ -110,6 +110,23 @@ describe Typhoeus::Request do
         end
       end
     end
+
+    context "when Config.proxy set" do
+      before { Typhoeus.configure { |config| config.proxy = "http://proxy.internal" } }
+      after { Typhoeus.configure { |config| config.proxy = nil } }
+
+      it "respects" do
+        expect(request.options[:proxy]).to eq("http://proxy.internal")
+      end
+
+      context "when option proxy set" do
+        let(:options) { {:proxy => nil} }
+
+        it "does not override" do
+          expect(request.options[:proxy]).to be_nil
+        end
+      end
+    end
   end
 
   describe "#eql?" do
@@ -150,7 +167,7 @@ describe Typhoeus::Request do
 
         context "when different order" do
           let(:other_options) {
-            {:headers => { 'User-Agent' => "Fubar" }, :verbose => true }
+            {:headers => { 'User-Agent' => "Fubar", 'Expect' => ""}, :verbose => true }
           }
           let(:other) { Typhoeus::Request.new(base_url, other_options)}
 
@@ -166,7 +183,7 @@ describe Typhoeus::Request do
     context "when request.eql?(other)" do
       context "when different order" do
         let(:other_options) {
-          {:headers => { 'User-Agent' => "Fubar" }, :verbose => true }
+          {:headers => { 'User-Agent' => "Fubar", 'Expect' => "" }, :verbose => true }
         }
         let(:other) { Typhoeus::Request.new(base_url, other_options)}
 
@@ -211,4 +228,5 @@ describe Typhoeus::Request do
       expect(request.encoded_body).to eq("a=1")
     end
   end
+
 end

data/spec/typhoeus/response/header_spec.rb

@@ -55,7 +55,7 @@ describe Typhoeus::Response::Header do
         Server: gws
         X-XSS-Protection: 1; mode=block
         X-Frame-Options: SAMEORIGIN
-        Transfer-Encoding: chunked'
+        Transfer-Encoding: chunked'.gsub(/^\s{8}/, '')
       end
 
       it "sets raw" do
@@ -92,6 +92,56 @@ describe Typhoeus::Response::Header do
           expect(header[name.downcase]).to eq(value)
         end
       end
+
+      context 'includes a multi-line header' do
+        let(:raw) do
+          'HTTP/1.1 200 OK
+          Date: Fri, 29 Jun 2012 10:09:23 GMT
+          Content-Security-Policy: default-src "self";
+            img-src * data: "self";
+            upgrade-insecure-requests;'.gsub(/^\s{10}/, '')
+        end
+
+        it "joins header parts" do
+          expect(header).to eq({
+            'Date' => 'Fri, 29 Jun 2012 10:09:23 GMT',
+            'Content-Security-Policy' => 'default-src "self"; img-src * data: "self"; upgrade-insecure-requests;'
+          })
+        end
+      end
+
+      context 'includes line with only whitespace' do
+        let(:raw) do
+          'HTTP/1.1 200 OK
+          Date: Fri, 29 Jun 2012 10:09:23 GMT
+            
+          '.gsub(/^\s{10}/, '')
+        end
+
+        it 'ignores it' do
+          expect(header).to eq({ 'Date' => 'Fri, 29 Jun 2012 10:09:23 GMT' })
+        end
+      end
+
+      context 'with broken headers' do
+        let(:raw) do
+          'HTTP/1.1 200 OK
+          Date:
+          Content-Type
+          '.gsub(/^\s{10}/, '')
+        end
+
+        it 'returns empty string for invalid headers' do
+          expect(header.to_hash).to include({ 'Date' => '', 'Content-Type' => '' })
+        end
+      end
     end
   end
+
+  it "can be Marshal'd" do
+    header = Typhoeus::Response::Header.new("Foo: Bar")
+    expect {
+      Marshal.dump(header)
+    }.not_to raise_error
+  end
 end

data/spec/typhoeus/response/informations_spec.rb

@@ -74,6 +74,17 @@ describe Typhoeus::Response::Informations do
             expect(response.response_headers).to include("\r\n")
           end
         end
+
+        context "when multiple values for a header" do
+          let(:options) { { :mock => true, :headers => {"Length" => 1, "Content-Type" => "text/plain", "set-cookie" => ["cookieone=one","cookietwo=two"] } } }
+
+          it "constructs response_headers" do
+            expect(response.response_headers).to include("Length: 1")
+            expect(response.response_headers).to include("Content-Type: text/plain")
+            expect(response.response_headers).to include("set-cookie: cookieone=one,cookietwo=two")
+            expect(response.response_headers).to include("\r\n")
+          end
+        end
       end
     end
   end
@@ -232,7 +243,7 @@ describe Typhoeus::Response::Informations do
         end
 
         it "returns headers" do
-          expect(response.headers).to include("Length" => "1")
+          expect(response.headers.to_hash).to include("Length" => "1")
         end
       end
     end

data/spec/typhoeus/response/status_spec.rb

@@ -128,6 +128,60 @@ describe Typhoeus::Response::Status do
     end
   end
 
+  describe "#failure?" do
+    context "when response code between 300-526 and 100-300" do
+      let(:options) { {:return_code => return_code, :response_code => 300} }
+
+      context "when mock" do
+        before { response.mock = true }
+
+        context "when return_code :internal_server_error" do
+          let(:return_code) { :internal_server_error }
+
+          it "returns true" do
+            expect(response.failure?).to be_truthy
+          end
+        end
+
+        context "when return_code nil" do
+          let(:return_code) { nil }
+
+          it "returns true" do
+            expect(response.failure?).to be_truthy
+          end
+        end
+      end
+
+      context "when no mock" do
+        before { response.mock = nil }
+
+        context "when return_code :internal_server_error" do
+          let(:return_code) { :internal_server_error }
+
+          it "returns true" do
+            expect(response.failure?).to be_truthy
+          end
+        end
+
+        context "when return_code nil" do
+          let(:return_code) { nil }
+
+          it "returns false" do
+            expect(response.failure?).to be_falsey
+          end
+        end
+      end
+    end
+
+    context "when response code is not 300-526" do
+      let(:options) { {:return_code => :ok, :response_code => 200} }
+
+      it "returns false" do
+        expect(response.failure?).to be_falsey
+      end
+    end
+  end
+
   describe "#modified?" do
     context "when response code 304" do
       let(:options) { {:return_code => :ok, :response_code => 304} }

data/typhoeus.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.license = 'MIT'
 
-  s.add_dependency('ethon', [">= 0.8.0"])
+  s.add_dependency('ethon', [">= 0.9.0"])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.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:
@@ -50,6 +50,9 @@ files:
 - lib/rack/typhoeus/middleware/params_decoder/helper.rb
 - lib/typhoeus.rb
 - lib/typhoeus/adapters/faraday.rb
+- lib/typhoeus/cache/dalli.rb
+- lib/typhoeus/cache/rails.rb
+- lib/typhoeus/cache/redis.rb
 - lib/typhoeus/config.rb
 - lib/typhoeus/easy_factory.rb
 - lib/typhoeus/errors.rb
@@ -94,6 +97,8 @@ files:
 - 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
@@ -145,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Parallel HTTP library on top of libcurl multi.
@@ -157,6 +162,8 @@ test_files:
 - 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