em-http-request 0.2.14 → 0.2.15

data/lib/em-http/request.rb

@@ -27,7 +27,7 @@ module EventMachine
     attr_reader :options, :method
 
     def initialize(host)
-      @uri = host.kind_of?(Addressable::URI) ? host : Addressable::URI::parse(host)
+      @uri = host.kind_of?(Addressable::URI) ? host : Addressable::URI::parse(host.to_s)
     end
 
     # Send an HTTP request and consume the response. Supported options:

data/spec/helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'pp'
 
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'em-http'
-require 'em-websocket'
+require 'em-websocket'

data/spec/mock_spec.rb

@@ -5,7 +5,7 @@ describe 'em-http mock' do
   before(:all) do
     EventMachine::MockHttpRequest.activate!
   end
-    
+
   after(:all) do
     EventMachine::MockHttpRequest.deactivate!
   end
@@ -31,7 +31,7 @@ describe 'em-http mock' do
         EventMachine.stop
       }
     }
-  
+
     EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
   end
 
@@ -44,7 +44,8 @@ describe 'em-http mock' do
       http.errback { fail }
       http.callback {
         http.response_header.status.should == 200
-        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\r\n\r\n", 2).last
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'), :encoding => 'ISO-8859-1').split("\r\n\r\n", 2).last
+        http.response.encoding.to_s.should == 'ISO-8859-1'
         EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
         EventMachine.stop
       }
@@ -54,12 +55,13 @@ describe 'em-http mock' do
   it "should serve a fake http request from a file" do
     EventMachine::HttpRequest.register_file('http://www.google.ca:80/', :get, {}, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
     EM.run {
-    
+
       http = EventMachine::HttpRequest.new('http://www.google.ca/').get
       http.errback { fail }
       http.callback {
         http.response_header.status.should == 200
-        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\r\n\r\n", 2).last
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'), :encoding => 'ISO-8859-1').split("\r\n\r\n", 2).last
+        http.response.encoding.to_s.should == 'ISO-8859-1'
         EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
         EventMachine.stop
       }
@@ -92,7 +94,7 @@ function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.
     HEREDOC
     EventMachine::HttpRequest.register('http://www.google.ca:80/', :get, {}, data)
     EventMachine.run {
-    
+
       http = EventMachine::HttpRequest.new('http://www.google.ca/').get
       http.errback { fail }
       http.callback {
@@ -101,7 +103,7 @@ function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.
         EventMachine.stop
       }
     }
-  
+
   end
 
   it "should serve a fake failing http request" do
@@ -130,24 +132,26 @@ function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.
       http.errback { fail }
       http.callback {
         http.response_header.status.should == 200
-        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\r\n\r\n", 2).last
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'), :encoding => 'ISO-8859-1').split("\r\n\r\n", 2).last
+        http.response.encoding.to_s.should == 'ISO-8859-1'
         EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
         EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {:user_agent => 'BERT'}).should == 0
         EventMachine.stop
       }
     }
-  
+
     EM.run {
       http = EventMachine::HttpRequest.new('http://www.google.ca/').get({:head => {:user_agent => 'BERT'}})
       http.errback { fail }
       http.callback {
         http.response_header.status.should == 200
-        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\r\n\r\n", 2).last
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'), :encoding => 'ISO-8859-1').split("\r\n\r\n", 2).last
+        http.response.encoding.to_s.should == 'ISO-8859-1'
         EventMachine::HttpRequest.count('http://www.google.ca:80/', :get, {:user_agent => 'BERT'}).should == 1
         EventMachine.stop
       }
     }
-  
+
   end
 
   it "should raise an exception if pass-thru is disabled" do

data/spec/request_spec.rb

@@ -100,6 +100,26 @@ describe EventMachine::HttpRequest do
       }
     end
 
+    it "should redirect with missing content-length" do
+      EventMachine.run {
+        @s = StubServer.new("HTTP/1.0 301 MOVED PERMANENTLY\r\nlocation: http://127.0.0.1:8080/redirect\r\n\r\n")
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get :redirects => 2
+        http.errback { failed }
+
+        http.callback {
+          http.response_header.status.should == 200
+          http.response_header["CONTENT_ENCODING"].should == "gzip"
+          http.response.should == "compressed"
+          http.last_effective_url.to_s.should == 'http://127.0.0.1:8080/gzip'
+          http.redirects.should == 2
+
+          @s.stop
+          EM.stop
+        }
+      }
+    end
+
     it "should follow redirects on HEAD method" do
       EventMachine.run {
         http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/redirect/head').head :redirects => 1

data/spec/stub_server.rb

@@ -1,22 +1,22 @@
-class StubServer
-  module Server
-    def receive_data(data)
-      send_data @response
-      close_connection_after_writing
-    end
-
-    def response=(response)
-      @response = response
-    end
-  end
-
-  def initialize(response, port=8081)
-    @sig = EventMachine::start_server("127.0.0.1", port, Server) { |s|
-      s.response = response
-    }
-  end
-
-  def stop
-    EventMachine.stop_server @sig
-  end
-end
+class StubServer
+  module Server
+    def receive_data(data)
+      send_data @response
+      close_connection_after_writing
+    end
+
+    def response=(response)
+      @response = response
+    end
+  end
+
+  def initialize(response, port=8081)
+    @sig = EventMachine::start_server("127.0.0.1", port, Server) { |s|
+      s.response = response
+    }
+  end
+
+  def stop
+    EventMachine.stop_server @sig
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -60,10 +60,12 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - Changelog.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- autotest/discover.rb
 - em-http-request.gemspec
 - examples/fetch.rb
 - examples/fibered-http.rb
@@ -94,7 +96,6 @@ files:
 - spec/mock_spec.rb
 - spec/multi_spec.rb
 - spec/request_spec.rb
-- spec/spec.opts
 - spec/stallion.rb
 - spec/stub_server.rb
 has_rdoc: true

data/spec/spec.opts

@@ -1,7 +0,0 @@
---colour
---format
-specdoc
---loadby
-mtime
---reverse
---backtrace