Skip to content

Commit 7159fd7

Browse files
committed
Compatibility with Rack 3
* Rack has removed Mongrel support ages ago [[1]]. Replace it with WEBrick. * Rack split the webserver handlers into Rackup [[2]] [1]: rack/rack@2577f0b [2]: rack/rack@91c9c7f
1 parent ce363a7 commit 7159fd7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

benchmarks/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module Benchmark
1515
class Server < Sinatra::Base
1616

1717
def self.run
18-
Rack::Handler::WEBrick.run(
18+
Rackup::Handler::WEBrick.run(
1919
Benchmark::Server.new,
2020
:Port => 9292,
2121
:AccessLog => [],

em-http-request.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
2121
s.add_dependency 'eventmachine', '>= 1.0.3'
2222
s.add_dependency 'http_parser.rb', '>= 0.6.0'
2323

24-
s.add_development_dependency 'mongrel', '~> 1.2.0.pre2'
24+
s.add_development_dependency 'webrick'
2525
s.add_development_dependency 'multi_json'
26-
s.add_development_dependency 'rack', '< 2.0'
26+
s.add_development_dependency 'rack'
27+
s.add_development_dependency 'rackup'
2728
s.add_development_dependency 'rake'
2829
s.add_development_dependency 'rspec'
2930

spec/stallion.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# #--
55

66
require 'rack'
7+
require 'rackup/handler/webrick'
78

89
module Stallion
910
class Mount
@@ -16,7 +17,7 @@ def ride
1617
end
1718

1819
def match?(request)
19-
method = request['REQUEST_METHOD']
20+
method = request.respond_to?(:params) ? request.params['REQUEST_METHOD'] : request['REQUEST_METHOD']
2021
@methods.empty? or @methods.include?(method)
2122
end
2223
end
@@ -56,9 +57,9 @@ def self.run(options = {})
5657

5758
ruby_version = RUBY_VERSION.split('.').map(&:to_i)
5859
if ruby_version[0] >= 3
59-
Rack::Handler::Mongrel.run(Rack::Lint.new(self), **options)
60+
Rackup::Handler::WEBrick.run(Rack::Lint.new(self), **options)
6061
else
61-
Rack::Handler::Mongrel.run(Rack::Lint.new(self), options)
62+
Rackup::Handler::WEBrick.run(Rack::Lint.new(self), options)
6263
end
6364
end
6465

0 commit comments

Comments
 (0)