0
@@ -111,7 +111,7 @@
0
         # ==== Returns
0
         # String:: The snake cased name of the class without the namespace.
0
         def name
0
-          self.to_s.snake_case.split('::').last
0
+          self.to_s.split('::').last.snake_case
0
         end
0
       
0
         # Get the actual status-code for an Exception class.
0
@@ -171,7 +171,7 @@
0
         # ==== Parameters
0
         # num<~to_i>:: The status code
0
         def register_status_code(klass, code)
0
-          STATUS_CODES[klass.name.snake_case.to_sym] = code.to_i
0
+          STATUS_CODES[klass.name.e.to_sym] = code.to_i
0
         end
0
         
0
       end

0
@@ -194,7 +194,21 @@
0
   end
0
 
0
   attr_reader :request, :headers
0
-  attr_accessor :status
0
+  attr_reader :status
0
+
0
+  # Set the response status code.
0
+  #
0
+  # ==== Parameters
0
+  # s<Fixnum, Symbol>:: A status-code or named http-status
0
+  def status=(s)
0
+    if s.is_a?(Symbol) && STATUS_CODES.key?(s)
0
+      @status = STATUS_CODES[s]
0
+    elsif s.is_a?(Fixnum)
0
+      @status = s
0
+    else
0
+      raise ArgumentError, "Status should be of type Fixnum or Symbol, was #{s.class}"
0
+    end
0
+  end
0
 
0
   # ==== Returns
0
   # Hash:: The parameters from the request object

0
@@ -25,8 +25,12 @@
0
   #
0
   # ==== Examples
0
   #   "FooBar".snake_case #=> "foo_bar"
0
+  #   "HeadlineCNNNews".snake_case #=> "headline_cnn_news"
0
+  #   "CNN".snake_case #=> "cnn"
0
   def snake_case
0
-    gsub(/\B[A-Z]/, '_\&').downcase
0
+    return self.downcase if self =~ /^[A-Z]+$/
0
+    self.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
0
+      return $+.downcase
0
   end
0
 
0
   # ==== Returns

0
@@ -74,7 +74,9 @@
0
   end
0
 
0
   it "handles CamelCase with more than 2 capital letter in a row" do
0
-    "CNNNews".snake_case.should == "c_n_n_news"
0
+    "CNN".snake_case.should == "cnn"
0
+    "CNNNews".snake_case.should == "cnn_news"
0
+    "HeadlineCNNNews".snake_case.should == "headline_cnn_news"
0
   end
0
 
0
   it "does NOT change one word lowercase" do

0
@@ -10,7 +10,9 @@
0
   end
0
   
0
   it "should dispatch to callable actions" do
0
-    dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index).body.should == "index"
0
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index)
0
+    controller.body.should == "index"
0
+    controller.status.should == 200
0
   end
0
 
0
   it "should not dispatch to hidden actions" do
0
@@ -26,7 +28,6 @@
0
     calling { dispatch_to(Merb::Test::Fixtures::Controllers::Base, :bat) }.
0
       should raise_error(Merb::ControllerExceptions::ActionNotFound)
0
   end
0
-
0
-    
0
+ 
0
 end

0
@@ -28,6 +28,7 @@
0
       include Inclusion
0
       
0
       def index
0
+        self.status = :ok
0
         "index"
0
       end
0