em-rack-mongrel2 0.2.0 → 0.2.1

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.2.0'
-  s.date              = '2012-02-12'
+  s.version           = '0.2.1'
+  s.date              = '2012-08-14'
   s.rubyforge_project = 'em-rack-mongrel2'
 
   ## Make sure your summary is short. The description may be as long

data/lib/mongrel2/request.rb

@@ -55,6 +55,7 @@ module Mongrel2
       }
       
       @env['SERVER_NAME'], @env['SERVER_PORT'] = headers['host'].split(':', 2)
+      @env['SERVER_PORT'] ||= '80'
       headers.each do |key, val|
         key = key.upcase.gsub('-', '_')
         unless %w[CONTENT_TYPE CONTENT_LENGTH].include?(key)

data/lib/mongrel2.rb

@@ -10,5 +10,5 @@ require 'mongrel2/request'
 require 'mongrel2/response'
 
 module Mongrel2
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/request_spec.rb

@@ -110,4 +110,53 @@ describe Mongrel2::Request do
     r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
     r.body.should eql(io)
   end
+
+  it "should split host header into SERVER_NAME:SERVER_PORT" 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" => "/"
+    }
+    body = double('body')
+    connection = double("connection")
+    r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
+    env = r.env
+    env['SERVER_NAME'].should eql('localhost')
+    env['SERVER_PORT'].should eql('6767')
+  end
+
+  it "should assume SERVER_PORT = 80 if not given" 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" => "example.com", # mongrel2 is running on port 80
+      "accept" => "*/*",
+      "connection" => "close",
+      "x-forwarded-for" => "::1",
+      "METHOD" => "GET",
+      "VERSION" => "HTTP/1.1",
+      "URI" => "/",
+      "PATTERN" => "/"
+    }
+    body = double('body')
+    connection = double("connection")
+    r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
+    env = r.env
+    env['SERVER_PORT'].should eql('80')
+  end
 end

metadata

@@ -1,105 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-rack-mongrel2
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - ICHIBANGASE, Yutaka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-12 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153231740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-zeromq
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153231740
+- !ruby/object:Gem::Dependency
+  name: em-zeromq
+  requirement: &2153247640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153247640
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2153247160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: tnetstring
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153247160
+- !ruby/object:Gem::Dependency
+  name: tnetstring
+  requirement: &2153246680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !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 
+  version_requirements: *2153246680
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153246200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153246200
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &2153245720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.3
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153245720
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153245240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
-  version_requirements: *id007
-description: A Rack handler for the Mongrel2 web server with EventMachine support, by Zed Shaw. http://mongrel2.org/
+  prerelease: false
+  version_requirements: *2153245240
+description: A Rack handler for the Mongrel2 web server with EventMachine support,
+  by Zed Shaw. http://mongrel2.org/
 email: yichiban@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.md
@@ -123,34 +120,31 @@ files:
 - spec/response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/ichiban/em-rack-mongrel2
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-rack-mongrel2
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: A Mongrel2 Rack handler with EventMachine.
-test_files: 
+test_files:
 - spec/request_spec.rb
 - spec/response_spec.rb