RubyGems - actionpack - Versions diffs - 1.8.1 → 1.9.0 - Mend

actionpack 1.8.1 → 1.9.0

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (101) hide show

data/CHANGELOG +309 -16
data/README +1 -1
data/lib/action_controller.rb +5 -0
data/lib/action_controller/assertions.rb +57 -12
data/lib/action_controller/auto_complete.rb +47 -0
data/lib/action_controller/base.rb +288 -258
data/lib/action_controller/benchmarking.rb +8 -3
data/lib/action_controller/caching.rb +88 -42
data/lib/action_controller/cgi_ext/cgi_ext.rb +1 -1
data/lib/action_controller/cgi_ext/cgi_methods.rb +41 -11
data/lib/action_controller/cgi_ext/multipart_progress.rb +169 -0
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +30 -12
data/lib/action_controller/cgi_process.rb +39 -11
data/lib/action_controller/code_generation.rb +235 -0
data/lib/action_controller/cookies.rb +14 -8
data/lib/action_controller/deprecated_renders_and_redirects.rb +76 -0
data/lib/action_controller/filters.rb +8 -7
data/lib/action_controller/helpers.rb +41 -6
data/lib/action_controller/layout.rb +45 -16
data/lib/action_controller/request.rb +86 -23
data/lib/action_controller/rescue.rb +1 -0
data/lib/action_controller/response.rb +1 -1
data/lib/action_controller/routing.rb +536 -272
data/lib/action_controller/scaffolding.rb +30 -25
data/lib/action_controller/session/active_record_store.rb +251 -50
data/lib/action_controller/streaming.rb +133 -0
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +0 -7
data/lib/action_controller/templates/scaffolds/edit.rhtml +2 -2
data/lib/action_controller/templates/scaffolds/layout.rhtml +22 -18
data/lib/action_controller/templates/scaffolds/list.rhtml +3 -3
data/lib/action_controller/templates/scaffolds/new.rhtml +2 -2
data/lib/action_controller/templates/scaffolds/show.rhtml +1 -1
data/lib/action_controller/test_process.rb +68 -47
data/lib/action_controller/upload_progress.rb +421 -0
data/lib/action_controller/url_rewriter.rb +8 -11
data/lib/action_controller/vendor/html-scanner/html/document.rb +6 -5
data/lib/action_controller/vendor/html-scanner/html/node.rb +70 -14
data/lib/action_controller/vendor/html-scanner/html/tokenizer.rb +17 -10
data/lib/action_controller/vendor/html-scanner/html/version.rb +3 -3
data/lib/action_controller/vendor/xml_simple.rb +1019 -0
data/lib/action_controller/verification.rb +36 -30
data/lib/action_view/base.rb +21 -14
data/lib/action_view/helpers/active_record_helper.rb +15 -13
data/lib/action_view/helpers/asset_tag_helper.rb +26 -9
data/lib/action_view/helpers/benchmark_helper.rb +24 -0
data/lib/action_view/helpers/capture_helper.rb +7 -5
data/lib/action_view/helpers/date_helper.rb +63 -46
data/lib/action_view/helpers/form_helper.rb +7 -1
data/lib/action_view/helpers/form_options_helper.rb +19 -11
data/lib/action_view/helpers/form_tag_helper.rb +5 -1
data/lib/action_view/helpers/javascript_helper.rb +403 -35
data/lib/action_view/helpers/javascripts/controls.js +261 -0
data/lib/action_view/helpers/javascripts/dragdrop.js +476 -0
data/lib/action_view/helpers/javascripts/effects.js +570 -0
data/lib/action_view/helpers/javascripts/prototype.js +633 -371
data/lib/action_view/helpers/number_helper.rb +11 -13
data/lib/action_view/helpers/tag_helper.rb +1 -2
data/lib/action_view/helpers/text_helper.rb +69 -6
data/lib/action_view/helpers/upload_progress_helper.rb +433 -0
data/lib/action_view/helpers/url_helper.rb +98 -3
data/lib/action_view/partials.rb +14 -8
data/lib/action_view/vendor/builder/xmlmarkup.rb +11 -0
data/rakefile +13 -5
data/test/abstract_unit.rb +1 -1
data/test/controller/action_pack_assertions_test.rb +52 -9
data/test/controller/active_record_assertions_test.rb +119 -120
data/test/controller/active_record_store_test.rb +111 -0
data/test/controller/addresses_render_test.rb +45 -0
data/test/controller/caching_filestore.rb +92 -0
data/test/controller/capture_test.rb +39 -0
data/test/controller/cgi_test.rb +40 -3
data/test/controller/helper_test.rb +65 -13
data/test/controller/multipart_progress_testx.rb +365 -0
data/test/controller/new_render_test.rb +263 -0
data/test/controller/redirect_test.rb +64 -0
data/test/controller/render_test.rb +20 -21
data/test/controller/request_test.rb +83 -3
data/test/controller/routing_test.rb +702 -0
data/test/controller/send_file_test.rb +2 -0
data/test/controller/test_test.rb +44 -8
data/test/controller/upload_progress_testx.rb +89 -0
data/test/controller/verification_test.rb +94 -29
data/test/fixtures/addresses/list.rhtml +1 -0
data/test/fixtures/test/capturing.rhtml +4 -0
data/test/fixtures/test/list.rhtml +1 -1
data/test/fixtures/test/update_element_with_capture.rhtml +9 -0
data/test/template/active_record_helper_test.rb +30 -15
data/test/template/asset_tag_helper_test.rb +12 -5
data/test/template/benchmark_helper_test.rb +72 -0
data/test/template/date_helper_test.rb +69 -0
data/test/template/form_helper_test.rb +18 -10
data/test/template/form_options_helper_test.rb +40 -5
data/test/template/javascript_helper.rb +149 -2
data/test/template/number_helper_test.rb +2 -0
data/test/template/tag_helper_test.rb +4 -0
data/test/template/text_helper_test.rb +36 -0
data/test/template/upload_progress_helper_testx.rb +272 -0
data/test/template/url_helper_test.rb +30 -0
metadata +30 -6
data/test/controller/layout_test.rb +0 -49
data/test/controller/routing_tests.rb +0 -543

data/test/controller/redirect_test.rb CHANGED

@@ -9,6 +9,14 @@ class RedirectController < ActionController::Base
     redirect_to :dashbord_url, 1, "hello"
   end
+  def host_redirect
+    redirect_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
+  def module_redirect
+    redirect_to :controller => 'module_test/module_redirect', :action => "hello_world"
+  end
   def rescue_errors(e) raise e end
   protected
@@ -33,4 +41,60 @@ class RedirectTest < Test::Unit::TestCase
     get :method_redirect
     assert_redirect_url "http://test.host/redirect/dashboard/1?message=hello"
   end
+  def test_simple_redirect_using_options
+    get :host_redirect
+    assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
+  def test_module_redirect
+    get :module_redirect
+    assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+  end
+  def test_module_redirect_using_options
+    get :module_redirect
+    assert_redirected_to :controller => 'module_test/module_redirect', :action => 'hello_world'
+  end
+end
+module ModuleTest
+  class ModuleRedirectController < ::RedirectController
+    def module_redirect
+      redirect_to :controller => '/redirect', :action => "hello_world"
+    end
+  end
+  class ModuleRedirectTest < Test::Unit::TestCase
+    def setup
+      @controller = ModuleRedirectController.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+    end
+    def test_simple_redirect
+      get :simple_redirect
+      assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+    end
+    def test_redirect_with_method_reference_and_parameters
+      get :method_redirect
+      assert_redirect_url "http://test.host/module_test/module_redirect/dashboard/1?message=hello"
+    end
+    def test_simple_redirect_using_options
+      get :host_redirect
+      assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+    end
+    def test_module_redirect
+      get :module_redirect
+      assert_redirect_url "http://test.host/redirect/hello_world"
+    end
+    def test_module_redirect_using_options
+      get :module_redirect
+      assert_redirected_to :controller => 'redirect', :action => "hello_world"
+    end
+  end
 end

data/test/controller/render_test.rb CHANGED

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
-Customer = Struct.new("Customer", :name)
+unless defined?(Customer)
+  Customer = Struct.new("Customer", :name)
+end
 module Fun
   class GamesController < ActionController::Base
@@ -55,6 +57,7 @@ class TestController < ActionController::Base
   end
   def partials_list
+    @test_unchanged = 'hello'
     @customers = [ Customer.new("david"), Customer.new("mary") ]
     render_action "list"
   end
@@ -67,6 +70,10 @@ class TestController < ActionController::Base
     @customers = [ Customer.new("david"), Customer.new("mary") ]
     render_text "How's there? #{render_to_string("test/list")}"
   end
+  def accessing_params_in_template
+    render_template "Hello: <%= params[:name] %>"
+  end
   def rescue_action(e) raise end
@@ -82,20 +89,6 @@ end
 TestController.template_root = File.dirname(__FILE__) + "/../fixtures/"
 Fun::GamesController.template_root = File.dirname(__FILE__) + "/../fixtures/"
-class TestLayoutController < ActionController::Base
-  layout "layouts/standard"
-  def hello_world
-  end
-  def hello_world_outside_layout
-  end
-  def rescue_action(e)
-    raise unless ActionController::MissingTemplate === e
-  end
-end
 class RenderTest < Test::Unit::TestCase
   def setup
     @request    = ActionController::TestRequest.new
@@ -180,10 +173,10 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", process_request.body
   end
-  def test_partials_list
-    @request.action = "partials_list"
-    assert_equal "Hello: davidHello: mary", process_request.body
-  end
+  # def test_partials_list
+  #   @request.action = "partials_list"
+  #   assert_equal "goodbyeHello: davidHello: marygoodbye\n", process_request.body
+  # end
   def test_partial_only
     @request.action = "partial_only"
@@ -192,7 +185,7 @@ class RenderTest < Test::Unit::TestCase
   def test_render_to_string
     @request.action = "hello_in_a_string"
-    assert_equal "How's there? Hello: davidHello: mary", process_request.body
+    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", process_request.body
   end
   def test_nested_rendering
@@ -200,8 +193,14 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "Living in a nested world", Fun::GamesController.process(@request, @response).body
   end
+  def test_accessing_params_in_template
+    @request.action = "accessing_params_in_template"
+    @request.query_parameters[:name] = "David"
+    assert_equal "Hello: David", process_request.body
+  end
   private
     def process_request
       TestController.process(@request, @response)
     end
-end
+end

data/test/controller/request_test.rb CHANGED

@@ -5,6 +5,39 @@ class RequestTest < Test::Unit::TestCase
     @request = ActionController::TestRequest.new
   end
+  def test_remote_ip
+    assert_equal '0.0.0.0', @request.remote_ip
+    @request.remote_addr = '1.2.3.4'
+    assert_equal '1.2.3.4', @request.remote_ip
+    @request.env['HTTP_CLIENT_IP'] = '2.3.4.5'
+    assert_equal '2.3.4.5', @request.remote_ip
+    @request.env.delete 'HTTP_CLIENT_IP'
+    @request.env['HTTP_X_FORWARDED_FOR'] = '3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = '172.16.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = '192.168.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,3.4.5.6'
+    assert_equal '127.0.0.1', @request.remote_ip
+    @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,192.168.0.1'
+    assert_equal '1.2.3.4', @request.remote_ip
+    @request.env.delete 'HTTP_X_FORWARDED_FOR'
+  end
   def test_domains
     @request.host = "www.rubyonrails.org"
     assert_equal "rubyonrails.org", @request.domain
@@ -32,7 +65,12 @@ class RequestTest < Test::Unit::TestCase
     assert_equal ":8080", @request.port_string
   end
-    def test_relative_url_root
+  def test_relative_url_root
+    @request.env['SERVER_SOFTWARE'] = 'lighttpd/1.2.3'
+    assert_nil @request.relative_url_root, "relative_url_root should be disabled on lighttpd"
+    @request.env['SERVER_SOFTWARE'] = 'apache/1.2.3 some random text'
     @request.env['SCRIPT_NAME'] = nil
     assert_equal "", @request.relative_url_root
@@ -42,92 +80,110 @@ class RequestTest < Test::Unit::TestCase
     @request.env['SCRIPT_NAME'] = "/myapp.rb"
     assert_equal "", @request.relative_url_root
+    @request.relative_url_root = nil
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
     assert_equal "/hieraki", @request.relative_url_root
+    @request.relative_url_root = nil
     @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
     assert_equal "/collaboration/hieraki", @request.relative_url_root
   end
   def test_request_uri
+    @request.env['SERVER_SOFTWARE'] = 'Apache 42.342.3432'
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri"
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/path/of/some/uri"
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/?m=b"
     assert_equal "/?m=b", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/hieraki/"
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
     assert_equal "/hieraki/", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/collaboration/hieraki/books/edit/2"
     @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
     assert_equal "/collaboration/hieraki/books/edit/2", @request.request_uri
     assert_equal "/books/edit/2", @request.path
     # The following tests are for when REQUEST_URI is not supplied (as in IIS)
+    @request.relative_url_root = nil
     @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = nil #"/path/dispatch.rb"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = "/path/dispatch.rb"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/path/of/some/uri"
     @request.env['SCRIPT_NAME'] = nil
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/?m=b"
     assert_equal "/?m=b", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
+    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/hieraki/"
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
     assert_equal "/hieraki/", @request.request_uri
     assert_equal "/", @request.path
     # This test ensures that Rails uses REQUEST_URI over PATH_INFO
+    @request.relative_url_root = nil
     @request.env['REQUEST_URI'] = "/some/path"
     @request.env['PATH_INFO'] = "/another/path"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
     assert_equal "/some/path", @request.request_uri
     assert_equal "/some/path", @request.path
   end
@@ -144,4 +200,28 @@ class RequestTest < Test::Unit::TestCase
     @request.port = 81
     assert_equal "rubyonrails.org:81", @request.host_with_port
   end
+  def test_server_software
+    assert_equal nil, @request.server_software
+    @request.env['SERVER_SOFTWARE'] = 'Apache3.422'
+    assert_equal 'apache', @request.server_software
+    @request.env['SERVER_SOFTWARE'] = 'lighttpd(1.1.4)'
+    assert_equal 'lighttpd', @request.server_software
+  end
+  def test_xml_http_request
+    assert !@request.xml_http_request?
+    assert !@request.xhr?
+    @request.env['HTTP_X_REQUESTED_WITH'] = "DefinitelyNotAjax1.0"
+    assert !@request.xml_http_request?
+    assert !@request.xhr?
+    @request.env['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
+    assert @request.xml_http_request?
+    assert @request.xhr?
+  end
 end

data/test/controller/routing_test.rb ADDED

@@ -0,0 +1,702 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+require 'test/unit'
+require 'stringio'
+RunTimeTests = ARGV.include? 'time'
+module ActionController::CodeGeneration
+class SourceTests < Test::Unit::TestCase
+  attr_accessor :source
+  def setup
+    @source = Source.new
+  end
+  def test_initial_state
+    assert_equal [], source.lines
+    assert_equal 0, source.indentation_level
+  end
+  def test_trivial_operations
+    source << "puts 'Hello World'"
+    assert_equal ["puts 'Hello World'"], source.lines
+    assert_equal "puts 'Hello World'", source.to_s
+    source.line "puts 'Goodbye World'"
+    assert_equal ["puts 'Hello World'", "puts 'Goodbye World'"], source.lines
+    assert_equal "puts 'Hello World'\nputs 'Goodbye World'", source.to_s
+  end
+  def test_indentation
+    source << "x = gets.to_i"
+    source << 'if x.odd?'
+    source.indent { source << "puts 'x is odd!'" }
+    source << 'else'
+    source.indent { source << "puts 'x is even!'" }
+    source << 'end'
+    assert_equal ["x = gets.to_i", "if x.odd?", "  puts 'x is odd!'", 'else', "  puts 'x is even!'", 'end'], source.lines
+    text = "x = gets.to_i
+if x.odd?
+  puts 'x is odd!'
+else
+  puts 'x is even!'
+end"
+    assert_equal text, source.to_s
+  end
+end
+class CodeGeneratorTests < Test::Unit::TestCase
+  attr_accessor :generator
+  def setup
+    @generator = CodeGenerator.new
+  end
+  def test_initial_state
+    assert_equal [], generator.source.lines
+    assert_equal [], generator.locals
+  end
+  def test_trivial_operations
+    ["puts 'Hello World'", "puts 'Goodbye World'"].each {|l| generator << l}
+    assert_equal ["puts 'Hello World'", "puts 'Goodbye World'"], generator.source.lines
+    assert_equal "puts 'Hello World'\nputs 'Goodbye World'", generator.to_s
+  end
+  def test_if
+    generator << "x = gets.to_i"
+    generator.if("x.odd?") { generator << "puts 'x is odd!'" }
+    assert_equal "x = gets.to_i\nif x.odd?\n  puts 'x is odd!'\nend", generator.to_s
+  end
+  def test_else
+    test_if
+    generator.else { generator << "puts 'x is even!'" }
+    assert_equal "x = gets.to_i\nif x.odd?\n  puts 'x is odd!'\nelse \n  puts 'x is even!'\nend", generator.to_s
+  end
+  def test_dup
+    generator << 'x = 2'
+    generator.locals << :x
+    g = generator.dup
+    assert_equal generator.source, g.source
+    assert_equal generator.locals, g.locals
+    g << 'y = 3'
+    g.locals << :y
+    assert_equal [:x, :y], g.locals # Make sure they don't share the same array.
+    assert_equal [:x], generator.locals
+  end
+end
+# XXX Extract to test/controller/fake_controllers.rb
+module Object::Controllers
+  def self.const_available?(*args)
+    const_defined?(*args)
+  end
+  class ContentController
+  end
+  module Admin
+    def self.const_available?(*args)
+      const_defined?(*args)
+    end
+    class UserController
+    end
+  end
+end
+class RecognitionTests < Test::Unit::TestCase
+  attr_accessor :generator
+  alias :g :generator
+  def setup
+    @generator = RecognitionGenerator.new
+  end
+  def go(components)
+    g.current = components.first
+    g.after = components[1..-1] || []
+    g.go
+  end
+  def execute(path, show = false)
+    path = path.split('/') if path.is_a? String
+    source = "index, path = 0, #{path.inspect}\n#{g.to_s}"
+    puts source if show
+    r = eval source
+    r ? r.symbolize_keys : nil
+  end
+  Static = ::ActionController::Routing::StaticComponent
+  Dynamic = ::ActionController::Routing::DynamicComponent
+  Path = ::ActionController::Routing::PathComponent
+  Controller = ::ActionController::Routing::ControllerComponent
+  def test_all_static
+    c = %w(hello world how are you).collect {|str| Static.new(str)}
+    g.result :controller, "::Controllers::ContentController", true
+    g.constant_result :action, 'index'
+    go c
+    assert_nil execute('x')
+    assert_nil execute('hello/world/how')
+    assert_nil execute('hello/world/how/are')
+    assert_nil execute('hello/world/how/are/you/today')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hello/world/how/are/you'))
+  end
+  def test_basic_dynamic
+    c = [Static.new("hi"), Dynamic.new(:action)]
+    g.result :controller, "::Controllers::ContentController", true
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi')
+    assert_nil execute('hi/dude/what')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'dude'}, execute('hi/dude'))
+  end
+  def test_dynamic_with_default
+    c = [Static.new("hi"), Dynamic.new(:action, :default => 'index')]
+    g.result :controller, "::Controllers::ContentController", true
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi/dude/what')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi/index'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'dude'}, execute('hi/dude'))
+  end
+  def test_dynamic_with_string_condition
+    c = [Static.new("hi"), Dynamic.new(:action, :condition => 'index')]
+    g.result :controller, "::Controllers::ContentController", true
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi')
+    assert_nil execute('hi/dude/what')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi/index'))
+    assert_nil execute('hi/dude')
+  end
+  def test_dynamic_with_regexp_condition
+    c = [Static.new("hi"), Dynamic.new(:action, :condition => /^[a-z]+$/)]
+    g.result :controller, "::Controllers::ContentController", true
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi')
+    assert_nil execute('hi/FOXY')
+    assert_nil execute('hi/138708jkhdf')
+    assert_nil execute('hi/dkjfl8792343dfsf')
+    assert_nil execute('hi/dude/what')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi/index'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'dude'}, execute('hi/dude'))
+  end
+  def test_dynamic_with_regexp_and_default
+    c = [Static.new("hi"), Dynamic.new(:action, :condition => /^[a-z]+$/, :default => 'index')]
+    g.result :controller, "::Controllers::ContentController", true
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi/FOXY')
+    assert_nil execute('hi/138708jkhdf')
+    assert_nil execute('hi/dkjfl8792343dfsf')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('hi/index'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'dude'}, execute('hi/dude'))
+    assert_nil execute('hi/dude/what')
+  end
+  def test_path
+    c = [Static.new("hi"), Path.new(:file)]
+    g.result :controller, "::Controllers::ContentController", true
+    g.constant_result :action, "download"
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'download', :file => []}, execute('hi'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'download', :file => %w(books agile_rails_dev.pdf)},
+                 execute('hi/books/agile_rails_dev.pdf'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'download', :file => ['dude']}, execute('hi/dude'))
+    assert_equal 'dude/what', execute('hi/dude/what')[:file].to_s
+  end
+  def test_controller
+    c = [Static.new("hi"), Controller.new(:controller)]
+    g.constant_result :action, "hi"
+    go c
+    assert_nil execute('boo')
+    assert_nil execute('boo/blah')
+    assert_nil execute('hi/x')
+    assert_nil execute('hi/13870948')
+    assert_nil execute('hi/content/dog')
+    assert_nil execute('hi/admin/user/foo')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'hi'}, execute('hi/content'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'hi'}, execute('hi/admin/user'))
+  end
+  def test_standard_route(time = ::RunTimeTests)
+    c = [Controller.new(:controller), Dynamic.new(:action, :default => 'index'), Dynamic.new(:id, :default => nil)]
+    go c
+    # Make sure we get the right answers
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute('content'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'list'}, execute('content/list'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'show', :id => '10'}, execute('content/show/10'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'index'}, execute('admin/user'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'list'}, execute('admin/user/list'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'show', :id => 'nseckar'}, execute('admin/user/show/nseckar'))
+    assert_nil execute('content/show/10/20')
+    assert_nil execute('food')
+    if time
+      source = "def self.execute(path)
+        path = path.split('/') if path.is_a? String
+        index = 0
+        r = #{g.to_s}
+      end"
+      eval(source)
+      GC.start
+      n = 1000
+      time = Benchmark.realtime do n.times {
+        execute('content')
+        execute('content/list')
+        execute('content/show/10')
+        execute('admin/user')
+        execute('admin/user/list')
+        execute('admin/user/show/nseckar')
+        execute('admin/user/show/nseckar/dude')
+        execute('admin/why/show/nseckar')
+        execute('content/show/10/20')
+        execute('food')
+      } end
+      time -= Benchmark.realtime do n.times { } end
+      puts "\n\nRecognition:"
+      per_url = time / (n * 10)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} urls/s\n\n"
+    end
+  end
+  def test_default_route
+    g.result :controller, "::Controllers::ContentController", true
+    g.constant_result :action, 'index'
+    go []
+    assert_nil execute('x')
+    assert_nil execute('hello/world/how')
+    assert_nil execute('hello/world/how/are')
+    assert_nil execute('hello/world/how/are/you/today')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, execute([]))
+  end
+end
+class GenerationTests < Test::Unit::TestCase
+  attr_accessor :generator
+  alias :g :generator
+  def setup
+    @generator = GenerationGenerator.new # ha!
+  end
+  def go(components)
+    g.current = components.first
+    g.after = components[1..-1] || []
+    g.go
+  end
+  def execute(options, recall, show = false)
+    source = "\n
+expire_on = ::ActionController::Routing.expiry_hash(options, recall)
+hash = merged = recall.merge(options)
+not_expired = true
+#{g.to_s}\n\n"
+    puts source if show
+    eval(source)
+  end
+  Static = ::ActionController::Routing::StaticComponent
+  Dynamic = ::ActionController::Routing::DynamicComponent
+  Path = ::ActionController::Routing::PathComponent
+  Controller = ::ActionController::Routing::ControllerComponent
+  def test_all_static_no_requirements
+    c = [Static.new("hello"), Static.new("world")]
+    go c
+    assert_equal "/hello/world", execute({}, {})
+  end
+  def test_basic_dynamic
+    c = [Static.new("hi"), Dynamic.new(:action)]
+    go c
+    assert_equal '/hi/index', execute({:action => 'index'}, {:action => 'index'})
+    assert_equal '/hi/show', execute({:action => 'show'}, {:action => 'index'})
+    assert_equal '/hi/list+people', execute({}, {:action => 'list people'})
+    assert_nil execute({},{})
+  end
+  def test_dynamic_with_default
+    c = [Static.new("hi"), Dynamic.new(:action, :default => 'index')]
+    go c
+    assert_equal '/hi', execute({:action => 'index'}, {:action => 'index'})
+    assert_equal '/hi/show', execute({:action => 'show'}, {:action => 'index'})
+    assert_equal '/hi/list+people', execute({}, {:action => 'list people'})
+    assert_equal '/hi', execute({}, {})
+  end
+  def test_dynamic_with_regexp_condition
+    c = [Static.new("hi"), Dynamic.new(:action, :condition => /^[a-z]+$/)]
+    go c
+    assert_equal '/hi/index', execute({:action => 'index'}, {:action => 'index'})
+    assert_nil execute({:action => 'fox5'}, {:action => 'index'})
+    assert_nil execute({:action => 'something_is_up'}, {:action => 'index'})
+    assert_nil execute({}, {:action => 'list people'})
+    assert_equal '/hi/abunchofcharacter', execute({:action => 'abunchofcharacter'}, {})
+    assert_nil execute({}, {})
+  end
+  def test_dynamic_with_default_and_regexp_condition
+    c = [Static.new("hi"), Dynamic.new(:action, :default => 'index', :condition => /^[a-z]+$/)]
+    go c
+    assert_equal '/hi', execute({:action => 'index'}, {:action => 'index'})
+    assert_nil execute({:action => 'fox5'}, {:action => 'index'})
+    assert_nil execute({:action => 'something_is_up'}, {:action => 'index'})
+    assert_nil execute({}, {:action => 'list people'})
+    assert_equal '/hi/abunchofcharacter', execute({:action => 'abunchofcharacter'}, {})
+    assert_equal '/hi', execute({}, {})
+  end
+  def test_path
+    c = [Static.new("hi"), Path.new(:file)]
+    go c
+    assert_equal '/hi', execute({:file => []}, {})
+    assert_equal '/hi/books/agile_rails_dev.pdf', execute({:file => %w(books agile_rails_dev.pdf)}, {})
+    assert_equal '/hi/books/development%26whatever/agile_rails_dev.pdf', execute({:file => %w(books development&whatever agile_rails_dev.pdf)}, {})
+    assert_equal '/hi', execute({:file => ''}, {})
+    assert_equal '/hi/books/agile_rails_dev.pdf', execute({:file => 'books/agile_rails_dev.pdf'}, {})
+    assert_equal '/hi/books/development%26whatever/agile_rails_dev.pdf', execute({:file => 'books/development&whatever/agile_rails_dev.pdf'}, {})
+  end
+  def test_controller
+    c = [Static.new("hi"), Controller.new(:controller)]
+    go c
+    assert_nil execute({}, {})
+    assert_equal '/hi/content', execute({:controller => 'content'}, {})
+    assert_equal '/hi/admin/user', execute({:controller => 'admin/user'}, {})
+    assert_equal '/hi/content', execute({}, {:controller => 'content'})
+    assert_equal '/hi/admin/user', execute({}, {:controller => 'admin/user'})
+  end
+  def test_standard_route(time = ::RunTimeTests)
+    c = [Controller.new(:controller), Dynamic.new(:action, :default => 'index'), Dynamic.new(:id, :default => nil)]
+    go c
+    # Make sure we get the right answers
+    assert_equal('/content', execute({:action => 'index'}, {:controller => 'content', :action => 'list'}))
+    assert_equal('/content/list', execute({:action => 'list'}, {:controller => 'content', :action => 'index'}))
+    assert_equal('/content/show/10', execute({:action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}))
+    assert_equal('/admin/user', execute({:action => 'index'}, {:controller => 'admin/user', :action => 'list'}))
+    assert_equal('/admin/user/list', execute({:action => 'list'}, {:controller => 'admin/user', :action => 'index'}))
+    assert_equal('/admin/user/show/10', execute({:action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}))
+    if time
+      GC.start
+      n = 1000
+      time = Benchmark.realtime do n.times {
+        execute({:action => 'index'}, {:controller => 'content', :action => 'list'})
+        execute({:action => 'list'}, {:controller => 'content', :action => 'index'})
+        execute({:action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'})
+        execute({:action => 'index'}, {:controller => 'admin/user', :action => 'list'})
+        execute({:action => 'list'}, {:controller => 'admin/user', :action => 'index'})
+        execute({:action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'})
+      } end
+      time -= Benchmark.realtime do n.times { } end
+      puts "\n\nGeneration:"
+      per_url = time / (n * 6)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} urls/s\n\n"
+    end
+  end
+  def test_default_route
+    g.if(g.check_conditions(:controller => 'content', :action => 'welcome')) { go [] }
+    assert_nil execute({:controller => 'foo', :action => 'welcome'}, {})
+    assert_nil execute({:controller => 'content', :action => 'elcome'}, {})
+    assert_nil execute({:action => 'elcome'}, {:controller => 'content'})
+    assert_equal '/', execute({:controller => 'content', :action => 'welcome'}, {})
+    assert_equal '/', execute({:action => 'welcome'}, {:controller => 'content'})
+    assert_equal '/', execute({:action => 'welcome', :id => '10'}, {:controller => 'content'})
+  end
+end
+class RouteTests < Test::Unit::TestCase
+  def route(*args)
+    @route = ::ActionController::Routing::Route.new(*args) unless args.empty?
+    return @route
+  end
+  def rec(path, show = false)
+    path = path.split('/') if path.is_a? String
+    index = 0
+    source = route.write_recognition.to_s
+    puts "\n\n#{source}\n\n" if show
+    r = eval(source)
+    r ? r.symbolize_keys : r
+  end
+  def gen(options, recall = nil, show = false)
+    recall ||= options.dup
+    expire_on = ::ActionController::Routing.expiry_hash(options, recall)
+    hash = merged = recall.merge(options)
+    not_expired = true
+    source = route.write_generation.to_s
+    puts "\n\n#{source}\n\n" if show
+    eval(source)
+  end
+  def test_static
+    route 'hello/world', :known => 'known_value'
+    assert_nil rec('hello/turn')
+    assert_nil rec('turn/world')
+    assert_equal({:known => 'known_value'}, rec('hello/world'))
+    assert_nil gen(:known => 'foo')
+    assert_nil gen({})
+    assert_equal '/hello/world', gen(:known => 'known_value')
+    assert_equal '/hello/world', gen(:known => 'known_value', :extra => 'hi')
+    assert_equal [:extra], route.extra_keys(:known => 'known_value', :extra => 'hi')
+  end
+  def test_dynamic
+    route 'hello/:name', :controller => 'content', :action => 'show_person'
+    assert_nil rec('hello')
+    assert_nil rec('foo/bar')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'show_person', :name => 'rails'}, rec('hello/rails'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'show_person', :name => 'Nicholas Seckar'}, rec('hello/Nicholas+Seckar'))
+    assert_nil gen(:controller => 'content', :action => 'show_dude', :name => 'rails')
+    assert_nil gen(:controller => 'content', :action => 'show_person')
+    assert_nil gen(:controller => 'admin/user', :action => 'show_person', :name => 'rails')
+    assert_equal '/hello/rails', gen(:controller => 'content', :action => 'show_person', :name => 'rails')
+    assert_equal '/hello/Nicholas+Seckar', gen(:controller => 'content', :action => 'show_person', :name => 'Nicholas Seckar')
+  end
+  def test_typical
+    route ':controller/:action/:id', :action => 'index', :id => nil
+    assert_nil rec('hello')
+    assert_nil rec('foo bar')
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}, rec('content'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'index'}, rec('admin/user'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'index'}, rec('admin/user/index'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'list'}, rec('admin/user/list'))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'show', :id => '10'}, rec('admin/user/show/10'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'list'}, rec('content/list'))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'show', :id => '10'}, rec('content/show/10'))
+    assert_equal '/content', gen(:controller => 'content', :action => 'index')
+    assert_equal '/content/list', gen(:controller => 'content', :action => 'list')
+    assert_equal '/content/show/10', gen(:controller => 'content', :action => 'show', :id => '10')
+    assert_equal '/admin/user', gen(:controller => 'admin/user', :action => 'index')
+    assert_equal '/admin/user', gen(:controller => 'admin/user')
+    assert_equal '/admin/user', gen({:controller => 'admin/user'}, {:controller => 'content', :action => 'list', :id => '10'})
+    assert_equal '/admin/user/show/10', gen(:controller => 'admin/user', :action => 'show', :id => '10')
+  end
+end
+class RouteSetTests < Test::Unit::TestCase
+  attr_reader :rs
+  def setup
+    @rs = ::ActionController::Routing::RouteSet.new
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+  end
+  def test_default_setup
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'index'}.stringify_keys, rs.recognize_path(%w(content)))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'list'}.stringify_keys, rs.recognize_path(%w(content list)))
+    assert_equal({:controller => ::Controllers::ContentController, :action => 'show', :id => '10'}.stringify_keys, rs.recognize_path(%w(content show 10)))
+    assert_equal({:controller => ::Controllers::Admin::UserController, :action => 'show', :id => '10'}.stringify_keys, rs.recognize_path(%w(admin user show 10)))
+    assert_equal ['/admin/user/show/10', {}], rs.generate({:controller => 'admin/user', :action => 'show', :id => 10})
+    assert_equal ['/admin/user/show', {}], rs.generate({:action => 'show'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal ['/admin/user/list/10', {}], rs.generate({}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal ['/admin/stuff', {}], rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal ['/stuff', {}], rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+  end
+  def test_ignores_leading_slash
+    @rs.draw {|m| m.connect '/:controller/:action/:id'}
+    test_default_setup
+  end
+  def test_time_recognition
+    n = 10000
+    if RunTimeTests
+      GC.start
+      rectime = Benchmark.realtime do
+        n.times do
+          rs.recognize_path(%w(content))
+          rs.recognize_path(%w(content list))
+          rs.recognize_path(%w(content show 10))
+          rs.recognize_path(%w(admin user))
+          rs.recognize_path(%w(admin user list))
+          rs.recognize_path(%w(admin user show 10))
+        end
+      end
+      puts "\n\nRecognition (RouteSet):"
+      per_url = rectime / (n * 6)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
+    end
+  end
+  def test_time_generation
+    n = 5000
+    if RunTimeTests
+      GC.start
+      pairs = [
+        [{:controller => 'content', :action => 'index'}, {:controller => 'content', :action => 'show'}],
+        [{:controller => 'content'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'list'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}],
+        [{:controller => 'admin/user', :action => 'index'}, {:controller => 'admin/user', :action => 'show'}],
+        [{:controller => 'admin/user'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'list'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}],
+      ]
+      p = nil
+      gentime = Benchmark.realtime do
+        n.times do
+        pairs.each {|(a, b)| rs.generate(a, b)}
+        end
+      end
+      puts "\n\nGeneration (RouteSet): (#{(n * 8)} urls)"
+      per_url = gentime / (n * 8)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
+    end
+  end
+  def test_route_with_colon_first
+    rs.draw do |map|
+      map.connect '/:controller/:action/:id', :action => 'index', :id => nil
+      map.connect ':url', :controller => 'tiny_url', :action => 'translate'
+    end
+  end
+  def test_route_generating_string_literal_in_comparison_warning
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    rs.draw do |map|
+      map.connect 'subscriptions/:action/:subscription_type', :controller => "subscriptions"
+    end
+    assert_equal "", $stderr.string
+  ensure
+    $stderr = old_stderr
+  end
+  def test_basic_named_route
+    rs.home '', :controller => 'content', :action => 'list'
+    x = setup_for_named_route
+    assert_equal({:controller => '/content', :action => 'list'},
+                 x.new.send(:home_url))
+  end
+  def test_named_route_with_option
+    rs.page 'page/:title', :controller => 'content', :action => 'show_page'
+    x = setup_for_named_route
+    assert_equal({:controller => '/content', :action => 'show_page', :title => 'new stuff'},
+                 x.new.send(:page_url, :title => 'new stuff'))
+  end
+  def setup_for_named_route
+    x = Class.new
+    x.send(:define_method, :url_for) {|x| x}
+    x.send :include, ::ActionController::Routing::NamedRoutes
+    x
+  end
+  def test_named_route_without_hash
+    rs.draw do |map|
+      rs.normal ':controller/:action/:id'
+    end
+  end
+  def test_changing_controller
+    assert_equal ['/admin/stuff/show/10', {}], rs.generate(
+      {:controller => 'stuff', :action => 'show', :id => 10},
+      {:controller => 'admin/user', :action => 'index'}
+    )
+  end
+  def test_backwards
+    rs.draw do |map|
+      rs.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
+      rs.connect ':controller/:action/:id'
+    end
+    assert_equal ['/page/20', {}], rs.generate({:id => 20}, {:controller => 'pages'})
+    assert_equal ['/page/20', {}], rs.generate(:controller => 'pages', :id => 20, :action => 'show')
+    assert_equal ['/pages/boo', {}], rs.generate(:controller => 'pages', :action => 'boo')
+  end
+  def test_action_expiry
+    assert_equal ['/content', {}], rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+  end
+end
+end