typhoeus 0.7.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTgwYWYyZmI1ZTkxMWMxZjM3MTQ2ZmE1OTJkMGJlMTJkNjQ1NWQ0Yg==
+    OTdmYmRhNGQwNjM5YzJiMjI4NzljODU0ODRjMzhjZjgwYTllOGM1MA==
   data.tar.gz: !binary |-
-    NjU1MTA2N2IxOGJhNWVmNWYwMGFjMTNhNjc2YTcyOWQ5MzFlMDljNw==
+    NTc5MzlkNmIyM2VmYTdlMmMzNzM0OTFkN2QwNGIyY2I2YTNhZDg3NQ==
 SHA512:
   metadata.gz: !binary |-
-    NzZmYjAyZTYxZDIwMjQyN2NhMmViNTE1ZjliNjI3OGU4MzEwNzYwMTMxZjEy
-    MWY1NDRjOWQyODZjMDRmYWVkMjIyOGU3ZGJiMjM5YmM5ZDI1YjFkODc1NWZm
-    YWY1YmZjYjliZWMzYzY3NDc1YzI5ZWRjYjA0Y2RmZDMxNmIzMDA=
+    YzlhNjk0NjRmYmFkZjI0NjUwYmZmNzEzYzM0MjIxN2FiMjJlYzI0YjFlMzVl
+    ZDZjZWQ5ZGUzODg5YTljZWJmMjNiOWYwZTUyNmU3N2QzOGQ3YjQ5M2VlMTky
+    NmExOTZiMDAyYmYyYjJlNjc1MDk1Njg1MGY1ODU5MmI5MmI2ZjY=
   data.tar.gz: !binary |-
-    ZGY3YTM2NjQyOGFkZjJiMDI4MWZlODUyYTI2YzFiMmM4MTZmYThkODAyODE3
-    OWQ0YmJkYTVhNzFiNzk4ZTdjNTNhMDFhYjAwZDg3ZGJjYzMxNzJhYTQxMjhh
-    NWMyOTBkNzM1ZTc3ZTZhZGI5ZjcwNGM5ZDM0ZmQ3NWM5MjM3OGY=
+    ODA0MTQxYzE5YTczYmRlNDE2ZTZiZDIxODJmZDYwMjg4OWE1ODAyNmQzNTFj
+    OWU1OWU3NjZmZTllMGUzMTNmZmY1Yjg1MDMyYWYwZjk0YzYzNWJmYmJjMjE3
+    Yjc3NjVkYmUwZGNkZGM2OWJjMmQ1MmM4ZTExNTA5MzY3NjYxYWQ=

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## Master
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.2...master)
+
+## 0.7.2
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.1...v0.7.2)
+
+* Allow arrays to be passed to Expectation#and_return
+  ([JP Moral](https://github.com/jpmoral))
+
+* Added getter for `redirect_time` value.
+  ([Adrien Jarthon](https://github.com/jarthod))
+
 ## 0.7.1
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.7.0...v0.7.1)

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem "rake"
 
 group :development, :test do
-  gem "rspec", "~> 2.11"
+  gem "rspec", "~> 3.0"
 
   gem "sinatra", "~> 1.3"
   gem "json"

data/README.md

@@ -2,6 +2,16 @@
 
 Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 
+# Typhoeus needs your help!
+
+I don't have enough time, but I think this is a nice project! If you or your company is using Typhoeus you should help keeping it alive! Pick any of:
+
+* add docs
+* respond to issues
+* add features
+
+Or send me an email! I would be more than happy to help getting you up to speed!
+
 ## Example
 
 A single request:
@@ -54,6 +64,24 @@ The options are all optional. The default for `:method` is `:get`.
 
 When you want to send URL parameters, you can use `:params` hash to do so. Please note that in case of you should send a request via `x-www-form-urlencoded` parameters, you need to use `:body` hash instead. `params` are for URL parameters and `:body` is for the request body.
 
+#### Sending requests through the proxy
+
+Add a proxy url to the list of options:
+
+```ruby
+options = {proxy: 'http://myproxy.org'}
+req = Typhoeus::Request.new(url, options)
+```
+
+If your proxy requires authentication, add it with `proxyuserpwd` option key:
+
+```ruby
+options = {proxy: 'http://proxyurl.com', proxyuserpwd: 'user:password'}
+req = Typhoeus::Request.new(url, options)
+```
+
+Note that `proxyuserpwd` is a colon-separated username and password, in the vein of basic auth `userpwd` option.
+
 
 You can run the query either on its own or through the hydra:
 
@@ -91,6 +119,14 @@ Typhoeus.post("www.example.com/posts", body: { title: "test post", content: "thi
 Typhoeus.delete("www.example.com/posts/1")
 Typhoeus.options("www.example.com")
 ```
+#### Sending params in the body with PUT
+When using POST the content-type is set automatically to 'application/x-www-form-urlencoded'. That's not the case for any other method like PUT, PATCH, HEAD and so on,  irrespective of whether you are using body or not. To get the same result as POST, i.e. a hash in the body coming through as params in the receiver, you need to set the content-type as shown below:
+```ruby
+Typhoeus.put("www.example.com/posts/1",
+        headers: {'Content-Type'=> "application/x-www-form-urlencoded"},
+        body: {title:"test post updated title", content: "this is my updated content"}
+    )
+```
 
 ### Handling HTTP errors
 
@@ -337,6 +373,15 @@ Typhoeus.get("www.example.com") == response
 #=> true
 ```
 
+You may also specify an array for the stub to return sequentially.
+
+```ruby
+Typhoeus.stub('www.example.com').and_return([response1, response2])
+
+Typhoeus.get('www.example.com') == response1 #=> true
+Typhoeus.get('www.example.com') == response2 #=> true
+```
+
 When testing make sure to clear your expectations or the stubs will persist between tests. The following can be included in your spec_helper.rb file to do this automatically.
 
 ```ruby

data/lib/typhoeus/adapters/faraday.rb

@@ -128,7 +128,7 @@ module Faraday # :nodoc:
         proxy = env[:request][:proxy]
         return unless proxy
 
-        req.options[:proxy] = "#{proxy[:uri].host}:#{proxy[:uri].port}"
+        req.options[:proxy] = "#{proxy[:uri].scheme}://#{proxy[:uri].host}:#{proxy[:uri].port}"
 
         if proxy[:user] && proxy[:password]
           req.options[:proxyuserpwd] = "#{proxy[:user]}:#{proxy[:password]}"

data/lib/typhoeus/expectation.rb

@@ -136,7 +136,8 @@ module Typhoeus
     #
     # @return [ void ]
     def and_return(response=nil, &block)
-      responses << (response.nil? ? block : response)
+      new_response = (response.nil? ? block : response)
+      responses.push *new_response
     end
 
     # Checks whether this expectation matches
@@ -205,7 +206,7 @@ module Typhoeus
       when String
         base_url == request_url
       when Regexp
-        !!request_url.match(base_url)
+        base_url === request_url
       when nil
         true
       else

data/lib/typhoeus/request/callbacks.rb

@@ -18,7 +18,7 @@ module Typhoeus
     #   request.on_complete { |response| p 2 }
     #   request.on_complete.clear
     #   request.execute_callbacks
-    #   #=> []
+    #   #=> nil
     #
     # @note If you're using the Hydra to execute multiple
     #   requests, then callbacks are delaying the
@@ -124,7 +124,7 @@ module Typhoeus
           callbacks += Typhoeus.on_failure + on_failure
         end
 
-        callbacks.map do |callback|
+        callbacks.each do |callback|
           self.response.handled_response = callback.call(self.response)
         end
       end

data/lib/typhoeus/response/informations.rb

@@ -160,6 +160,19 @@ module Typhoeus
       end
       alias :name_lookup_time :namelookup_time
 
+      # Return the time, in seconds, it took for all redirection steps
+      # include name lookup, connect, pretransfer and transfer before the
+      # final transaction was started. time_redirect shows the complete
+      # execution time for multiple redirections.
+      #
+      # @example Get redirect_time.
+      #   response.redirect_time
+      #
+      # @return [ Float ] The redirect_time.
+      def redirect_time
+        options[:redirect_time]
+      end
+
       # Return the last used effective url.
       #
       # @example Get effective_url.

data/lib/typhoeus/version.rb

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

data/spec/typhoeus/adapters/faraday_spec.rb

@@ -159,16 +159,16 @@ describe Faraday::Adapter::Typhoeus do
     before { adapter.method(:configure_proxy).call(request, env) }
 
     context "when proxy" do
-      let(:env) { { :request => { :proxy => { :uri => double(:host => "localhost", :port => "3001") } } } }
+      let(:env) { { :request => { :proxy => { :uri => double(:scheme => 'http', :host => "localhost", :port => "3001") } } } }
 
       it "sets proxy" do
-        expect(request.options[:proxy]).to eq("localhost:3001")
+        expect(request.options[:proxy]).to eq("http://localhost:3001")
       end
 
       context "when username and password" do
         let(:env) do
           { :request => { :proxy => {
-            :uri => double(:host => :a, :port => :b),
+            :uri => double(:scheme => 'http', :host => :a, :port => :b),
             :user => "a",
             :password => "b"
           } } }

data/spec/typhoeus/expectation_spec.rb

@@ -88,7 +88,6 @@ describe Typhoeus::Expectation do
 
     context "when array" do
       it "adds to responses" do
-        skip
         expectation.and_return([1, 2])
         expect(expectation.responses).to eq([1, 2])
       end
@@ -201,6 +200,14 @@ describe Typhoeus::Expectation do
         it "returns false" do
           expect(url_match).to be_falsey
         end
+
+        context "with nil request_url" do
+          let(:request_url) { nil }
+
+          it "returns false" do
+            expect(url_match).to be_falsey
+          end
+        end
       end
     end
 

data/spec/typhoeus/request/marshal_spec.rb

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

data/spec/typhoeus/response/informations_spec.rb

@@ -152,6 +152,14 @@ describe Typhoeus::Response::Informations do
     end
   end
 
+  describe "#redirect_time" do
+    let(:options) { { :redirect_time =>  1 } }
+
+    it "returns redirect_time from options" do
+      expect(response.redirect_time).to eq(1)
+    end
+  end
+
   describe "#effective_url" do
     let(:options) { { :effective_url => "http://www.example.com" } }
 

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.7.1"])
+  s.add_dependency('ethon', [">= 0.7.4"])
 
   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: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - David Balatero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.4
 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: