Merge commit 'origin/master'

Conflicts:
	actionpack/lib/action_controller/abstract/base.rb
	actionpack/lib/action_controller/routing.rb

1 files changed, 34 insertions, 0 deletions

diff --git a/actionpack/examples/minimal.rb b/actionpack/examples/minimal.rb
new file mode 100644
index 0000000000..84a8499daf
--- /dev/null
+++ b/actionpack/examples/minimal.rb
@@ -0,0 +1,34 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'action_controller'
+require 'action_controller/new_base' if ENV['NEW']
+require 'benchmark'
+
+class BaseController < ActionController::Base
+  def index
+    render :text => ''
+  end
+end
+
+n = (ENV['N'] || 10000).to_i
+input = StringIO.new('')
+
+def call_index(controller, input, n)
+  n.times do
+    controller.action(:index).call({ 'rack.input' => input })
+  end
+
+  puts controller.name
+  status, headers, body = controller.action(:index).call({ 'rack.input' => input })
+
+  puts status
+  puts headers.to_yaml
+  puts '---'
+  body.each do |part|
+    puts part
+  end
+  puts '---'
+end
+
+elapsed = Benchmark.realtime { call_index BaseController, input, n }
+
+puts "%dms elapsed, %d requests/sec" % [1000 * elapsed, n / elapsed]