lib/merb/merb_controller.rb in merb-0.0.1 vs lib/merb/merb_controller.rb in merb-0.0.2

@@ -1,12 +1,10 @@
 module Merb
   
   class Controller
-    attr_accessor :response_code, :content_type
+    attr_accessor :status, :headers
     # Stolen from Camping without a twinge of remorse ;)
     def initialize(req, env, method=(env['REQUEST_METHOD']||"GET")) #:nodoc:
-      @response_code = 200
-      @content_type = 'text/html'
       env = MerbHash[env.to_hash]
       puts env.inspect if $DEBUG
       puts req.inspect if $DEBUG
       @status, @method, @env, @headers, @root = 200, method.downcase, env, 
           {'Content-Type'=>'text/html'}, env['SCRIPT_NAME'].sub(/\/$/,'')
\ No newline at end of file