em-http-request 0.2.9 → 0.2.10

data/README.rdoc

@@ -108,7 +108,7 @@ Full transparent proxy support with support for SSL tunneling.
 Specify the max depth of redirects to follow, default is 0.
 
   EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.google.com/').get :redirect => 1
+    http = EventMachine::HttpRequest.new('http://www.google.com/').get :redirects => 1
     http.callback { p http.last_effective_url }
   }
 

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/em-http-request.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-http-request}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik"]

data/lib/em-http/client.rb

@@ -375,7 +375,7 @@ module EventMachine
     end
 
     def unbind
-      if @last_effective_url != @uri and @redirects < @options[:redirects]
+      if (@state == :finished) && (@last_effective_url != @uri) && (@redirects < @options[:redirects])
         # update uri to redirect location if we're allowed to traverse deeper
         @uri = @last_effective_url
 

data/spec/request_spec.rb

@@ -361,6 +361,17 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should not invoke redirect logic on failed connections" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get :timeout => 0.1, :redirects => 5
+      http.callback { failed }
+      http.errback {
+        http.redirects.should == 0
+        EM.stop
+      }
+    }
+  end
+
   it "should optionally pass the response body progressively" do
     EventMachine.run {
       body = ''
@@ -510,7 +521,7 @@ describe EventMachine::HttpRequest do
     it "should not override content-type when passing in ruby hash/array for body" do
       EventMachine.run {
         http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post({
-            :body => {:a => :b}, :head => {'content-type' => 'text'}})
+        :body => {:a => :b}, :head => {'content-type' => 'text'}})
 
         http.errback { failed }
         http.callback {
@@ -602,7 +613,7 @@ describe EventMachine::HttpRequest do
       EventMachine.run {
 
         http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').post({
-            :body => "data", :proxy => {:host => '127.0.0.1', :port => 8082}})
+        :body => "data", :proxy => {:host => '127.0.0.1', :port => 8082}})
 
         http.errback { failed }
         http.callback {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Ilya Grigorik