em-rack-mongrel2 0.1.0 → 0.2.0

data/README.md

@@ -22,31 +22,40 @@ Download all dependencies.
 Run Mongrel2.
 
     cd example
-    mkdir -p tmp/pids logs
+    mkdir -p tmp/pids logs run
     m2sh load
-    m2sh start -name main
+    sudo m2sh start -name main
 
-Run a simple sinatra example or
+Run a simple sinatra example,
 
     cd sinatra
-    export RACK_MONGREL2_SEND=tcp://127.0.0.1:9996
-    export RACK_MONGREL2_RECV=tcp://127.0.0.1:9997
-    export RACK_MONGREL2_UUID=9539ED88-1B33-4D19-A9F9-283E5BF11AC7
-    rackup -s Mongrel2
+    rackup -s Mongrel2 \
+     	   -O uuid=9539ED88-1B33-4D19-A9F9-283E5BF11AC7 \
+     	   -O send=tcp://127.0.0.1:9996 \
+     	   -O recv=tcp://127.0.0.1:9997
 
-Run an async sinatra example.
+an async sinatra example or
 
     cd async_sinatra
-    export RACK_MONGREL2_SEND=tcp://127.0.0.1:9998
-    export RACK_MONGREL2_RECV=tcp://127.0.0.1:9999
-    export RACK_MONGREL2_UUID=AEE66029-E420-42E7-A7C8-6C37BBFC7B9F
-    rackup -s Mongrel2
+    rackup -s Mongrel2 \
+     	   -O uuid=AEE66029-E420-42E7-A7C8-6C37BBFC7B9F \
+     	   -O send=tcp://127.0.0.1:9998 \
+     	   -O recv=tcp://127.0.0.1:9999
 
-## How to use in your projects (work in progress)
+a big-upload example.
+
+    cd upload
+    rackup -s Mongrel2 \
+     	   -O uuid=51226E47-AE49-4BC8-A9C6-BD7F6827E8A4 \
+     	   -O send=tcp://127.0.0.1:10000 \
+     	   -O recv=tcp://127.0.0.1:10001 \
+     	   -O chroot=..
+
+## How to use in your projects
 
 1. Get mongrel2 installed (http://mongrel2.org/wiki/quick_start.html)
 1. Get your config for mongrel2 setup (see example directory)
-1. Add it to your Gemfile (gem 'em-rack-mongrel2', '~> 0.0.0' # This is not available yet.)
+1. Add it to your Gemfile (gem 'em-rack-mongrel2')
 1. You also need some sort of JSON parsing library installed, like Yajl or JSON (gem i yajl-ruby or gem i json). json-jruby will work too
 1. Run Mongrel2
 1. Run your rack application

data/em-rack-mongrel2.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'em-rack-mongrel2'
-  s.version           = '0.1.0'
-  s.date              = '2012-01-13'
+  s.version           = '0.2.0'
+  s.date              = '2012-02-12'
   s.rubyforge_project = 'em-rack-mongrel2'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,6 +42,8 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('ffi', ['~> 1.0.0'])
   s.add_dependency('em-zeromq', ['~> 0.2.2'])
+  s.add_dependency('multi_json', ['~> 1.0.3'])
+  s.add_dependency('tnetstring', ['~> 0.3.4'])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -66,6 +68,8 @@ Gem::Specification.new do |s|
     example/sinatra/.gitignore
     example/sinatra/app.rb
     example/sinatra/config.ru
+    example/upload/app.rb
+    example/upload/config.ru
     lib/mongrel2.rb
     lib/mongrel2/connection.rb
     lib/mongrel2/request.rb
@@ -81,4 +85,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
-end
+end

data/example/async_sinatra/app.rb

@@ -5,8 +5,8 @@ require 'yajl/json_gem'
 class AsyncExample < Sinatra::Base
   register Sinatra::Async
 
-  aget '*' do
-    EM.add_timer(5) do
+  aget '/' do
+    EM.add_timer(1) do
       body request.env.to_json
     end
   end

data/example/async_sinatra/config.ru

@@ -1,8 +1,7 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-$:.unshift(File.expand_path('.')) # Ruby 1.9 doesn't have . in the load path...
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path('.') # Ruby 1.9 doesn't have . in the load path...
 
 require 'rack/handler/mongrel2'
 require 'app'
 
-Rack::Handler::Mongrel2.run AsyncExample, :uuid => 'sinatra', :block => true
-exit(0)
+run AsyncExample

data/example/mongrel2.conf

@@ -7,6 +7,10 @@ darkblog2 = Host(name='localhost', routes={
     send_ident='AEE66029-E420-42E7-A7C8-6C37BBFC7B9F',
     recv_spec='tcp://127.0.0.1:9998',
     recv_ident='')
+  '/upload/': Handler(send_spec='tcp://127.0.0.1:10001',
+    send_ident='51226E47-AE49-4BC8-A9C6-BD7F6827E8A4',
+    recv_spec='tcp://127.0.0.1:10000',
+    recv_ident='')
 })
 
 main = Server(
@@ -24,7 +28,9 @@ main = Server(
 
 settings = {
   'zeromq.threads': 1,
-  'control_port': 'ipc://tmp/mongrel2_control'
+  'control_port': 'ipc://tmp/mongrel2_control',
+  'upload.temp_store': '/tmp/mongrel2.upload.XXXXXX',
+  'limits.content_length': 1024
 }
 
 servers = [main]

data/example/sinatra/app.rb

@@ -1,7 +1,7 @@
 require 'sinatra'
 require 'yajl/json_gem'
 
-get '*' do
-  sleep(5)
+get '/' do
+  sleep 1
   request.env.to_json
-end
+end

data/example/sinatra/config.ru

@@ -1,8 +1,7 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-$:.unshift(File.expand_path('.')) # Ruby 1.9 doesn't have . in the load path...
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path('.') # Ruby 1.9 doesn't have . in the load path...
 
 require 'rack/handler/mongrel2'
 require 'app'
 
-Rack::Handler::Mongrel2.run Sinatra::Application, :uuid => 'sinatra', :block => true
-exit(0)
+run Sinatra::Application

data/example/upload/app.rb

@@ -0,0 +1,36 @@
+require 'sinatra'
+require 'yajl/json_gem'
+require 'pp'
+
+set(:mongrel2_upload) do |value|
+  condition do
+    case value
+    when :start
+      request.env.key?('HTTP_X_MONGREL2_UPLOAD_START')
+    when :done
+      request.env.key?('HTTP_X_MONGREL2_UPLOAD_DONE')
+    else
+      false
+    end
+  end
+end
+
+before do
+  pp request
+end
+
+put '/ok', :mongrel2_upload => :done do
+  'upload done'
+end
+
+put '/ok', :mongrel2_upload => :start do
+  throw :async # continue the upload
+end
+
+put '/ng', :mongrel2_upload => :done do
+  'this will never happen'
+end
+
+put '/ng', :mongrel2_upload => :start do
+  '' # cancel the upload
+end

data/example/upload/config.ru

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path('.') # Ruby 1.9 doesn't have . in the load path...
+
+require 'rack/handler/mongrel2'
+require 'app'
+
+run Sinatra::Application

data/lib/mongrel2/connection.rb

@@ -1,18 +1,14 @@
-require 'em-zeromq'
-require 'mongrel2/request'
-require 'mongrel2/response'
-
 module Mongrel2
   class Connection
-    attr_reader :received
+    attr_reader :chroot
     @context = nil
 
     def self.context
-      @context ||= EM::ZeroMQ::Context.new(1)
+       @context ||= EM::ZeroMQ::Context.new(1)
     end
 
-    def initialize(uuid, sub, pub, app)
-      @uuid, @sub, @pub, @app = uuid, sub, pub, app
+    def initialize(uuid, sub, pub, chroot, app)
+      @uuid, @sub, @pub, @chroot, @app = uuid, sub, pub, chroot, app
 
       # Connect to receive requests
       @reqs = self.class.context.connect(ZMQ::PULL, sub, self)

data/lib/mongrel2/request.rb

@@ -1,7 +1,3 @@
-require 'mongrel2'
-require 'rack'
-require 'eventmachine'
-
 module Mongrel2
   class Request
     attr_reader :headers, :body, :uuid, :conn_id, :path, :connection
@@ -10,25 +6,21 @@ module Mongrel2
       def parse(msg, connection)
         # UUID CONN_ID PATH SIZE:HEADERS,SIZE:BODY,
         uuid, conn_id, path, rest = msg.split(' ', 4)
-        headers, rest = parse_netstring(rest)
-        body, _ = parse_netstring(rest)
-        headers = Mongrel2::JSON.parse(headers)
+        headers, rest = TNetstring.parse(rest)
+        headers = MultiJson.decode(headers)
+        body, _ = TNetstring.parse(rest)
         new(uuid, conn_id, path, headers, body, connection)
       end
-
-      def parse_netstring(ns)
-        # SIZE:HEADERS,
-
-        len, rest = ns.split(':', 2)
-        len = len.to_i
-        raise "Netstring did not end in ','" unless rest[len].chr == ','
-        [rest[0, len], rest[(len + 1)..-1]]
-      end
     end
 
     def initialize(uuid, conn_id, path, headers, body, connection)
-      @uuid, @conn_id, @path, @headers, @body = uuid, conn_id, path, headers, body
-      @data = headers['METHOD'] == 'JSON' ? Mongrel2::JSON.parse(body) : {}
+      @uuid, @conn_id, @path, @headers = uuid, conn_id, path, headers
+      if (body_path = headers['x-mongrel2-upload-done'])
+        @body = File.open(File.join(connection.chroot, body_path))
+      else
+        @body = StringIO.new(body)
+      end
+      @data = headers['METHOD'] == 'JSON' ? MultiJson.decode(body) : {}
       @connection = connection
     end
 
@@ -41,18 +33,18 @@ module Mongrel2
     end
 
     def env
+      return @env if @env
       script_name = ENV['RACK_RELATIVE_URL_ROOT'] || headers['PATTERN'].split('(', 2).first.gsub(/\/$/, '')
-      env = {
+      @env = {
         'rack.version' => Rack::VERSION,
         'rack.url_scheme' => 'http', # Only HTTP for now
-        'rack.input' => StringIO.new(body),
+        'rack.input' => body,
         'rack.errors' => $stderr,
         'rack.multithread' => true,
         'rack.multiprocess' => true,
         'rack.run_once' => false,
         'mongrel2.pattern' => headers['PATTERN'],
         'REQUEST_METHOD' => headers['METHOD'],
-        'CONTENT_TYPE' => headers['content-type'],
         'SCRIPT_NAME' => script_name,
         'PATH_INFO' => headers['PATH'].gsub(script_name, ''),
         'QUERY_STRING' => headers['QUERY'] || '',
@@ -62,15 +54,16 @@ module Mongrel2
         'async.close' => EM::DefaultDeferrable.new
       }
       
-      env['SERVER_NAME'], env['SERVER_PORT'] = headers['host'].split(':', 2)
+      @env['SERVER_NAME'], @env['SERVER_PORT'] = headers['host'].split(':', 2)
       headers.each do |key, val|
-        unless key =~ /content_(type|length)/i
-          key = "HTTP_#{key.upcase.gsub('-', '_')}"
+        key = key.upcase.gsub('-', '_')
+        unless %w[CONTENT_TYPE CONTENT_LENGTH].include?(key)
+          key = "HTTP_#{key}"
         end
-        env[key] = val
+        @env[key] = val
       end
 
-      env
+      @env
     end
   end
 end

data/lib/mongrel2.rb

@@ -1,14 +1,14 @@
-begin
-  require 'yajl'
-rescue LoadError
-  begin
-    require 'json'
-  rescue LoadError
-    raise "You need either the yajl-ruby or json gems present in order to parse JSON!"
-  end
-end
+require 'rack'
+require 'stringio'
+require 'eventmachine'
+require 'em-zeromq'
+require 'multi_json'
+require 'tnetstring'
+
+require 'mongrel2/connection'
+require 'mongrel2/request'
+require 'mongrel2/response'
 
 module Mongrel2
-  JSON = Object.const_defined?('Yajl') ? ::Yajl::Parser : ::JSON
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/rack/handler/mongrel2.rb

@@ -1,6 +1,6 @@
-require 'mongrel2/connection'
-require 'stringio'
-require 'eventmachine'
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+
+require 'mongrel2'
 
 module Rack
   module Handler
@@ -10,7 +10,8 @@ module Rack
           options = {
             :recv => ENV['RACK_MONGREL2_RECV'] || 'tcp://127.0.0.1:9997',
             :send => ENV['RACK_MONGREL2_SEND'] || 'tcp://127.0.0.1:9996',
-            :uuid => ENV['RACK_MONGREL2_UUID']
+            :uuid => ENV['RACK_MONGREL2_UUID'],
+            :chroot => ENV['RACK_MONGREL2_CHROOT'] || '.'
           }.merge(options)
 
           raise ArgumentError.new('Must specify an :uuid or set RACK_MONGREL2_UUID') if options[:uuid].nil?
@@ -18,7 +19,7 @@ module Rack
           conn = nil
 
           EM.run do
-            conn = ::Mongrel2::Connection.new(options[:uuid], options[:recv], options[:send], app)
+            conn = ::Mongrel2::Connection.new(options[:uuid], options[:recv], options[:send], options[:chroot], app)
             
             # This doesn't work at all until zmq fixes their shit (in 2.1.x I think), but trap it now anyway.
             %w(INT TERM KILL).each do |sig|

data/spec/request_spec.rb

@@ -1,32 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'mongrel2/request'
 
 describe Mongrel2::Request do
-  it 'should parse a netstring and ignore the contents of the netstring as well as the trailing comma' do
-    netstring = '9:aoeu:snth,'
-    result = Mongrel2::Request.parse_netstring(netstring)
-    result.length.should == 2
-    result[0].length.should == 9
-    result[0].should eql('aoeu:snth')
+  it "should parse a Mongrel2 message" do
+    message = "UUID CON PATH 253:{\"PATH\":\"/\",\"user-agent\":\"curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3\",\"host\":\"localhost:6767\",\"accept\":\"*/*\",\"connection\":\"close\",\"x-forwarded-for\":\"::1\",\"METHOD\":\"GET\",\"VERSION\":\"HTTP/1.1\",\"URI\":\"/\",\"PATTERN\":\"/\"},0:,"
+    connection = double('connection')
+    uuid = 'UUID'
+    conn_id = 'CON'
+    path = 'PATH'
+    headers = {
+      'PATH' => '/',
+      'user-agent' => 'curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3',
+      'host' => 'localhost:6767',
+      'accept' => '*/*',
+      'connection' => 'close',
+      'x-forwarded-for' => '::1',
+      'METHOD' => 'GET',
+      'VERSION' => 'HTTP/1.1',
+      'URI' => '/',
+      'PATTERN' => '/'
+    }
+    body = ''
+    request = double('request')
+    Mongrel2::Request.should_receive(:new).with(uuid, conn_id, path, headers, body, connection).and_return(request)
+    r = Mongrel2::Request.parse(message, connection)
+    r.should eql(request)
   end
 
-  it 'should parse a netstring made up of multiple netstrings' do
-    netstring = '9:aoeu:snth,16:aeou snth qwerty,'
-    result = Mongrel2::Request.parse_netstring(netstring)
-    result.length.should == 2
-    result[0].length.should == 9
-    result[0].should eql('aoeu:snth')
-    result[1].length.should == 20
-    result[1].should eql('16:aeou snth qwerty,')
-  end
-
-  it 'should fail if the netstring does not end in a comma' do
-    expect { Mongrel2::Request.parse_netstring('3:foo') }.to raise_error(NameError)
-  end
-
-  it "should parse a Mongrel2 message and have all parts populated" do
-    netstring = "UUID CON PATH 253:{\"PATH\":\"/\",\"user-agent\":\"curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3\",\"host\":\"localhost:6767\",\"accept\":\"*/*\",\"connection\":\"close\",\"x-forwarded-for\":\"::1\",\"METHOD\":\"GET\",\"VERSION\":\"HTTP/1.1\",\"URI\":\"/\",\"PATTERN\":\"/\"},0:,"
-    r = Mongrel2::Request.parse(netstring, double())
+  it "should have all parts populated" do
+    headers = {
+      "PATH" => "/",
+      "user-agent" => "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3",
+      "host" => "localhost:6767",
+      "accept" => "*/*",
+      "connection" => "close",
+      "x-forwarded-for" => "::1",
+      "METHOD" => "GET",
+      "VERSION" => "HTTP/1.1",
+      "URI" => "/",
+      "PATTERN" => "/"
+    }
+    r = Mongrel2::Request.new('UUID', 'CON', 'PATH', headers, '', double())
     r.should_not be_nil
     r.uuid.should eql('UUID')
     r.conn_id.should eql('CON')
@@ -46,13 +59,55 @@ describe Mongrel2::Request do
   end
 
   it "should return rack env with async callbacks" do
-    netstring = "UUID CON PATH 253:{\"PATH\":\"/\",\"user-agent\":\"curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3\",\"host\":\"localhost:6767\",\"accept\":\"*/*\",\"connection\":\"close\",\"x-forwarded-for\":\"::1\",\"METHOD\":\"GET\",\"VERSION\":\"HTTP/1.1\",\"URI\":\"/\",\"PATTERN\":\"/\"},0:,"
     response = double("response")
+    uuid = double('uuid')
+    conn_id = double('conn_id')
+    path = double('path')
+    headers = {
+      "PATH" => "/",
+      "user-agent" => "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3",
+      "host" => "localhost:6767",
+      "accept" => "*/*",
+      "connection" => "close",
+      "x-forwarded-for" => "::1",
+      "METHOD" => "GET",
+      "VERSION" => "HTTP/1.1",
+      "URI" => "/",
+      "PATTERN" => "/"
+    }
+    body = double('body')
     connection = double("connection")
-    r = Mongrel2::Request.parse(netstring, connection)
+    r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
     connection.should_receive(:post_process).with(response, r)
     env = r.env
     env['async.callback'].call(response)
     env['async.close'].should_not be_nil
   end
+
+  it "should open an async uploaded file for body" do
+    response = double("response")
+    uuid = double('uuid')
+    conn_id = double('conn_id')
+    path = double('path')
+    headers = {
+      "PATH" => "/",
+      "user-agent" => "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3",
+      "host" => "localhost:6767",
+      "accept" => "*/*",
+      "connection" => "close",
+      "x-forwarded-for" => "::1",
+      "METHOD" => "GET",
+      "VERSION" => "HTTP/1.1",
+      "URI" => "/",
+      "PATTERN" => "/",
+      'x-mongrel2-upload-done' => 'tmp/upload.file'
+    }
+    body = double('body')
+    connection = double("connection")
+    connection.stub(:chroot).and_return('.')
+    io = double('io')
+    File.should_receive(:open).with('./tmp/upload.file').and_return(io)
+    r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
+    r.body.should eql(io)
+  end
 end

data/spec/response_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'mongrel2/response'
 
 describe Mongrel2::Response do
   before(:each) do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rspec'
+require 'rspec'
+require 'rack/handler/mongrel2'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: em-rack-mongrel2
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - ICHIBANGASE, Yutaka
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-12 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -41,62 +32,64 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: multi_json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+        version: 1.0.3
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tnetstring
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.4
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 2.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fuubar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 description: A Rack handler for the Mongrel2 web server with EventMachine support, by Zed Shaw. http://mongrel2.org/
 email: yichiban@gmail.com
 executables: []
@@ -119,6 +112,8 @@ files:
 - example/sinatra/.gitignore
 - example/sinatra/app.rb
 - example/sinatra/config.ru
+- example/upload/app.rb
+- example/upload/config.ru
 - lib/mongrel2.rb
 - lib/mongrel2/connection.rb
 - lib/mongrel2/request.rb
@@ -128,6 +123,7 @@ files:
 - spec/response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/ichiban/em-rack-mongrel2
 licenses: []
 
@@ -141,23 +137,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: em-rack-mongrel2
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: A Mongrel2 Rack handler with EventMachine.