typhoeus 0.6.5 → 0.6.6

data/.travis.yml

@@ -3,8 +3,15 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - ruby-head
+  - ree
   - jruby-head
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
+matrix: 
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.4...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.6...master)
 
-## Master
+## 0.6.6
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.5...v0.6.6)
+
+## 0.6.5
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.4...v0.6.5)
+
+## 0.6.4
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.3...v0.6.4)
 

data/README.md

@@ -1,4 +1,4 @@
-# Typhoeus [![Build Status](https://secure.travis-ci.org/typhoeus/typhoeus.png)](http://travis-ci.org/typhoeus/typhoeus) [![Code Climate](https://codeclimate.com/github/typhoeus/typhoeus.png)](https://codeclimate.com/github/typhoeus/typhoeus)
+# Typhoeus [![Build Status](https://secure.travis-ci.org/typhoeus/typhoeus.png)](http://travis-ci.org/typhoeus/typhoeus) [![Code Climate](https://codeclimate.com/github/typhoeus/typhoeus.png)](https://codeclimate.com/github/typhoeus/typhoeus) [![Gem Version](https://badge.fury.io/rb/typhoeus.png)](http://badge.fury.io/rb/typhoeus)
 
 Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 
@@ -74,7 +74,7 @@ The response object will be set after the request is run.
 response = request.response
 response.code
 response.total_time
-response.headers_has
+response.headers_hash
 response.body
 ```
 
@@ -253,6 +253,12 @@ No exceptions are raised on HTTP timeouts. You can check whether a request timed
 Typhoeus.get("www.example.com").timed_out?
 ```
 
+There are two different timeouts available: [`timeout`](http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTTIMEOUT) 
+and [`connecttimeout`](http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCONNECTTIMEOUT). `timeout` is the
+maximum time in seconds that you allow the libcurl transfer operation to take and `connecttimeout` is the maximum 
+time in seconds that you allow the connection to the server to take. These two are always available, while `timeout_ms` ond 
+`connecttimeout_ms` accept milliseconds but only an option when curl is build with `c-ares`, it will use `timout` or `connecttimeout` otherwise.
+
 ### Following Redirections
 
 Use `followlocation: true`, eg:

data/lib/typhoeus/adapters/faraday.rb

@@ -120,6 +120,7 @@ module Faraday # :nodoc:
         req.options[:sslkey]     = ssl[:client_key]  if ssl[:client_key]
         req.options[:cainfo]     = ssl[:ca_file]     if ssl[:ca_file]
         req.options[:capath]     = ssl[:ca_path]     if ssl[:ca_path]
+        req.options[:keypasswd]  = ssl[:client_cert_passwd] if ssl[:client_cert_passwd]
       end
 
       def configure_proxy(req, env)
@@ -128,8 +129,8 @@ module Faraday # :nodoc:
 
         req.options[:proxy] = "#{proxy[:uri].host}:#{proxy[:uri].port}"
 
-        if proxy[:username] && proxy[:password]
-          req.options[:proxyuserpwd] = "#{proxy[:username]}:#{proxy[:password]}"
+        if proxy[:user] && proxy[:password]
+          req.options[:proxyuserpwd] = "#{proxy[:user]}:#{proxy[:password]}"
         end
       end
 

data/lib/typhoeus/hydra.rb

@@ -63,9 +63,6 @@ module Typhoeus
       #   Typhoeus::Hydra.hydra
       #
       # @return [Typhoeus::Hydra] A new hydra.
-      #
-      # @deprecated This is only for convenience because so
-      #   much external code relies on it.
       def hydra
         Thread.current[:typhoeus_hydra] ||= new
       end

data/lib/typhoeus/hydra/queueable.rb

@@ -40,6 +40,17 @@ module Typhoeus
         queued_requests << request
       end
 
+      # Pushes a request to the front of the queue,
+      # to be performed by the hydra. Also sets hydra
+      # on request
+      #
+      # @example Queue reques.
+      #   hydra.queue_front(request)
+      def queue_front(request)
+        request.hydra = self
+        queued_requests.unshift request
+      end
+
       # Removes a request from queued_requests and
       # adds it to the hydra in order to be
       # performed next.

data/lib/typhoeus/request.rb

@@ -155,6 +155,17 @@ module Typhoeus
       Zlib.crc32 "#{self.class.name}#{base_url}#{options}"
     end
 
+    # Mimics libcurls POST body generation. This is not accurate, but good
+    # enough for VCR.
+    #
+    # @return [ String ] The encoded body.
+    #   otherwise.
+    #
+    # @api private
+    def encoded_body
+      Ethon::Easy::Form.new(nil, options[:body]).to_s
+    end
+
     private
 
     # Checks if two hashes are equal or not, discarding

data/lib/typhoeus/response.rb

@@ -52,6 +52,7 @@ module Typhoeus
     def mock
       defined?(@mock) ? @mock : options[:mock]
     end
+    alias :mock? :mock
 
     # Returns the handled_response if it has
     # been defined; otherwise, returns the response

data/lib/typhoeus/response/informations.rb

@@ -24,7 +24,7 @@ module Typhoeus
       #
       # @since 0.6.2
       def return_message
-        Ethon::Curl.easy_strerror(return_code)
+        Ethon::Curl.easy_strerror(return_code) if return_code
       end
 
       # Return the http response body.
@@ -45,7 +45,12 @@ module Typhoeus
       #
       # @return [ String ] The response_headers.
       def response_headers
-        options[:response_headers]
+        return options[:response_headers] if options[:response_headers]
+        if mock? && h = options[:headers]
+            h.map{ |k,v| [k, v.respond_to?(:join) ? v.join : v] }.
+              map{ |e| "#{e.first}: #{e.last}" }.
+              join("\r\n")
+        end
       end
 
       # Return the last received HTTP, FTP or SMTP response code.
@@ -199,8 +204,9 @@ module Typhoeus
       #
       # @return [ Typhoeus::Header ] The response header.
       def headers
+        return Header.new(options[:headers]) if mock? && options[:headers]
         return nil if response_headers.nil? && !defined?(@headers)
-        @headers ||= Response::Header.new(response_headers.split("\r\n\r\n").last)
+        @headers ||= Header.new(response_headers.split("\r\n\r\n").last)
       end
       alias :headers_hash :headers
 

data/lib/typhoeus/version.rb

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

data/spec/typhoeus/adapters/faraday_spec.rb

@@ -36,6 +36,30 @@ describe Faraday::Adapter::Typhoeus do
     end
   end
 
+  context "when a response is stubbed" do
+    before do
+      stub = Typhoeus::Response.new \
+        :code    => 200,
+        :headers => { "Foo" => "2", "Bar" => "3" },
+        :body    => "Hello",
+        :mock    => true
+
+      Typhoeus.stub(base_url + '/').and_return(stub)
+    end
+
+    it 'stubs the status code' do
+      expect(response.status).to eq(200)
+    end
+
+    it 'stubs the response body' do
+      expect(response.body).to eq("Hello")
+    end
+
+    it 'stubs the headers' do
+      expect(response.headers).to eq("Foo" => "2", "Bar" => "3")
+    end
+  end
+
   describe "#perform_request" do
     let(:env) { {} }
 
@@ -145,7 +169,7 @@ describe Faraday::Adapter::Typhoeus do
         let(:env) do
           { :request => { :proxy => {
             :uri => double(:host => :a, :port => :b),
-            :username => "a",
+            :user => "a",
             :password => "b"
           } } }
         end

data/spec/typhoeus/hydra/queueable_spec.rb

@@ -21,6 +21,11 @@ describe Typhoeus::Hydra::Queueable do
       hydra.queue(request)
       expect(hydra.queued_requests).to include(request)
     end
+    
+    it "adds to front of queued requests" do 
+      hydra.queue_front(request)
+      expect(hydra.queued_requests.first).to be(request)
+    end
   end
 
   describe "#abort" do

data/spec/typhoeus/request_spec.rb

@@ -7,9 +7,9 @@ describe Typhoeus::Request do
 
   describe ".url" do
     context "when no parameters" do
-    it "returns base_url" do
-      expect(request.url).to eq(request.base_url)
-    end
+      it "returns base_url" do
+        expect(request.url).to eq(request.base_url)
+      end
     end
 
     context "when parameters" do
@@ -49,7 +49,8 @@ describe Typhoeus::Request do
       let(:options) { {:headers => {} } }
 
       it "add user agent" do
-        expect(request.options[:headers]['User-Agent']).to eq(Typhoeus::USER_AGENT)
+        agent = request.options[:headers]['User-Agent']
+        expect(agent).to eq(Typhoeus::USER_AGENT)
       end
     end
 
@@ -100,7 +101,9 @@ describe Typhoeus::Request do
         end
 
         context "when different order" do
-          let(:other_options) { {:headers => { 'User-Agent' => "Fubar",  }, :verbose => true } }
+          let(:other_options) {
+            {:headers => { 'User-Agent' => "Fubar" }, :verbose => true }
+          }
           let(:other) { Typhoeus::Request.new(base_url, other_options)}
 
           it "returns true" do
@@ -128,4 +131,14 @@ describe Typhoeus::Request do
       end
     end
   end
+
+  describe "#encoded_body" do
+    let(:request) {
+      Typhoeus::Request.new("www.example.com",:body => {:a => 1})
+    }
+
+    it "returns encoded body" do
+      expect(request.encoded_body).to eq("a=1")
+    end
+  end
 end

data/spec/typhoeus/response/informations_spec.rb

@@ -26,6 +26,14 @@ describe Typhoeus::Response::Informations do
     it "returns a message" do
       expect(response.return_message).to eq("Couldn't connect to server")
     end
+
+    describe "with nil return_code" do
+      let(:options) { { :return_code => nil } }
+
+      it "returns nil" do
+        expect(response.return_message).to be_nil
+      end
+    end
   end
 
   describe "#response_body" do
@@ -47,10 +55,26 @@ describe Typhoeus::Response::Informations do
   end
 
   describe "#response_headers" do
-    let(:options) { { :response_headers => "headers" } }
+    let(:options) { { :response_headers => "Length: 1" } }
+
+    context "when no mock" do
+      it "returns response_headers from options" do
+        expect(response.response_headers).to eq("Length: 1")
+      end
+    end
 
-    it "returns response_headers from options" do
-      expect(response.response_headers).to eq("headers")
+    context "when mock" do
+      context "when no response_headers" do
+        context "when headers" do
+          let(:options) { { :mock => true, :headers => {"Length" => 1, "Content-Type" => "text/plain" } } }
+
+          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("\r\n")
+          end
+        end
+      end
     end
   end
 
@@ -153,13 +177,13 @@ describe Typhoeus::Response::Informations do
   end
 
   describe "#headers" do
-    context "when no headers" do
+    context "when no response_headers" do
       it "returns nil" do
         expect(response.headers).to be_nil
       end
     end
 
-    context "when headers" do
+    context "when response_headers" do
       let(:options) { {:response_headers => "Expire: -1\nServer: gws"} }
 
       it "returns nonempty headers" do
@@ -183,6 +207,20 @@ describe Typhoeus::Response::Informations do
       end
     end
 
+    context "when mock" do
+      context "when headers" do
+        let(:options) { {:mock => true, :headers => {"Length" => "1"}} }
+
+        it "returns Typhoeus::Response::Header" do
+          expect(response.headers).to be_a(Typhoeus::Response::Header)
+        end
+
+        it "returns headers" do
+          expect(response.headers).to include("Length" => "1")
+        end
+      end
+    end
+
     context "when requesting" do
       let(:response) { Typhoeus.get("localhost:3001") }
 

data/typhoeus.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.rubyforge_project         = '[none]'
+  s.license = 'MIT'
 
   s.add_dependency('ethon', ["~> 0.6.1"])
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
+  prerelease: 
 platform: ruby
 authors:
 - David Balatero
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -123,27 +126,32 @@ files:
 - spec/typhoeus_spec.rb
 - typhoeus.gemspec
 homepage: https://github.com/typhoeus/typhoeus
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -806955660153474198
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 2.0.3
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Parallel HTTP library on top of libcurl multi.
 test_files:
 - spec/rack/typhoeus/middleware/params_decoder/helper_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDdmYjM1MjNhYzZkNWViZjdiMGE2YjUzYjQzMzJjMTk4YzI4ODNlNA==
-  data.tar.gz: !binary |-
-    N2Y3MTBjOGViOGExMDI1Mjk3MjkyOWJiYTA4OWM3N2M5NWRlM2Y4NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDQxZDBmNWM2N2RkY2Y2NWEwZDBjNGQ1YTZlNTUwZmYwMDNlN2MzNzIwN2Fi
-    N2RjMjQ5NDZiZTU0ZjBlZDQ0NTc4ZDEwMTNiZTljNmZmOTQxYWM2NzAwNDcw
-    ZWUxZDcyNTExMTkxZTE4ZjcxMjM5OTUxNWNiOWExZTUwNDk3NjI=
-  data.tar.gz: !binary |-
-    YjBlZTkxNzQ1Y2Y3ODQ0NGNlODNiMmM0MmMxYWMwY2I5M2MwYTgxMDZkZjdl
-    OWZkNTNlYTE5OTI3Njk4YzU3N2U3ZDIwNDU5ODhiOTk0YWEwMzQ3Y2NmM2Rh
-    Zjc2OTFhMzRhYmE3ZTEyMjQ4OGIwMDUyNDk1Y2EwYjgwNDY2OTI=