actionpack 2.3.18 → 3.0.0.beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
# Legacy TemplateHandler stub
|
|
2
|
-
module ActionView
|
|
3
|
-
module TemplateHandlers #:nodoc:
|
|
4
|
-
module Compilable
|
|
5
|
-
def self.included(base)
|
|
6
|
-
base.extend(ClassMethods)
|
|
7
|
-
end
|
|
8
|
-
|
|
9
|
-
module ClassMethods
|
|
10
|
-
def call(template)
|
|
11
|
-
new.compile(template)
|
|
12
|
-
end
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
def compile(template)
|
|
16
|
-
raise "Need to implement #{self.class.name}#compile(template)"
|
|
17
|
-
end
|
|
18
|
-
end
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
class TemplateHandler
|
|
22
|
-
def self.call(template)
|
|
23
|
-
"#{name}.new(self).render(template, local_assigns)"
|
|
24
|
-
end
|
|
25
|
-
|
|
26
|
-
def initialize(view = nil)
|
|
27
|
-
@view = view
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def render(template, local_assigns)
|
|
31
|
-
raise "Need to implement #{self.class.name}#render(template, local_assigns)"
|
|
32
|
-
end
|
|
33
|
-
end
|
|
34
|
-
end
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
module ActionView #:nodoc:
|
|
2
|
-
module TemplateHandlers #:nodoc:
|
|
3
|
-
autoload :ERB, 'action_view/template_handlers/erb'
|
|
4
|
-
autoload :RJS, 'action_view/template_handlers/rjs'
|
|
5
|
-
autoload :Builder, 'action_view/template_handlers/builder'
|
|
6
|
-
|
|
7
|
-
def self.extended(base)
|
|
8
|
-
base.register_default_template_handler :erb, TemplateHandlers::ERB
|
|
9
|
-
base.register_template_handler :rjs, TemplateHandlers::RJS
|
|
10
|
-
base.register_template_handler :builder, TemplateHandlers::Builder
|
|
11
|
-
|
|
12
|
-
# TODO: Depreciate old template extensions
|
|
13
|
-
base.register_template_handler :rhtml, TemplateHandlers::ERB
|
|
14
|
-
base.register_template_handler :rxml, TemplateHandlers::Builder
|
|
15
|
-
end
|
|
16
|
-
|
|
17
|
-
@@template_handlers = {}
|
|
18
|
-
@@default_template_handlers = nil
|
|
19
|
-
|
|
20
|
-
# Register a class that knows how to handle template files with the given
|
|
21
|
-
# extension. This can be used to implement new template types.
|
|
22
|
-
# The constructor for the class must take the ActiveView::Base instance
|
|
23
|
-
# as a parameter, and the class must implement a +render+ method that
|
|
24
|
-
# takes the contents of the template to render as well as the Hash of
|
|
25
|
-
# local assigns available to the template. The +render+ method ought to
|
|
26
|
-
# return the rendered template as a string.
|
|
27
|
-
def register_template_handler(extension, klass)
|
|
28
|
-
@@template_handlers[extension.to_sym] = klass
|
|
29
|
-
end
|
|
30
|
-
|
|
31
|
-
def template_handler_extensions
|
|
32
|
-
@@template_handlers.keys.map(&:to_s).sort
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
def registered_template_handler(extension)
|
|
36
|
-
extension && @@template_handlers[extension.to_sym]
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
def register_default_template_handler(extension, klass)
|
|
40
|
-
register_template_handler(extension, klass)
|
|
41
|
-
@@default_template_handlers = klass
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
def handler_class_for_extension(extension)
|
|
45
|
-
registered_template_handler(extension) || @@default_template_handlers
|
|
46
|
-
end
|
|
47
|
-
end
|
|
48
|
-
end
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
module ActionView
|
|
2
|
-
module TemplateHandlers
|
|
3
|
-
class ERB < TemplateHandler
|
|
4
|
-
include Compilable
|
|
5
|
-
|
|
6
|
-
##
|
|
7
|
-
# :singleton-method:
|
|
8
|
-
# Specify trim mode for the ERB compiler. Defaults to '-'.
|
|
9
|
-
# See ERb documentation for suitable values.
|
|
10
|
-
cattr_accessor :erb_trim_mode
|
|
11
|
-
self.erb_trim_mode = '-'
|
|
12
|
-
|
|
13
|
-
def compile(template)
|
|
14
|
-
magic = $1 if template.source =~ /\A(<%#.*coding[:=]\s*(\S+)\s*-?%>)/
|
|
15
|
-
erb = "#{magic}<% __in_erb_template=true %>#{template.source}"
|
|
16
|
-
|
|
17
|
-
if erb.respond_to?(:force_encoding)
|
|
18
|
-
erb.force_encoding(template.source.encoding)
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
::ERB.new(erb, nil, erb_trim_mode, '@output_buffer').src
|
|
22
|
-
end
|
|
23
|
-
end
|
|
24
|
-
end
|
|
25
|
-
end
|
data/lib/actionpack.rb
DELETED
data/test/abstract_unit.rb
DELETED
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
$:.unshift File.expand_path('../../lib', __FILE__)
|
|
2
|
-
$:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
|
|
3
|
-
$:.unshift File.expand_path('../fixtures/helpers', __FILE__)
|
|
4
|
-
$:.unshift File.expand_path('../fixtures/alternate_helpers', __FILE__)
|
|
5
|
-
|
|
6
|
-
require 'rubygems'
|
|
7
|
-
require 'yaml'
|
|
8
|
-
require 'stringio'
|
|
9
|
-
require 'test/unit'
|
|
10
|
-
|
|
11
|
-
gem 'mocha', '>= 0.9.7'
|
|
12
|
-
require 'mocha'
|
|
13
|
-
|
|
14
|
-
begin
|
|
15
|
-
require 'ruby-debug'
|
|
16
|
-
Debugger.settings[:autoeval] = true
|
|
17
|
-
Debugger.start
|
|
18
|
-
rescue LoadError
|
|
19
|
-
# Debugging disabled. `gem install ruby-debug` to enable.
|
|
20
|
-
end
|
|
21
|
-
|
|
22
|
-
require 'action_controller'
|
|
23
|
-
require 'action_controller/cgi_ext'
|
|
24
|
-
require 'action_controller/test_process'
|
|
25
|
-
require 'action_view/test_case'
|
|
26
|
-
|
|
27
|
-
# Show backtraces for deprecated behavior for quicker cleanup.
|
|
28
|
-
ActiveSupport::Deprecation.debug = true
|
|
29
|
-
|
|
30
|
-
ActionController::Base.logger = nil
|
|
31
|
-
ActionController::Routing::Routes.reload rescue nil
|
|
32
|
-
|
|
33
|
-
ActionController::Base.session_store = nil
|
|
34
|
-
|
|
35
|
-
# Register languages for testing
|
|
36
|
-
I18n.backend.store_translations 'da', "da" => {}
|
|
37
|
-
I18n.backend.store_translations 'pt-BR', "pt-BR" => {}
|
|
38
|
-
ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort
|
|
39
|
-
|
|
40
|
-
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
|
|
41
|
-
ActionView::Base.cache_template_loading = true
|
|
42
|
-
ActionController::Base.view_paths = FIXTURE_LOAD_PATH
|
|
43
|
-
CACHED_VIEW_PATHS = ActionView::Base.cache_template_loading? ?
|
|
44
|
-
ActionController::Base.view_paths :
|
|
45
|
-
ActionController::Base.view_paths.map {|path| ActionView::Template::EagerPath.new(path.to_s)}
|
|
46
|
-
|
|
47
|
-
class DummyMutex
|
|
48
|
-
def lock
|
|
49
|
-
@locked = true
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
def unlock
|
|
53
|
-
@locked = false
|
|
54
|
-
end
|
|
55
|
-
|
|
56
|
-
def locked?
|
|
57
|
-
@locked
|
|
58
|
-
end
|
|
59
|
-
end
|
|
60
|
-
|
|
61
|
-
class ActionController::IntegrationTest < ActiveSupport::TestCase
|
|
62
|
-
def with_autoload_path(path)
|
|
63
|
-
path = File.join(File.dirname(__FILE__), "fixtures", path)
|
|
64
|
-
if ActiveSupport::Dependencies.autoload_paths.include?(path)
|
|
65
|
-
yield
|
|
66
|
-
else
|
|
67
|
-
begin
|
|
68
|
-
ActiveSupport::Dependencies.autoload_paths << path
|
|
69
|
-
yield
|
|
70
|
-
ensure
|
|
71
|
-
ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
|
|
72
|
-
ActiveSupport::Dependencies.clear
|
|
73
|
-
end
|
|
74
|
-
end
|
|
75
|
-
end
|
|
76
|
-
end
|
|
77
|
-
|
|
78
|
-
ActionController::Reloader.default_lock = DummyMutex.new
|
data/test/active_record_unit.rb
DELETED
|
@@ -1,104 +0,0 @@
|
|
|
1
|
-
require 'abstract_unit'
|
|
2
|
-
|
|
3
|
-
# Define the essentials
|
|
4
|
-
class ActiveRecordTestConnector
|
|
5
|
-
cattr_accessor :able_to_connect
|
|
6
|
-
cattr_accessor :connected
|
|
7
|
-
|
|
8
|
-
# Set our defaults
|
|
9
|
-
self.connected = false
|
|
10
|
-
self.able_to_connect = true
|
|
11
|
-
end
|
|
12
|
-
|
|
13
|
-
# Try to grab AR
|
|
14
|
-
if defined?(ActiveRecord) && defined?(Fixtures)
|
|
15
|
-
$stderr.puts 'Active Record is already loaded, running tests'
|
|
16
|
-
else
|
|
17
|
-
$stderr.print 'Attempting to load Active Record... '
|
|
18
|
-
begin
|
|
19
|
-
PATH_TO_AR = File.expand_path('../../../activerecord/lib', __FILE__)
|
|
20
|
-
raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
|
|
21
|
-
$LOAD_PATH.unshift PATH_TO_AR
|
|
22
|
-
require 'active_record'
|
|
23
|
-
require 'active_record/fixtures'
|
|
24
|
-
$stderr.puts 'success'
|
|
25
|
-
rescue LoadError => e
|
|
26
|
-
$stderr.print "failed. Skipping Active Record assertion tests: #{e}"
|
|
27
|
-
ActiveRecordTestConnector.able_to_connect = false
|
|
28
|
-
end
|
|
29
|
-
end
|
|
30
|
-
$stderr.flush
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
# Define the rest of the connector
|
|
34
|
-
class ActiveRecordTestConnector
|
|
35
|
-
class << self
|
|
36
|
-
def setup
|
|
37
|
-
unless self.connected || !self.able_to_connect
|
|
38
|
-
setup_connection
|
|
39
|
-
load_schema
|
|
40
|
-
require_fixture_models
|
|
41
|
-
self.connected = true
|
|
42
|
-
end
|
|
43
|
-
rescue Exception => e # errors from ActiveRecord setup
|
|
44
|
-
$stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
|
|
45
|
-
#$stderr.puts " #{e.backtrace.join("\n ")}\n"
|
|
46
|
-
self.able_to_connect = false
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
private
|
|
50
|
-
def setup_connection
|
|
51
|
-
if Object.const_defined?(:ActiveRecord)
|
|
52
|
-
defaults = { :database => ':memory:' }
|
|
53
|
-
begin
|
|
54
|
-
adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
|
|
55
|
-
options = defaults.merge :adapter => adapter, :timeout => 500
|
|
56
|
-
ActiveRecord::Base.establish_connection(options)
|
|
57
|
-
ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
|
|
58
|
-
ActiveRecord::Base.connection
|
|
59
|
-
rescue Exception # errors from establishing a connection
|
|
60
|
-
$stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
|
|
61
|
-
options = defaults.merge :adapter => 'sqlite'
|
|
62
|
-
ActiveRecord::Base.establish_connection(options)
|
|
63
|
-
ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => options }
|
|
64
|
-
ActiveRecord::Base.connection
|
|
65
|
-
end
|
|
66
|
-
|
|
67
|
-
Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
|
|
68
|
-
else
|
|
69
|
-
raise "Can't setup connection since ActiveRecord isn't loaded."
|
|
70
|
-
end
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
# Load actionpack sqlite tables
|
|
74
|
-
def load_schema
|
|
75
|
-
File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
|
|
76
|
-
ActiveRecord::Base.connection.execute(sql) unless sql.blank?
|
|
77
|
-
end
|
|
78
|
-
end
|
|
79
|
-
|
|
80
|
-
def require_fixture_models
|
|
81
|
-
Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
|
|
82
|
-
end
|
|
83
|
-
end
|
|
84
|
-
end
|
|
85
|
-
|
|
86
|
-
class ActiveRecordTestCase < ActionController::TestCase
|
|
87
|
-
include ActiveRecord::TestFixtures
|
|
88
|
-
|
|
89
|
-
# Set our fixture path
|
|
90
|
-
if ActiveRecordTestConnector.able_to_connect
|
|
91
|
-
self.fixture_path = [FIXTURE_LOAD_PATH]
|
|
92
|
-
self.use_transactional_fixtures = false
|
|
93
|
-
end
|
|
94
|
-
|
|
95
|
-
def self.fixtures(*args)
|
|
96
|
-
super if ActiveRecordTestConnector.connected
|
|
97
|
-
end
|
|
98
|
-
|
|
99
|
-
def run(*args)
|
|
100
|
-
super if ActiveRecordTestConnector.connected
|
|
101
|
-
end
|
|
102
|
-
end
|
|
103
|
-
|
|
104
|
-
ActiveRecordTestConnector.setup
|
|
@@ -1,221 +0,0 @@
|
|
|
1
|
-
require 'active_record_unit'
|
|
2
|
-
|
|
3
|
-
class ActiveRecordStoreTest < ActionController::IntegrationTest
|
|
4
|
-
DispatcherApp = ActionController::Dispatcher.new
|
|
5
|
-
SessionApp = ActiveRecord::SessionStore.new(DispatcherApp,
|
|
6
|
-
:key => '_session_id')
|
|
7
|
-
SessionAppWithFixation = ActiveRecord::SessionStore.new(DispatcherApp,
|
|
8
|
-
:key => '_session_id', :cookie_only => false)
|
|
9
|
-
|
|
10
|
-
class TestController < ActionController::Base
|
|
11
|
-
def no_session_access
|
|
12
|
-
head :ok
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
def set_session_value
|
|
16
|
-
session[:foo] = params[:foo] || "bar"
|
|
17
|
-
head :ok
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def get_session_value
|
|
21
|
-
render :text => "foo: #{session[:foo].inspect}"
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
def get_session_id
|
|
25
|
-
render :text => "#{request.session_options[:id]}"
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def call_reset_session
|
|
29
|
-
session[:foo]
|
|
30
|
-
reset_session
|
|
31
|
-
session[:foo] = "baz"
|
|
32
|
-
head :ok
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
def rescue_action(e) raise end
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
def setup
|
|
39
|
-
ActiveRecord::SessionStore.session_class.create_table!
|
|
40
|
-
@integration_session = open_session(SessionApp)
|
|
41
|
-
end
|
|
42
|
-
|
|
43
|
-
def teardown
|
|
44
|
-
ActiveRecord::SessionStore.session_class.drop_table!
|
|
45
|
-
end
|
|
46
|
-
|
|
47
|
-
%w{ session sql_bypass }.each do |class_name|
|
|
48
|
-
define_method("test_setting_and_getting_session_value_with_#{class_name}_store") do
|
|
49
|
-
with_store class_name do
|
|
50
|
-
with_test_route_set do
|
|
51
|
-
get '/set_session_value'
|
|
52
|
-
assert_response :success
|
|
53
|
-
assert cookies['_session_id']
|
|
54
|
-
|
|
55
|
-
get '/get_session_value'
|
|
56
|
-
assert_response :success
|
|
57
|
-
assert_equal 'foo: "bar"', response.body
|
|
58
|
-
|
|
59
|
-
get '/set_session_value', :foo => "baz"
|
|
60
|
-
assert_response :success
|
|
61
|
-
assert cookies['_session_id']
|
|
62
|
-
|
|
63
|
-
get '/get_session_value'
|
|
64
|
-
assert_response :success
|
|
65
|
-
assert_equal 'foo: "baz"', response.body
|
|
66
|
-
end
|
|
67
|
-
end
|
|
68
|
-
end
|
|
69
|
-
end
|
|
70
|
-
|
|
71
|
-
def test_getting_nil_session_value
|
|
72
|
-
with_test_route_set do
|
|
73
|
-
get '/get_session_value'
|
|
74
|
-
assert_response :success
|
|
75
|
-
assert_equal 'foo: nil', response.body
|
|
76
|
-
end
|
|
77
|
-
end
|
|
78
|
-
|
|
79
|
-
def test_setting_session_value_after_session_reset
|
|
80
|
-
with_test_route_set do
|
|
81
|
-
get '/set_session_value'
|
|
82
|
-
assert_response :success
|
|
83
|
-
assert cookies['_session_id']
|
|
84
|
-
session_id = cookies['_session_id']
|
|
85
|
-
|
|
86
|
-
get '/call_reset_session'
|
|
87
|
-
assert_response :success
|
|
88
|
-
assert_not_equal [], headers['Set-Cookie']
|
|
89
|
-
|
|
90
|
-
get '/get_session_value'
|
|
91
|
-
assert_response :success
|
|
92
|
-
assert_equal 'foo: "baz"', response.body
|
|
93
|
-
|
|
94
|
-
get '/get_session_id'
|
|
95
|
-
assert_response :success
|
|
96
|
-
assert_not_equal session_id, response.body
|
|
97
|
-
end
|
|
98
|
-
end
|
|
99
|
-
|
|
100
|
-
def test_getting_session_id
|
|
101
|
-
with_test_route_set do
|
|
102
|
-
get '/set_session_value'
|
|
103
|
-
assert_response :success
|
|
104
|
-
assert cookies['_session_id']
|
|
105
|
-
session_id = cookies['_session_id']
|
|
106
|
-
|
|
107
|
-
get '/get_session_id'
|
|
108
|
-
assert_response :success
|
|
109
|
-
assert_equal session_id, response.body
|
|
110
|
-
end
|
|
111
|
-
end
|
|
112
|
-
|
|
113
|
-
def test_getting_session_value
|
|
114
|
-
with_test_route_set do
|
|
115
|
-
get '/set_session_value'
|
|
116
|
-
assert_response :success
|
|
117
|
-
assert cookies['_session_id']
|
|
118
|
-
|
|
119
|
-
get '/get_session_value'
|
|
120
|
-
assert_response :success
|
|
121
|
-
assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
|
|
122
|
-
session_id = cookies["_session_id"]
|
|
123
|
-
|
|
124
|
-
get '/call_reset_session'
|
|
125
|
-
assert_response :success
|
|
126
|
-
assert_not_equal [], headers['Set-Cookie']
|
|
127
|
-
|
|
128
|
-
cookies["_session_id"] = session_id # replace our new session_id with our old, pre-reset session_id
|
|
129
|
-
|
|
130
|
-
get '/get_session_value'
|
|
131
|
-
assert_response :success
|
|
132
|
-
assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from the database"
|
|
133
|
-
end
|
|
134
|
-
end
|
|
135
|
-
|
|
136
|
-
def test_getting_from_nonexistent_session
|
|
137
|
-
with_test_route_set do
|
|
138
|
-
get '/get_session_value'
|
|
139
|
-
assert_response :success
|
|
140
|
-
assert_equal 'foo: nil', response.body
|
|
141
|
-
assert_nil cookies['_session_id'], "should only create session on write, not read"
|
|
142
|
-
end
|
|
143
|
-
end
|
|
144
|
-
|
|
145
|
-
def test_prevents_session_fixation
|
|
146
|
-
with_test_route_set do
|
|
147
|
-
get '/set_session_value'
|
|
148
|
-
assert_response :success
|
|
149
|
-
assert cookies['_session_id']
|
|
150
|
-
|
|
151
|
-
get '/get_session_value'
|
|
152
|
-
assert_response :success
|
|
153
|
-
assert_equal 'foo: "bar"', response.body
|
|
154
|
-
session_id = cookies['_session_id']
|
|
155
|
-
assert session_id
|
|
156
|
-
|
|
157
|
-
reset!
|
|
158
|
-
|
|
159
|
-
get '/set_session_value', :_session_id => session_id, :foo => "baz"
|
|
160
|
-
assert_response :success
|
|
161
|
-
assert_equal nil, cookies['_session_id']
|
|
162
|
-
|
|
163
|
-
get '/get_session_value', :_session_id => session_id
|
|
164
|
-
assert_response :success
|
|
165
|
-
assert_equal 'foo: nil', response.body
|
|
166
|
-
assert_equal nil, cookies['_session_id']
|
|
167
|
-
end
|
|
168
|
-
end
|
|
169
|
-
|
|
170
|
-
def test_allows_session_fixation
|
|
171
|
-
@integration_session = open_session(SessionAppWithFixation)
|
|
172
|
-
|
|
173
|
-
with_test_route_set do
|
|
174
|
-
get '/set_session_value'
|
|
175
|
-
assert_response :success
|
|
176
|
-
assert cookies['_session_id']
|
|
177
|
-
|
|
178
|
-
get '/get_session_value'
|
|
179
|
-
assert_response :success
|
|
180
|
-
assert_equal 'foo: "bar"', response.body
|
|
181
|
-
session_id = cookies['_session_id']
|
|
182
|
-
assert session_id
|
|
183
|
-
|
|
184
|
-
reset!
|
|
185
|
-
@integration_session = open_session(SessionAppWithFixation)
|
|
186
|
-
|
|
187
|
-
get '/set_session_value', :_session_id => session_id, :foo => "baz"
|
|
188
|
-
assert_response :success
|
|
189
|
-
assert_equal session_id, cookies['_session_id']
|
|
190
|
-
|
|
191
|
-
get '/get_session_value', :_session_id => session_id
|
|
192
|
-
assert_response :success
|
|
193
|
-
assert_equal 'foo: "baz"', response.body
|
|
194
|
-
assert_equal session_id, cookies['_session_id']
|
|
195
|
-
end
|
|
196
|
-
end
|
|
197
|
-
|
|
198
|
-
private
|
|
199
|
-
def with_test_route_set
|
|
200
|
-
with_routing do |set|
|
|
201
|
-
set.draw do |map|
|
|
202
|
-
map.with_options :controller => "active_record_store_test/test" do |c|
|
|
203
|
-
c.connect "/:action"
|
|
204
|
-
end
|
|
205
|
-
end
|
|
206
|
-
yield
|
|
207
|
-
end
|
|
208
|
-
end
|
|
209
|
-
|
|
210
|
-
def with_store(class_name)
|
|
211
|
-
begin
|
|
212
|
-
session_class = ActiveRecord::SessionStore.session_class
|
|
213
|
-
ActiveRecord::SessionStore.session_class = "ActiveRecord::SessionStore::#{class_name.camelize}".constantize
|
|
214
|
-
yield
|
|
215
|
-
rescue
|
|
216
|
-
ActiveRecord::SessionStore.session_class = session_class
|
|
217
|
-
raise
|
|
218
|
-
end
|
|
219
|
-
end
|
|
220
|
-
|
|
221
|
-
end
|