typhoeus 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7b2e8c2befcc3ef20e522c6a479ee45daf89f14
-  data.tar.gz: 59386c8e084d7a61d4c71f6e03bb71e6904fa873
+  metadata.gz: 209f15af78c352c7b5e54d1ad520d6a147eca869
+  data.tar.gz: 1a0a2f51d4ea855c1f50d35036092a4a736abfee
 SHA512:
-  metadata.gz: ea9fd7ddcd70e7e07ed439b8e2d65d87d4d48723a2c23fdd7f01611e1c928601017af4e30ef438790e0e19a1417e409a454218f39a43e20b4aaf53d9dda65842
-  data.tar.gz: 739e0f9b1407f08605ccaee9921f09a0cb8d2c69d2945f5ae9859b3f6f36d283fe6e35524e72a51124a4c2fd0969e58849a3e5b7412826b5736fef4f75c61502
+  metadata.gz: c4fcf5b5dd53cf4efd1eb01a96ec3f987fb494563f94a32338e9a97004bf2ba83b519499b8793d1f3b7a8fdfe331c1cafdff1c05c296d8c71d59193e19353e66
+  data.tar.gz: f9b2ac78c68e374543404cdbbc34dfd3a64ff113f75bf5101a82fde17b62819ac8daebafc8e39d819cae88b7a94da071cf261f4febc0e68948449a375eb09da6

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 script: "bundle exec rake"
 sudo: false
 rvm:
@@ -5,17 +6,18 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
   - jruby-head
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx  # It's actually RBX 3
+  - rbx-2
 matrix: 
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
     - rvm: ree

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.1...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.2...master)
+
+## 1.0.2
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v1.0.1...v1.0.2)
 
 ## 1.0.1
 
@@ -12,7 +16,7 @@
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.8.0...v1.0.0)
 
-## O.8.0
+## 0.8.0
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.3...v0.8.0)
 

data/Gemfile

@@ -1,7 +1,11 @@
 source "https://rubygems.org"
 gemspec
 
-gem "rake"
+if Gem.ruby_version < Gem::Version.new("1.9.3")
+  gem "rake", "< 11"
+else
+  gem "rake"
+end
 
 group :development, :test do
   gem "rspec", "~> 3.0"

data/LICENSE

@@ -1,6 +1,6 @@
 Copyright (c) 2009-2010 Paul Dix
 Copyright (c) 2011 David Balatero
-Copyright (c) 2012-2014 Hans Hasselberg
+Copyright (c) 2012-2016 Hans Hasselberg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -535,7 +535,7 @@ Copyright © 2009-2010 [Paul Dix](http://www.pauldix.net/)
 
 Copyright © 2011-2012 [David Balatero](https://github.com/dbalatero/)
 
-Copyright © 2012-2014 [Hans Hasselberg](http://github.com/i0rek/)
+Copyright © 2012-2016 [Hans Hasselberg](http://github.com/i0rek/)
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/lib/typhoeus/adapters/faraday.rb

@@ -135,6 +135,7 @@ module Faraday # :nodoc:
         req.options[:proxy] = "#{proxy[:uri].scheme}://#{proxy[:uri].host}:#{proxy[:uri].port}"
 
         if proxy[:user] && proxy[:password]
+          req.options[:proxyauth] = :any
           req.options[:proxyuserpwd] = "#{proxy[:user]}:#{proxy[:password]}"
         end
       end

data/lib/typhoeus/easy_factory.rb

@@ -121,7 +121,7 @@ module Typhoeus
     end
 
     def sanitize_timeout!(options, timeout)
-      timeout_ms = (timeout.to_s + '_ms').to_sym
+      timeout_ms = :"#{timeout}_ms"
       if options[timeout] && options[timeout].round != options[timeout]
         if !options[timeout_ms]
           options[timeout_ms] = (options[timeout]*1000).ceil

data/lib/typhoeus/pool.rb

@@ -17,6 +17,8 @@ module Typhoeus
     # @example Release easy.
     #   Typhoeus::Pool.release(easy)
     def self.release(easy)
+      easy.cookielist = "flush" # dump all known cookies to 'cookiejar'
+      easy.cookielist = "all" # remove all cookies from memory for this handle
       easy.reset
       @mutex.synchronize { easies << easy }
     end

data/lib/typhoeus/response/header.rb

@@ -3,6 +3,7 @@ module Typhoeus
 
     # This class represents the response header.
     # It can be accessed like a hash.
+    # Values can be strings (normal case) or arrays of strings (for duplicates headers)
     #
     # @api private
     class Header < Hash

data/lib/typhoeus/version.rb

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

data/spec/support/server.rb

@@ -23,6 +23,14 @@ TESTSERVER = Sinatra.new do
     [200, { 'Set-Cookie' => %w[ foo bar ], 'Content-Type' => 'text/plain' }, ['']]
   end
 
+  get '/cookies-test' do
+    [200, { 'Set-Cookie' => %w(foo=bar bar=foo), 'Content-Type' => 'text/plain' }, ['']]
+  end
+
+  get '/cookies-test2' do
+    [200, { 'Set-Cookie' => %w(foo2=bar bar2=foo), 'Content-Type' => 'text/plain' }, ['']]
+  end
+
   get '/fail/:number' do
     if fail_count >= params[:number].to_i
       "ok"

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/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)

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/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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-04-28 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: