0
@@ -56,14 +56,14 @@ module Merb
0
       # ==== Returns
0
       # Object:: The value of the configuration parameter.
0
       def [](key)
0
-        (@configuration||={})[key]
0
+        (@configuration ||= setup)[key]
0
       end
0
 
0
       # ==== Parameters
0
       # key<Object>:: The key to set the parameter for.
0
       # val<Object>:: The value of the parameter.
0
-      def []=(key,val)
0
-        @configuration[key] = val
0
+      def []=(key, val)
0
+        (@configuration ||= setup)[key] = val
0
       end
0
 
0
       # ==== Parameters

0
@@ -1,10 +1,21 @@
0
 require File.dirname(__FILE__) + '/spec_helper'
0
 
0
-describe Merb::Config do
0
+describe "Merb::Config without .setup" do
0
+  it "should be able to try to get a non-existing key" do
0
+    Merb::Config[:does_not_exist].should == nil
0
+  end
0
+
0
+  it "should be able to set a configuration key" do
0
+    Merb::Config[:arbitrary_key] = "arbitrary_value"
0
+    Merb::Config[:arbitrary_key].should == "arbitrary_value"
0
+  end
0
+end
0
+
0
+describe "Merb::Config with .setup" do
0
   before do
0
     Merb::Config.setup
0
   end
0
-
0
+  
0
   it "should be able to yield the configuration via #use" do
0
     res = nil
0
     Merb::Config.use {|c| res = c}
0
@@ -199,4 +210,4 @@ describe Merb::Config do
0
   it "has verbose mode turned off by default" do
0
     Merb::Config[:verbose].should be(false)
0
   end
0
-end
0
+end
0
\ No newline at end of file