RubyGems - actionpack - Versions diffs - 2.3.18 → 3.0.0.beta - Mend

actionpack 2.3.18 → 3.0.0.beta

Potentially problematic release.

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

Files changed (513) hide show

data/CHANGELOG +15 -64
data/README +39 -48
data/lib/abstract_controller.rb +22 -0
data/lib/abstract_controller/base.rb +191 -0
data/lib/abstract_controller/callbacks.rb +113 -0
data/lib/abstract_controller/collector.rb +30 -0
data/lib/abstract_controller/compatibility.rb +18 -0
data/lib/abstract_controller/helpers.rb +163 -0
data/lib/abstract_controller/layouts.rb +413 -0
data/lib/abstract_controller/localized_cache.rb +49 -0
data/lib/abstract_controller/logger.rb +13 -0
data/lib/abstract_controller/rendering.rb +238 -0
data/lib/{action_controller → abstract_controller}/translation.rb +1 -1
data/lib/action_controller.rb +68 -102
data/lib/action_controller/base.rb +77 -1409
data/lib/action_controller/caching.rb +58 -45
data/lib/action_controller/caching/actions.rb +100 -114
data/lib/action_controller/caching/fragments.rb +17 -19
data/lib/action_controller/caching/pages.rb +12 -6
data/lib/action_controller/caching/sweeping.rb +42 -0
data/lib/action_controller/deprecated.rb +5 -0
data/lib/action_controller/deprecated/dispatcher.rb +28 -0
data/lib/action_controller/deprecated/integration_test.rb +2 -0
data/lib/action_controller/deprecated/performance_test.rb +1 -0
data/lib/action_controller/metal.rb +125 -0
data/lib/action_controller/metal/compatibility.rb +141 -0
data/lib/action_controller/metal/conditional_get.rb +86 -0
data/lib/action_controller/metal/configuration.rb +28 -0
data/lib/action_controller/metal/cookies.rb +17 -0
data/lib/action_controller/metal/exceptions.rb +46 -0
data/lib/action_controller/metal/flash.rb +28 -0
data/lib/action_controller/metal/head.rb +33 -0
data/lib/action_controller/metal/helpers.rb +116 -0
data/lib/action_controller/metal/hide_actions.rb +50 -0
data/lib/action_controller/{http_authentication.rb → metal/http_authentication.rb} +18 -15
data/lib/action_controller/metal/instrumentation.rb +99 -0
data/lib/action_controller/metal/mime_responds.rb +300 -0
data/lib/action_controller/metal/rack_delegation.rb +35 -0
data/lib/action_controller/metal/redirecting.rb +90 -0
data/lib/action_controller/metal/renderers.rb +95 -0
data/lib/action_controller/metal/rendering.rb +69 -0
data/lib/action_controller/metal/request_forgery_protection.rb +115 -0
data/lib/action_controller/metal/rescue.rb +13 -0
data/lib/action_controller/metal/responder.rb +220 -0
data/lib/action_controller/{session_management.rb → metal/session_management.rb} +5 -14
data/lib/action_controller/{streaming.rb → metal/streaming.rb} +13 -12
data/lib/action_controller/metal/testing.rb +42 -0
data/lib/action_controller/metal/url_for.rb +157 -0
data/lib/action_controller/{verification.rb → metal/verification.rb} +41 -41
data/lib/action_controller/middleware.rb +38 -0
data/lib/action_controller/polymorphic_routes.rb +20 -26
data/lib/action_controller/railtie.rb +30 -0
data/lib/action_controller/railties/subscriber.rb +63 -0
data/lib/action_controller/record_identifier.rb +3 -16
data/lib/action_controller/test_case.rb +156 -18
data/lib/action_controller/url_rewriter.rb +47 -200
data/lib/action_controller/vendor/html-scanner.rb +16 -12
data/lib/action_controller/vendor/html-scanner/html/node.rb +1 -1
data/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +12 -9
data/lib/action_dispatch.rb +88 -0
data/lib/action_dispatch/http/cache.rb +123 -0
data/lib/action_dispatch/http/filter_parameters.rb +98 -0
data/lib/{action_controller → action_dispatch/http}/headers.rb +8 -8
data/lib/action_dispatch/http/mime_negotiation.rb +101 -0
data/lib/{action_controller → action_dispatch/http}/mime_type.rb +30 -11
data/lib/{action_controller → action_dispatch/http}/mime_types.rb +5 -3
data/lib/action_dispatch/http/parameters.rb +49 -0
data/lib/action_dispatch/http/request.rb +223 -0
data/lib/action_dispatch/http/response.rb +209 -0
data/lib/action_dispatch/http/upload.rb +48 -0
data/lib/action_dispatch/http/url.rb +129 -0
data/lib/action_dispatch/middleware/callbacks.rb +50 -0
data/lib/action_dispatch/middleware/cascade.rb +29 -0
data/lib/action_dispatch/middleware/cookies.rb +216 -0
data/lib/{action_controller → action_dispatch/middleware}/flash.rb +51 -90
data/lib/action_dispatch/middleware/head.rb +18 -0
data/lib/action_dispatch/middleware/params_parser.rb +78 -0
data/lib/action_dispatch/middleware/rescue.rb +26 -0
data/lib/action_dispatch/middleware/session/abstract_store.rb +209 -0
data/lib/{action_controller → action_dispatch/middleware}/session/cookie_store.rb +56 -60
data/lib/action_dispatch/middleware/session/mem_cache_store.rb +47 -0
data/lib/action_dispatch/middleware/show_exceptions.rb +173 -0
data/lib/{action_controller/middleware_stack.rb → action_dispatch/middleware/stack.rb} +23 -13
data/lib/action_dispatch/middleware/static.rb +44 -0
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/_request_and_response.erb +10 -3
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/_trace.erb +4 -4
data/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb +10 -0
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/layout.erb +2 -2
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/missing_template.erb +0 -0
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/routing_error.erb +0 -0
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/template_error.erb +3 -3
data/lib/{action_controller → action_dispatch/middleware}/templates/rescues/unknown_action.erb +0 -0
data/lib/action_dispatch/railtie.rb +15 -0
data/lib/action_dispatch/routing.rb +217 -0
data/lib/action_dispatch/routing/deprecated_mapper.rb +877 -0
data/lib/action_dispatch/routing/mapper.rb +649 -0
data/lib/action_dispatch/routing/route.rb +55 -0
data/lib/action_dispatch/routing/route_set.rb +445 -0
data/lib/action_dispatch/testing/assertions.rb +21 -0
data/lib/action_dispatch/testing/assertions/dom.rb +37 -0
data/lib/{action_controller/assertions/model_assertions.rb → action_dispatch/testing/assertions/model.rb} +2 -4
data/lib/action_dispatch/testing/assertions/response.rb +154 -0
data/lib/{action_controller/assertions/routing_assertions.rb → action_dispatch/testing/assertions/routing.rb} +72 -34
data/lib/{action_controller/assertions/selector_assertions.rb → action_dispatch/testing/assertions/selector.rb} +14 -11
data/lib/{action_controller/assertions/tag_assertions.rb → action_dispatch/testing/assertions/tag.rb} +25 -14
data/lib/{action_controller → action_dispatch/testing}/integration.rb +173 -406
data/lib/action_dispatch/testing/performance_test.rb +17 -0
data/lib/action_dispatch/testing/test_process.rb +42 -0
data/lib/action_dispatch/testing/test_request.rb +83 -0
data/lib/action_dispatch/testing/test_response.rb +136 -0
data/lib/action_pack/version.rb +3 -3
data/lib/action_view.rb +29 -26
data/lib/action_view/base.rb +101 -148
data/lib/action_view/context.rb +44 -0
data/lib/action_view/helpers.rb +6 -4
data/lib/action_view/helpers/{active_record_helper.rb → active_model_helper.rb} +63 -63
data/lib/action_view/helpers/asset_tag_helper.rb +166 -31
data/lib/action_view/helpers/cache_helper.rb +1 -1
data/lib/action_view/helpers/capture_helper.rb +40 -8
data/lib/action_view/helpers/csrf_helper.rb +2 -4
data/lib/action_view/helpers/date_helper.rb +14 -15
data/lib/action_view/helpers/form_helper.rb +121 -24
data/lib/action_view/helpers/form_options_helper.rb +26 -25
data/lib/action_view/helpers/form_tag_helper.rb +42 -33
data/lib/action_view/helpers/javascript_helper.rb +1 -109
data/lib/action_view/helpers/number_helper.rb +4 -1
data/lib/action_view/helpers/prototype_helper.rb +75 -499
data/lib/action_view/helpers/raw_output_helper.rb +1 -1
data/lib/action_view/helpers/record_tag_helper.rb +3 -3
data/lib/action_view/helpers/sanitize_helper.rb +3 -2
data/lib/action_view/helpers/scriptaculous_helper.rb +89 -53
data/lib/action_view/helpers/tag_helper.rb +12 -13
data/lib/action_view/helpers/text_helper.rb +33 -38
data/lib/action_view/helpers/translation_helper.rb +11 -35
data/lib/action_view/helpers/url_helper.rb +140 -134
data/lib/action_view/locale/en.yml +34 -28
data/lib/action_view/paths.rb +27 -24
data/lib/action_view/railtie.rb +17 -0
data/lib/action_view/railties/subscriber.rb +24 -0
data/lib/action_view/{partials.rb → render/partials.rb} +161 -51
data/lib/action_view/render/rendering.rb +117 -0
data/lib/action_view/template.rb +88 -217
data/lib/action_view/template/error.rb +105 -0
data/lib/action_view/template/handler.rb +41 -0
data/lib/action_view/template/handlers.rb +54 -0
data/lib/action_view/{template_handlers → template/handlers}/builder.rb +6 -6
data/lib/action_view/template/handlers/erb.rb +58 -0
data/lib/action_view/{template_handlers → template/handlers}/rjs.rb +8 -3
data/lib/action_view/template/resolver.rb +164 -0
data/lib/action_view/template/text.rb +40 -0
data/lib/action_view/test_case.rb +18 -18
metadata +165 -420
data/RUNNING_UNIT_TESTS +0 -24
data/Rakefile +0 -158
data/install.rb +0 -30
data/lib/action_controller/assertions/dom_assertions.rb +0 -55
data/lib/action_controller/assertions/response_assertions.rb +0 -169
data/lib/action_controller/benchmarking.rb +0 -107
data/lib/action_controller/caching/sweeper.rb +0 -45
data/lib/action_controller/cgi_ext.rb +0 -15
data/lib/action_controller/cgi_ext/cookie.rb +0 -112
data/lib/action_controller/cgi_ext/query_extension.rb +0 -22
data/lib/action_controller/cgi_ext/stdinput.rb +0 -24
data/lib/action_controller/cgi_process.rb +0 -77
data/lib/action_controller/cookies.rb +0 -197
data/lib/action_controller/dispatcher.rb +0 -133
data/lib/action_controller/failsafe.rb +0 -87
data/lib/action_controller/filters.rb +0 -680
data/lib/action_controller/helpers.rb +0 -225
data/lib/action_controller/layout.rb +0 -286
data/lib/action_controller/middlewares.rb +0 -14
data/lib/action_controller/mime_responds.rb +0 -193
data/lib/action_controller/params_parser.rb +0 -77
data/lib/action_controller/performance_test.rb +0 -15
data/lib/action_controller/rack_lint_patch.rb +0 -36
data/lib/action_controller/reloader.rb +0 -54
data/lib/action_controller/request.rb +0 -518
data/lib/action_controller/request_forgery_protection.rb +0 -116
data/lib/action_controller/rescue.rb +0 -183
data/lib/action_controller/resources.rb +0 -682
data/lib/action_controller/response.rb +0 -237
data/lib/action_controller/routing.rb +0 -388
data/lib/action_controller/routing/builder.rb +0 -197
data/lib/action_controller/routing/optimisations.rb +0 -130
data/lib/action_controller/routing/recognition_optimisation.rb +0 -167
data/lib/action_controller/routing/route.rb +0 -265
data/lib/action_controller/routing/route_set.rb +0 -503
data/lib/action_controller/routing/routing_ext.rb +0 -49
data/lib/action_controller/routing/segments.rb +0 -343
data/lib/action_controller/session/abstract_store.rb +0 -276
data/lib/action_controller/session/mem_cache_store.rb +0 -60
data/lib/action_controller/status_codes.rb +0 -88
data/lib/action_controller/string_coercion.rb +0 -29
data/lib/action_controller/templates/rescues/diagnostics.erb +0 -11
data/lib/action_controller/test_process.rb +0 -580
data/lib/action_controller/uploaded_file.rb +0 -44
data/lib/action_view/helpers/benchmark_helper.rb +0 -54
data/lib/action_view/inline_template.rb +0 -19
data/lib/action_view/reloadable_template.rb +0 -117
data/lib/action_view/renderable.rb +0 -109
data/lib/action_view/renderable_partial.rb +0 -53
data/lib/action_view/template_error.rb +0 -99
data/lib/action_view/template_handler.rb +0 -34
data/lib/action_view/template_handlers.rb +0 -48
data/lib/action_view/template_handlers/erb.rb +0 -25
data/lib/actionpack.rb +0 -2
data/test/abstract_unit.rb +0 -78
data/test/active_record_unit.rb +0 -104
data/test/activerecord/active_record_store_test.rb +0 -221
data/test/activerecord/render_partial_with_record_identification_test.rb +0 -188
data/test/adv_attr_test.rb +0 -20
data/test/controller/action_pack_assertions_test.rb +0 -545
data/test/controller/addresses_render_test.rb +0 -37
data/test/controller/assert_select_test.rb +0 -735
data/test/controller/base_test.rb +0 -217
data/test/controller/benchmark_test.rb +0 -32
data/test/controller/caching_test.rb +0 -743
data/test/controller/capture_test.rb +0 -66
data/test/controller/content_type_test.rb +0 -178
data/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb +0 -0
data/test/controller/controller_fixtures/app/controllers/user_controller.rb +0 -0
data/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb +0 -0
data/test/controller/cookie_test.rb +0 -208
data/test/controller/deprecation/deprecated_base_methods_test.rb +0 -32
data/test/controller/dispatcher_test.rb +0 -144
data/test/controller/dom_assertions_test.rb +0 -53
data/test/controller/failsafe_test.rb +0 -60
data/test/controller/fake_controllers.rb +0 -33
data/test/controller/fake_models.rb +0 -19
data/test/controller/filter_params_test.rb +0 -52
data/test/controller/filters_test.rb +0 -885
data/test/controller/flash_test.rb +0 -174
data/test/controller/header_test.rb +0 -14
data/test/controller/helper_test.rb +0 -224
data/test/controller/html-scanner/cdata_node_test.rb +0 -15
data/test/controller/html-scanner/document_test.rb +0 -148
data/test/controller/html-scanner/node_test.rb +0 -89
data/test/controller/html-scanner/sanitizer_test.rb +0 -300
data/test/controller/html-scanner/tag_node_test.rb +0 -238
data/test/controller/html-scanner/text_node_test.rb +0 -50
data/test/controller/html-scanner/tokenizer_test.rb +0 -131
data/test/controller/http_basic_authentication_test.rb +0 -113
data/test/controller/http_digest_authentication_test.rb +0 -254
data/test/controller/integration_test.rb +0 -526
data/test/controller/layout_test.rb +0 -215
data/test/controller/localized_templates_test.rb +0 -24
data/test/controller/logging_test.rb +0 -46
data/test/controller/middleware_stack_test.rb +0 -90
data/test/controller/mime_responds_test.rb +0 -536
data/test/controller/mime_type_test.rb +0 -93
data/test/controller/output_escaping_test.rb +0 -19
data/test/controller/polymorphic_routes_test.rb +0 -297
data/test/controller/rack_test.rb +0 -308
data/test/controller/record_identifier_test.rb +0 -139
data/test/controller/redirect_test.rb +0 -285
data/test/controller/reloader_test.rb +0 -125
data/test/controller/render_test.rb +0 -1783
data/test/controller/request/json_params_parsing_test.rb +0 -65
data/test/controller/request/multipart_params_parsing_test.rb +0 -177
data/test/controller/request/query_string_parsing_test.rb +0 -129
data/test/controller/request/test_request_test.rb +0 -35
data/test/controller/request/url_encoded_params_parsing_test.rb +0 -146
data/test/controller/request/xml_params_parsing_test.rb +0 -103
data/test/controller/request_forgery_protection_test.rb +0 -233
data/test/controller/request_test.rb +0 -398
data/test/controller/rescue_test.rb +0 -541
data/test/controller/resources_test.rb +0 -1393
data/test/controller/routing_test.rb +0 -2592
data/test/controller/selector_test.rb +0 -628
data/test/controller/send_file_test.rb +0 -171
data/test/controller/session/abstract_store_test.rb +0 -64
data/test/controller/session/cookie_store_test.rb +0 -354
data/test/controller/session/mem_cache_store_test.rb +0 -187
data/test/controller/session/test_session_test.rb +0 -58
data/test/controller/test_test.rb +0 -700
data/test/controller/translation_test.rb +0 -26
data/test/controller/url_rewriter_test.rb +0 -395
data/test/controller/verification_test.rb +0 -270
data/test/controller/view_paths_test.rb +0 -141
data/test/controller/webservice_test.rb +0 -273
data/test/fixtures/_top_level_partial.html.erb +0 -1
data/test/fixtures/_top_level_partial_only.erb +0 -1
data/test/fixtures/addresses/list.erb +0 -1
data/test/fixtures/alternate_helpers/foo_helper.rb +0 -3
data/test/fixtures/bad_customers/_bad_customer.html.erb +0 -1
data/test/fixtures/companies.yml +0 -24
data/test/fixtures/company.rb +0 -10
data/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml +0 -1
data/test/fixtures/content_type/render_default_for_rhtml.rhtml +0 -1
data/test/fixtures/content_type/render_default_for_rjs.rjs +0 -1
data/test/fixtures/content_type/render_default_for_rxml.rxml +0 -1
data/test/fixtures/customers/_customer.html.erb +0 -1
data/test/fixtures/db_definitions/sqlite.sql +0 -49
data/test/fixtures/developer.rb +0 -9
data/test/fixtures/developers.yml +0 -21
data/test/fixtures/developers/_developer.erb +0 -1
data/test/fixtures/developers_projects.yml +0 -13
data/test/fixtures/failsafe/500.html +0 -1
data/test/fixtures/fun/games/_game.erb +0 -1
data/test/fixtures/fun/games/hello_world.erb +0 -1
data/test/fixtures/fun/serious/games/_game.erb +0 -1
data/test/fixtures/functional_caching/_partial.erb +0 -3
data/test/fixtures/functional_caching/formatted_fragment_cached.html.erb +0 -3
data/test/fixtures/functional_caching/formatted_fragment_cached.js.rjs +0 -6
data/test/fixtures/functional_caching/formatted_fragment_cached.xml.builder +0 -5
data/test/fixtures/functional_caching/fragment_cached.html.erb +0 -2
data/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb +0 -1
data/test/fixtures/functional_caching/inline_fragment_cached.html.erb +0 -2
data/test/fixtures/functional_caching/js_fragment_cached_with_partial.js.rjs +0 -1
data/test/fixtures/good_customers/_good_customer.html.erb +0 -1
data/test/fixtures/helpers/abc_helper.rb +0 -5
data/test/fixtures/helpers/fun/games_helper.rb +0 -3
data/test/fixtures/helpers/fun/pdf_helper.rb +0 -3
data/test/fixtures/layout_tests/abs_path_layout.rhtml +0 -1
data/test/fixtures/layout_tests/alt/hello.rhtml +0 -1
data/test/fixtures/layout_tests/alt/layouts/alt.rhtml +0 -0
data/test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml +0 -1
data/test/fixtures/layout_tests/layouts/item.rhtml +0 -1
data/test/fixtures/layout_tests/layouts/layout_test.rhtml +0 -1
data/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb +0 -1
data/test/fixtures/layout_tests/layouts/third_party_template_library.mab +0 -1
data/test/fixtures/layout_tests/views/hello.rhtml +0 -1
data/test/fixtures/layouts/_column.html.erb +0 -2
data/test/fixtures/layouts/block_with_layout.erb +0 -3
data/test/fixtures/layouts/builder.builder +0 -3
data/test/fixtures/layouts/default_html.html.erb +0 -1
data/test/fixtures/layouts/partial_with_layout.erb +0 -3
data/test/fixtures/layouts/standard.erb +0 -1
data/test/fixtures/layouts/talk_from_action.erb +0 -2
data/test/fixtures/layouts/xhr.html.erb +0 -2
data/test/fixtures/layouts/yield.erb +0 -2
data/test/fixtures/localized/hello_world.de.html +0 -1
data/test/fixtures/localized/hello_world.en.html +0 -1
data/test/fixtures/mascot.rb +0 -3
data/test/fixtures/mascots.yml +0 -4
data/test/fixtures/mascots/_mascot.html.erb +0 -1
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/multipart/boundary_problem_file +0 -10
data/test/fixtures/multipart/bracketed_param +0 -5
data/test/fixtures/multipart/empty +0 -10
data/test/fixtures/multipart/hello.txt +0 -1
data/test/fixtures/multipart/large_text_file +0 -10
data/test/fixtures/multipart/mixed_files +0 -0
data/test/fixtures/multipart/mona_lisa.jpg +0 -0
data/test/fixtures/multipart/none +0 -9
data/test/fixtures/multipart/single_parameter +0 -5
data/test/fixtures/multipart/text_file +0 -10
data/test/fixtures/override/test/hello_world.erb +0 -1
data/test/fixtures/override2/layouts/test/sub.erb +0 -1
data/test/fixtures/post_test/layouts/post.html.erb +0 -1
data/test/fixtures/post_test/layouts/super_post.iphone.erb +0 -1
data/test/fixtures/post_test/post/index.html.erb +0 -1
data/test/fixtures/post_test/post/index.iphone.erb +0 -1
data/test/fixtures/post_test/super_post/index.html.erb +0 -1
data/test/fixtures/post_test/super_post/index.iphone.erb +0 -1
data/test/fixtures/project.rb +0 -3
data/test/fixtures/projects.yml +0 -7
data/test/fixtures/projects/_project.erb +0 -1
data/test/fixtures/public/404.html +0 -1
data/test/fixtures/public/500.da.html +0 -1
data/test/fixtures/public/500.html +0 -1
data/test/fixtures/public/absolute/test.css +0 -23
data/test/fixtures/public/absolute/test.js +0 -63
data/test/fixtures/public/images/rails.png +0 -0
data/test/fixtures/public/javascripts/application.js +0 -1
data/test/fixtures/public/javascripts/bank.js +0 -1
data/test/fixtures/public/javascripts/controls.js +0 -1
data/test/fixtures/public/javascripts/dragdrop.js +0 -1
data/test/fixtures/public/javascripts/effects.js +0 -1
data/test/fixtures/public/javascripts/prototype.js +0 -1
data/test/fixtures/public/javascripts/robber.js +0 -1
data/test/fixtures/public/javascripts/subdir/subdir.js +0 -1
data/test/fixtures/public/javascripts/version.1.0.js +0 -1
data/test/fixtures/public/stylesheets/bank.css +0 -1
data/test/fixtures/public/stylesheets/robber.css +0 -1
data/test/fixtures/public/stylesheets/subdir/subdir.css +0 -1
data/test/fixtures/public/stylesheets/version.1.0.css +0 -1
data/test/fixtures/quiz/questions/_question.html.erb +0 -1
data/test/fixtures/replies.yml +0 -15
data/test/fixtures/replies/_reply.erb +0 -1
data/test/fixtures/reply.rb +0 -7
data/test/fixtures/respond_to/all_types_with_layout.html.erb +0 -1
data/test/fixtures/respond_to/all_types_with_layout.js.rjs +0 -1
data/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb +0 -1
data/test/fixtures/respond_to/iphone_with_html_response_type.html.erb +0 -1
data/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb +0 -1
data/test/fixtures/respond_to/layouts/missing.html.erb +0 -1
data/test/fixtures/respond_to/layouts/standard.html.erb +0 -1
data/test/fixtures/respond_to/layouts/standard.iphone.erb +0 -1
data/test/fixtures/respond_to/using_defaults.html.erb +0 -1
data/test/fixtures/respond_to/using_defaults.js.rjs +0 -1
data/test/fixtures/respond_to/using_defaults.xml.builder +0 -1
data/test/fixtures/respond_to/using_defaults_with_type_list.html.erb +0 -1
data/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs +0 -1
data/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder +0 -1
data/test/fixtures/scope/test/modgreet.erb +0 -1
data/test/fixtures/session_autoload_test/session_autoload_test/foo.rb +0 -10
data/test/fixtures/shared.html.erb +0 -1
data/test/fixtures/symlink_parent/symlinked_layout.erb +0 -5
data/test/fixtures/test/_counter.html.erb +0 -1
data/test/fixtures/test/_customer.erb +0 -1
data/test/fixtures/test/_customer_counter.erb +0 -1
data/test/fixtures/test/_customer_counter_with_as.erb +0 -1
data/test/fixtures/test/_customer_greeting.erb +0 -1
data/test/fixtures/test/_customer_with_var.erb +0 -1
data/test/fixtures/test/_form.erb +0 -1
data/test/fixtures/test/_from_helper.erb +0 -1
data/test/fixtures/test/_hash_greeting.erb +0 -1
data/test/fixtures/test/_hash_object.erb +0 -2
data/test/fixtures/test/_hello.builder +0 -1
data/test/fixtures/test/_labelling_form.erb +0 -1
data/test/fixtures/test/_layout_for_block_with_args.html.erb +0 -3
data/test/fixtures/test/_layout_for_partial.html.erb +0 -3
data/test/fixtures/test/_local_inspector.html.erb +0 -1
data/test/fixtures/test/_one.html.erb +0 -1
data/test/fixtures/test/_partial.erb +0 -1
data/test/fixtures/test/_partial.html.erb +0 -1
data/test/fixtures/test/_partial.js.erb +0 -1
data/test/fixtures/test/_partial_for_use_in_layout.html.erb +0 -1
data/test/fixtures/test/_partial_only.erb +0 -1
data/test/fixtures/test/_partial_with_only_html_version.html.erb +0 -1
data/test/fixtures/test/_person.erb +0 -2
data/test/fixtures/test/_raise.html.erb +0 -1
data/test/fixtures/test/_two.html.erb +0 -1
data/test/fixtures/test/_utf8_partial.html.erb +0 -1
data/test/fixtures/test/_utf8_partial_magic.html.erb +0 -2
data/test/fixtures/test/action_talk_to_layout.erb +0 -2
data/test/fixtures/test/array_translation.erb +0 -1
data/test/fixtures/test/calling_partial_with_layout.html.erb +0 -1
data/test/fixtures/test/capturing.erb +0 -4
data/test/fixtures/test/content_for.erb +0 -2
data/test/fixtures/test/content_for_concatenated.erb +0 -3
data/test/fixtures/test/content_for_with_parameter.erb +0 -2
data/test/fixtures/test/delete_with_js.rjs +0 -2
data/test/fixtures/test/dont_pick_me +0 -1
data/test/fixtures/test/dot.directory/render_file_with_ivar.erb +0 -1
data/test/fixtures/test/enum_rjs_test.rjs +0 -6
data/test/fixtures/test/formatted_html_erb.html.erb +0 -1
data/test/fixtures/test/formatted_xml_erb.builder +0 -1
data/test/fixtures/test/formatted_xml_erb.html.erb +0 -1
data/test/fixtures/test/formatted_xml_erb.xml.erb +0 -1
data/test/fixtures/test/greeting.erb +0 -1
data/test/fixtures/test/greeting.js.rjs +0 -1
data/test/fixtures/test/hello.builder +0 -4
data/test/fixtures/test/hello_world.da.html.erb +0 -1
data/test/fixtures/test/hello_world.erb +0 -1
data/test/fixtures/test/hello_world.erb~ +0 -1
data/test/fixtures/test/hello_world.pt-BR.html.erb +0 -1
data/test/fixtures/test/hello_world_container.builder +0 -3
data/test/fixtures/test/hello_world_from_rxml.builder +0 -4
data/test/fixtures/test/hello_world_with_layout_false.erb +0 -1
data/test/fixtures/test/hello_xml_world.builder +0 -11
data/test/fixtures/test/hyphen-ated.erb +0 -1
data/test/fixtures/test/implicit_content_type.atom.builder +0 -2
data/test/fixtures/test/list.erb +0 -1
data/test/fixtures/test/malformed/malformed.en.html.erb~ +0 -1
data/test/fixtures/test/malformed/malformed.erb~ +0 -1
data/test/fixtures/test/malformed/malformed.html.erb~ +0 -1
data/test/fixtures/test/nested_layout.erb +0 -3
data/test/fixtures/test/non_erb_block_content_for.builder +0 -4
data/test/fixtures/test/potential_conflicts.erb +0 -4
data/test/fixtures/test/render_explicit_html_template.js.rjs +0 -1
data/test/fixtures/test/render_file_from_template.html.erb +0 -1
data/test/fixtures/test/render_file_with_ivar.erb +0 -1
data/test/fixtures/test/render_file_with_locals.erb +0 -1
data/test/fixtures/test/render_implicit_html_template.js.rjs +0 -1
data/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb +0 -1
data/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb +0 -1
data/test/fixtures/test/render_implicit_js_template_without_layout.js.erb +0 -1
data/test/fixtures/test/render_to_string_test.erb +0 -1
data/test/fixtures/test/scoped_array_translation.erb +0 -1
data/test/fixtures/test/sub_template_raise.html.erb +0 -1
data/test/fixtures/test/template.erb +0 -1
data/test/fixtures/test/translation.erb +0 -1
data/test/fixtures/test/update_element_with_capture.erb +0 -9
data/test/fixtures/test/using_layout_around_block.html.erb +0 -1
data/test/fixtures/test/using_layout_around_block_with_args.html.erb +0 -1
data/test/fixtures/test/utf8.html.erb +0 -4
data/test/fixtures/test/utf8_magic.html.erb +0 -5
data/test/fixtures/test/utf8_magic_with_bare_partial.html.erb +0 -5
data/test/fixtures/topic.rb +0 -3
data/test/fixtures/topics.yml +0 -22
data/test/fixtures/topics/_topic.html.erb +0 -1
data/test/template/active_record_helper_i18n_test.rb +0 -51
data/test/template/active_record_helper_test.rb +0 -302
data/test/template/asset_tag_helper_test.rb +0 -770
data/test/template/atom_feed_helper_test.rb +0 -315
data/test/template/benchmark_helper_test.rb +0 -86
data/test/template/compiled_templates_test.rb +0 -204
data/test/template/date_helper_i18n_test.rb +0 -121
data/test/template/date_helper_test.rb +0 -2603
data/test/template/erb_util_test.rb +0 -36
data/test/template/form_helper_test.rb +0 -1447
data/test/template/form_options_helper_i18n_test.rb +0 -27
data/test/template/form_options_helper_test.rb +0 -811
data/test/template/form_tag_helper_test.rb +0 -356
data/test/template/javascript_helper_test.rb +0 -106
data/test/template/number_helper_i18n_test.rb +0 -69
data/test/template/number_helper_test.rb +0 -132
data/test/template/prototype_helper_test.rb +0 -639
data/test/template/raw_output_helper_test.rb +0 -21
data/test/template/record_tag_helper_test.rb +0 -58
data/test/template/render_test.rb +0 -329
data/test/template/sanitize_helper_test.rb +0 -57
data/test/template/scriptaculous_helper_test.rb +0 -90
data/test/template/tag_helper_test.rb +0 -98
data/test/template/template_test.rb +0 -32
data/test/template/test_test.rb +0 -54
data/test/template/text_helper_test.rb +0 -601
data/test/template/translation_helper_test.rb +0 -95
data/test/template/url_helper_test.rb +0 -641
data/test/testing_sandbox.rb +0 -15
data/test/view/test_case_test.rb +0 -176

data/lib/action_view/render/rendering.rb ADDED

@@ -0,0 +1,117 @@
+require 'active_support/core_ext/object/try'
+module ActionView
+  module Rendering
+    # Returns the result of a render that's dictated by the options hash. The primary options are:
+    #
+    # * <tt>:partial</tt> - See ActionView::Partials.
+    # * <tt>:update</tt> - Calls update_page with the block given.
+    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
+    # * <tt>:text</tt> - Renders the text passed in out.
+    #
+    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
+    # as the locals hash.
+    def render(options = {}, locals = {}, &block) #:nodoc:
+      case options
+      when Hash
+        layout = options[:layout]
+        options[:locals] ||= {}
+        if block_given?
+          return concat(_render_partial(options.merge(:partial => layout), &block))
+        elsif options.key?(:partial)
+          return _render_partial(options)
+        end
+        template = if options[:file]
+          find(options[:file], {:formats => formats})
+        elsif options[:inline]
+          handler = Template.handler_class_for_extension(options[:type] || "erb")
+          Template.new(options[:inline], "inline template", handler, {})
+        elsif options[:text]
+          Template::Text.new(options[:text])
+        end
+        if template
+          layout = find(layout, {:formats => formats}) if layout
+          _render_template(template, layout, :locals => options[:locals])
+        end
+      when :update
+        update_page(&block)
+      else
+        _render_partial(:partial => options, :locals => locals)
+      end
+    end
+    # You can think of a layout as a method that is called with a block. _layout_for
+    # returns the contents that are yielded to the layout. If the user calls yield
+    # :some_name, the block, by default, returns content_for(:some_name). If the user
+    # calls yield, the default block returns content_for(:layout).
+    #
+    # The user can override this default by passing a block to the layout.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do %>Content<% end %>
+    #
+    #   # The layout
+    #   <html><% yield %></html>
+    #
+    # In this case, instead of the default block, which would return content_for(:layout),
+    # this method returns the block that was passed in to render layout, and the response
+    # would be <html>Content</html>.
+    #
+    # Finally, the block can take block arguments, which can be passed in by yield.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
+    #
+    #   # The layout
+    #   <html><% yield Struct.new(:name).new("David") %></html>
+    #
+    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
+    # and the Struct specified in the layout would be passed into the block. The result
+    # would be <html>Hello David</html>.
+    def _layout_for(name = nil, &block)
+      return @_content_for[name || :layout] if !block_given? || name
+      capture(&block)
+    end
+    # This is the API to render a ViewContext's template from a controller.
+    #
+    # Internal Options:
+    # _template:: The Template object to render
+    # _layout::   The layout, if any, to wrap the Template in
+    def render_template(options)
+      _evaluate_assigns_and_ivars
+      template, layout = options.values_at(:_template, :_layout)
+      _render_template(template, layout, options)
+    end
+    def _render_template(template, layout = nil, options = {})
+      locals = options[:locals] || {}
+      ActiveSupport::Notifications.instrument("action_view.render_template",
+        :identifier => template.identifier, :layout => layout.try(:identifier)) do
+        content = template.render(self, locals)
+        @_content_for[:layout] = content
+        if layout
+          @_layout = layout.identifier
+          content  = _render_layout(layout, locals)
+        end
+        content
+      end
+    end
+    def _render_layout(layout, locals, &block)
+      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
+    end
+  end
+end

data/lib/action_view/template.rb CHANGED

@@ -1,252 +1,123 @@
-module ActionView #:nodoc:
-  class Template
-    class Path
-      attr_reader :path, :paths
-      delegate :hash, :inspect, :to => :path
-      def initialize(path)
-        raise ArgumentError, "path already is a Path class" if path.is_a?(Path)
-        @path = (path.ends_with?(File::SEPARATOR) ? path.to(-2) : path).freeze
-      end
-      def to_s
-        if defined?(RAILS_ROOT)
-          path.to_s.sub(/^#{Regexp.escape(File.expand_path(RAILS_ROOT))}\//, '')
-        else
-          path.to_s
-        end
-      end
-      def to_str
-        path.to_str
-      end
-      def ==(path)
-        to_str == path.to_str
-      end
-      def eql?(path)
-        to_str == path.to_str
-      end
-      # Returns a ActionView::Template object for the given path string. The
-      # input path should be relative to the view path directory,
-      # +hello/index.html.erb+. This method also has a special exception to
-      # match partial file names without a handler extension. So
-      # +hello/index.html+ will match the first template it finds with a
-      # known template extension, +hello/index.html.erb+. Template extensions
-      # should not be confused with format extensions +html+, +js+, +xml+,
-      # etc. A format must be supplied to match a formated file. +hello/index+
-      # will never match +hello/index.html.erb+.
-      def [](path)
-      end
-      def load!
-      end
-      def self.new_and_loaded(path)
-        new(path).tap do |_path|
-          _path.load!
-        end
-      end
+# encoding: utf-8
+# This is so that templates compiled in this file are UTF-8
-      private
-        def relative_path_for_template_file(full_file_path)
-          full_file_path.split("#{@path}/").last
-        end
-    end
-    class EagerPath < Path
-      def initialize(path)
-        super
-        @loaded = false
-      end
-      def load!
-        return if @loaded
-        @paths = {}
-        templates_in_path do |template|
-          template.load!
-          template.accessible_paths.each do |path|
-            @paths[path] = template
-          end
-        end
-        @paths.freeze
-        @loaded = true
-      end
-      def [](path)
-        load! unless @loaded
-        @paths[path]
-      end
+require 'set'
+require "action_view/template/resolver"
-      private
-        def templates_in_path
-          (Dir.glob("#{@path}/**/*/**") | Dir.glob("#{@path}/**")).each do |file|
-            yield create_template(file) unless File.directory?(file)
-          end
-        end
+module ActionView
+  class Template
+    extend ActiveSupport::Autoload
-        def create_template(file)
-          Template.new(relative_path_for_template_file(file), self)
-        end
+    eager_autoload do
+      autoload :Error
+      autoload :Handler
+      autoload :Handlers
+      autoload :Text
     end
-    extend TemplateHandlers
-    extend ActiveSupport::Memoizable
-    include Renderable
+    extend Template::Handlers
+    attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
-    # Templates that are exempt from layouts
-    @@exempt_from_layout = Set.new([/\.rjs$/])
+    def initialize(source, identifier, handler, details)
+      @source     = source
+      @identifier = identifier
+      @handler    = handler
+      @details    = details
+      @method_names = {}
-    # Don't render layouts for templates with the given extensions.
-    def self.exempt_from_layout(*extensions)
-      regexps = extensions.collect do |extension|
-        extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
+      format = details.delete(:format) || begin
+        # TODO: Clean this up
+        handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
       end
-      @@exempt_from_layout.merge(regexps)
+      @mime_type = Mime::Type.lookup_by_extension(format.to_s)
+      @formats = [format.to_sym]
+      @formats << :html if format == :js
+      @details[:formats] = Array.wrap(format.to_sym)
     end
-    attr_accessor :template_path, :load_path, :base_path
-    attr_accessor :locale, :name, :format, :extension
-    attr_writer :filename
-    delegate :to_s, :to => :path
-    def initialize(template_path, load_path = nil)
-      @template_path, @load_path = template_path.dup, load_path
-      @base_path, @name, @locale, @format, @extension = split(template_path)
-      @base_path.to_s.gsub!(/\/$/, '') # Push to split method
-      # Extend with partial super powers
-      extend RenderablePartial if @name =~ /^_/
-    end
-    def accessible_paths
-      paths = []
-      if valid_extension?(extension)
-        paths << path
-        paths << path_without_extension
-        if multipart?
-          formats = format.split(".")
-          paths << "#{path_without_format_and_extension}.#{formats.first}"
-          paths << "#{path_without_format_and_extension}.#{formats.second}"
-        end
+    def render(view, locals, &block)
+      method_name = compile(locals, view)
+      view.send(method_name, locals, &block)
+    rescue Exception => e
+      if e.is_a?(Template::Error)
+        e.sub_template_of(self)
+        raise e
       else
-        # template without explicit template handler should only be reachable through its exact path
-        paths << template_path
+        raise Template::Error.new(self, view.assigns, e)
       end
-      paths
-    end
-    def format_and_extension
-      (extensions = [format, extension].compact.join(".")).blank? ? nil : extensions
-    end
-    memoize :format_and_extension
-    def multipart?
-      format && format.include?('.')
-    end
-    def content_type
-      format.gsub('.', '/')
-    end
-    def mime_type
-      Mime::Type.lookup_by_extension(format) if format && defined?(::Mime)
-    end
-    memoize :mime_type
-    def path
-      [base_path, [name, locale, format, extension].compact.join('.')].compact.join('/')
     end
-    memoize :path
-    def path_without_extension
-      [base_path, [name, locale, format].compact.join('.')].compact.join('/')
+    # TODO: Figure out how to abstract this
+    def variable_name
+      @variable_name ||= identifier[%r'_?(\w+)(\.\w+)*$', 1].to_sym
     end
-    memoize :path_without_extension
-    def path_without_format_and_extension
-      [base_path, [name, locale].compact.join('.')].compact.join('/')
+    # TODO: Figure out how to abstract this
+    def counter_name
+      @counter_name ||= "#{variable_name}_counter".to_sym
     end
-    memoize :path_without_format_and_extension
-    def relative_path
-      path = File.expand_path(filename)
-      path.sub!(/^#{Regexp.escape(File.expand_path(RAILS_ROOT))}\//, '') if defined?(RAILS_ROOT)
-      path
+    # TODO: kill hax
+    def partial?
+      @details[:partial]
     end
-    memoize :relative_path
-    def exempt_from_layout?
-      @@exempt_from_layout.any? { |exempted| path =~ exempted }
-    end
-    def filename
-      # no load_path means this is an "absolute pathed" template
-      load_path ? File.join(load_path, template_path) : template_path
-    end
-    memoize :filename
-    def source
-      File.read(filename)
-    end
-    memoize :source
-    def method_segment
-      relative_path.to_s.gsub(/([^a-zA-Z0-9_])/) { $1.ord }
-    end
-    memoize :method_segment
-    def render_template(view, local_assigns = {})
-      render(view, local_assigns)
-    rescue Exception => e
-      raise e unless filename
-      if TemplateError === e
-        e.sub_template_of(self)
-        raise e
+    def inspect
+      if defined?(Rails.root)
+        identifier.sub("#{Rails.root}/", '')
       else
-        raise TemplateError.new(self, view.assigns, e)
+        identifier
       end
     end
-    def load!
-      freeze
-    end
     private
-      def valid_extension?(extension)
-        !Template.registered_template_handler(extension).nil?
-      end
+      def compile(locals, view)
+        method_name = build_method_name(locals)
-      def valid_locale?(locale)
-        locale && I18n.available_locales.include?(locale.to_sym)
-      end
+        return method_name if view.respond_to?(method_name)
-      # Returns file split into an array
-      #   [base_path, name, locale, format, extension]
-      def split(file)
-        if m = file.to_s.match(/^(.*\/)?([^\.]+)\.(.*)$/)
-          [m[1], m[2], *parse_extensions(m[3])]
+        locals_code = locals.keys.map! { |key| "#{key} = local_assigns[:#{key}];" }.join
+        code = @handler.call(self)
+        if code.sub!(/\A(#.*coding.*)\n/, '')
+          encoding_comment = $1
+        elsif defined?(Encoding) && Encoding.respond_to?(:default_external)
+          encoding_comment = "#coding:#{Encoding.default_external}"
         end
-      end
-      # returns parsed extensions as an array
-      #   [locale, format, extension]
-      def parse_extensions(extensions)
-        exts = extensions.split(".")
+        source = <<-end_src
+          def #{method_name}(local_assigns)
+            _old_virtual_path, @_virtual_path = @_virtual_path, #{@details[:virtual_path].inspect};_old_output_buffer = output_buffer;#{locals_code};#{code}
+          ensure
+            @_virtual_path, self.output_buffer = _old_virtual_path, _old_output_buffer
+          end
+        end_src
-        if extension = valid_extension?(exts.last) && exts.pop || nil
-          locale = valid_locale?(exts.first) && exts.shift || nil
-          format = exts.join('.') if exts.any? # join('.') is needed for multipart templates
-        else # no extension, just format
-          format = exts.last
+        if encoding_comment
+          source = "#{encoding_comment}\n#{source}"
+          line = -1
+        else
+          line = 0
         end
-        [locale, format, extension]
+        begin
+          ActionView::CompiledTemplates.module_eval(source, identifier, line)
+          method_name
+        rescue Exception => e # errors from template code
+          if logger = (view && view.logger)
+            logger.debug "ERROR: compiling #{method_name} RAISED #{e}"
+            logger.debug "Function body: #{source}"
+            logger.debug "Backtrace: #{e.backtrace.join("\n")}"
+          end
+          raise ActionView::Template::Error.new(self, {}, e)
+        end
+      end
+      def build_method_name(locals)
+        # TODO: is locals.keys.hash reliably the same?
+        @method_names[locals.keys.hash] ||=
+          "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
       end
   end
 end