RubyGems - actionpack - Versions diffs - 1.13.6 → 2.0.0 - Mend

actionpack 1.13.6 → 2.0.0

Potentially problematic release.

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

Files changed (317) hide show

data/CHANGELOG +1400 -20
data/MIT-LICENSE +1 -1
data/README +5 -5
data/RUNNING_UNIT_TESTS +4 -5
data/Rakefile +5 -6
data/install.rb +2 -2
data/lib/action_controller.rb +11 -15
data/lib/action_controller/assertions.rb +12 -25
data/lib/action_controller/assertions/dom_assertions.rb +18 -4
data/lib/action_controller/assertions/model_assertions.rb +8 -1
data/lib/action_controller/assertions/response_assertions.rb +35 -12
data/lib/action_controller/assertions/routing_assertions.rb +56 -12
data/lib/action_controller/assertions/selector_assertions.rb +105 -38
data/lib/action_controller/assertions/tag_assertions.rb +28 -15
data/lib/action_controller/base.rb +318 -250
data/lib/action_controller/benchmarking.rb +33 -29
data/lib/action_controller/caching.rb +130 -64
data/lib/action_controller/cgi_ext.rb +16 -0
data/lib/action_controller/cgi_ext/{cookie_performance_fix.rb → cookie.rb} +25 -40
data/lib/action_controller/cgi_ext/query_extension.rb +22 -0
data/lib/action_controller/cgi_ext/session.rb +73 -0
data/lib/action_controller/cgi_ext/stdinput.rb +23 -0
data/lib/action_controller/cgi_process.rb +34 -57
data/lib/action_controller/components.rb +19 -36
data/lib/action_controller/cookies.rb +10 -9
data/lib/action_controller/dispatcher.rb +195 -0
data/lib/action_controller/filters.rb +35 -34
data/lib/action_controller/flash.rb +30 -35
data/lib/action_controller/helpers.rb +121 -47
data/lib/action_controller/http_authentication.rb +126 -0
data/lib/action_controller/integration.rb +105 -101
data/lib/action_controller/layout.rb +59 -47
data/lib/action_controller/mime_responds.rb +57 -68
data/lib/action_controller/mime_type.rb +43 -80
data/lib/action_controller/mime_types.rb +20 -0
data/lib/action_controller/polymorphic_routes.rb +88 -0
data/lib/action_controller/record_identifier.rb +91 -0
data/lib/action_controller/request.rb +553 -88
data/lib/action_controller/request_forgery_protection.rb +126 -0
data/lib/action_controller/request_profiler.rb +138 -0
data/lib/action_controller/rescue.rb +185 -69
data/lib/action_controller/resources.rb +211 -172
data/lib/action_controller/response.rb +49 -8
data/lib/action_controller/routing.rb +359 -236
data/lib/action_controller/routing_optimisation.rb +119 -0
data/lib/action_controller/session/active_record_store.rb +3 -2
data/lib/action_controller/session/cookie_store.rb +161 -0
data/lib/action_controller/session/mem_cache_store.rb +9 -16
data/lib/action_controller/session_management.rb +17 -8
data/lib/action_controller/streaming.rb +6 -3
data/lib/action_controller/templates/rescues/_request_and_response.erb +24 -0
data/lib/action_controller/templates/rescues/{_trace.rhtml → _trace.erb} +0 -0
data/lib/action_controller/templates/rescues/{diagnostics.rhtml → diagnostics.erb} +2 -2
data/lib/action_controller/templates/rescues/{layout.rhtml → layout.erb} +0 -0
data/lib/action_controller/templates/rescues/{missing_template.rhtml → missing_template.erb} +0 -0
data/lib/action_controller/templates/rescues/{routing_error.rhtml → routing_error.erb} +0 -0
data/lib/action_controller/templates/rescues/{template_error.rhtml → template_error.erb} +2 -2
data/lib/action_controller/templates/rescues/{unknown_action.rhtml → unknown_action.erb} +0 -0
data/lib/action_controller/test_case.rb +53 -0
data/lib/action_controller/test_process.rb +59 -46
data/lib/action_controller/url_rewriter.rb +48 -24
data/lib/action_controller/vendor/html-scanner/html/document.rb +7 -4
data/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +173 -0
data/lib/action_controller/vendor/html-scanner/html/selector.rb +11 -6
data/lib/action_controller/verification.rb +27 -21
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +4 -4
data/lib/action_view.rb +2 -3
data/lib/action_view/base.rb +218 -63
data/lib/action_view/compiled_templates.rb +1 -2
data/lib/action_view/helpers/active_record_helper.rb +35 -17
data/lib/action_view/helpers/asset_tag_helper.rb +395 -87
data/lib/action_view/helpers/atom_feed_helper.rb +111 -0
data/lib/action_view/helpers/benchmark_helper.rb +12 -5
data/lib/action_view/helpers/cache_helper.rb +29 -0
data/lib/action_view/helpers/capture_helper.rb +97 -63
data/lib/action_view/helpers/date_helper.rb +295 -35
data/lib/action_view/helpers/debug_helper.rb +6 -2
data/lib/action_view/helpers/form_helper.rb +354 -111
data/lib/action_view/helpers/form_options_helper.rb +171 -109
data/lib/action_view/helpers/form_tag_helper.rb +332 -76
data/lib/action_view/helpers/javascript_helper.rb +35 -11
data/lib/action_view/helpers/javascripts/controls.js +484 -354
data/lib/action_view/helpers/javascripts/dragdrop.js +88 -58
data/lib/action_view/helpers/javascripts/effects.js +396 -364
data/lib/action_view/helpers/javascripts/prototype.js +2817 -1107
data/lib/action_view/helpers/number_helper.rb +84 -60
data/lib/action_view/helpers/prototype_helper.rb +419 -43
data/lib/action_view/helpers/record_identification_helper.rb +20 -0
data/lib/action_view/helpers/record_tag_helper.rb +59 -0
data/lib/action_view/helpers/sanitize_helper.rb +223 -0
data/lib/action_view/helpers/scriptaculous_helper.rb +63 -4
data/lib/action_view/helpers/tag_helper.rb +69 -39
data/lib/action_view/helpers/text_helper.rb +221 -148
data/lib/action_view/helpers/url_helper.rb +283 -165
data/lib/action_view/partials.rb +134 -62
data/lib/action_view/template_error.rb +4 -12
data/lib/actionpack.rb +1 -0
data/test/abstract_unit.rb +21 -1
data/test/action_view_test.rb +26 -0
data/test/active_record_unit.rb +12 -20
data/test/activerecord/active_record_store_test.rb +2 -2
data/test/activerecord/render_partial_with_record_identification_test.rb +74 -0
data/test/controller/action_pack_assertions_test.rb +21 -152
data/test/controller/addresses_render_test.rb +2 -7
data/test/controller/assert_select_test.rb +120 -14
data/test/controller/base_test.rb +11 -13
data/test/controller/caching_test.rb +125 -5
data/test/controller/capture_test.rb +23 -16
data/test/controller/cgi_test.rb +66 -391
data/test/controller/components_test.rb +31 -42
data/test/controller/content_type_test.rb +1 -1
data/test/controller/cookie_test.rb +42 -14
data/test/controller/deprecation/deprecated_base_methods_test.rb +1 -42
data/test/controller/dispatcher_test.rb +123 -0
data/test/controller/fake_models.rb +5 -0
data/test/controller/filters_test.rb +44 -7
data/test/controller/flash_test.rb +46 -2
data/test/controller/fragment_store_setting_test.rb +10 -8
data/test/controller/helper_test.rb +19 -2
data/test/controller/html-scanner/document_test.rb +124 -0
data/test/controller/html-scanner/node_test.rb +69 -0
data/test/controller/html-scanner/sanitizer_test.rb +250 -0
data/test/controller/html-scanner/tag_node_test.rb +239 -0
data/test/controller/html-scanner/text_node_test.rb +51 -0
data/test/controller/html-scanner/tokenizer_test.rb +125 -0
data/test/controller/http_authentication_test.rb +54 -0
data/test/controller/integration_test.rb +12 -26
data/test/controller/layout_test.rb +64 -12
data/test/controller/mime_responds_test.rb +193 -38
data/test/controller/mime_type_test.rb +30 -8
data/test/controller/new_render_test.rb +104 -22
data/test/controller/polymorphic_routes_test.rb +98 -0
data/test/controller/record_identifier_test.rb +103 -0
data/test/controller/redirect_test.rb +120 -18
data/test/controller/render_test.rb +195 -45
data/test/controller/request_forgery_protection_test.rb +217 -0
data/test/controller/request_test.rb +545 -27
data/test/controller/rescue_test.rb +501 -0
data/test/controller/resources_test.rb +258 -132
data/test/controller/routing_test.rb +502 -106
data/test/controller/selector_test.rb +5 -5
data/test/controller/send_file_test.rb +17 -7
data/test/controller/session/cookie_store_test.rb +246 -0
data/test/controller/session/mem_cache_store_test.rb +182 -0
data/test/controller/session_fixation_test.rb +8 -11
data/test/controller/session_management_test.rb +7 -7
data/test/controller/test_test.rb +150 -38
data/test/controller/url_rewriter_test.rb +87 -12
data/test/controller/verification_test.rb +11 -0
data/test/controller/view_paths_test.rb +137 -0
data/test/controller/webservice_test.rb +11 -75
data/test/fixtures/addresses/{list.rhtml → list.erb} +0 -0
data/test/fixtures/db_definitions/sqlite.sql +2 -1
data/test/fixtures/developer.rb +2 -0
data/test/fixtures/fun/games/{hello_world.rhtml → hello_world.erb} +0 -0
data/test/fixtures/helpers/fun/pdf_helper.rb +1 -1
data/test/fixtures/layout_tests/alt/hello.rhtml +1 -0
data/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb +1 -0
data/test/fixtures/layouts/{builder.rxml → builder.builder} +0 -0
data/test/fixtures/layouts/{standard.rhtml → standard.erb} +0 -0
data/test/fixtures/layouts/{talk_from_action.rhtml → talk_from_action.erb} +0 -0
data/test/fixtures/layouts/{yield.rhtml → yield.erb} +0 -0
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/multipart/bracketed_param +5 -0
data/test/fixtures/override/test/hello_world.erb +1 -0
data/test/fixtures/override2/layouts/test/sub.erb +1 -0
data/test/fixtures/post_test/layouts/post.html.erb +1 -0
data/test/fixtures/post_test/layouts/super_post.iphone.erb +1 -0
data/test/fixtures/post_test/post/index.html.erb +1 -0
data/test/fixtures/post_test/post/index.iphone.erb +1 -0
data/test/fixtures/post_test/super_post/index.html.erb +1 -0
data/test/fixtures/post_test/super_post/index.iphone.erb +1 -0
data/test/fixtures/public/404.html +1 -0
data/test/fixtures/public/500.html +1 -0
data/test/fixtures/public/javascripts/application.js +0 -1
data/test/fixtures/public/javascripts/bank.js +1 -0
data/test/fixtures/public/javascripts/robber.js +1 -0
data/test/fixtures/public/stylesheets/bank.css +1 -0
data/test/fixtures/public/stylesheets/robber.css +1 -0
data/test/fixtures/replies.yml +2 -0
data/test/fixtures/reply.rb +2 -1
data/test/fixtures/respond_to/{all_types_with_layout.rhtml → all_types_with_layout.html.erb} +0 -0
data/test/fixtures/respond_to/{all_types_with_layout.rjs → all_types_with_layout.js.rjs} +0 -0
data/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb +1 -0
data/test/fixtures/respond_to/iphone_with_html_response_type.html.erb +1 -0
data/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb +1 -0
data/test/fixtures/respond_to/layouts/missing.html.erb +1 -0
data/test/fixtures/respond_to/layouts/standard.html.erb +1 -0
data/test/fixtures/respond_to/layouts/standard.iphone.erb +1 -0
data/test/fixtures/respond_to/{using_defaults.rhtml → using_defaults.html.erb} +0 -0
data/test/fixtures/respond_to/{using_defaults.rjs → using_defaults.js.rjs} +0 -0
data/test/fixtures/respond_to/{using_defaults.rxml → using_defaults.xml.builder} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rhtml → using_defaults_with_type_list.html.erb} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rjs → using_defaults_with_type_list.js.rjs} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rxml → using_defaults_with_type_list.xml.builder} +0 -0
data/test/fixtures/scope/test/{modgreet.rhtml → modgreet.erb} +0 -0
data/test/fixtures/test/{_customer.rhtml → _customer.erb} +0 -0
data/test/fixtures/test/{_customer_greeting.rhtml → _customer_greeting.erb} +0 -0
data/test/fixtures/test/_hash_greeting.erb +1 -0
data/test/fixtures/test/_hash_object.erb +2 -0
data/test/fixtures/test/{_hello.rxml → _hello.builder} +0 -0
data/test/fixtures/test/_layout_for_partial.html.erb +3 -0
data/test/fixtures/test/_partial.erb +1 -0
data/test/fixtures/test/_partial.html.erb +1 -0
data/test/fixtures/test/_partial.js.erb +1 -0
data/test/fixtures/test/_partial_for_use_in_layout.html.erb +1 -0
data/test/fixtures/test/{_partial_only.rhtml → _partial_only.erb} +0 -0
data/test/fixtures/test/{_person.rhtml → _person.erb} +0 -0
data/test/fixtures/test/{action_talk_to_layout.rhtml → action_talk_to_layout.erb} +0 -0
data/test/fixtures/test/{block_content_for.rhtml → block_content_for.erb} +0 -0
data/test/fixtures/test/calling_partial_with_layout.html.erb +1 -0
data/test/fixtures/test/{capturing.rhtml → capturing.erb} +0 -0
data/test/fixtures/test/{content_for.rhtml → content_for.erb} +0 -0
data/test/fixtures/test/content_for_concatenated.erb +3 -0
data/test/fixtures/test/content_for_with_parameter.erb +2 -0
data/test/fixtures/test/dot.directory/{render_file_with_ivar.rhtml → render_file_with_ivar.erb} +0 -0
data/test/fixtures/test/{erb_content_for.rhtml → erb_content_for.erb} +0 -0
data/test/fixtures/test/formatted_html_erb.html.erb +1 -0
data/test/fixtures/test/formatted_xml_erb.builder +1 -0
data/test/fixtures/test/formatted_xml_erb.html.erb +1 -0
data/test/fixtures/test/formatted_xml_erb.xml.erb +1 -0
data/test/fixtures/test/{greeting.rhtml → greeting.erb} +0 -0
data/test/fixtures/test/{hello.rxml → hello.builder} +0 -0
data/test/fixtures/test/{hello_world.rxml → hello_world.builder} +0 -0
data/test/fixtures/test/{hello_world.rhtml → hello_world.erb} +0 -0
data/test/fixtures/test/{hello_world_container.rxml → hello_world_container.builder} +0 -0
data/test/fixtures/test/{hello_world_with_layout_false.rhtml → hello_world_with_layout_false.erb} +0 -0
data/test/fixtures/test/{hello_xml_world.rxml → hello_xml_world.builder} +0 -0
data/test/fixtures/test/list.erb +1 -0
data/test/fixtures/test/{non_erb_block_content_for.rxml → non_erb_block_content_for.builder} +0 -0
data/test/fixtures/test/{potential_conflicts.rhtml → potential_conflicts.erb} +0 -0
data/test/fixtures/test/{render_file_with_ivar.rhtml → render_file_with_ivar.erb} +0 -0
data/test/fixtures/test/{render_file_with_locals.rhtml → render_file_with_locals.erb} +0 -0
data/test/fixtures/test/{render_to_string_test.rhtml → render_to_string_test.erb} +0 -0
data/test/fixtures/test/{update_element_with_capture.rhtml → update_element_with_capture.erb} +0 -0
data/test/fixtures/test/using_layout_around_block.html.erb +1 -0
data/test/fixtures/topic.rb +1 -1
data/test/template/active_record_helper_test.rb +67 -20
data/test/template/asset_tag_helper_test.rb +222 -54
data/test/template/atom_feed_helper_test.rb +101 -0
data/test/template/benchmark_helper_test.rb +2 -2
data/test/template/compiled_templates_test.rb +76 -32
data/test/template/date_helper_test.rb +125 -9
data/test/template/form_helper_test.rb +326 -33
data/test/template/form_options_helper_test.rb +822 -15
data/test/template/form_tag_helper_test.rb +96 -30
data/test/template/javascript_helper_test.rb +61 -13
data/test/template/number_helper_test.rb +12 -11
data/test/template/prototype_helper_test.rb +185 -24
data/test/template/sanitize_helper_test.rb +49 -0
data/test/template/scriptaculous_helper_test.rb +9 -3
data/test/template/tag_helper_test.rb +13 -2
data/test/template/text_helper_test.rb +38 -52
data/test/template/url_helper_test.rb +216 -46
metadata +144 -116
data/examples/.htaccess +0 -24
data/examples/address_book/index.rhtml +0 -33
data/examples/address_book/layout.rhtml +0 -8
data/examples/address_book_controller.cgi +0 -9
data/examples/address_book_controller.fcgi +0 -6
data/examples/address_book_controller.rb +0 -52
data/examples/address_book_controller.rbx +0 -4
data/examples/benchmark.rb +0 -52
data/examples/benchmark_with_ar.fcgi +0 -89
data/examples/blog_controller.cgi +0 -53
data/examples/debate/index.rhtml +0 -14
data/examples/debate/new_topic.rhtml +0 -22
data/examples/debate/topic.rhtml +0 -32
data/examples/debate_controller.cgi +0 -57
data/lib/action_controller/assertions/deprecated_assertions.rb +0 -228
data/lib/action_controller/cgi_ext/cgi_ext.rb +0 -36
data/lib/action_controller/cgi_ext/cgi_methods.rb +0 -211
data/lib/action_controller/cgi_ext/pstore_performance_fix.rb +0 -30
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +0 -95
data/lib/action_controller/cgi_ext/session_performance_fix.rb +0 -30
data/lib/action_controller/deprecated_dependencies.rb +0 -65
data/lib/action_controller/deprecated_redirects.rb +0 -17
data/lib/action_controller/deprecated_request_methods.rb +0 -34
data/lib/action_controller/macros/auto_complete.rb +0 -53
data/lib/action_controller/macros/in_place_editing.rb +0 -33
data/lib/action_controller/pagination.rb +0 -408
data/lib/action_controller/scaffolding.rb +0 -189
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +0 -44
data/lib/action_controller/templates/scaffolds/edit.rhtml +0 -7
data/lib/action_controller/templates/scaffolds/layout.rhtml +0 -69
data/lib/action_controller/templates/scaffolds/list.rhtml +0 -27
data/lib/action_controller/templates/scaffolds/new.rhtml +0 -6
data/lib/action_controller/templates/scaffolds/show.rhtml +0 -9
data/lib/action_controller/vendor/xml_node.rb +0 -97
data/lib/action_view/helpers/deprecated_helper.rb +0 -37
data/lib/action_view/helpers/java_script_macros_helper.rb +0 -233
data/lib/action_view/helpers/pagination_helper.rb +0 -86
data/test/activerecord/active_record_assertions_test.rb +0 -92
data/test/activerecord/pagination_test.rb +0 -165
data/test/controller/deprecated_instance_variables_test.rb +0 -48
data/test/controller/raw_post_test.rb +0 -68
data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_params_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_request_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_response_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_session_method.rhtml +0 -1
data/test/fixtures/respond_to/layouts/standard.rhtml +0 -1
data/test/fixtures/test/_hash_object.rhtml +0 -1
data/test/fixtures/test/list.rhtml +0 -1
data/test/template/deprecated_helper_test.rb +0 -36
data/test/template/deprecated_instance_variables_test.rb +0 -43
data/test/template/java_script_macros_helper_test.rb +0 -109

data/test/controller/html-scanner/text_node_test.rb ADDED

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'test/unit'
+class TextNodeTest < Test::Unit::TestCase
+  def setup
+    @node = HTML::Text.new(nil, 0, 0, "hello, howdy, aloha, annyeong")
+  end
+  def test_to_s
+    assert_equal "hello, howdy, aloha, annyeong", @node.to_s
+  end
+  def test_find_string
+    assert_equal @node, @node.find("hello, howdy, aloha, annyeong")
+    assert_equal false, @node.find("bogus")
+  end
+  def test_find_regexp
+    assert_equal @node, @node.find(/an+y/)
+    assert_nil @node.find(/b/)
+  end
+  def test_find_hash
+    assert_equal @node, @node.find(:content => /howdy/)
+    assert_nil @node.find(:content => /^howdy$/)
+    assert_equal false, @node.find(:content => "howdy")
+  end
+  def test_find_other
+    assert_nil @node.find(:hello)
+  end
+  def test_match_string
+    assert @node.match("hello, howdy, aloha, annyeong")
+    assert_equal false, @node.match("bogus")
+  end
+  def test_match_regexp
+    assert_not_nil @node, @node.match(/an+y/)
+    assert_nil @node.match(/b/)
+  end
+  def test_match_hash
+    assert_not_nil @node, @node.match(:content => "howdy")
+    assert_nil @node.match(:content => /^howdy$/)
+  end
+  def test_match_other
+    assert_nil @node.match(:hello)
+  end
+end

data/test/controller/html-scanner/tokenizer_test.rb ADDED

@@ -0,0 +1,125 @@
+require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'test/unit'
+class TokenizerTest < Test::Unit::TestCase
+  def test_blank
+    tokenize ""
+    assert_end
+  end
+  def test_space
+    tokenize " "
+    assert_next " "
+    assert_end
+  end
+  def test_tag_simple_open
+    tokenize "<tag>"
+    assert_next "<tag>"
+    assert_end
+  end
+  def test_tag_simple_self_closing
+    tokenize "<tag />"
+    assert_next "<tag />"
+    assert_end
+  end
+  def test_tag_simple_closing
+    tokenize "</tag>"
+    assert_next "</tag>"
+  end
+  def test_tag_with_single_quoted_attribute
+    tokenize %{<tag a='hello'>x}
+    assert_next %{<tag a='hello'>}
+  end
+  def test_tag_with_single_quoted_attribute_with_escape
+    tokenize %{<tag a='hello\\''>x}
+    assert_next %{<tag a='hello\\''>}
+  end
+  def test_tag_with_double_quoted_attribute
+    tokenize %{<tag a="hello">x}
+    assert_next %{<tag a="hello">}
+  end
+  def test_tag_with_double_quoted_attribute_with_escape
+    tokenize %{<tag a="hello\\"">x}
+    assert_next %{<tag a="hello\\"">}
+  end
+  def test_tag_with_unquoted_attribute
+    tokenize %{<tag a=hello>x}
+    assert_next %{<tag a=hello>}
+  end
+  def test_tag_with_lt_char_in_attribute
+    tokenize %{<tag a="x < y">x}
+    assert_next %{<tag a="x < y">}
+  end
+  def test_tag_with_gt_char_in_attribute
+    tokenize %{<tag a="x > y">x}
+    assert_next %{<tag a="x > y">}
+  end
+  def test_doctype_tag
+    tokenize %{<!DOCTYPE "blah" "blah" "blah">\n    <html>}
+    assert_next %{<!DOCTYPE "blah" "blah" "blah">}
+    assert_next %{\n    }
+    assert_next %{<html>}
+  end
+  def test_cdata_tag
+    tokenize %{<![CDATA[<br>]]>}
+    assert_next %{<![CDATA[<br>]]>}
+    assert_end
+  end
+  def test_less_than_with_space
+    tokenize %{original < hello > world}
+    assert_next %{original }
+    assert_next %{< hello > world}
+  end
+  def test_less_than_without_matching_greater_than
+    tokenize %{hello <span onmouseover="gotcha"\n<b>foo</b>\nbar</span>}
+    assert_next %{hello }
+    assert_next %{<span onmouseover="gotcha"\n}
+    assert_next %{<b>}
+    assert_next %{foo}
+    assert_next %{</b>}
+    assert_next %{\nbar}
+    assert_next %{</span>}
+    assert_end
+  end
+  def test_unterminated_comment
+    tokenize %{hello <!-- neverending...}
+    assert_next %{hello }
+    assert_next %{<!-- neverending...}
+    assert_end
+  end
+  private
+    def tokenize(text)
+      @tokenizer = HTML::Tokenizer.new(text)
+    end
+    def assert_next(expected, message=nil)
+      token = @tokenizer.next
+      assert_equal expected, token, message
+    end
+    def assert_sequence(*expected)
+      assert_next expected.shift until expected.empty?
+    end
+    def assert_end(message=nil)
+      assert_nil @tokenizer.next, message
+    end
+end

data/test/controller/http_authentication_test.rb ADDED

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+class HttpBasicAuthenticationTest < Test::Unit::TestCase
+  include ActionController::HttpAuthentication::Basic
+  class DummyController
+    attr_accessor :headers, :renders, :request
+    def initialize
+      @headers, @renders = {}, []
+      @request = ActionController::TestRequest.new
+    end
+    def render(options)
+      self.renders << options
+    end
+  end
+  def setup
+    @controller  = DummyController.new
+    @credentials = ActionController::HttpAuthentication::Basic.encode_credentials("dhh", "secret")
+  end
+  def test_successful_authentication
+    login = Proc.new { |user_name, password| user_name == "dhh" && password == "secret" }
+    set_headers
+    assert authenticate(@controller, &login)
+    set_headers ''
+    assert_nothing_raised do
+      assert !authenticate(@controller, &login)
+    end
+    set_headers nil
+    set_headers @credentials, 'REDIRECT_X_HTTP_AUTHORIZATION'
+    assert authenticate(@controller, &login)
+  end
+  def test_failing_authentication
+    set_headers
+    assert !authenticate(@controller) { |user_name, password| user_name == "dhh" && password == "incorrect" }
+  end
+  def test_authentication_request
+    authentication_request(@controller, "Megaglobalapp")
+    assert_equal 'Basic realm="Megaglobalapp"', @controller.headers["WWW-Authenticate"]
+    assert_equal :unauthorized, @controller.renders.first[:status]
+  end
+  private
+    def set_headers(value = @credentials, name = 'HTTP_AUTHORIZATION')
+      @controller.request.env[name] = value
+    end
+end

data/test/controller/integration_test.rb CHANGED

@@ -3,9 +3,7 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 $:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
 require 'action_controller/integration'
-begin # rescue LoadError
-require 'mocha'
-require 'stubba'
+uses_mocha 'integration' do
 # Stub process for testing.
 module ActionController
@@ -52,27 +50,27 @@ class SessionTest < Test::Unit::TestCase
   end
   def test_get_via_redirect
-    path = "/somepath"; args = {:id => '1'}
+    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
-    @session.expects(:get).with(path,args)
+    @session.expects(:get).with(path,args,headers)
-    @session.stubs(:redirect?).returns(true).then.returns(true).then.returns(false)
+    @session.stubs(:redirect?).returns(true, true, false)
     @session.expects(:follow_redirect!).times(2)
     @session.stubs(:status).returns(200)
-    assert_equal 200, @session.get_via_redirect(path, args)
+    assert_equal 200, @session.get_via_redirect(path, args, headers)
   end
   def test_post_via_redirect
-    path = "/somepath"; args = {:id => '1'}
+    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
-    @session.expects(:post).with(path,args)
+    @session.expects(:post).with(path,args,headers)
-    @session.stubs(:redirect?).returns(true).then.returns(true).then.returns(false)
+    @session.stubs(:redirect?).returns(true, true, false)
     @session.expects(:follow_redirect!).times(2)
     @session.stubs(:status).returns(200)
-    assert_equal 200, @session.post_via_redirect(path, args)
+    assert_equal 200, @session.post_via_redirect(path, args, headers)
   end
   def test_url_for_with_controller
@@ -132,16 +130,6 @@ class SessionTest < Test::Unit::TestCase
     @session.head(path,params,headers)
   end
-  def test_xml_http_request_deprecated_call
-    path = "/index"; params = "blah"; headers = {:location => 'blah'}
-    headers_after_xhr = headers.merge(
-      "X-Requested-With" => "XMLHttpRequest",
-      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
-    )
-    @session.expects(:process).with(:post,path,params,headers_after_xhr)
-    assert_deprecated { @session.xml_http_request(path,params,headers) }
-  end
   def test_xml_http_request_get
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     headers_after_xhr = headers.merge(
@@ -200,7 +188,7 @@ class IntegrationTestTest < Test::Unit::TestCase
     @test.class.stubs(:fixture_table_names).returns([])
     @session = @test.open_session
   end
   def test_opens_new_session
     @test.class.expects(:fixture_table_names).times(2).returns(['foo'])
@@ -224,7 +212,7 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
   def test_integration_methods_called
     %w( get post head put delete ).each do |verb|
-      assert_nothing_raised("'#{verb}' should use integration test methods") { send(verb, '/') }
+      assert_nothing_raised("'#{verb}' should use integration test methods") { send!(verb, '/') }
     end
   end
@@ -234,6 +222,4 @@ end
 # class MockCGITest < Test::Unit::TestCase
 # end
-rescue LoadError
-  $stderr.puts "Skipping integration tests. `gem install mocha` and try again."
-end
+end # uses_mocha

data/test/controller/layout_test.rb CHANGED

@@ -1,15 +1,17 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
-# The template_root must be set on Base and not LayoutTest so that LayoutTest's inherited method has access to
-# the template_root when looking for a layout
-ActionController::Base.template_root = File.dirname(__FILE__) + '/../fixtures/layout_tests/'
+# The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
+# method has access to the view_paths array when looking for a layout to automatically assign.
+old_load_paths = ActionController::Base.view_paths
+ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
 class LayoutTest < ActionController::Base
   def self.controller_path; 'views' end
+  self.view_paths = ActionController::Base.view_paths.dup
 end
-# Restore template root to be unset
-ActionController::Base.template_root = nil
+# Restore view_paths to previous value
+ActionController::Base.view_paths = old_load_paths
 class ProductController < LayoutTest
 end
@@ -26,6 +28,9 @@ end
 class ControllerNameSpace::NestedController < LayoutTest
 end
+class MultipleExtensions < LayoutTest
+end
 class MabView
   def initialize(view)
   end
@@ -61,6 +66,7 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
     @controller = ThirdPartyTemplateLibraryController.new
     get :hello
     assert_equal 'layouts/third_party_template_library', @controller.active_layout
+    assert_equal 'layouts/third_party_template_library', @response.layout
     assert_equal 'Mab', @response.body
   end
@@ -70,6 +76,13 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
     assert_equal 'layouts/controller_name_space/nested', @controller.active_layout
     assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
   end
+  def test_namespaced_controllers_auto_detect_layouts
+    @controller = MultipleExtensions.new
+    get :hello
+    assert_equal 'layouts/multiple_extensions', @controller.active_layout
+    assert_equal 'multiple_extensions.html.erb hello.rhtml', @response.body.strip
+  end
 end
 class ExemptFromLayoutTest < Test::Unit::TestCase
@@ -80,16 +93,16 @@ class ExemptFromLayoutTest < Test::Unit::TestCase
   end
   def test_rjs_exempt_from_layout
-    assert @controller.send(:template_exempt_from_layout?, 'test.rjs')
+    assert @controller.send!(:template_exempt_from_layout?, 'test.rjs')
   end
   def test_rhtml_and_rxml_not_exempt_from_layout
-    assert !@controller.send(:template_exempt_from_layout?, 'test.rhtml')
-    assert !@controller.send(:template_exempt_from_layout?, 'test.rxml')
+    assert !@controller.send!(:template_exempt_from_layout?, 'test.rhtml')
+    assert !@controller.send!(:template_exempt_from_layout?, 'test.rxml')
   end
   def test_other_extension_not_exempt_from_layout
-    assert !@controller.send(:template_exempt_from_layout?, 'test.random')
+    assert !@controller.send!(:template_exempt_from_layout?, 'test.random')
   end
   def test_add_extension_to_exempt_from_layout
@@ -97,18 +110,20 @@ class ExemptFromLayoutTest < Test::Unit::TestCase
       assert_nothing_raised do
         ActionController::Base.exempt_from_layout ext
       end
-      assert @controller.send(:template_exempt_from_layout?, "test.#{ext}")
+      assert @controller.send!(:template_exempt_from_layout?, "test.#{ext}")
     end
   end
   def test_add_regexp_to_exempt_from_layout
     ActionController::Base.exempt_from_layout /\.rdoc/
-    assert @controller.send(:template_exempt_from_layout?, 'test.rdoc')
+    assert @controller.send!(:template_exempt_from_layout?, 'test.rdoc')
   end
   def test_rhtml_exempt_from_layout_status_should_prevent_layout_render
     ActionController::Base.exempt_from_layout :rhtml
-    assert @controller.send(:template_exempt_from_layout?, 'test.rhtml')
+    assert @controller.send!(:template_exempt_from_layout?, 'test.rhtml')
+    assert @controller.send!(:template_exempt_from_layout?, 'hello.rhtml')
     get :hello
     assert_equal 'hello.rhtml', @response.body
@@ -165,8 +180,26 @@ class LayoutSetInResponseTest < Test::Unit::TestCase
     get :hello
     assert_nil @response.layout
   end
+  def test_exempt_from_layout_honored_by_render_template
+    ActionController::Base.exempt_from_layout :rhtml
+    @controller = RenderWithTemplateOptionController.new
+    assert @controller.send(:template_exempt_from_layout?, 'alt/hello.rhtml')
+    get :hello
+    assert_equal "alt/hello.rhtml", @response.body.strip
+  ensure
+    ActionController::Base.exempt_from_layout.delete(/\.rhtml$/)
+  end
 end
+class RenderWithTemplateOptionController < LayoutTest
+  def hello
+    render :template => 'alt/hello'
+  end
+end
 class SetsNonExistentLayoutFile < LayoutTest
   layout "nofile.rhtml"
@@ -185,3 +218,22 @@ class LayoutExceptionRaised < Test::Unit::TestCase
     assert_equal ActionController::MissingTemplate, @response.template.exception.class
   end
 end
+class LayoutStatusIsRendered < LayoutTest
+  def hello
+    render :status => 401
+  end
+end
+class LayoutStatusIsRenderedTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  def test_layout_status_is_rendered
+    @controller = LayoutStatusIsRendered.new
+    get :hello
+    assert_response 401
+  end
+end