0
@@ -873,7 +873,7 @@ module Sinatra
0
     FORWARD_METHODS = %w[
0
       get put post delete head
0
       template layout before error not_found
0
-      configures configure
0
+      configures configure set_options set_option
0
     ]
0
 
0
     # Create a new Application with a default configuration taken
0
@@ -960,6 +960,31 @@ module Sinatra
0
 
0
     alias :configure :configures
0
 
0
+    # When both +option+ and +value+ arguments are provided, set the option
0
+    # specified. With a single Hash argument, set all options specified in
0
+    # Hash. Options are available via the Application#options object.
0
+    #
0
+    # Setting individual options:
0
+    #   set :port, 80
0
+    #   set :env, :production
0
+    #   set :views, '/path/to/views'
0
+    #
0
+    # Setting multiple options:
0
+    #   set :port  => 80,
0
+    #       :env   => :production,
0
+    #       :views => '/path/to/views'
0
+    #
0
+    def set(option, value=self)
0
+      if value == self && option.kind_of?(Hash)
0
+        option.each { |key,val| set(key, val) }
0
+      else
0
+        options.send("#{option}=", value)
0
+      end
0
+    end
0
+
0
+    alias :set_option :set
0
+    alias :set_options :set
0
+
0
 
0
     # Define an event handler for the given request method and path
0
     # spec. The block is executed when a request matches the method
0
@@ -1296,14 +1321,6 @@ def use_in_file_templates!
0
   end
0
 end
0
 
0
-def set_options(opts)
0
-  Sinatra::Application.default_options.merge!(opts)
0
-end
0
-
0
-def set_option(key, value)
0
-  set_options(key => value)
0
-end
0
-
0
 def mime(ext, type)
0
   Rack::File::MIME_TYPES[ext.to_s] = type
0
 end

0
@@ -204,3 +204,37 @@ context "Events in an app" do
0
 end
0
 
0
 
0
+context "Options in an app" do
0
+
0
+  setup do
0
+    Sinatra.application = nil
0
+    @app = Sinatra::application
0
+  end
0
+
0
+  specify "can be set singly on app" do
0
+    @app.set :foo, 1234
0
+    @app.options.foo.should.equal 1234
0
+  end
0
+
0
+  specify "can be set singly from top-level" do
0
+    set_option :foo, 1234
0
+    @app.options.foo.should.equal 1234
0
+  end
0
+
0
+  specify "can be set multiply on app" do
0
+    @app.options.foo.should.be.nil
0
+    @app.set :foo => 1234,
0
+      :bar => 'hello, world'
0
+    @app.options.foo.should.equal 1234
0
+    @app.options.bar.should.equal 'hello, world'
0
+  end
0
+
0
+  specify "can be set multiply from top-level" do
0
+    @app.options.foo.should.be.nil
0
+    set_options :foo => 1234,
0
+      :bar => 'hello, world'
0
+    @app.options.foo.should.equal 1234
0
+    @app.options.bar.should.equal 'hello, world'
0
+  end
0
+
0
+end

0
@@ -1,10 +1,10 @@
0
 require File.dirname(__FILE__) + '/helper'
0
 
0
 context "Sessions" do
0
-  
0
-  specify "should be off by default" do
0
-    Sinatra.application = nil
0
 
0
+  setup { Sinatra.application = nil }
0
+
0
+  specify "should be off by default" do
0
     get '/asdf' do
0
       session[:test] = true
0
       "asdf"
0
@@ -18,10 +18,9 @@ context "Sessions" do
0
     assert ok?
0
     assert !include?('Set-Cookie')
0
   end
0
-  
0
+
0
   specify "should be able to store data accross requests" do
0
-    set_options(:sessions => true)
0
-    Sinatra.application = nil
0
+    set_option :sessions, true
0
 
0
     get '/foo' do
0
       session[:test] = true