typhoeus 0.6.8 → 0.6.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmYzNGMzZmI1NzgwZjM4MjE3Mjc3OTkxMzkzZDQ4NWI1MmViZGQ4OQ==
+  data.tar.gz: !binary |-
+    YTVlMWVhYjBjYzczYTgyYWUzN2E3NDNiM2Y0ZTc2YjViNDZmMzUyYw==
+SHA512:
+  metadata.gz: !binary |-
+    M2MwNzI3MmM3NmE0OGU3OGQ3OTY2OThmOGQ4ZDFiNzU2ZDU4NGYyYTFhM2Y1
+    ZGZiNTUwNjFhYjlmMTJjM2QwY2ZjNjlkZDkwOTRjYzIxOWNkMzA0YzZhMWY4
+    ZThjYzEzZDIzMDRhODU1NmU5NDFmMTQwNDQ3MmQxNWY3YThjNGM=
+  data.tar.gz: !binary |-
+    N2ZlMTBjNGZhMzBhMWNmZDE5OWI3MWZhOTIxNGNmMDFiOGQ2YzAyYzExOWQ3
+    M2JmZTQxYzg4MzM2MTA0ODFmM2Y3NTcwYzY1Y2EyZjQ3MjgzMjQ5NDg4YWIx
+    MzA3ZDhjOTBkNTBkMTQ4Y2E1NTAyN2VmNTU0MTk4NTYxNmY2ODY=

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - ree
   - jruby-head
   - jruby-18mode
   - jruby-19mode
@@ -18,3 +17,4 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+    - rvm: ree

data/CHANGELOG.md

@@ -13,8 +13,9 @@ Bugfixes:
 
 Enhancements:
 
+* Use an updated Ethon version. Note that from now on the `mime-types` is no longer a Ethon dependency. The gem will be still used if available to determine the mime type of a file which is uploaded. That means you have to have take care of the gem installation yourself.
 * Use SVG for status badges in README.
-  7[Sean Linsley](https://github.com/seanlinsley), [\#353](https://github.com/typhoeus/typhoeus/pull/353))
+  ([Sean Linsley](https://github.com/seanlinsley), [\#353](https://github.com/typhoeus/typhoeus/pull/353))
 * Missing quotes in README example code.
   ([Jason R. Clark](https://github.com/jasonrclark), [\#351](https://github.com/typhoeus/typhoeus/pull/351))
 * Specs for Faraday adapter.

data/README.md

@@ -344,6 +344,12 @@ Typhoeus.get("www.example.com", followlocation: true)
 Typhoeus::Request.get("www.example.com", userpwd: "user:password")
 ```
 
+### Compression
+
+```ruby
+Typhoeus.get("www.example.com", accept_encoding: "gzip")
+```
+
 ### Cookies
 
 ```ruby
@@ -383,7 +389,10 @@ certificate subject is \*.host.com). You can disable host verification. Like
 this:
 
 ```ruby
+# host checking enabled
 Typhoeus.get("https://www.example.com", ssl_verifyhost: 2)
+# host checking disabled
+Typhoeus.get("https://www.example.com", ssl_verifyhost: 0)
 ```
 
 ### Verbose debug output

data/lib/typhoeus/easy_factory.rb

@@ -49,7 +49,7 @@ module Typhoeus
     def get
       begin
         easy.http_request(
-          request.base_url,
+          request.base_url.to_s,
           request.options.fetch(:method, :get),
           sanitize(request.options)
         )
@@ -105,7 +105,7 @@ module Typhoeus
         request.finish(Response.new(easy.mirror.options))
         Typhoeus::Pool.release(easy)
         if hydra && !hydra.queued_requests.empty?
-          hydra.dequeue
+          hydra.dequeue_many
         end
       end
     end

data/lib/typhoeus/hydra.rb

@@ -50,7 +50,7 @@ module Typhoeus
 
     # @example Set max_concurrency.
     #   Typhoeus::Hydra.new(max_concurrency: 20)
-    attr_reader :max_concurrency
+    attr_accessor :max_concurrency
 
     # @api private
     attr_reader :multi

data/lib/typhoeus/hydra/queueable.rb

@@ -62,6 +62,22 @@ module Typhoeus
       def dequeue
         add(queued_requests.shift) unless queued_requests.empty?
       end
+
+      # Removes requests from queued_requests and
+      # adds them to the hydra until max_concurrency
+      # is reached.
+      #
+      # @example Dequeue requests.
+      #   hydra.dequeue_many
+      #
+      # @since 0.6.8
+      def dequeue_many
+        number = multi.easy_handles.count
+        until number == max_concurrency || queued_requests.empty?
+          add(queued_requests.shift)
+          number += 1
+        end
+      end
     end
   end
 end

data/lib/typhoeus/hydra/runnable.rb

@@ -11,13 +11,7 @@ module Typhoeus
       #
       # @return [ Symbol ] Return value from multi.perform.
       def run
-        number_requests = 0
-        loop do
-          break if number_requests == max_concurrency || queued_requests.empty?
-          number_requests += queued_requests.pop(max_concurrency).map do |request|
-            add(request)
-          end.size
-        end
+        dequeue_many
         multi.perform
       end
     end

data/lib/typhoeus/request/stubbable.rb

@@ -8,8 +8,8 @@ module Typhoeus
     # @api private
     module Stubbable
 
-      # Override run in order to check for matching expecations.
-      # When an expecation is found, super is not called. Instead a
+      # Override run in order to check for matching expectations.
+      # When an expectation is found, super is not called. Instead a
       # canned response is assigned to the request.
       #
       # @example Run the request.

data/lib/typhoeus/response/informations.rb

@@ -193,6 +193,10 @@ module Typhoeus
         options[:redirect_count]
       end
 
+      def request_size
+        options[:request_size]
+      end
+
       def debug_info
         options[:debug_info]
       end

data/lib/typhoeus/version.rb

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

data/spec/rack/typhoeus/middleware/params_decoder/helper_spec.rb

@@ -82,13 +82,13 @@ describe "Rack::Typhoeus::Middleware::ParamsDecoder::Helper" do
       context "and its 0" do
         let(:params){ {'0' => 1} }
         it 'returns true' do
-          expect(encoded).to be_true
+          expect(encoded).to be_truthy
         end
       end
       context "and its not 0" do
         let(:params){ {'some-key' => 1}}
         it 'returns false' do
-          expect(encoded).to be_false
+          expect(encoded).to be_falsey
         end
       end
     end
@@ -97,7 +97,7 @@ describe "Rack::Typhoeus::Middleware::ParamsDecoder::Helper" do
       let(:params) { Hash[12.times.map {|i| [i, (i+65).chr]}] }
 
       it "returns true" do
-        expect(encoded).to be_true
+        expect(encoded).to be_truthy
       end
     end
 
@@ -105,7 +105,7 @@ describe "Rack::Typhoeus::Middleware::ParamsDecoder::Helper" do
       let(:params) { {:a => 1} }
 
       it "returns false" do
-        expect(encoded).to be_false
+        expect(encoded).to be_falsey
       end
     end
   end

data/spec/rack/typhoeus/middleware/params_decoder_spec.rb

@@ -7,11 +7,11 @@ describe "Rack::Typhoeus::Middleware::ParamsDecoder" do
   end
 
   let(:app) do
-    stub
+    double
   end
 
   let(:env) do
-    stub
+    double
   end
 
   let(:klass) do

data/spec/typhoeus/adapters/faraday_spec.rb

@@ -84,7 +84,7 @@ describe Faraday::Adapter::Typhoeus do
         let(:env) { { :method => :get, :ssl => {}, :request => {} } }
 
         it "falls back to single" do
-          Typhoeus::Request.should_receive(:new).and_return(double(:options => {}, :on_complete => [], :run => true))
+          expect(Typhoeus::Request).to receive(:new).and_return(double(:options => {}, :on_complete => [], :run => true))
           adapter.method(:perform_request).call(env)
         end
       end
@@ -119,7 +119,7 @@ describe Faraday::Adapter::Typhoeus do
     end
 
     it "sets on_complete callback" do
-      expect(request.on_complete).to have(1).items
+      expect(request.on_complete.size).to eq(1)
     end
   end
 
@@ -256,7 +256,7 @@ describe Faraday::Adapter::Typhoeus do
       end
 
       it "sets ssl_verifypeer to false" do
-        expect(request.options[:ssl_verifypeer]).to be_false
+        expect(request.options[:ssl_verifypeer]).to be_falsey
       end
     end
 
@@ -268,7 +268,7 @@ describe Faraday::Adapter::Typhoeus do
       end
 
       it "sets ssl_verifypeer to true" do
-        expect(request.options[:ssl_verifypeer]).to be_true
+        expect(request.options[:ssl_verifypeer]).to be_truthy
       end
     end
   end
@@ -278,7 +278,7 @@ describe Faraday::Adapter::Typhoeus do
       let(:env) { { :parallel_manager => true } }
 
       it "returns true" do
-        expect(adapter.method(:parallel?).call(env)).to be_true
+        expect(adapter.method(:parallel?).call(env)).to be_truthy
       end
     end
 
@@ -286,7 +286,7 @@ describe Faraday::Adapter::Typhoeus do
       let(:env) { { :parallel_manager => nil } }
 
       it "returns false" do
-        expect(adapter.method(:parallel?).call(env)).to be_false
+        expect(adapter.method(:parallel?).call(env)).to be_falsey
       end
     end
   end

data/spec/typhoeus/easy_factory_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Typhoeus::EasyFactory do
   let(:base_url) { "http://localhost:3001" }
-  let(:hydra) { Typhoeus::Hydra.new(:max_concurrency => 0) }
+  let(:hydra) { Typhoeus::Hydra.new(:max_concurrency => 1) }
   let(:options) { {} }
   let(:request) { Typhoeus::Request.new(base_url, options) }
   let(:easy_factory) { described_class.new(request, hydra) }
@@ -48,15 +48,15 @@ describe Typhoeus::EasyFactory do
       let(:options) { {:connect_timeout => 1} }
 
       it "warns" do
-        easy_factory.should_receive(:warn).with(
+        expect(easy_factory).to receive(:warn).with(
           "Deprecated option connect_timeout. Please use connecttimeout instead."
         )
         easy_factory.get
       end
 
       it "passes correct option" do
-        easy_factory.should_receive(:warn)
-        easy_factory.easy.should_receive(:connecttimeout=).with(1)
+        expect(easy_factory).to receive(:warn)
+        expect(easy_factory.easy).to receive(:connecttimeout=).with(1)
         easy_factory.get
       end
     end
@@ -64,19 +64,19 @@ describe Typhoeus::EasyFactory do
 
   describe "#set_callback" do
     it "sets easy.on_complete callback" do
-      easy_factory.easy.should_receive(:on_complete)
+      expect(easy_factory.easy).to receive(:on_complete)
       easy_factory.send(:set_callback)
     end
 
     it "finishes request" do
       easy_factory.send(:set_callback)
-      request.should_receive(:finish)
+      expect(request).to receive(:finish)
       easy_factory.easy.complete
     end
 
     it "resets easy" do
       easy_factory.send(:set_callback)
-      easy_factory.easy.should_receive(:reset)
+      expect(easy_factory.easy).to receive(:reset)
       easy_factory.easy.complete
     end
 
@@ -88,7 +88,7 @@ describe Typhoeus::EasyFactory do
 
     it "adds next request" do
       easy_factory.hydra.instance_variable_set(:@queued_requests, [request])
-      easy_factory.hydra.should_receive(:add).with(request)
+      expect(easy_factory.hydra).to receive(:add).with(request)
       easy_factory.send(:set_callback)
       easy_factory.easy.complete
     end

data/spec/typhoeus/expectation_spec.rb

@@ -40,7 +40,7 @@ describe Typhoeus::Expectation do
     let(:expectations) { double(:clear) }
 
     it "clears all" do
-      expectations.should_receive(:clear)
+      expect(expectations).to receive(:clear)
       Typhoeus::Expectation.instance_variable_set(:@expectations, expectations)
       Typhoeus::Expectation.clear
       Typhoeus::Expectation.instance_variable_set(:@expectations, nil)
@@ -53,8 +53,8 @@ describe Typhoeus::Expectation do
 
     it "finds a matching expectation and returns its next response" do
       Typhoeus::Expectation.all << expectation
-      expectation.should_receive(:matches?).with(request).and_return(true)
-      expectation.should_receive(:response).with(request).and_return(stubbed_response)
+      expect(expectation).to receive(:matches?).with(request).and_return(true)
+      expect(expectation).to receive(:response).with(request).and_return(stubbed_response)
 
       response = Typhoeus::Expectation.response_for(request)
 
@@ -88,7 +88,7 @@ describe Typhoeus::Expectation do
 
     context "when array" do
       it "adds to responses" do
-        pending
+        skip
         expectation.and_return([1, 2])
         expect(expectation.responses).to eq([1, 2])
       end
@@ -154,13 +154,13 @@ describe Typhoeus::Expectation do
     let(:request) { double(:base_url => nil) }
 
     it "calls url_match?" do
-      expectation.should_receive(:url_match?)
+      expect(expectation).to receive(:url_match?)
       expectation.matches?(request)
     end
 
     it "calls options_match?" do
-      expectation.should_receive(:url_match?).and_return(true)
-      expectation.should_receive(:options_match?)
+      expect(expectation).to receive(:url_match?).and_return(true)
+      expect(expectation).to receive(:options_match?)
       expectation.matches?(request)
     end
   end
@@ -173,7 +173,7 @@ describe Typhoeus::Expectation do
     context "when string" do
       context "when match" do
         it "returns true" do
-          expect(url_match).to be_true
+          expect(url_match).to be_truthy
         end
       end
 
@@ -181,7 +181,7 @@ describe Typhoeus::Expectation do
         let(:base_url) { "no_match" }
 
         it "returns false" do
-          expect(url_match).to be_false
+          expect(url_match).to be_falsey
         end
       end
     end
@@ -191,7 +191,7 @@ describe Typhoeus::Expectation do
         let(:base_url) { /example/ }
 
         it "returns true" do
-          expect(url_match).to be_true
+          expect(url_match).to be_truthy
         end
       end
 
@@ -199,7 +199,7 @@ describe Typhoeus::Expectation do
         let(:base_url) { /nomatch/ }
 
         it "returns false" do
-          expect(url_match).to be_false
+          expect(url_match).to be_falsey
         end
       end
     end
@@ -208,7 +208,7 @@ describe Typhoeus::Expectation do
       let(:base_url) { nil }
 
       it "returns true" do
-        expect(url_match).to be_true
+        expect(url_match).to be_truthy
       end
     end
 
@@ -216,7 +216,7 @@ describe Typhoeus::Expectation do
       let(:base_url) { 1 }
 
       it "returns false" do
-        expect(url_match).to be_false
+        expect(url_match).to be_falsey
       end
     end
   end
@@ -231,7 +231,7 @@ describe Typhoeus::Expectation do
       let(:request_options) { options }
 
       it "returns true" do
-        expect(options_match).to be_true
+        expect(options_match).to be_truthy
       end
     end
 
@@ -240,7 +240,7 @@ describe Typhoeus::Expectation do
       let(:request_options) { { :a => 1, :b => 2 } }
 
       it "returns true" do
-        expect(options_match).to be_true
+        expect(options_match).to be_truthy
       end
     end
 
@@ -249,7 +249,7 @@ describe Typhoeus::Expectation do
       let(:request_options) { options }
 
       it "returns true" do
-        expect(options_match).to be_true
+        expect(options_match).to be_truthy
       end
     end
 
@@ -258,7 +258,7 @@ describe Typhoeus::Expectation do
       let(:request_options) { options }
 
       it "returns true" do
-        expect(options_match).to be_true
+        expect(options_match).to be_truthy
       end
     end
 
@@ -266,7 +266,7 @@ describe Typhoeus::Expectation do
       let(:options) { { :a => 1 } }
 
       it "returns false" do
-        expect(options_match).to be_false
+        expect(options_match).to be_falsey
       end
     end
   end