FIX: maintain default_options through resets

2007-11-29 00:35:04 -08:00 · 2007-11-29 00:35:04 -08:00 · b9c9672659
parent 06e2a38f09
commit b9c9672659
1 changed files with 3 additions and 3 deletions
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@ -204,15 +204,15 @@ module Sinatra
    attr_reader :events, :layouts, :default_options
    
    def self.default_options
-      @@default_options = {
+      @@default_options ||= {
        :run => true,
        :port => 4567,
-        :environment => :development
+        :env => :development
      }
    end
    
    def default_options
-      @@default_options
+      self.class.default_options
    end
    
    def initialize