astro-em-http-request 0.1.15 → 0.2.2

data/README.rdoc

@@ -7,7 +7,18 @@ EventMachine based HTTP Request interface. Supports streaming response processin
 - Custom timeouts 
 
 Screencast / Demo of using EM-HTTP-Request: 
- - http://everburning.com/news/eventmachine-screencast-em-http-request/
+- http://everburning.com/news/eventmachine-screencast-em-http-request/
+
+== Getting started
+
+  # install & configure gemcutter repos
+  gem update --system
+  gem install gemcutter
+  gem tumble
+
+  gem install em-http-request
+
+  irb:0> require 'em-http'
 
 == Simple client example
 

data/Rakefile

@@ -82,3 +82,23 @@ task :compile => [:em_buffer, :http11_client]
 
 CLEAN.include ['build/*', '**/*.o', '**/*.so', '**/*.a', '**/*.log', 'pkg']
 CLEAN.include ['ext/buffer/Makefile', 'lib/em_buffer.*', 'lib/http11_client.*']
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "astro-em-http-request"
+    gemspec.summary = "EventMachine based, async HTTP Request interface"
+    gemspec.description = gemspec.summary
+    gemspec.email = "ilya@igvita.com"
+    gemspec.homepage = "http://github.com/igrigorik/em-http-request"
+    gemspec.authors = ["Ilya Grigorik", "Stephan Maka"]
+    gemspec.extensions = ["ext/buffer/extconf.rb" , "ext/http11_client/extconf.rb"]
+    gemspec.add_dependency('eventmachine', '>= 0.12.2')
+    gemspec.add_dependency('addressable', '>= 2.0.0')
+    gemspec.rubyforge_project = "em-http-request"
+  end
+  
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/examples/fetch.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'eventmachine'
+require '../lib/em-http'
+
+urls = ARGV
+if urls.size < 1
+  puts "Usage: #{$0} <url> <url> <...>"
+  exit
+end
+
+pending = urls.size
+
+EM.run do
+  urls.each do |url|
+    http = EM::HttpRequest.new(url).get
+    http.callback {
+      puts "#{url}\n#{http.response_header.status} - #{http.response.length} bytes\n"
+      puts http.response
+
+      pending -= 1
+      EM.stop if pending < 1
+    }
+    http.errback {
+      puts "#{url}\n" + http.errors.join("\n")
+
+      pending -= 1
+      EM.stop if pending < 1
+    }
+  end
+end

data/examples/fibered-http.rb

@@ -0,0 +1,39 @@
+require 'eventmachine'
+require 'em-http'
+require 'fiber'
+
+# Using Fibers in Ruby 1.9 to simulate blocking IO / IO scheduling
+# while using the async EventMachine API's
+
+def async_fetch(url)
+  f = Fiber.current
+  http = EventMachine::HttpRequest.new(url).get :timeout => 10
+
+  http.callback { f.resume(http) }
+  http.errback  { f.resume(http) }
+
+  return Fiber.yield
+end
+
+EventMachine.run do
+  Fiber.new{
+
+    puts "Setting up HTTP request #1"
+    data = async_fetch('http://www.google.com/')
+    puts "Fetched page #1: #{data.response_header.status}"
+
+    puts "Setting up HTTP request #2"
+    data = async_fetch('http://www.yahoo.com/')
+    puts "Fetched page #2: #{data.response_header.status}"
+
+    EventMachine.stop
+  }.resume
+end
+
+puts "Done"
+
+#  Setting up HTTP request #1
+#  Fetched page #1: 302
+#  Setting up HTTP request #2
+#  Fetched page #2: 200
+#  Done

data/lib/em-http/client.rb

@@ -256,6 +256,11 @@ module EventMachine
         head['cookie'] = encode_cookie(cookie)
       end
 
+      # Set content-type header if missing and body is a Ruby hash
+      if not head['content-type'] and options[:body].is_a? Hash
+        head['content-type'] = "application/x-www-form-urlencoded"
+      end
+
       # Build the request
       request_header = encode_request(@method, @uri.path, query)
       request_header << encode_headers(head)
@@ -361,9 +366,9 @@ module EventMachine
       # correct location header - some servers will incorrectly give a relative URI
       if @response_header.location
         begin
-          location = URI.parse @response_header.location
+          location = Addressable::URI.parse @response_header.location
           if location.relative?
-            location = (@uri.merge location).to_s
+            location = (@uri.join location).to_s
             @response_header[LOCATION] = location
           end
         rescue

data/lib/em-http/request.rb

@@ -58,6 +58,9 @@ module EventMachine
     def send_request(method, options)
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
 
+      # default connect & inactivity timeouts
+      options[:timeout] = 5 if not options[:timeout]
+
       # Make sure the port is set as Addressable::URI doesn't set the
       # port if it isn't there.
       @uri.port = @uri.port ? @uri.port : 80
@@ -86,4 +89,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/test/stallion.rb

@@ -87,7 +87,11 @@ Stallion.saddle :spec do |stable|
       stable.response.status = 200
 
     elsif stable.request.post?
-      stable.response.write stable.request.body.read
+      if stable.request.path_info == '/echo_content_type'
+        stable.response.write stable.request.env["CONTENT_TYPE"]
+      else
+        stable.response.write stable.request.body.read
+      end
 
     elsif stable.request.path_info == '/set_cookie'
       stable.response["Set-Cookie"] = "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
@@ -126,6 +130,10 @@ Stallion.saddle :spec do |stable|
         stable.response.status = 401
       end
 
+    elsif stable.request.path_info == '/relative-location'
+      stable.response.status = 301
+      stable.response["Location"] = '/forwarded'
+
     elsif
       stable.response.write  'Hello, World!'
     end
@@ -141,4 +149,4 @@ Thread.new do
   end
 end
 
-sleep(1)
+sleep(1)

data/test/test_request.rb

@@ -22,7 +22,7 @@ describe EventMachine::HttpRequest do
 
   it "should fail GET on invalid host" do
     EventMachine.run {
-      http = EventMachine::HttpRequest.new('http://google1.com/').get :timeout => 1
+      http = EventMachine::HttpRequest.new('http://somethinglocal/').get :timeout => 1
       http.callback { failed }
       http.errback {
         http.response_header.status.should == 0
@@ -390,4 +390,58 @@ describe EventMachine::HttpRequest do
       }
     end
   end
+
+  context "body content-type encoding" do
+    it "should not set content type on string in body" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post :body => "data"
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should be_empty
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should set content-type automatically when passed a 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}
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should match("application/x-www-form-urlencoded")
+          EventMachine.stop
+        }
+      }
+    end
+
+     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'}})
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should match("text")
+          EventMachine.stop
+        }
+      }
+    end
+  end
+
+  it "should complete a Location: with a relative path" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/relative-location').get
+
+        http.errback { failed }
+        http.callback {
+          http.response_header['LOCATION'].should == 'http://127.0.0.1:8080/forwarded'
+          EventMachine.stop
+        }
+      }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.15
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 +02:00
+date: 2009-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,22 +33,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: EventMachine based HTTP Request interface
-email: astro@spaceboyz.net
+description: EventMachine based, async HTTP Request interface
+email: ilya@igvita.com
 executables: []
 
 extensions: 
 - ext/buffer/extconf.rb
 - ext/http11_client/extconf.rb
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
 files: 
-- .autotest
 - .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
-- em-http-request.gemspec
+- VERSION
+- examples/fetch.rb
+- examples/fibered-http.rb
 - ext/buffer/em_buffer.c
 - ext/buffer/extconf.rb
 - ext/http11_client/ext_help.h
@@ -63,10 +65,10 @@ files:
 - lib/em-http/decoders.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
-- test/test_hash.rb
 - test/helper.rb
 - test/stallion.rb
 - test/stub_server.rb
+- test/test_hash.rb
 - test/test_multi.rb
 - test/test_request.rb
 has_rdoc: true
@@ -74,8 +76,8 @@ homepage: http://github.com/igrigorik/em-http-request
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -96,6 +98,13 @@ rubyforge_project: em-http-request
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: EventMachine based HTTP Request interface
-test_files: []
-
+summary: EventMachine based, async HTTP Request interface
+test_files: 
+- test/helper.rb
+- test/test_hash.rb
+- test/test_multi.rb
+- test/stub_server.rb
+- test/stallion.rb
+- test/test_request.rb
+- examples/fibered-http.rb
+- examples/fetch.rb

data/.autotest

@@ -1 +0,0 @@
-require 'autotest/redgreen'

data/em-http-request.gemspec

@@ -1,44 +0,0 @@
-spec = Gem::Specification.new do |s|
-  s.name = 'em-http-request'
-  s.version = '0.1.9'
-  s.date = '2009-10-17'
-  s.summary = 'EventMachine based HTTP Request interface'
-  s.description = s.summary
-  s.email = 'ilya@igvita.com'
-  s.homepage = "http://github.com/igrigorik/em-http-request"
-  s.has_rdoc = true
-  s.authors = ["Ilya Grigorik"]
-  s.add_dependency('eventmachine', '>= 0.12.9')
-  s.add_dependency('addressable', '>= 2.0.0')
-  s.extensions = ["ext/buffer/extconf.rb" , "ext/http11_client/extconf.rb"]
-  s.rubyforge_project = "em-http-request" 
-  
-  # ruby -rpp -e' pp `git ls-files`.split("\n") '
-  s.files = [
- ".autotest",
- ".gitignore",
- "LICENSE",
- "README.rdoc",
- "Rakefile",
- "em-http-request.gemspec",
- "ext/buffer/em_buffer.c",
- "ext/buffer/extconf.rb",
- "ext/http11_client/ext_help.h",
- "ext/http11_client/extconf.rb",
- "ext/http11_client/http11_client.c",
- "ext/http11_client/http11_parser.c",
- "ext/http11_client/http11_parser.h",
- "ext/http11_client/http11_parser.rl",
- "lib/em-http.rb",
- "lib/em-http/client.rb",
- "lib/em-http/core_ext/hash.rb",
- "lib/em-http/decoders.rb",
- "lib/em-http/multi.rb",
- "lib/em-http/request.rb",
- "test/test_hash.rb",
- "test/helper.rb",
- "test/stallion.rb",
- "test/stub_server.rb",
- "test/test_multi.rb",
- "test/test_request.rb"]
-end