padrino-core 0.11.4 → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eaaf6b58a471d045e8141109e191b8932937605
-  data.tar.gz: f84f79482e130307c53a7fd152b8db5b2e6aec2d
+  metadata.gz: 07676eda48ccc772dcca11b4d6ebe2267cb86fe9
+  data.tar.gz: 669c9795dd7cd5eab46986a28fed64ea87400311
 SHA512:
-  metadata.gz: d19c9ccab9b572cb7d624e884f1e3948b8c1d4b7cd6e22cba8a8a4c16d0cc139b97365f8fdcf5e9fca288aef8b5d12d0308a193fd685d505c51c7378986cb644
-  data.tar.gz: f8c01eaba904cc2ba5dbab8ddb28d323721ed00b9ff56ac95619dc999cbd711172751fed794d249febfd33b932bc44a22c430c24f47182a101f7af622d956eab
+  metadata.gz: a4b95dfbdd3ea29423c1f09424ac28a4fce32e08732830b739b08ec159d6205f84f423a04224c9b17ed889c5b4d6850678e94943f8960c6ee94ad2fe8cf69709
+  data.tar.gz: 3c5da6330346fe9950be1bb42dc706c4bca7e682e452d42c7d1c9e6fc18f82b71c482c7eceaaac2838285db1629bf8ecab76d04061201e00afa4b7edc070237f

data/lib/padrino-core/application/authenticity_token.rb

@@ -0,0 +1,25 @@
+module Padrino
+  class AuthenticityToken < Rack::Protection::AuthenticityToken
+    def initialize(app, options = {})
+      @app = app
+      @except = options[:except]
+      @except = Array(@except) unless @except.is_a?(Proc)
+      super
+    end
+
+    def call(env)
+      if except?(env)
+        @app.call(env)
+      else
+        super(env)
+      end
+    end
+
+    def except?(env)
+      return false unless @except
+      path_info = env['PATH_INFO']
+      @except.is_a?(Proc) ? @except.call(env) : @except.any?{|path|
+        path.is_a?(Regexp) ? path.match(path_info) : path == path_info }
+    end
+  end
+end

data/lib/padrino-core/application/rendering/extensions/erubis.rb

@@ -40,15 +40,18 @@ begin
         def render(*args)
           app       = args.first
           app_class = app.class
-          @padrino_app = app.kind_of?(Padrino::Application) || 
-                         (app_class.respond_to?(:erb) && app_class.erb[:engine_class] == Padrino::Erubis::SafeBufferTemplate)
+          @is_padrino_app = app.kind_of?(Padrino::Application) || 
+                            (app_class.respond_to?(:erb) && app_class.erb[:engine_class] == Padrino::Erubis::SafeBufferTemplate)
           super
         end
 
+        ##
+        # In preamble we need a flag `__in_erb_template` and SafeBuffer for padrino apps.
+        #
         def precompiled_preamble(locals)
-          buf = @padrino_app ? "ActiveSupport::SafeBuffer.new" : "''"
-          old_postamble = super.split("\n")[0..-2]
-          [old_postamble, "#{@outvar} = _buf = (#{@outvar} || #{buf})"].join("\n")
+          original = super
+          return original unless @is_padrino_app
+          "__in_erb_template = true\n" << original.rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
         end
       end
     end
@@ -57,8 +60,9 @@ begin
   Tilt.prefer(Padrino::Erubis::Template, :erb)
 
   if defined? Padrino::Rendering
-    Padrino::Rendering.engine_configurations[:erb] =
-      {:engine_class => Padrino::Erubis::SafeBufferTemplate}
+    Padrino::Rendering.engine_configurations[:erb] = {
+      :engine_class => Padrino::Erubis::SafeBufferTemplate,
+    }
   end
 rescue LoadError
 end

data/lib/padrino-core/application/rendering/extensions/haml.rb

@@ -17,8 +17,9 @@ begin
   end
 
   if defined? Padrino::Rendering
-    Padrino::Rendering.engine_configurations[:haml] =
-      {:escape_html => true}
+    Padrino::Rendering.engine_configurations[:haml] = {
+      :escape_html => true,
+    }
 
     class Tilt::HamlTemplate
       include Padrino::Rendering::SafeTemplate

data/lib/padrino-core/application/rendering/extensions/slim.rb

@@ -2,12 +2,19 @@ begin
   require 'slim'
 
   if defined? Padrino::Rendering
-    Padrino::Rendering.engine_configurations[:slim] =
-      {:generator => Temple::Generators::RailsOutputBuffer,
-      :buffer => "@_out_buf", :use_html_safe => true}
+    Padrino::Rendering.engine_configurations[:slim] = {
+      :generator => Temple::Generators::RailsOutputBuffer,
+      :buffer => "@_out_buf",
+      :use_html_safe => true,
+      :disable_capture => true,
+    }
 
     class Slim::Template
       include Padrino::Rendering::SafeTemplate
+
+      def precompiled_preamble(locals)
+        "__in_slim_template = true\n" << super
+      end
     end
   end
 rescue LoadError

data/lib/padrino-core/application/rendering.rb

@@ -195,14 +195,16 @@ module Padrino
         options[:layout] = @layout if options[:layout].nil? || options[:layout] == true
         # Resolve layouts similar to in Rails
         if options[:layout].nil? && !settings.templates.has_key?(:layout)
-          layout_path, layout_engine = *resolved_layout
+          layout_path = settings.fetch_layout_path(options[:layout])
+          is_included_extension = %w[.slim .erb .haml].include?(File.extname(layout_path.to_s))
+          layout_path, layout_engine = *(is_included_extension ? resolve_template(layout_path) : resolved_layout)
 
           # We need to force layout false so sinatra don't try to render it
           options[:layout] = layout_path || false
-          options[:layout] = false unless layout_engine == engine # TODO allow different layout engine
+          options[:layout] = false unless is_included_extension ? layout_engine : layout_engine == engine
           options[:layout_engine] = layout_engine || engine if options[:layout]
         elsif options[:layout].present?
-          options[:layout] = settings.fetch_layout_path(options[:layout] || @layout)
+          options[:layout], options[:layout_engine] = *resolve_template(settings.fetch_layout_path(options[:layout]))
         end
         # Default to original layout value if none found.
         options[:layout] ||= layout_was
@@ -276,11 +278,17 @@ module Padrino
         view_path = options.delete(:views) || settings.views || "./views"
         target_extension = File.extname(template_path)[1..-1] || "none" # explicit template extension
         template_path = template_path.chomp(".#{target_extension}")
+        template_glob =
+          if respond_to?(:request) && request.controller.present?
+            File.join("{,#{request.controller}}", template_path)
+          else
+            template_path
+          end
 
         # Generate potential template candidates
-        templates = Dir[File.join(view_path, template_path) + ".*"].map do |file|
+        templates = Dir[File.join(view_path, template_glob) + ".*"].map do |file|
           template_engine = File.extname(file)[1..-1].to_sym # Retrieves engine extension
-          template_file   = file.sub(view_path, '').chomp(".#{template_engine}").to_sym # retrieves template filename
+          template_file   = file.squeeze('/').sub(view_path, '').chomp(".#{template_engine}").to_sym # retrieves template filename
           [template_file, template_engine] unless IGNORE_FILE_PATTERN.any? { |pattern| template_engine.to_s =~ pattern }
         end
 

data/lib/padrino-core/application/routing.rb

@@ -15,6 +15,19 @@ class Sinatra::Request
   end
 end
 
+##
+# This patches Sinatra to accept UTF-8 urls on JRuby 1.7.6
+#
+if RUBY_ENGINE == 'jruby' && defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.7.4'
+  class Sinatra::Base
+    class << self
+      alias_method :old_generate_method, :generate_method
+      def generate_method(method_name, &block)
+        old_generate_method(method_name.to_sym, &block)
+      end
+    end
+  end
+end
 
 class HttpRouter
   def rewrite_partial_path_info(env, request); end
@@ -61,7 +74,7 @@ class HttpRouter
   class Route
     VALID_HTTP_VERBS.replace %w[GET POST PUT PATCH DELETE HEAD OPTIONS LINK UNLINK]
 
-    attr_accessor :use_layout, :controller, :action, :cache, :cache_key, :cache_expires_in, :parent
+    attr_accessor :use_layout, :controller, :action, :cache, :cache_key, :cache_expires, :parent
 
     def before_filters(&block)
       @_before_filters ||= []
@@ -172,6 +185,7 @@ class HttpRouter
             env['router.request'] = request
             env['router.params'] ||= {}
             #{"env['router.params'].merge!(Hash[#{param_names.inspect}.zip(request.params)])" if dynamic?}
+            env['router.params'] = env['router.params'].with_indifferent_access
             @router.rewrite#{"_partial" if route.match_partially}_path_info(env, request)
             response = @router.process_destination_path(#{path_ivar}, env)
             return response unless router.pass_on_response(response)
@@ -193,7 +207,7 @@ module Padrino
     def apply?(request)
       detect = @args.any? do |arg|
         case arg
-        when Symbol then request.route_obj && (request.route_obj.name == arg or request.route_obj.name == [@scoped_controller, arg].flatten.join("_").to_sym)
+        when Symbol then request.route_obj && (request.route_obj.name == arg or request.route_obj.name == [@scoped_controller, arg].flatten.join(" ").to_sym)
         else             arg === request.path_info
         end
       end || @options.any? do |name, val|
@@ -557,7 +571,7 @@ module Padrino
       def url(*args)
         params = args.extract_options!  # parameters is hash at end
         names, params_array = args.partition{|a| a.is_a?(Symbol)}
-        name = names.join("_").to_sym    # route name is concatenated with underscores
+        name = names[0, 2].join(" ").to_sym    # route name is concatenated with underscores
         if params.is_a?(Hash)
           params[:format] = params[:format].to_s unless params[:format].nil?
           params = value_to_param(params)
@@ -568,10 +582,7 @@ module Padrino
           else
             compiled_router.path(name, *(params_array << params))
           end
-        url[0,0] = conform_uri(uri_root) if defined?(uri_root)
-        url[0,0] = conform_uri(ENV['RACK_BASE_URI']) if ENV['RACK_BASE_URI']
-        url = "/" if url.blank?
-        url
+        rebase_url(url)
       rescue HttpRouter::InvalidRouteException
         route_error = "route mapping for url(#{name.inspect}) could not be found!"
         raise Padrino::Routing::UnrecognizedException.new(route_error)
@@ -586,6 +597,17 @@ module Padrino
         route('HEAD', path, *args, &block)
       end
 
+      def rebase_url(url)
+        if url.start_with?('/')
+          new_url = ''
+          new_url << conform_uri(uri_root) if defined?(uri_root)
+          new_url << conform_uri(ENV['RACK_BASE_URI']) if ENV['RACK_BASE_URI']
+          new_url << url
+        else
+          url.blank? ? '/' : url
+        end
+      end
+
       private
       # Parse params from the url method
       def value_to_param(value)
@@ -786,7 +808,7 @@ module Padrino
         name = options.delete(:name) if name.nil? && options.key?(:name)
         if name
           controller_name = controller.join("_")
-          name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
+          name = "#{controller_name} #{name}".to_sym unless controller_name.blank?
         end
 
         # Merge in option defaults.
@@ -859,6 +881,7 @@ module Padrino
           mime_types        = types.map { |t| mime_type(t) }.compact
           url_format        = params[:format].to_sym if params[:format]
           accepts           = request.accept.map(&:to_str)
+          accepts           = [] if accepts == ["*/*"]
 
           # Per rfc2616-sec14:
           # Assume */* if no ACCEPT header is given.
@@ -890,7 +913,12 @@ module Padrino
 
           if matched_format
             @_content_type = url_format || accept_format || :html
-            content_type(@_content_type, :charset => 'utf-8')
+
+            if @_content_type != :json
+              content_type(@_content_type, :charset => 'utf-8')
+            else
+              content_type(@_content_type)
+            end
           end
 
           matched_format
@@ -924,17 +952,24 @@ module Padrino
       #   url(:show, :id => 1)
       #   url(:show, :name => :test)
       #   url(:show, 1)
-      #   url("/foo")
+      #   url("/foo", false, false)
       #
       # @see Padrino::Routing::ClassMethods#url
       #
       def url(*args)
-        # Delegate to Sinatra 1.2 for simple url("/foo")
-        # http://www.sinatrarb.com/intro#Generating%20URLs
-        return super if args.first.is_a?(String) && !args[1].is_a?(Hash)
-
-        # Delegate to Padrino named route URL generation.
-        settings.url(*args)
+        if args.first.is_a?(String)
+          url_path = settings.rebase_url(args.shift)
+          if args.empty?
+            url_path
+          else
+            # Delegate sinatra-style urls to Sinatra. Ex: url("/foo", false, false)
+            # http://www.sinatrarb.com/intro#Generating%20URLs
+            super url_path, *args
+          end
+        else
+          # Delegate to Padrino named route URL generation.
+          settings.url(*args)
+        end
       end
       alias :url_for :url
 
@@ -944,9 +979,15 @@ module Padrino
       # @example
       #   absolute_url(:show, :id => 1)  # => http://example.com/show?id=1
       #   absolute_url(:show, 24)        # => https://example.com/admin/show/24
+      #   absolute_url('/foo/bar')       # => https://example.com/admin/foo/bar
+      #   absolute_url('baz')            # => https://example.com/admin/foo/baz
       #
-      def absolute_url( *args )
-        uri url(*args), true, false
+      def absolute_url(*args)
+        url_path = args.shift
+        if url_path.is_a?(String) && !url_path.start_with?('/')
+          url_path = request.env['PATH_INFO'].rpartition('/').first << '/' << url_path
+        end
+        uri url(url_path, *args), true, false
       end
 
       def recognize_path(path)
@@ -958,10 +999,12 @@ module Padrino
       #
       def current_path(*path_params)
         if path_params.last.is_a?(Hash)
-          path_params[-1] = params.merge(path_params[-1])
+          path_params[-1] = params.merge(path_params[-1].with_indifferent_access)
         else
           path_params << params
         end
+
+        path_params[-1] = path_params[-1].symbolize_keys
         @route.path(*path_params)
       end
 

data/lib/padrino-core/application.rb

@@ -2,11 +2,9 @@ require 'padrino-core/application/flash'
 require 'padrino-core/application/rendering'
 require 'padrino-core/application/routing'
 require 'padrino-core/application/showexceptions'
+require 'padrino-core/application/authenticity_token'
 
 module Padrino
-  class ApplicationSetupError < RuntimeError
-  end
-
   ##
   # Subclasses of this become independent Padrino applications
   # (stemming from Sinatra::Application).
@@ -26,20 +24,24 @@ module Padrino
       Padrino.logger
     end
 
+    # TODO: Remove this hack after getting rid of thread-unsafe http_router:
+    alias_method :original_call, :call
+    def call(*args)
+      settings.init_mutex.synchronize do
+        instance_eval{ undef :call }
+        class_eval{ alias_method :call, :original_call }
+        instance_eval{ undef :original_call }
+        super(*args)
+      end
+    end
+
     class << self
       def inherited(base)
         begun_at = Time.now
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         base.default_configuration!
-        base.prerequisites.concat([
-          File.join(base.root, '/models.rb'),
-          File.join(base.root, '/models/**/*.rb'),
-          File.join(base.root, '/lib.rb'),
-          File.join(base.root, '/lib/**/*.rb')
-        ]).uniq!
-        Padrino.require_dependencies(base.prerequisites)
         logger.devel :setup, begun_at, base
-        super(base) # Loading the subclass inherited method
+        super(base)
       end
 
       ##
@@ -54,10 +56,10 @@ module Padrino
       #   MyApp.reload!
       #
       def reload!
-        logger.devel "Reloading #{settings}"
+        logger.devel "Reloading application #{settings}"
         reset!
         reset_router!
-        Padrino.require_dependencies(settings.app_file, :force => true) # Reload the app file
+        Padrino.require_dependencies(settings.app_file, :force => true)
         require_dependencies
         default_filters!
         default_routes!
@@ -90,6 +92,26 @@ module Padrino
         router.routes
       end
 
+      ##
+      # Returns an absolute path of view in application views folder.
+      #
+      # @example
+      #   Admin.view_path 'users/index' #=> "/home/user/test/admin/views/users/index"
+      #
+      def view_path(view)
+        File.expand_path(view, views)
+      end
+
+      ##
+      # Returns an absolute path of application layout.
+      #
+      # @example
+      #   Admin.layout_path :application #=> "/home/user/test/admin/views/layouts/application"
+      #
+      def layout_path(layout)
+        view_path("layouts/#{layout}")
+      end
+
       ##
       # Setup the application by registering initializers, load paths and logger.
       # Invoked automatically when an application is first instantiated.
@@ -103,11 +125,11 @@ module Padrino
         settings.default_routes!
         settings.default_errors!
         if defined?(I18n)
+          Reloader.special_files += settings.locale_path
           I18n.load_path << settings.locale_path
           I18n.reload!
         end
         @_configured = true
-        @_configured
       end
 
       ##
@@ -127,7 +149,13 @@ module Padrino
       #   directory that need to be added to +$LOAD_PATHS+ from this application
       #
       def load_paths
-        @_load_paths ||= %w[models lib mailers controllers helpers].map { |path| File.join(settings.root, path) }
+        @_load_paths ||= [
+          'models',
+          'lib',
+          'mailers',
+          'controllers',
+          'helpers',
+        ].map { |path| File.join(settings.root, path) }
       end
 
       ##
@@ -143,8 +171,14 @@ module Padrino
       #
       def dependencies
         [
-          'urls.rb', 'config/urls.rb', 'mailers/*.rb', 'mailers.rb',
-          'controllers/**/*.rb', 'controllers.rb', 'helpers/**/*.rb', 'helpers.rb'
+          'urls.rb',
+          'config/urls.rb',
+          'mailers/*.rb',
+          'mailers.rb',
+          'controllers/**/*.rb',
+          'controllers.rb',
+          'helpers/**/*.rb',
+          'helpers.rb',
         ].map { |file| Dir[File.join(settings.root, file)] }.flatten
       end
 
@@ -168,37 +202,62 @@ module Padrino
       end
 
       protected
+
       ##
       # Defines default settings for Padrino application.
       #
       def default_configuration!
-        # Overwriting Sinatra defaults
-        set :app_file, File.expand_path(caller_files.first || $0) # Assume app file is first caller
+        set :app_file, File.expand_path(caller_files.first || $0)
+        set :app_name, settings.to_s.underscore.to_sym
+
         set :environment, Padrino.env
         set :reload, Proc.new { development? }
         set :logging, Proc.new { development? }
+
         set :method_override, true
-        set :sessions, false
-        set :public_folder, Proc.new { Padrino.root('public', uri_root) }
-        set :views, Proc.new { File.join(root, 'views') }
-        set :images_path, Proc.new { File.join(public_folder, 'images') }
-        set :protection, true
+        set :default_builder, 'StandardFormBuilder'
 
-        set :haml, { :ugly => (Padrino.env == :production) } if defined?(Haml)
+        # TODO: Remove this hack after getting rid of thread-unsafe http_router:
+        set :init_mutex, Mutex.new
 
-        # Padrino specific
-        set :uri_root, '/'
-        set :app_name, settings.to_s.underscore.to_sym
-        set :default_builder, 'StandardFormBuilder'
-        set :authentication, false
+        # TODO: Remove this line after sinatra version up.
+        set :add_charset, %w[javascript xml xhtml+xml].map {|t| "application/#{t}" }
+
+        default_paths!
+        default_security!
+        global_configuration!
+        setup_prerequisites!
+      end
+
+      def setup_prerequisites!
+        prerequisites.concat(default_prerequisites).uniq!
+        Padrino.require_dependencies(prerequisites)
+      end
 
-        set :locale_path, Proc.new { Dir[File.join(settings.root, '/locale/**/*.{rb,yml}')] }
+      def default_paths!
+        set :locale_path,   Proc.new { Dir.glob File.join(root, 'locale/**/*.{rb,yml}') }
+        set :views,         Proc.new { File.join(root, 'views') }
 
-        # Authenticity token
+        set :uri_root,      '/'
+        set :public_folder, Proc.new { Padrino.root('public', uri_root) }
+        set :images_path,   Proc.new { File.join(public_folder, 'images') }
+      end
+      
+      def default_security!
+        set :protection, :except => :path_traversal
+        set :authentication, false
+        set :sessions, false
         set :protect_from_csrf, false
         set :allow_disabled_csrf, false
-        # Load the Global Configurations
-        class_eval(&Padrino.apps_configuration) if Padrino.apps_configuration
+      end
+
+      ##
+      # Applies global padrino configuration blocks to current application.
+      #
+      def global_configuration!
+        Padrino.global_configurations.each do |configuration|
+          class_eval(&configuration)
+        end
       end
 
       ##
@@ -220,9 +279,7 @@ module Padrino
       #
       def default_filters!
         before do
-          unless @_content_type
-            response['Content-Type'] = 'text/html;charset=utf-8'
-          end
+          response['Content-Type'] = 'text/html;charset=utf-8' unless @_content_type
         end
       end
 
@@ -249,7 +306,20 @@ module Padrino
         Padrino.require_dependencies(dependencies, :force => true)
       end
 
+      ##
+      # Returns globs of default paths of application prerequisites.
+      #
+      def default_prerequisites
+        [
+          '/models.rb',
+          '/models/**/*.rb',
+          '/lib.rb',
+          '/lib/**/*.rb',
+        ].map{ |glob| File.join(settings.root, glob) }
+      end
+
       private
+
       # Overrides the default middleware for Sinatra based on Padrino conventions.
       # Also initializes the application after setting up the middleware.
       def setup_default_middleware(builder)
@@ -267,6 +337,34 @@ module Padrino
 
       # sets up csrf protection for the app:
       def setup_csrf_protection(builder)
+        check_csrf_protection_dependency
+
+        if protect_from_csrf?
+          if protect_from_csrf.is_a?(Hash) && protect_from_csrf[:except]
+            builder.use(AuthenticityToken,
+                        options_for_csrf_protection_setup.merge(:except => protect_from_csrf[:except]))
+          else
+            builder.use(Rack::Protection::AuthenticityToken,
+                        options_for_csrf_protection_setup)
+          end
+        end
+      end
+
+      # returns the options used in the builder for csrf protection setup
+      def options_for_csrf_protection_setup
+        options = { :logger => logger }
+
+        if allow_disabled_csrf?
+          options.merge!({
+                             :reaction   => :report,
+                             :report_key => 'protection.csrf.failed'
+                         })
+        end
+        options
+      end
+
+      # throw an exception if the protect_from_csrf is active but sessions not.
+      def check_csrf_protection_dependency
         if protect_from_csrf? && !sessions?
           raise(<<-ERROR)
 `protect_from_csrf` is activated, but `sessions` are not. To enable csrf
@@ -277,19 +375,7 @@ protection, use:
 or deactivate protect_from_csrf:
 
     disable :protect_from_csrf
-ERROR
-        end
-
-        if protect_from_csrf?
-          if allow_disabled_csrf?
-            builder.use Rack::Protection::AuthenticityToken,
-                        :reaction => :report,
-                        :report_key => 'protection.csrf.failed',
-                        :logger => logger
-          else
-            builder.use Rack::Protection::AuthenticityToken,
-                        :logger => logger
-          end
+          ERROR
         end
       end
     end

data/lib/padrino-core/cli/base.rb

@@ -18,11 +18,19 @@ module Padrino
       method_option :daemonize, :type => :boolean, :aliases => "-d", :desc => "Run daemonized in the background."
       method_option :pid,       :type => :string,  :aliases => "-i", :desc => "File to store pid."
       method_option :debug,     :type => :boolean,                   :desc => "Set debugging flags."
+      method_option :options,   :type => :array,  :aliases => "-O", :desc => "--options NAME=VALUE NAME2=VALUE2'. pass VALUE to the server as option NAME. If no VALUE, sets it to true. Run '#{$0} --server_options"
+      method_option :server_options,   :type => :boolean, :desc => "Tells the current server handler's options that can be used with --options"
+
       def start
         prepare :start
         require File.expand_path("../adapter", __FILE__)
         require File.expand_path('config/boot.rb')
-        Padrino::Cli::Adapter.start(options)
+
+        if options[:server_options]
+          puts server_options(options)
+        else
+          Padrino::Cli::Adapter.start(options)
+        end
       end
 
       desc "stop", "Stops the Padrino application (alternatively use 'st')."
@@ -124,6 +132,29 @@ module Padrino
         end
       end
 
+      # https://github.com/rack/rack/blob/master/lib/rack/server.rb\#L100
+      def server_options(options)
+        begin
+          info = []
+          server = Rack::Handler.get(options[:server]) || Rack::Handler.default(options)
+          if server && server.respond_to?(:valid_options)
+            info << ""
+            info << "Server-specific options for #{server.name}:"
+
+            has_options = false
+            server.valid_options.each do |name, description|
+              next if name.to_s.match(/^(Host|Port)[^a-zA-Z]/) # ignore handler's host and port options, we do our own.
+              info << "  -O %-21s %s" % [name, description]
+              has_options = true
+            end
+            return "" if !has_options
+          end
+          info.join("\n")
+        rescue NameError
+          return "Warning: Could not find handler specified (#{options[:server] || 'default'}) to determine handler-specific options"
+        end
+      end
+
       protected
 
       def self.banner(task=nil, *args)