From 44d06fd36b03856bb9dc67a95af7c57d79b8b582 Mon Sep 17 00:00:00 2001 From: Trevor Wennblom Date: Wed, 14 Mar 2012 16:08:40 -0500 Subject: [PATCH 1/2] include puma server in docs --- lib/sinatra/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index fce5aaa5..a944024a 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -1339,7 +1339,7 @@ module Sinatra end # Run the Sinatra app as a self-hosted server using - # Thin, Mongrel or WEBrick (in that order). If given a block, will call + # Thin, Puma, Mongrel, or WEBrick (in that order). If given a block, will call # with the constructed handler once we have taken the stage. def run!(options={}) set options From e45b7eca5afa5f4ae9c3623e9935dc3c55121e84 Mon Sep 17 00:00:00 2001 From: Trevor Wennblom Date: Wed, 14 Mar 2012 19:02:55 -0500 Subject: [PATCH 2/2] 1byte indent fix --- lib/sinatra/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index fce5aaa5..0eea7bab 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -1177,7 +1177,7 @@ module Sinatra set(:public_folder, value) end - private + private # Condition for matching host name. Parameter might be String or Regexp. def host_name(pattern) condition { pattern === request.host }