em-rack-mongrel2 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/em-rack-mongrel2.gemspec +2 -2
  2. data/lib/mongrel2/request.rb +1 -0
  3. data/lib/mongrel2.rb +1 -1
  4. data/spec/request_spec.rb +49 -0
  5. metadata +66 -72
data/em-rack-mongrel2.gemspec CHANGED
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  ## If your rubyforge_project name is different, then edit it and comment out
14
14
  ## the sub! line in the Rakefile
15
15
  s.name = 'em-rack-mongrel2'
16
- s.version = '0.2.0'
17
- s.date = '2012-02-12'
16
+ s.version = '0.2.1'
17
+ s.date = '2012-08-14'
18
18
  s.rubyforge_project = 'em-rack-mongrel2'
19
19
 
20
20
  ## Make sure your summary is short. The description may be as long
data/lib/mongrel2/request.rb CHANGED
@@ -55,6 +55,7 @@ module Mongrel2
55
55
  }
56
56
 
57
57
  @env['SERVER_NAME'], @env['SERVER_PORT'] = headers['host'].split(':', 2)
58
+ @env['SERVER_PORT'] ||= '80'
58
59
  headers.each do |key, val|
59
60
  key = key.upcase.gsub('-', '_')
60
61
  unless %w[CONTENT_TYPE CONTENT_LENGTH].include?(key)
data/lib/mongrel2.rb CHANGED
@@ -10,5 +10,5 @@ require 'mongrel2/request'
10
10
  require 'mongrel2/response'
11
11
 
12
12
  module Mongrel2
13
- VERSION = '0.2.0'
13
+ VERSION = '0.2.1'
14
14
  end
data/spec/request_spec.rb CHANGED
@@ -110,4 +110,53 @@ describe Mongrel2::Request do
110
110
  r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
111
111
  r.body.should eql(io)
112
112
  end
113
+
114
+ it "should split host header into SERVER_NAME:SERVER_PORT" do
115
+ response = double("response")
116
+ uuid = double('uuid')
117
+ conn_id = double('conn_id')
118
+ path = double('path')
119
+ headers = {
120
+ "PATH" => "/",
121
+ "user-agent" => "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3",
122
+ "host" => "localhost:6767",
123
+ "accept" => "*/*",
124
+ "connection" => "close",
125
+ "x-forwarded-for" => "::1",
126
+ "METHOD" => "GET",
127
+ "VERSION" => "HTTP/1.1",
128
+ "URI" => "/",
129
+ "PATTERN" => "/"
130
+ }
131
+ body = double('body')
132
+ connection = double("connection")
133
+ r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
134
+ env = r.env
135
+ env['SERVER_NAME'].should eql('localhost')
136
+ env['SERVER_PORT'].should eql('6767')
137
+ end
138
+
139
+ it "should assume SERVER_PORT = 80 if not given" do
140
+ response = double("response")
141
+ uuid = double('uuid')
142
+ conn_id = double('conn_id')
143
+ path = double('path')
144
+ headers = {
145
+ "PATH" => "/",
146
+ "user-agent" => "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3",
147
+ "host" => "example.com", # mongrel2 is running on port 80
148
+ "accept" => "*/*",
149
+ "connection" => "close",
150
+ "x-forwarded-for" => "::1",
151
+ "METHOD" => "GET",
152
+ "VERSION" => "HTTP/1.1",
153
+ "URI" => "/",
154
+ "PATTERN" => "/"
155
+ }
156
+ body = double('body')
157
+ connection = double("connection")
158
+ r = Mongrel2::Request.new(uuid, conn_id, path, headers, body, connection)
159
+ env = r.env
160
+ env['SERVER_PORT'].should eql('80')
161
+ end
113
162
  end
metadata CHANGED
@@ -1,105 +1,102 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: em-rack-mongrel2
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.2.1
4
5
  prerelease:
5
- version: 0.2.0
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - ICHIBANGASE, Yutaka
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
-
13
- date: 2012-02-12 00:00:00 +09:00
14
- default_executable:
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
12
+ date: 2012-08-14 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
17
15
  name: ffi
18
- prerelease: false
19
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &2153231740 !ruby/object:Gem::Requirement
20
17
  none: false
21
- requirements:
18
+ requirements:
22
19
  - - ~>
23
- - !ruby/object:Gem::Version
20
+ - !ruby/object:Gem::Version
24
21
  version: 1.0.0
25
22
  type: :runtime
26
- version_requirements: *id001
27
- - !ruby/object:Gem::Dependency
28
- name: em-zeromq
29
23
  prerelease: false
30
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *2153231740
25
+ - !ruby/object:Gem::Dependency
26
+ name: em-zeromq
27
+ requirement: &2153247640 !ruby/object:Gem::Requirement
31
28
  none: false
32
- requirements:
29
+ requirements:
33
30
  - - ~>
34
- - !ruby/object:Gem::Version
31
+ - !ruby/object:Gem::Version
35
32
  version: 0.2.2
36
33
  type: :runtime
37
- version_requirements: *id002
38
- - !ruby/object:Gem::Dependency
39
- name: multi_json
40
34
  prerelease: false
41
- requirement: &id003 !ruby/object:Gem::Requirement
35
+ version_requirements: *2153247640
36
+ - !ruby/object:Gem::Dependency
37
+ name: multi_json
38
+ requirement: &2153247160 !ruby/object:Gem::Requirement
42
39
  none: false
43
- requirements:
40
+ requirements:
44
41
  - - ~>
45
- - !ruby/object:Gem::Version
42
+ - !ruby/object:Gem::Version
46
43
  version: 1.0.3
47
44
  type: :runtime
48
- version_requirements: *id003
49
- - !ruby/object:Gem::Dependency
50
- name: tnetstring
51
45
  prerelease: false
52
- requirement: &id004 !ruby/object:Gem::Requirement
46
+ version_requirements: *2153247160
47
+ - !ruby/object:Gem::Dependency
48
+ name: tnetstring
49
+ requirement: &2153246680 !ruby/object:Gem::Requirement
53
50
  none: false
54
- requirements:
51
+ requirements:
55
52
  - - ~>
56
- - !ruby/object:Gem::Version
53
+ - !ruby/object:Gem::Version
57
54
  version: 0.3.4
58
55
  type: :runtime
59
- version_requirements: *id004
60
- - !ruby/object:Gem::Dependency
61
- name: rspec
62
56
  prerelease: false
63
- requirement: &id005 !ruby/object:Gem::Requirement
57
+ version_requirements: *2153246680
58
+ - !ruby/object:Gem::Dependency
59
+ name: rspec
60
+ requirement: &2153246200 !ruby/object:Gem::Requirement
64
61
  none: false
65
- requirements:
62
+ requirements:
66
63
  - - ~>
67
- - !ruby/object:Gem::Version
64
+ - !ruby/object:Gem::Version
68
65
  version: 2.3.0
69
66
  type: :development
70
- version_requirements: *id005
71
- - !ruby/object:Gem::Dependency
72
- name: fuubar
73
67
  prerelease: false
74
- requirement: &id006 !ruby/object:Gem::Requirement
68
+ version_requirements: *2153246200
69
+ - !ruby/object:Gem::Dependency
70
+ name: fuubar
71
+ requirement: &2153245720 !ruby/object:Gem::Requirement
75
72
  none: false
76
- requirements:
73
+ requirements:
77
74
  - - ~>
78
- - !ruby/object:Gem::Version
75
+ - !ruby/object:Gem::Version
79
76
  version: 0.0.3
80
77
  type: :development
81
- version_requirements: *id006
82
- - !ruby/object:Gem::Dependency
83
- name: yard
84
78
  prerelease: false
85
- requirement: &id007 !ruby/object:Gem::Requirement
79
+ version_requirements: *2153245720
80
+ - !ruby/object:Gem::Dependency
81
+ name: yard
82
+ requirement: &2153245240 !ruby/object:Gem::Requirement
86
83
  none: false
87
- requirements:
84
+ requirements:
88
85
  - - ~>
89
- - !ruby/object:Gem::Version
86
+ - !ruby/object:Gem::Version
90
87
  version: 0.6.4
91
88
  type: :development
92
- version_requirements: *id007
93
- description: A Rack handler for the Mongrel2 web server with EventMachine support, by Zed Shaw. http://mongrel2.org/
89
+ prerelease: false
90
+ version_requirements: *2153245240
91
+ description: A Rack handler for the Mongrel2 web server with EventMachine support,
92
+ by Zed Shaw. http://mongrel2.org/
94
93
  email: yichiban@gmail.com
95
94
  executables: []
96
-
97
95
  extensions: []
98
-
99
- extra_rdoc_files:
96
+ extra_rdoc_files:
100
97
  - README.md
101
98
  - LICENSE
102
- files:
99
+ files:
103
100
  - Gemfile
104
101
  - LICENSE
105
102
  - README.md
@@ -123,34 +120,31 @@ files:
123
120
  - spec/response_spec.rb
124
121
  - spec/spec.opts
125
122
  - spec/spec_helper.rb
126
- has_rdoc: true
127
123
  homepage: http://github.com/ichiban/em-rack-mongrel2
128
124
  licenses: []
129
-
130
125
  post_install_message:
131
- rdoc_options:
126
+ rdoc_options:
132
127
  - --charset=UTF-8
133
- require_paths:
128
+ require_paths:
134
129
  - lib
135
- required_ruby_version: !ruby/object:Gem::Requirement
130
+ required_ruby_version: !ruby/object:Gem::Requirement
136
131
  none: false
137
- requirements:
138
- - - ">="
139
- - !ruby/object:Gem::Version
140
- version: "0"
141
- required_rubygems_version: !ruby/object:Gem::Requirement
132
+ requirements:
133
+ - - ! '>='
134
+ - !ruby/object:Gem::Version
135
+ version: '0'
136
+ required_rubygems_version: !ruby/object:Gem::Requirement
142
137
  none: false
143
- requirements:
144
- - - ">="
145
- - !ruby/object:Gem::Version
146
- version: "0"
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
147
142
  requirements: []
148
-
149
143
  rubyforge_project: em-rack-mongrel2
150
- rubygems_version: 1.6.2
144
+ rubygems_version: 1.8.11
151
145
  signing_key:
152
146
  specification_version: 2
153
147
  summary: A Mongrel2 Rack handler with EventMachine.
154
- test_files:
148
+ test_files:
155
149
  - spec/request_spec.rb
156
150
  - spec/response_spec.rb