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

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 1.13.6
-date: 2007-11-24 00:00:00 +13:00
+  version: 2.0.0
+date: 2007-12-06 00:00:00 -06:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths:
 - lib
@@ -35,10 +35,8 @@ files:
 - RUNNING_UNIT_TESTS
 - CHANGELOG
 - MIT-LICENSE
-- examples/.htaccess
 - lib/action_controller
 - lib/action_controller/assertions
-- lib/action_controller/assertions/deprecated_assertions.rb
 - lib/action_controller/assertions/dom_assertions.rb
 - lib/action_controller/assertions/model_assertions.rb
 - lib/action_controller/assertions/response_assertions.rb
@@ -50,37 +48,37 @@ files:
 - lib/action_controller/benchmarking.rb
 - lib/action_controller/caching.rb
 - lib/action_controller/cgi_ext
-- lib/action_controller/cgi_ext/cgi_ext.rb
-- lib/action_controller/cgi_ext/cgi_methods.rb
-- lib/action_controller/cgi_ext/cookie_performance_fix.rb
-- lib/action_controller/cgi_ext/pstore_performance_fix.rb
-- lib/action_controller/cgi_ext/raw_post_data_fix.rb
-- lib/action_controller/cgi_ext/session_performance_fix.rb
+- lib/action_controller/cgi_ext/cookie.rb
+- lib/action_controller/cgi_ext/query_extension.rb
+- lib/action_controller/cgi_ext/session.rb
+- lib/action_controller/cgi_ext/stdinput.rb
+- lib/action_controller/cgi_ext.rb
 - lib/action_controller/cgi_process.rb
 - lib/action_controller/components.rb
 - lib/action_controller/cookies.rb
-- lib/action_controller/deprecated_dependencies.rb
-- lib/action_controller/deprecated_redirects.rb
-- lib/action_controller/deprecated_request_methods.rb
+- lib/action_controller/dispatcher.rb
 - lib/action_controller/filters.rb
 - lib/action_controller/flash.rb
 - lib/action_controller/helpers.rb
+- lib/action_controller/http_authentication.rb
 - lib/action_controller/integration.rb
 - lib/action_controller/layout.rb
-- lib/action_controller/macros
-- lib/action_controller/macros/auto_complete.rb
-- lib/action_controller/macros/in_place_editing.rb
 - lib/action_controller/mime_responds.rb
 - lib/action_controller/mime_type.rb
-- lib/action_controller/pagination.rb
+- lib/action_controller/mime_types.rb
+- lib/action_controller/polymorphic_routes.rb
+- lib/action_controller/record_identifier.rb
 - lib/action_controller/request.rb
+- lib/action_controller/request_forgery_protection.rb
+- lib/action_controller/request_profiler.rb
 - lib/action_controller/rescue.rb
 - lib/action_controller/resources.rb
 - lib/action_controller/response.rb
 - lib/action_controller/routing.rb
-- lib/action_controller/scaffolding.rb
+- lib/action_controller/routing_optimisation.rb
 - lib/action_controller/session
 - lib/action_controller/session/active_record_store.rb
+- lib/action_controller/session/cookie_store.rb
 - lib/action_controller/session/drb_server.rb
 - lib/action_controller/session/drb_store.rb
 - lib/action_controller/session/mem_cache_store.rb
@@ -89,20 +87,15 @@ files:
 - lib/action_controller/streaming.rb
 - lib/action_controller/templates
 - lib/action_controller/templates/rescues
-- lib/action_controller/templates/rescues/_request_and_response.rhtml
-- lib/action_controller/templates/rescues/_trace.rhtml
-- lib/action_controller/templates/rescues/diagnostics.rhtml
-- lib/action_controller/templates/rescues/layout.rhtml
-- lib/action_controller/templates/rescues/missing_template.rhtml
-- lib/action_controller/templates/rescues/routing_error.rhtml
-- lib/action_controller/templates/rescues/template_error.rhtml
-- lib/action_controller/templates/rescues/unknown_action.rhtml
-- lib/action_controller/templates/scaffolds
-- lib/action_controller/templates/scaffolds/edit.rhtml
-- lib/action_controller/templates/scaffolds/layout.rhtml
-- lib/action_controller/templates/scaffolds/list.rhtml
-- lib/action_controller/templates/scaffolds/new.rhtml
-- lib/action_controller/templates/scaffolds/show.rhtml
+- lib/action_controller/templates/rescues/_request_and_response.erb
+- lib/action_controller/templates/rescues/_trace.erb
+- lib/action_controller/templates/rescues/diagnostics.erb
+- lib/action_controller/templates/rescues/layout.erb
+- lib/action_controller/templates/rescues/missing_template.erb
+- lib/action_controller/templates/rescues/routing_error.erb
+- lib/action_controller/templates/rescues/template_error.erb
+- lib/action_controller/templates/rescues/unknown_action.erb
+- lib/action_controller/test_case.rb
 - lib/action_controller/test_process.rb
 - lib/action_controller/url_rewriter.rb
 - lib/action_controller/vendor
@@ -110,10 +103,10 @@ files:
 - lib/action_controller/vendor/html-scanner/html
 - lib/action_controller/vendor/html-scanner/html/document.rb
 - lib/action_controller/vendor/html-scanner/html/node.rb
+- lib/action_controller/vendor/html-scanner/html/sanitizer.rb
 - lib/action_controller/vendor/html-scanner/html/selector.rb
 - lib/action_controller/vendor/html-scanner/html/tokenizer.rb
 - lib/action_controller/vendor/html-scanner/html/version.rb
-- lib/action_controller/vendor/xml_node.rb
 - lib/action_controller/verification.rb
 - lib/action_controller.rb
 - lib/action_pack
@@ -125,16 +118,15 @@ files:
 - lib/action_view/helpers
 - lib/action_view/helpers/active_record_helper.rb
 - lib/action_view/helpers/asset_tag_helper.rb
+- lib/action_view/helpers/atom_feed_helper.rb
 - lib/action_view/helpers/benchmark_helper.rb
 - lib/action_view/helpers/cache_helper.rb
 - lib/action_view/helpers/capture_helper.rb
 - lib/action_view/helpers/date_helper.rb
 - lib/action_view/helpers/debug_helper.rb
-- lib/action_view/helpers/deprecated_helper.rb
 - lib/action_view/helpers/form_helper.rb
 - lib/action_view/helpers/form_options_helper.rb
 - lib/action_view/helpers/form_tag_helper.rb
-- lib/action_view/helpers/java_script_macros_helper.rb
 - lib/action_view/helpers/javascript_helper.rb
 - lib/action_view/helpers/javascripts
 - lib/action_view/helpers/javascripts/controls.js
@@ -142,8 +134,10 @@ files:
 - lib/action_view/helpers/javascripts/effects.js
 - lib/action_view/helpers/javascripts/prototype.js
 - lib/action_view/helpers/number_helper.rb
-- lib/action_view/helpers/pagination_helper.rb
 - lib/action_view/helpers/prototype_helper.rb
+- lib/action_view/helpers/record_identification_helper.rb
+- lib/action_view/helpers/record_tag_helper.rb
+- lib/action_view/helpers/sanitize_helper.rb
 - lib/action_view/helpers/scriptaculous_helper.rb
 - lib/action_view/helpers/tag_helper.rb
 - lib/action_view/helpers/text_helper.rb
@@ -151,12 +145,13 @@ files:
 - lib/action_view/partials.rb
 - lib/action_view/template_error.rb
 - lib/action_view.rb
+- lib/actionpack.rb
 - test/abstract_unit.rb
+- test/action_view_test.rb
 - test/active_record_unit.rb
 - test/activerecord
-- test/activerecord/active_record_assertions_test.rb
 - test/activerecord/active_record_store_test.rb
-- test/activerecord/pagination_test.rb
+- test/activerecord/render_partial_with_record_identification_test.rb
 - test/controller
 - test/controller/action_pack_assertions_test.rb
 - test/controller/addresses_render_test.rb
@@ -181,37 +176,53 @@ files:
 - test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb
 - test/controller/cookie_test.rb
 - test/controller/custom_handler_test.rb
-- test/controller/deprecated_instance_variables_test.rb
 - test/controller/deprecation
 - test/controller/deprecation/deprecated_base_methods_test.rb
+- test/controller/dispatcher_test.rb
 - test/controller/fake_controllers.rb
+- test/controller/fake_models.rb
 - test/controller/filter_params_test.rb
 - test/controller/filters_test.rb
 - test/controller/flash_test.rb
 - test/controller/fragment_store_setting_test.rb
 - test/controller/helper_test.rb
+- test/controller/html-scanner
+- test/controller/html-scanner/document_test.rb
+- test/controller/html-scanner/node_test.rb
+- test/controller/html-scanner/sanitizer_test.rb
+- test/controller/html-scanner/tag_node_test.rb
+- test/controller/html-scanner/text_node_test.rb
+- test/controller/html-scanner/tokenizer_test.rb
+- test/controller/http_authentication_test.rb
 - test/controller/integration_test.rb
 - test/controller/layout_test.rb
 - test/controller/mime_responds_test.rb
 - test/controller/mime_type_test.rb
 - test/controller/new_render_test.rb
-- test/controller/raw_post_test.rb
+- test/controller/polymorphic_routes_test.rb
+- test/controller/record_identifier_test.rb
 - test/controller/redirect_test.rb
 - test/controller/render_test.rb
+- test/controller/request_forgery_protection_test.rb
 - test/controller/request_test.rb
+- test/controller/rescue_test.rb
 - test/controller/resources_test.rb
 - test/controller/routing_test.rb
 - test/controller/selector_test.rb
 - test/controller/send_file_test.rb
+- test/controller/session
+- test/controller/session/cookie_store_test.rb
+- test/controller/session/mem_cache_store_test.rb
 - test/controller/session_fixation_test.rb
 - test/controller/session_management_test.rb
 - test/controller/test_test.rb
 - test/controller/url_rewriter_test.rb
 - test/controller/verification_test.rb
+- test/controller/view_paths_test.rb
 - test/controller/webservice_test.rb
 - test/fixtures
 - test/fixtures/addresses
-- test/fixtures/addresses/list.rhtml
+- test/fixtures/addresses/list.erb
 - test/fixtures/companies.yml
 - test/fixtures/company.rb
 - test/fixtures/content_type
@@ -221,143 +232,160 @@ files:
 - test/fixtures/content_type/render_default_for_rxml.rxml
 - test/fixtures/db_definitions
 - test/fixtures/db_definitions/sqlite.sql
-- test/fixtures/deprecated_instance_variables
-- test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
-- test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_flash_method.rhtml
-- test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_headers_method.rhtml
-- test/fixtures/deprecated_instance_variables/_params_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_params_method.rhtml
-- test/fixtures/deprecated_instance_variables/_request_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_request_method.rhtml
-- test/fixtures/deprecated_instance_variables/_response_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_response_method.rhtml
-- test/fixtures/deprecated_instance_variables/_session_ivar.rhtml
-- test/fixtures/deprecated_instance_variables/_session_method.rhtml
 - test/fixtures/developer.rb
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
 - test/fixtures/fun
 - test/fixtures/fun/games
-- test/fixtures/fun/games/hello_world.rhtml
+- test/fixtures/fun/games/hello_world.erb
 - test/fixtures/helpers
 - test/fixtures/helpers/abc_helper.rb
 - test/fixtures/helpers/fun
 - test/fixtures/helpers/fun/games_helper.rb
 - test/fixtures/helpers/fun/pdf_helper.rb
 - test/fixtures/layout_tests
+- test/fixtures/layout_tests/alt
+- test/fixtures/layout_tests/alt/hello.rhtml
 - test/fixtures/layout_tests/layouts
 - test/fixtures/layout_tests/layouts/controller_name_space
 - test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml
 - test/fixtures/layout_tests/layouts/item.rhtml
 - test/fixtures/layout_tests/layouts/layout_test.rhtml
+- test/fixtures/layout_tests/layouts/multiple_extensions.html.erb
 - test/fixtures/layout_tests/layouts/third_party_template_library.mab
 - test/fixtures/layout_tests/views
 - test/fixtures/layout_tests/views/hello.rhtml
 - test/fixtures/layouts
-- test/fixtures/layouts/builder.rxml
-- test/fixtures/layouts/standard.rhtml
-- test/fixtures/layouts/talk_from_action.rhtml
-- test/fixtures/layouts/yield.rhtml
+- test/fixtures/layouts/builder.builder
+- test/fixtures/layouts/standard.erb
+- test/fixtures/layouts/talk_from_action.erb
+- test/fixtures/layouts/yield.erb
 - test/fixtures/multipart
 - test/fixtures/multipart/binary_file
+- test/fixtures/multipart/bracketed_param
 - test/fixtures/multipart/large_text_file
 - test/fixtures/multipart/mixed_files
 - test/fixtures/multipart/mona_lisa.jpg
 - test/fixtures/multipart/single_parameter
 - test/fixtures/multipart/text_file
+- test/fixtures/override
+- test/fixtures/override/test
+- test/fixtures/override/test/hello_world.erb
+- test/fixtures/override2
+- test/fixtures/override2/layouts
+- test/fixtures/override2/layouts/test
+- test/fixtures/override2/layouts/test/sub.erb
+- test/fixtures/post_test
+- test/fixtures/post_test/layouts
+- test/fixtures/post_test/layouts/post.html.erb
+- test/fixtures/post_test/layouts/super_post.iphone.erb
+- test/fixtures/post_test/post
+- test/fixtures/post_test/post/index.html.erb
+- test/fixtures/post_test/post/index.iphone.erb
+- test/fixtures/post_test/super_post
+- test/fixtures/post_test/super_post/index.html.erb
+- test/fixtures/post_test/super_post/index.iphone.erb
 - test/fixtures/project.rb
 - test/fixtures/projects.yml
 - test/fixtures/public
+- test/fixtures/public/404.html
+- test/fixtures/public/500.html
 - test/fixtures/public/images
 - test/fixtures/public/images/rails.png
 - test/fixtures/public/javascripts
 - test/fixtures/public/javascripts/application.js
+- test/fixtures/public/javascripts/bank.js
+- test/fixtures/public/javascripts/cache
+- test/fixtures/public/javascripts/robber.js
+- test/fixtures/public/stylesheets
+- test/fixtures/public/stylesheets/bank.css
+- test/fixtures/public/stylesheets/robber.css
 - test/fixtures/replies.yml
 - test/fixtures/reply.rb
 - test/fixtures/respond_to
-- test/fixtures/respond_to/all_types_with_layout.rhtml
-- test/fixtures/respond_to/all_types_with_layout.rjs
+- test/fixtures/respond_to/all_types_with_layout.html.erb
+- test/fixtures/respond_to/all_types_with_layout.js.rjs
+- test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb
+- test/fixtures/respond_to/iphone_with_html_response_type.html.erb
+- test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb
 - test/fixtures/respond_to/layouts
-- test/fixtures/respond_to/layouts/standard.rhtml
-- test/fixtures/respond_to/using_defaults.rhtml
-- test/fixtures/respond_to/using_defaults.rjs
-- test/fixtures/respond_to/using_defaults.rxml
-- test/fixtures/respond_to/using_defaults_with_type_list.rhtml
-- test/fixtures/respond_to/using_defaults_with_type_list.rjs
-- test/fixtures/respond_to/using_defaults_with_type_list.rxml
+- test/fixtures/respond_to/layouts/missing.html.erb
+- test/fixtures/respond_to/layouts/standard.html.erb
+- test/fixtures/respond_to/layouts/standard.iphone.erb
+- test/fixtures/respond_to/using_defaults.html.erb
+- test/fixtures/respond_to/using_defaults.js.rjs
+- test/fixtures/respond_to/using_defaults.xml.builder
+- test/fixtures/respond_to/using_defaults_with_type_list.html.erb
+- test/fixtures/respond_to/using_defaults_with_type_list.js.rjs
+- test/fixtures/respond_to/using_defaults_with_type_list.xml.builder
 - test/fixtures/scope
 - test/fixtures/scope/test
-- test/fixtures/scope/test/modgreet.rhtml
+- test/fixtures/scope/test/modgreet.erb
 - test/fixtures/test
-- test/fixtures/test/_customer.rhtml
-- test/fixtures/test/_customer_greeting.rhtml
-- test/fixtures/test/_hash_object.rhtml
-- test/fixtures/test/_hello.rxml
-- test/fixtures/test/_partial_only.rhtml
-- test/fixtures/test/_person.rhtml
-- test/fixtures/test/action_talk_to_layout.rhtml
-- test/fixtures/test/block_content_for.rhtml
-- test/fixtures/test/capturing.rhtml
-- test/fixtures/test/content_for.rhtml
+- test/fixtures/test/_customer.erb
+- test/fixtures/test/_customer_greeting.erb
+- test/fixtures/test/_hash_greeting.erb
+- test/fixtures/test/_hash_object.erb
+- test/fixtures/test/_hello.builder
+- test/fixtures/test/_layout_for_partial.html.erb
+- test/fixtures/test/_partial.erb
+- test/fixtures/test/_partial.html.erb
+- test/fixtures/test/_partial.js.erb
+- test/fixtures/test/_partial_for_use_in_layout.html.erb
+- test/fixtures/test/_partial_only.erb
+- test/fixtures/test/_person.erb
+- test/fixtures/test/action_talk_to_layout.erb
+- test/fixtures/test/block_content_for.erb
+- test/fixtures/test/calling_partial_with_layout.html.erb
+- test/fixtures/test/capturing.erb
+- test/fixtures/test/content_for.erb
+- test/fixtures/test/content_for_concatenated.erb
+- test/fixtures/test/content_for_with_parameter.erb
 - test/fixtures/test/delete_with_js.rjs
 - test/fixtures/test/dot.directory
-- test/fixtures/test/dot.directory/render_file_with_ivar.rhtml
+- test/fixtures/test/dot.directory/render_file_with_ivar.erb
 - test/fixtures/test/enum_rjs_test.rjs
-- test/fixtures/test/erb_content_for.rhtml
-- test/fixtures/test/greeting.rhtml
-- test/fixtures/test/hello.rxml
-- test/fixtures/test/hello_world.rhtml
-- test/fixtures/test/hello_world.rxml
-- test/fixtures/test/hello_world_container.rxml
-- test/fixtures/test/hello_world_with_layout_false.rhtml
-- test/fixtures/test/hello_xml_world.rxml
-- test/fixtures/test/list.rhtml
-- test/fixtures/test/non_erb_block_content_for.rxml
-- test/fixtures/test/potential_conflicts.rhtml
-- test/fixtures/test/render_file_with_ivar.rhtml
-- test/fixtures/test/render_file_with_locals.rhtml
-- test/fixtures/test/render_to_string_test.rhtml
-- test/fixtures/test/update_element_with_capture.rhtml
+- test/fixtures/test/erb_content_for.erb
+- test/fixtures/test/formatted_html_erb.html.erb
+- test/fixtures/test/formatted_xml_erb.builder
+- test/fixtures/test/formatted_xml_erb.html.erb
+- test/fixtures/test/formatted_xml_erb.xml.erb
+- test/fixtures/test/greeting.erb
+- test/fixtures/test/hello.builder
+- test/fixtures/test/hello_world.builder
+- test/fixtures/test/hello_world.erb
+- test/fixtures/test/hello_world_container.builder
+- test/fixtures/test/hello_world_with_layout_false.erb
+- test/fixtures/test/hello_xml_world.builder
+- test/fixtures/test/list.erb
+- test/fixtures/test/non_erb_block_content_for.builder
+- test/fixtures/test/potential_conflicts.erb
+- test/fixtures/test/render_file_with_ivar.erb
+- test/fixtures/test/render_file_with_locals.erb
+- test/fixtures/test/render_to_string_test.erb
+- test/fixtures/test/update_element_with_capture.erb
+- test/fixtures/test/using_layout_around_block.html.erb
 - test/fixtures/topic.rb
 - test/fixtures/topics.yml
 - test/template
 - test/template/active_record_helper_test.rb
 - test/template/asset_tag_helper_test.rb
+- test/template/atom_feed_helper_test.rb
 - test/template/benchmark_helper_test.rb
 - test/template/compiled_templates_test.rb
 - test/template/date_helper_test.rb
-- test/template/deprecated_helper_test.rb
-- test/template/deprecated_instance_variables_test.rb
 - test/template/form_helper_test.rb
 - test/template/form_options_helper_test.rb
 - test/template/form_tag_helper_test.rb
-- test/template/java_script_macros_helper_test.rb
 - test/template/javascript_helper_test.rb
 - test/template/number_helper_test.rb
 - test/template/prototype_helper_test.rb
+- test/template/sanitize_helper_test.rb
 - test/template/scriptaculous_helper_test.rb
 - test/template/tag_helper_test.rb
 - test/template/text_helper_test.rb
 - test/template/url_helper_test.rb
 - test/testing_sandbox.rb
-- examples/address_book
-- examples/address_book/index.rhtml
-- examples/address_book/layout.rhtml
-- examples/address_book_controller.cgi
-- examples/address_book_controller.fcgi
-- examples/address_book_controller.rb
-- examples/address_book_controller.rbx
-- examples/benchmark.rb
-- examples/benchmark_with_ar.fcgi
-- examples/blog_controller.cgi
-- examples/debate
-- examples/debate/index.rhtml
-- examples/debate/new_topic.rhtml
-- examples/debate/topic.rhtml
-- examples/debate_controller.cgi
 test_files: []
 rdoc_options: []
@@ -378,5 +406,5 @@ dependencies:
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.0.0
     version: