0
@@ -72,8 +72,28 @@ class Merb::Dispatcher
0
     # to the error controller
0
     rescue => exception
0
       Merb.logger.error(Merb.exception(exception))
0
-      exception = controller_exception(exception)
0
-      dispatch_exception(request, exception)
0
+      unless request.xhr?
0
+        exception = controller_exception(exception)
0
+        dispatch_exception(request, exception)
0
+      else
0
+        Struct.new(:headers, :status, :body).new({}, 500,
0
+          <<-HERE
0
+#{exception.message}
0
+ 
0
+Params:
0
+#{(request.params || {}).map { |p,v| "  #{p}: #{v}\n"}.join("\n")}
0
+ 
0
+Session:
0
+#{(request.session || {}).map { |p,v| "  #{p}: #{v}\n"}.join("\n")}
0
+ 
0
+Cookies:
0
+#{(request.cookies || {}).map { |p,v| "  #{p}: #{v}\n"}.join("\n")}
0
+ 
0
+Stacktrace:
0
+#{exception.backtrace.join("\n")}
0
+          HERE
0
+        )
0
+      end
0
     end
0
     
0
     private

0
@@ -407,6 +407,17 @@ class Dictionary
0
     each { |k,v| ary << [k,v] }
0
     ary
0
   end
0
+  
0
+  def to_json
0
+    buf = "{"
0
+    map do |k,v|
0
+      buf << k.to_s.inspect
0
+      buf << ": "
0
+      buf << v.to_json
0
+    end.join(", ")
0
+    buf << "}"
0
+    buf
0
+  end
0
 
0
   def to_s
0
     self.to_a.to_s

0
@@ -0,0 +1,9 @@
0
+require 'benchmark'
0
+require 'zlib'
0
+
0
+TIMES = (ARGV[0] || 100_000).to_i
0
+
0
+Benchmark.bmbm do |x|
0
+  x.report("instantiate") { TIMES.times { [1,2] }}
0
+  x.report("zlib") { TIMES.times { 1.object_id + 2.object_id }}
0
+end