merb-core 0.9.7 → 0.9.8
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +136 -2
- data/CONTRIBUTORS +6 -0
- data/PUBLIC_CHANGELOG +38 -0
- data/Rakefile +38 -30
- data/lib/merb-core.rb +88 -23
- data/lib/merb-core/bootloader.rb +235 -51
- data/lib/merb-core/config.rb +121 -36
- data/lib/merb-core/controller/abstract_controller.rb +59 -36
- data/lib/merb-core/controller/exceptions.rb +2 -15
- data/lib/merb-core/controller/merb_controller.rb +44 -1
- data/lib/merb-core/controller/mime.rb +4 -0
- data/lib/merb-core/controller/mixins/controller.rb +38 -21
- data/lib/merb-core/controller/mixins/render.rb +44 -29
- data/lib/merb-core/controller/mixins/responder.rb +3 -31
- data/lib/merb-core/controller/template.rb +45 -21
- data/lib/merb-core/core_ext/kernel.rb +60 -32
- data/lib/merb-core/dispatch/default_exception/default_exception.rb +2 -2
- data/lib/merb-core/dispatch/default_exception/views/_css.html.erb +3 -1
- data/lib/merb-core/dispatch/default_exception/views/_javascript.html.erb +71 -67
- data/lib/merb-core/dispatch/default_exception/views/index.html.erb +7 -3
- data/lib/merb-core/dispatch/dispatcher.rb +3 -3
- data/lib/merb-core/dispatch/request.rb +56 -9
- data/lib/merb-core/dispatch/router.rb +159 -133
- data/lib/merb-core/dispatch/router/behavior.rb +462 -703
- data/lib/merb-core/dispatch/router/cached_proc.rb +3 -3
- data/lib/merb-core/dispatch/router/resources.rb +289 -0
- data/lib/merb-core/dispatch/router/route.rb +514 -294
- data/lib/merb-core/dispatch/session.rb +4 -2
- data/lib/merb-core/logger.rb +213 -202
- data/lib/merb-core/plugins.rb +9 -1
- data/lib/merb-core/rack.rb +3 -1
- data/lib/merb-core/rack/adapter.rb +7 -4
- data/lib/merb-core/rack/adapter/abstract.rb +188 -0
- data/lib/merb-core/rack/adapter/ebb.rb +12 -13
- data/lib/merb-core/rack/adapter/evented_mongrel.rb +2 -15
- data/lib/merb-core/rack/adapter/irb.rb +3 -2
- data/lib/merb-core/rack/adapter/mongrel.rb +22 -15
- data/lib/merb-core/rack/adapter/swiftiplied_mongrel.rb +4 -16
- data/lib/merb-core/rack/adapter/thin.rb +21 -22
- data/lib/merb-core/rack/adapter/thin_turbo.rb +4 -11
- data/lib/merb-core/rack/adapter/webrick.rb +54 -18
- data/lib/merb-core/rack/application.rb +4 -4
- data/lib/merb-core/rack/handler/mongrel.rb +12 -13
- data/lib/merb-core/rack/middleware/csrf.rb +1 -1
- data/lib/merb-core/rack/stream_wrapper.rb +41 -0
- data/lib/merb-core/server.rb +157 -90
- data/lib/merb-core/tasks/gem_management.rb +267 -0
- data/lib/merb-core/tasks/merb.rb +1 -0
- data/lib/merb-core/tasks/merb_rake_helper.rb +48 -34
- data/lib/merb-core/tasks/stats.rake +1 -1
- data/lib/merb-core/test.rb +9 -3
- data/lib/merb-core/test/helpers.rb +1 -0
- data/lib/merb-core/test/helpers/mock_request_helper.rb +393 -0
- data/lib/merb-core/test/helpers/multipart_request_helper.rb +3 -2
- data/lib/merb-core/test/helpers/request_helper.rb +40 -372
- data/lib/merb-core/test/helpers/route_helper.rb +16 -2
- data/lib/merb-core/test/matchers.rb +1 -0
- data/lib/merb-core/test/matchers/controller_matchers.rb +4 -247
- data/lib/merb-core/test/matchers/request_matchers.rb +140 -0
- data/lib/merb-core/test/matchers/view_matchers.rb +22 -4
- data/lib/merb-core/test/run_specs.rb +118 -26
- data/lib/merb-core/test/test_ext/rspec.rb +181 -0
- data/lib/merb-core/version.rb +1 -9
- metadata +10 -342
- data/docs/bootloading.dox +0 -58
- data/docs/documentation_standards +0 -40
- data/docs/merb-core-call-stack-diagram.mmap +0 -0
- data/docs/merb-core-call-stack-diagram.pdf +0 -0
- data/docs/merb-core-call-stack-diagram.png +0 -0
- data/docs/new_render_api +0 -51
- data/lib/merb-core/vendor/facets.rb +0 -2
- data/lib/merb-core/vendor/facets/dictionary.rb +0 -433
- data/lib/merb-core/vendor/facets/inflect.rb +0 -342
- data/spec/private/config/adapter_spec.rb +0 -32
- data/spec/private/config/config_spec.rb +0 -202
- data/spec/private/config/environment_spec.rb +0 -13
- data/spec/private/config/merb_spec.rb +0 -34
- data/spec/private/config/spec_helper.rb +0 -1
- data/spec/private/core_ext/kernel_spec.rb +0 -159
- data/spec/private/dispatch/bootloader_spec.rb +0 -24
- data/spec/private/dispatch/fixture/app/controllers/application.rb +0 -4
- data/spec/private/dispatch/fixture/app/controllers/exceptions.rb +0 -25
- data/spec/private/dispatch/fixture/app/controllers/foo.rb +0 -19
- data/spec/private/dispatch/fixture/app/helpers/global_helpers.rb +0 -8
- data/spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb +0 -37
- data/spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb +0 -216
- data/spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb +0 -38
- data/spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb +0 -40
- data/spec/private/dispatch/fixture/app/views/foo/bar.html.erb +0 -0
- data/spec/private/dispatch/fixture/app/views/layout/application.html.erb +0 -11
- data/spec/private/dispatch/fixture/config/black_hole.rb +0 -12
- data/spec/private/dispatch/fixture/config/environments/development.rb +0 -6
- data/spec/private/dispatch/fixture/config/environments/production.rb +0 -5
- data/spec/private/dispatch/fixture/config/environments/test.rb +0 -6
- data/spec/private/dispatch/fixture/config/init.rb +0 -45
- data/spec/private/dispatch/fixture/config/rack.rb +0 -11
- data/spec/private/dispatch/fixture/config/router.rb +0 -35
- data/spec/private/dispatch/fixture/log/merb_test.log +0 -8839
- data/spec/private/dispatch/fixture/public/images/merb.jpg +0 -0
- data/spec/private/dispatch/fixture/public/merb.fcgi +0 -4
- data/spec/private/dispatch/fixture/public/stylesheets/master.css +0 -119
- data/spec/private/dispatch/route_params_spec.rb +0 -23
- data/spec/private/dispatch/spec_helper.rb +0 -1
- data/spec/private/router/behavior_spec.rb +0 -60
- data/spec/private/router/fixture/log/merb_test.log +0 -35
- data/spec/private/router/route_spec.rb +0 -418
- data/spec/private/router/router_spec.rb +0 -183
- data/spec/private/vendor/facets/plural_spec.rb +0 -564
- data/spec/private/vendor/facets/singular_spec.rb +0 -489
- data/spec/public/DEFINITIONS +0 -11
- data/spec/public/abstract_controller/controllers/alt_views/layout/application.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/cousins.rb +0 -41
- data/spec/public/abstract_controller/controllers/display.rb +0 -60
- data/spec/public/abstract_controller/controllers/filters.rb +0 -260
- data/spec/public/abstract_controller/controllers/helpers.rb +0 -41
- data/spec/public/abstract_controller/controllers/partial.rb +0 -121
- data/spec/public/abstract_controller/controllers/render.rb +0 -113
- data/spec/public/abstract_controller/controllers/views/helpers/capture/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/helpers/concat/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/layout/alt.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/layout/custom.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb +0 -0
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/_collection.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/test_display/foo.html.erb +0 -1
- data/spec/public/abstract_controller/controllers/views/test_render/foo.html.erb +0 -0
- data/spec/public/abstract_controller/controllers/views/wonderful/index.erb +0 -1
- data/spec/public/abstract_controller/display_spec.rb +0 -37
- data/spec/public/abstract_controller/filter_spec.rb +0 -136
- data/spec/public/abstract_controller/helper_spec.rb +0 -21
- data/spec/public/abstract_controller/partial_spec.rb +0 -61
- data/spec/public/abstract_controller/render_spec.rb +0 -90
- data/spec/public/abstract_controller/spec_helper.rb +0 -31
- data/spec/public/boot_loader/boot_loader_spec.rb +0 -33
- data/spec/public/boot_loader/spec_helper.rb +0 -1
- data/spec/public/controller/authentication_spec.rb +0 -174
- data/spec/public/controller/base_spec.rb +0 -88
- data/spec/public/controller/conditional_get_spec.rb +0 -100
- data/spec/public/controller/config/init.rb +0 -6
- data/spec/public/controller/controllers/authentication.rb +0 -74
- data/spec/public/controller/controllers/base.rb +0 -65
- data/spec/public/controller/controllers/conditional_get.rb +0 -35
- data/spec/public/controller/controllers/cookies.rb +0 -36
- data/spec/public/controller/controllers/dispatcher.rb +0 -35
- data/spec/public/controller/controllers/display.rb +0 -118
- data/spec/public/controller/controllers/redirect.rb +0 -36
- data/spec/public/controller/controllers/responder.rb +0 -93
- data/spec/public/controller/controllers/url.rb +0 -7
- data/spec/public/controller/controllers/views/layout/custom.html.erb +0 -1
- data/spec/public/controller/controllers/views/layout/custom_arg.html.erb +0 -1
- data/spec/public/controller/controllers/views/layout/custom_arg.json.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.xml.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/no_layout.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb +0 -1
- data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb +0 -1
- data/spec/public/controller/cookies_spec.rb +0 -95
- data/spec/public/controller/dispatcher_spec.rb +0 -410
- data/spec/public/controller/display_spec.rb +0 -84
- data/spec/public/controller/redirect_spec.rb +0 -33
- data/spec/public/controller/responder_spec.rb +0 -169
- data/spec/public/controller/spec_helper.rb +0 -13
- data/spec/public/controller/url_spec.rb +0 -255
- data/spec/public/core/merb_core_spec.rb +0 -45
- data/spec/public/core_ext/fixtures/core_ext_dependency.rb +0 -2
- data/spec/public/core_ext/kernel_spec.rb +0 -88
- data/spec/public/core_ext/spec_helper.rb +0 -1
- data/spec/public/directory_structure/directory/app/controllers/application.rb +0 -3
- data/spec/public/directory_structure/directory/app/controllers/base.rb +0 -13
- data/spec/public/directory_structure/directory/app/controllers/custom.rb +0 -19
- data/spec/public/directory_structure/directory/app/views/base/template.html.erb +0 -1
- data/spec/public/directory_structure/directory/app/views/wonderful/template.erb +0 -1
- data/spec/public/directory_structure/directory/config/router.rb +0 -3
- data/spec/public/directory_structure/directory/log/merb_test.log +0 -4588
- data/spec/public/directory_structure/directory_spec.rb +0 -43
- data/spec/public/logger/logger_spec.rb +0 -181
- data/spec/public/logger/spec_helper.rb +0 -1
- data/spec/public/rack/conditinal_get_middleware_spec.rb +0 -127
- data/spec/public/rack/csrf_middleware_spec.rb +0 -70
- data/spec/public/rack/rack_middleware_spec.rb +0 -99
- data/spec/public/rack/shared_example_groups.rb +0 -35
- data/spec/public/reloading/directory/app/controllers/application.rb +0 -3
- data/spec/public/reloading/directory/app/controllers/reload.rb +0 -6
- data/spec/public/reloading/directory/config/init.rb +0 -2
- data/spec/public/reloading/directory/log/merb_test.log +0 -288231
- data/spec/public/reloading/reload_spec.rb +0 -103
- data/spec/public/request/multipart_spec.rb +0 -41
- data/spec/public/request/request_spec.rb +0 -250
- data/spec/public/router/default_spec.rb +0 -21
- data/spec/public/router/deferred_spec.rb +0 -22
- data/spec/public/router/fixation_spec.rb +0 -49
- data/spec/public/router/fixture/log/merb_test.log +0 -524
- data/spec/public/router/namespace_spec.rb +0 -113
- data/spec/public/router/nested_matches_spec.rb +0 -97
- data/spec/public/router/nested_resources_spec.rb +0 -41
- data/spec/public/router/resource_spec.rb +0 -37
- data/spec/public/router/resources_spec.rb +0 -82
- data/spec/public/router/spec_helper.rb +0 -90
- data/spec/public/router/special_spec.rb +0 -61
- data/spec/public/router/string_spec.rb +0 -61
- data/spec/public/session/controllers/sessions.rb +0 -56
- data/spec/public/session/cookie_session_spec.rb +0 -73
- data/spec/public/session/memcached_session_spec.rb +0 -31
- data/spec/public/session/memory_session_spec.rb +0 -28
- data/spec/public/session/multiple_sessions_spec.rb +0 -74
- data/spec/public/session/no_session_spec.rb +0 -12
- data/spec/public/session/session_spec.rb +0 -106
- data/spec/public/template/template_spec.rb +0 -104
- data/spec/public/template/templates/error.html.erb +0 -2
- data/spec/public/template/templates/template.html.erb +0 -1
- data/spec/public/template/templates/template.html.myt +0 -1
- data/spec/public/test/controller_matchers_spec.rb +0 -412
- data/spec/public/test/controllers/controller_assertion_mock.rb +0 -7
- data/spec/public/test/controllers/dispatch_controller.rb +0 -11
- data/spec/public/test/controllers/spec_helper_controller.rb +0 -39
- data/spec/public/test/multipart_request_helper_spec.rb +0 -159
- data/spec/public/test/multipart_upload_text_file.txt +0 -1
- data/spec/public/test/request_helper_spec.rb +0 -269
- data/spec/public/test/route_helper_spec.rb +0 -78
- data/spec/public/test/route_matchers_spec.rb +0 -166
- data/spec/public/test/view_helper_spec.rb +0 -96
- data/spec/public/test/view_matchers_spec.rb +0 -183
- data/spec/spec_helper.rb +0 -121
data/spec/public/DEFINITIONS
DELETED
@@ -1,11 +0,0 @@
|
|
1
|
-
==== Public API
|
2
|
-
This is the API that is available in your app itself. Anything not in the public API is subject to change.
|
3
|
-
|
4
|
-
==== Semipublic API
|
5
|
-
This is the API that is guaranteed to be available between components of Merb. If something in the semipublic
|
6
|
-
API changes, this will likely require changes in other parts of Merb. Additionally, items in the semipublic
|
7
|
-
API can be relied upon for introspection, for testing purposes.
|
8
|
-
|
9
|
-
For instance, AbstractController#_body should not be used in Merb apps themselves, as it may change, but
|
10
|
-
it may be used in other components of Merb and in the Merb tests themselves. Including it in the semipublic
|
11
|
-
API is designed to alert Merb's maintainers that changing it will have framework-wide repercussions.
|
@@ -1 +0,0 @@
|
|
1
|
-
App: <%= catch_content(:for_layout) %>
|
@@ -1 +0,0 @@
|
|
1
|
-
Controller: <%= catch_content :for_layout %>
|
@@ -1 +0,0 @@
|
|
1
|
-
Controller: <%= catch_content :for_layout %>
|
@@ -1 +0,0 @@
|
|
1
|
-
new index
|
@@ -1 +0,0 @@
|
|
1
|
-
new show
|
@@ -1 +0,0 @@
|
|
1
|
-
Multiple
|
@@ -1 +0,0 @@
|
|
1
|
-
Alt Partial
|
@@ -1 +0,0 @@
|
|
1
|
-
Woot.
|
@@ -1 +0,0 @@
|
|
1
|
-
Good.
|
@@ -1,41 +0,0 @@
|
|
1
|
-
module Merb::Test::Fixtures
|
2
|
-
|
3
|
-
module Abstract
|
4
|
-
|
5
|
-
class Testing < Merb::AbstractController
|
6
|
-
self._template_root = File.dirname(__FILE__) / "views"
|
7
|
-
end
|
8
|
-
|
9
|
-
class FilterParent < Testing
|
10
|
-
before :print_before_filter
|
11
|
-
|
12
|
-
def print_before_filter
|
13
|
-
@before_string = "Before"
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
class FilterChild1 < FilterParent
|
18
|
-
before :print_before_filter, :only => :limited
|
19
|
-
|
20
|
-
def index
|
21
|
-
@before_string.to_s + " Index"
|
22
|
-
end
|
23
|
-
|
24
|
-
def limited
|
25
|
-
@before_string.to_s + " Limited"
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
class FilterChild2 < FilterParent
|
30
|
-
|
31
|
-
def index
|
32
|
-
@before_string.to_s + " Index"
|
33
|
-
end
|
34
|
-
|
35
|
-
def limited
|
36
|
-
@before_string.to_s + " Limited"
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
end
|
41
|
-
end
|
@@ -1,60 +0,0 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
module Merb::Test::Fixtures
|
4
|
-
|
5
|
-
module Abstract
|
6
|
-
|
7
|
-
class SomeModel; end
|
8
|
-
|
9
|
-
class Testing < Merb::AbstractController
|
10
|
-
self._template_root = File.dirname(__FILE__) / "views"
|
11
|
-
end
|
12
|
-
|
13
|
-
class DisplayObject < Testing
|
14
|
-
def index
|
15
|
-
@obj = SomeModel.new
|
16
|
-
display @obj
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
class DisplayObjectWithAction < Testing
|
21
|
-
def create
|
22
|
-
@obj = SomeModel.new
|
23
|
-
display @obj, :new
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
class DisplayObjectWithPath < Testing
|
28
|
-
def index
|
29
|
-
@obj = SomeModel.new
|
30
|
-
display @obj, "test_display/foo.html"
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
class DisplayObjectWithPathViaOpts < Testing
|
35
|
-
def index
|
36
|
-
@obj = SomeModel.new
|
37
|
-
display @obj, :template => "test_display/foo.html"
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
class DisplayObjectWithMultipleRoots < DisplayObject
|
42
|
-
self._template_roots << [File.dirname(__FILE__) / "alt_views", :_template_location]
|
43
|
-
|
44
|
-
def show
|
45
|
-
@obj = SomeModel.new
|
46
|
-
display @obj, nil, :layout=>"alt"
|
47
|
-
end
|
48
|
-
|
49
|
-
def another
|
50
|
-
@obj = SomeModel.new
|
51
|
-
display @obj, "test_display/foo.html", :layout=>false
|
52
|
-
end
|
53
|
-
|
54
|
-
def wonderful
|
55
|
-
true
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
|
60
|
-
end
|
@@ -1,260 +0,0 @@
|
|
1
|
-
# ==== Methodology
|
2
|
-
# Each of the controllers tested here tests a discrete, single case. This
|
3
|
-
# is to ensure that each test is actually testing exactly what we want,
|
4
|
-
# and that other features (or lack thereof), are not causing tests to fail
|
5
|
-
# that would otherwise pass.
|
6
|
-
module Merb::Test::Fixtures
|
7
|
-
|
8
|
-
module Abstract
|
9
|
-
|
10
|
-
class Testing < Merb::AbstractController
|
11
|
-
self._template_root = File.dirname(__FILE__) / "views"
|
12
|
-
end
|
13
|
-
|
14
|
-
class TestBeforeFilter < Testing
|
15
|
-
before :foo
|
16
|
-
|
17
|
-
def index
|
18
|
-
"#{@x}"
|
19
|
-
end
|
20
|
-
|
21
|
-
private
|
22
|
-
|
23
|
-
def foo
|
24
|
-
@x = "foo filter"
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
class TestAfterFilter < Testing
|
29
|
-
after :foo
|
30
|
-
|
31
|
-
def index
|
32
|
-
"index action"
|
33
|
-
end
|
34
|
-
|
35
|
-
private
|
36
|
-
|
37
|
-
def foo
|
38
|
-
@body = "foo filter"
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
class TestSkipFilter < TestBeforeFilter
|
43
|
-
skip_before :foo
|
44
|
-
end
|
45
|
-
|
46
|
-
class TestBeforeFilterOrder < TestBeforeFilter
|
47
|
-
before :bar
|
48
|
-
|
49
|
-
def index
|
50
|
-
"#{@x}"
|
51
|
-
end
|
52
|
-
|
53
|
-
private
|
54
|
-
|
55
|
-
def bar
|
56
|
-
@x = "bar filter"
|
57
|
-
end
|
58
|
-
end
|
59
|
-
|
60
|
-
class TestAfterFilterOrder < TestAfterFilter
|
61
|
-
after :bar
|
62
|
-
|
63
|
-
def index
|
64
|
-
"index action"
|
65
|
-
end
|
66
|
-
|
67
|
-
private
|
68
|
-
|
69
|
-
def bar
|
70
|
-
@body = "bar filter"
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
class TestProcFilter < Testing
|
75
|
-
before { @x = "proc filter1" }
|
76
|
-
before Proc.new { @y = "proc filter2" }
|
77
|
-
|
78
|
-
def index
|
79
|
-
"#{@x} #{@y}"
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
class TestProcFilterViaMethod < Testing
|
84
|
-
def self.my_before(data)
|
85
|
-
before proc { add_string(data) }
|
86
|
-
end
|
87
|
-
|
88
|
-
my_before("one")
|
89
|
-
my_before("two")
|
90
|
-
|
91
|
-
def index
|
92
|
-
@text
|
93
|
-
end
|
94
|
-
protected
|
95
|
-
def add_string(str)
|
96
|
-
@text ||= ""
|
97
|
-
@text << str
|
98
|
-
end
|
99
|
-
end
|
100
|
-
|
101
|
-
class TestExcludeFilter < Testing
|
102
|
-
before :foo, :exclude => :index
|
103
|
-
before :bar, :exclude => [:index]
|
104
|
-
|
105
|
-
def index
|
106
|
-
"#{@x} #{@y}"
|
107
|
-
end
|
108
|
-
|
109
|
-
def show
|
110
|
-
"#{@x} #{@y}"
|
111
|
-
end
|
112
|
-
|
113
|
-
private
|
114
|
-
|
115
|
-
def foo
|
116
|
-
@x = "foo filter"
|
117
|
-
end
|
118
|
-
|
119
|
-
def bar
|
120
|
-
@y = "bar filter"
|
121
|
-
end
|
122
|
-
end
|
123
|
-
|
124
|
-
class TestOnlyFilter < Testing
|
125
|
-
before :foo, :only => :index
|
126
|
-
before :bar, :only => [:index]
|
127
|
-
|
128
|
-
def index
|
129
|
-
"#{@x} #{@y}"
|
130
|
-
end
|
131
|
-
|
132
|
-
def show
|
133
|
-
"#{@x} #{@y}"
|
134
|
-
end
|
135
|
-
|
136
|
-
private
|
137
|
-
|
138
|
-
def foo
|
139
|
-
@x = "foo filter"
|
140
|
-
end
|
141
|
-
|
142
|
-
def bar
|
143
|
-
@y = "bar filter"
|
144
|
-
end
|
145
|
-
end
|
146
|
-
|
147
|
-
class TestConditionalFilterWithMethod < Testing
|
148
|
-
before :foo, :if => :bar
|
149
|
-
|
150
|
-
attr_accessor :bar
|
151
|
-
|
152
|
-
def index
|
153
|
-
"#{@x}"
|
154
|
-
end
|
155
|
-
|
156
|
-
private
|
157
|
-
def foo
|
158
|
-
@x = "foo filter"
|
159
|
-
end
|
160
|
-
end
|
161
|
-
|
162
|
-
class TestConditionalFilterWithProc < Testing
|
163
|
-
after :foo, :unless => lambda { |x| x.bar == "bar" }
|
164
|
-
|
165
|
-
attr_accessor :bar
|
166
|
-
|
167
|
-
def index
|
168
|
-
"index action"
|
169
|
-
end
|
170
|
-
|
171
|
-
private
|
172
|
-
def foo
|
173
|
-
@body = "foo filter"
|
174
|
-
end
|
175
|
-
end
|
176
|
-
|
177
|
-
class TestConditionalFilterWithNoProcOrSymbol < Testing
|
178
|
-
after :foo, :unless => true
|
179
|
-
|
180
|
-
def index
|
181
|
-
"index action"
|
182
|
-
end
|
183
|
-
end
|
184
|
-
|
185
|
-
class TestBeforeFilterWithArgument < Testing
|
186
|
-
before :foo, :with => "bar"
|
187
|
-
|
188
|
-
def index
|
189
|
-
"index action"
|
190
|
-
end
|
191
|
-
|
192
|
-
private
|
193
|
-
def foo(bar)
|
194
|
-
bar == "bar"
|
195
|
-
end
|
196
|
-
end
|
197
|
-
|
198
|
-
class TestBeforeFilterWithArguments < Testing
|
199
|
-
before :foo, :with => ["bar", "baz"]
|
200
|
-
|
201
|
-
def index
|
202
|
-
"index action"
|
203
|
-
end
|
204
|
-
|
205
|
-
private
|
206
|
-
def foo(bar,baz)
|
207
|
-
bar == "bar" && baz == "baz"
|
208
|
-
end
|
209
|
-
end
|
210
|
-
|
211
|
-
class BeforeFilterWithThrowHalt < Testing
|
212
|
-
before do
|
213
|
-
throw :halt, "Halt thrown"
|
214
|
-
end
|
215
|
-
|
216
|
-
def index
|
217
|
-
"Halt not thrown"
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
|
-
class BeforeFilterWithThrowProc < Testing
|
222
|
-
before do
|
223
|
-
throw :halt, Proc.new { "Proc thrown" }
|
224
|
-
end
|
225
|
-
|
226
|
-
def index
|
227
|
-
"Proc not thrown"
|
228
|
-
end
|
229
|
-
end
|
230
|
-
|
231
|
-
class ThrowNil < Testing
|
232
|
-
before do
|
233
|
-
throw :halt, nil
|
234
|
-
end
|
235
|
-
|
236
|
-
def index
|
237
|
-
"Awesome"
|
238
|
-
end
|
239
|
-
end
|
240
|
-
|
241
|
-
class FilterChainError < Testing
|
242
|
-
before do
|
243
|
-
throw :halt, Merb
|
244
|
-
end
|
245
|
-
|
246
|
-
def index
|
247
|
-
"Awesome"
|
248
|
-
end
|
249
|
-
end
|
250
|
-
|
251
|
-
class Benchmarking < Testing
|
252
|
-
before {}
|
253
|
-
after {}
|
254
|
-
|
255
|
-
def index
|
256
|
-
"Awesome"
|
257
|
-
end
|
258
|
-
end
|
259
|
-
end
|
260
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
module Merb::Test::Fixtures
|
2
|
-
module Abstract
|
3
|
-
|
4
|
-
class HelperTesting < Merb::AbstractController
|
5
|
-
self._template_root = File.dirname(__FILE__) / "views"
|
6
|
-
|
7
|
-
def _template_location(context, type = nil, controller = controller_name)
|
8
|
-
"helpers/#{File.basename(controller)}/#{context}"
|
9
|
-
end
|
10
|
-
|
11
|
-
def index
|
12
|
-
render
|
13
|
-
end
|
14
|
-
end
|
15
|
-
|
16
|
-
class Capture < HelperTesting
|
17
|
-
end
|
18
|
-
|
19
|
-
class CaptureWithArgs < HelperTesting
|
20
|
-
end
|
21
|
-
|
22
|
-
class CaptureEq < HelperTesting
|
23
|
-
def helper_using_capture(&blk)
|
24
|
-
"Beginning... #{capture(&blk)}... Done"
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
module ConcatHelper
|
29
|
-
def concatter(&blk)
|
30
|
-
concat("Concat", blk.binding)
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
class Concat < HelperTesting
|
35
|
-
def index
|
36
|
-
render
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
end
|
41
|
-
end
|