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.
Files changed (274) hide show
  1. data/CHANGELOG +136 -2
  2. data/CONTRIBUTORS +6 -0
  3. data/PUBLIC_CHANGELOG +38 -0
  4. data/Rakefile +38 -30
  5. data/lib/merb-core.rb +88 -23
  6. data/lib/merb-core/bootloader.rb +235 -51
  7. data/lib/merb-core/config.rb +121 -36
  8. data/lib/merb-core/controller/abstract_controller.rb +59 -36
  9. data/lib/merb-core/controller/exceptions.rb +2 -15
  10. data/lib/merb-core/controller/merb_controller.rb +44 -1
  11. data/lib/merb-core/controller/mime.rb +4 -0
  12. data/lib/merb-core/controller/mixins/controller.rb +38 -21
  13. data/lib/merb-core/controller/mixins/render.rb +44 -29
  14. data/lib/merb-core/controller/mixins/responder.rb +3 -31
  15. data/lib/merb-core/controller/template.rb +45 -21
  16. data/lib/merb-core/core_ext/kernel.rb +60 -32
  17. data/lib/merb-core/dispatch/default_exception/default_exception.rb +2 -2
  18. data/lib/merb-core/dispatch/default_exception/views/_css.html.erb +3 -1
  19. data/lib/merb-core/dispatch/default_exception/views/_javascript.html.erb +71 -67
  20. data/lib/merb-core/dispatch/default_exception/views/index.html.erb +7 -3
  21. data/lib/merb-core/dispatch/dispatcher.rb +3 -3
  22. data/lib/merb-core/dispatch/request.rb +56 -9
  23. data/lib/merb-core/dispatch/router.rb +159 -133
  24. data/lib/merb-core/dispatch/router/behavior.rb +462 -703
  25. data/lib/merb-core/dispatch/router/cached_proc.rb +3 -3
  26. data/lib/merb-core/dispatch/router/resources.rb +289 -0
  27. data/lib/merb-core/dispatch/router/route.rb +514 -294
  28. data/lib/merb-core/dispatch/session.rb +4 -2
  29. data/lib/merb-core/logger.rb +213 -202
  30. data/lib/merb-core/plugins.rb +9 -1
  31. data/lib/merb-core/rack.rb +3 -1
  32. data/lib/merb-core/rack/adapter.rb +7 -4
  33. data/lib/merb-core/rack/adapter/abstract.rb +188 -0
  34. data/lib/merb-core/rack/adapter/ebb.rb +12 -13
  35. data/lib/merb-core/rack/adapter/evented_mongrel.rb +2 -15
  36. data/lib/merb-core/rack/adapter/irb.rb +3 -2
  37. data/lib/merb-core/rack/adapter/mongrel.rb +22 -15
  38. data/lib/merb-core/rack/adapter/swiftiplied_mongrel.rb +4 -16
  39. data/lib/merb-core/rack/adapter/thin.rb +21 -22
  40. data/lib/merb-core/rack/adapter/thin_turbo.rb +4 -11
  41. data/lib/merb-core/rack/adapter/webrick.rb +54 -18
  42. data/lib/merb-core/rack/application.rb +4 -4
  43. data/lib/merb-core/rack/handler/mongrel.rb +12 -13
  44. data/lib/merb-core/rack/middleware/csrf.rb +1 -1
  45. data/lib/merb-core/rack/stream_wrapper.rb +41 -0
  46. data/lib/merb-core/server.rb +157 -90
  47. data/lib/merb-core/tasks/gem_management.rb +267 -0
  48. data/lib/merb-core/tasks/merb.rb +1 -0
  49. data/lib/merb-core/tasks/merb_rake_helper.rb +48 -34
  50. data/lib/merb-core/tasks/stats.rake +1 -1
  51. data/lib/merb-core/test.rb +9 -3
  52. data/lib/merb-core/test/helpers.rb +1 -0
  53. data/lib/merb-core/test/helpers/mock_request_helper.rb +393 -0
  54. data/lib/merb-core/test/helpers/multipart_request_helper.rb +3 -2
  55. data/lib/merb-core/test/helpers/request_helper.rb +40 -372
  56. data/lib/merb-core/test/helpers/route_helper.rb +16 -2
  57. data/lib/merb-core/test/matchers.rb +1 -0
  58. data/lib/merb-core/test/matchers/controller_matchers.rb +4 -247
  59. data/lib/merb-core/test/matchers/request_matchers.rb +140 -0
  60. data/lib/merb-core/test/matchers/view_matchers.rb +22 -4
  61. data/lib/merb-core/test/run_specs.rb +118 -26
  62. data/lib/merb-core/test/test_ext/rspec.rb +181 -0
  63. data/lib/merb-core/version.rb +1 -9
  64. metadata +10 -342
  65. data/docs/bootloading.dox +0 -58
  66. data/docs/documentation_standards +0 -40
  67. data/docs/merb-core-call-stack-diagram.mmap +0 -0
  68. data/docs/merb-core-call-stack-diagram.pdf +0 -0
  69. data/docs/merb-core-call-stack-diagram.png +0 -0
  70. data/docs/new_render_api +0 -51
  71. data/lib/merb-core/vendor/facets.rb +0 -2
  72. data/lib/merb-core/vendor/facets/dictionary.rb +0 -433
  73. data/lib/merb-core/vendor/facets/inflect.rb +0 -342
  74. data/spec/private/config/adapter_spec.rb +0 -32
  75. data/spec/private/config/config_spec.rb +0 -202
  76. data/spec/private/config/environment_spec.rb +0 -13
  77. data/spec/private/config/merb_spec.rb +0 -34
  78. data/spec/private/config/spec_helper.rb +0 -1
  79. data/spec/private/core_ext/kernel_spec.rb +0 -159
  80. data/spec/private/dispatch/bootloader_spec.rb +0 -24
  81. data/spec/private/dispatch/fixture/app/controllers/application.rb +0 -4
  82. data/spec/private/dispatch/fixture/app/controllers/exceptions.rb +0 -25
  83. data/spec/private/dispatch/fixture/app/controllers/foo.rb +0 -19
  84. data/spec/private/dispatch/fixture/app/helpers/global_helpers.rb +0 -8
  85. data/spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb +0 -37
  86. data/spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb +0 -216
  87. data/spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb +0 -38
  88. data/spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb +0 -40
  89. data/spec/private/dispatch/fixture/app/views/foo/bar.html.erb +0 -0
  90. data/spec/private/dispatch/fixture/app/views/layout/application.html.erb +0 -11
  91. data/spec/private/dispatch/fixture/config/black_hole.rb +0 -12
  92. data/spec/private/dispatch/fixture/config/environments/development.rb +0 -6
  93. data/spec/private/dispatch/fixture/config/environments/production.rb +0 -5
  94. data/spec/private/dispatch/fixture/config/environments/test.rb +0 -6
  95. data/spec/private/dispatch/fixture/config/init.rb +0 -45
  96. data/spec/private/dispatch/fixture/config/rack.rb +0 -11
  97. data/spec/private/dispatch/fixture/config/router.rb +0 -35
  98. data/spec/private/dispatch/fixture/log/merb_test.log +0 -8839
  99. data/spec/private/dispatch/fixture/public/images/merb.jpg +0 -0
  100. data/spec/private/dispatch/fixture/public/merb.fcgi +0 -4
  101. data/spec/private/dispatch/fixture/public/stylesheets/master.css +0 -119
  102. data/spec/private/dispatch/route_params_spec.rb +0 -23
  103. data/spec/private/dispatch/spec_helper.rb +0 -1
  104. data/spec/private/router/behavior_spec.rb +0 -60
  105. data/spec/private/router/fixture/log/merb_test.log +0 -35
  106. data/spec/private/router/route_spec.rb +0 -418
  107. data/spec/private/router/router_spec.rb +0 -183
  108. data/spec/private/vendor/facets/plural_spec.rb +0 -564
  109. data/spec/private/vendor/facets/singular_spec.rb +0 -489
  110. data/spec/public/DEFINITIONS +0 -11
  111. data/spec/public/abstract_controller/controllers/alt_views/layout/application.erb +0 -1
  112. data/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb +0 -1
  113. data/spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb +0 -1
  114. data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb +0 -1
  115. data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb +0 -1
  116. data/spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb +0 -1
  117. data/spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb +0 -1
  118. data/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb +0 -1
  119. data/spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb +0 -1
  120. data/spec/public/abstract_controller/controllers/cousins.rb +0 -41
  121. data/spec/public/abstract_controller/controllers/display.rb +0 -60
  122. data/spec/public/abstract_controller/controllers/filters.rb +0 -260
  123. data/spec/public/abstract_controller/controllers/helpers.rb +0 -41
  124. data/spec/public/abstract_controller/controllers/partial.rb +0 -121
  125. data/spec/public/abstract_controller/controllers/render.rb +0 -113
  126. data/spec/public/abstract_controller/controllers/views/helpers/capture/index.erb +0 -1
  127. data/spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb +0 -1
  128. data/spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb +0 -1
  129. data/spec/public/abstract_controller/controllers/views/helpers/concat/index.erb +0 -1
  130. data/spec/public/abstract_controller/controllers/views/layout/alt.erb +0 -1
  131. data/spec/public/abstract_controller/controllers/views/layout/custom.erb +0 -1
  132. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb +0 -1
  133. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb +0 -1
  134. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb +0 -1
  135. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb +0 -0
  136. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb +0 -1
  137. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb +0 -1
  138. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb +0 -1
  139. data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb +0 -1
  140. data/spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb +0 -1
  141. data/spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb +0 -1
  142. data/spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb +0 -1
  143. data/spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb +0 -1
  144. data/spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb +0 -1
  145. data/spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb +0 -1
  146. data/spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb +0 -1
  147. data/spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb +0 -1
  148. data/spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb +0 -1
  149. data/spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb +0 -1
  150. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb +0 -1
  151. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb +0 -1
  152. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb +0 -1
  153. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb +0 -1
  154. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/_collection.erb +0 -1
  155. data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/index.erb +0 -1
  156. data/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb +0 -1
  157. data/spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb +0 -1
  158. data/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb +0 -1
  159. data/spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb +0 -1
  160. data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb +0 -1
  161. data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb +0 -1
  162. data/spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb +0 -1
  163. data/spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb +0 -1
  164. data/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb +0 -1
  165. data/spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb +0 -1
  166. data/spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb +0 -1
  167. data/spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb +0 -1
  168. data/spec/public/abstract_controller/controllers/views/test_display/foo.html.erb +0 -1
  169. data/spec/public/abstract_controller/controllers/views/test_render/foo.html.erb +0 -0
  170. data/spec/public/abstract_controller/controllers/views/wonderful/index.erb +0 -1
  171. data/spec/public/abstract_controller/display_spec.rb +0 -37
  172. data/spec/public/abstract_controller/filter_spec.rb +0 -136
  173. data/spec/public/abstract_controller/helper_spec.rb +0 -21
  174. data/spec/public/abstract_controller/partial_spec.rb +0 -61
  175. data/spec/public/abstract_controller/render_spec.rb +0 -90
  176. data/spec/public/abstract_controller/spec_helper.rb +0 -31
  177. data/spec/public/boot_loader/boot_loader_spec.rb +0 -33
  178. data/spec/public/boot_loader/spec_helper.rb +0 -1
  179. data/spec/public/controller/authentication_spec.rb +0 -174
  180. data/spec/public/controller/base_spec.rb +0 -88
  181. data/spec/public/controller/conditional_get_spec.rb +0 -100
  182. data/spec/public/controller/config/init.rb +0 -6
  183. data/spec/public/controller/controllers/authentication.rb +0 -74
  184. data/spec/public/controller/controllers/base.rb +0 -65
  185. data/spec/public/controller/controllers/conditional_get.rb +0 -35
  186. data/spec/public/controller/controllers/cookies.rb +0 -36
  187. data/spec/public/controller/controllers/dispatcher.rb +0 -35
  188. data/spec/public/controller/controllers/display.rb +0 -118
  189. data/spec/public/controller/controllers/redirect.rb +0 -36
  190. data/spec/public/controller/controllers/responder.rb +0 -93
  191. data/spec/public/controller/controllers/url.rb +0 -7
  192. data/spec/public/controller/controllers/views/layout/custom.html.erb +0 -1
  193. data/spec/public/controller/controllers/views/layout/custom_arg.html.erb +0 -1
  194. data/spec/public/controller/controllers/views/layout/custom_arg.json.erb +0 -1
  195. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.html.erb +0 -1
  196. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.xml.erb +0 -1
  197. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb +0 -1
  198. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb +0 -1
  199. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb +0 -1
  200. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/no_layout.html.erb +0 -1
  201. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb +0 -1
  202. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb +0 -1
  203. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb +0 -1
  204. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb +0 -1
  205. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb +0 -1
  206. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb +0 -1
  207. data/spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb +0 -1
  208. data/spec/public/controller/cookies_spec.rb +0 -95
  209. data/spec/public/controller/dispatcher_spec.rb +0 -410
  210. data/spec/public/controller/display_spec.rb +0 -84
  211. data/spec/public/controller/redirect_spec.rb +0 -33
  212. data/spec/public/controller/responder_spec.rb +0 -169
  213. data/spec/public/controller/spec_helper.rb +0 -13
  214. data/spec/public/controller/url_spec.rb +0 -255
  215. data/spec/public/core/merb_core_spec.rb +0 -45
  216. data/spec/public/core_ext/fixtures/core_ext_dependency.rb +0 -2
  217. data/spec/public/core_ext/kernel_spec.rb +0 -88
  218. data/spec/public/core_ext/spec_helper.rb +0 -1
  219. data/spec/public/directory_structure/directory/app/controllers/application.rb +0 -3
  220. data/spec/public/directory_structure/directory/app/controllers/base.rb +0 -13
  221. data/spec/public/directory_structure/directory/app/controllers/custom.rb +0 -19
  222. data/spec/public/directory_structure/directory/app/views/base/template.html.erb +0 -1
  223. data/spec/public/directory_structure/directory/app/views/wonderful/template.erb +0 -1
  224. data/spec/public/directory_structure/directory/config/router.rb +0 -3
  225. data/spec/public/directory_structure/directory/log/merb_test.log +0 -4588
  226. data/spec/public/directory_structure/directory_spec.rb +0 -43
  227. data/spec/public/logger/logger_spec.rb +0 -181
  228. data/spec/public/logger/spec_helper.rb +0 -1
  229. data/spec/public/rack/conditinal_get_middleware_spec.rb +0 -127
  230. data/spec/public/rack/csrf_middleware_spec.rb +0 -70
  231. data/spec/public/rack/rack_middleware_spec.rb +0 -99
  232. data/spec/public/rack/shared_example_groups.rb +0 -35
  233. data/spec/public/reloading/directory/app/controllers/application.rb +0 -3
  234. data/spec/public/reloading/directory/app/controllers/reload.rb +0 -6
  235. data/spec/public/reloading/directory/config/init.rb +0 -2
  236. data/spec/public/reloading/directory/log/merb_test.log +0 -288231
  237. data/spec/public/reloading/reload_spec.rb +0 -103
  238. data/spec/public/request/multipart_spec.rb +0 -41
  239. data/spec/public/request/request_spec.rb +0 -250
  240. data/spec/public/router/default_spec.rb +0 -21
  241. data/spec/public/router/deferred_spec.rb +0 -22
  242. data/spec/public/router/fixation_spec.rb +0 -49
  243. data/spec/public/router/fixture/log/merb_test.log +0 -524
  244. data/spec/public/router/namespace_spec.rb +0 -113
  245. data/spec/public/router/nested_matches_spec.rb +0 -97
  246. data/spec/public/router/nested_resources_spec.rb +0 -41
  247. data/spec/public/router/resource_spec.rb +0 -37
  248. data/spec/public/router/resources_spec.rb +0 -82
  249. data/spec/public/router/spec_helper.rb +0 -90
  250. data/spec/public/router/special_spec.rb +0 -61
  251. data/spec/public/router/string_spec.rb +0 -61
  252. data/spec/public/session/controllers/sessions.rb +0 -56
  253. data/spec/public/session/cookie_session_spec.rb +0 -73
  254. data/spec/public/session/memcached_session_spec.rb +0 -31
  255. data/spec/public/session/memory_session_spec.rb +0 -28
  256. data/spec/public/session/multiple_sessions_spec.rb +0 -74
  257. data/spec/public/session/no_session_spec.rb +0 -12
  258. data/spec/public/session/session_spec.rb +0 -106
  259. data/spec/public/template/template_spec.rb +0 -104
  260. data/spec/public/template/templates/error.html.erb +0 -2
  261. data/spec/public/template/templates/template.html.erb +0 -1
  262. data/spec/public/template/templates/template.html.myt +0 -1
  263. data/spec/public/test/controller_matchers_spec.rb +0 -412
  264. data/spec/public/test/controllers/controller_assertion_mock.rb +0 -7
  265. data/spec/public/test/controllers/dispatch_controller.rb +0 -11
  266. data/spec/public/test/controllers/spec_helper_controller.rb +0 -39
  267. data/spec/public/test/multipart_request_helper_spec.rb +0 -159
  268. data/spec/public/test/multipart_upload_text_file.txt +0 -1
  269. data/spec/public/test/request_helper_spec.rb +0 -269
  270. data/spec/public/test/route_helper_spec.rb +0 -78
  271. data/spec/public/test/route_matchers_spec.rb +0 -166
  272. data/spec/public/test/view_helper_spec.rb +0 -96
  273. data/spec/public/test/view_matchers_spec.rb +0 -183
  274. data/spec/spec_helper.rb +0 -121
@@ -1,121 +0,0 @@
1
-
2
-
3
- module Merb::Test::Fixtures
4
-
5
- module Abstract
6
-
7
- class RenderIt < Merb::AbstractController
8
- self._template_root = File.dirname(__FILE__) / "views"
9
-
10
- def _template_location(context, type = nil, controller = controller_name)
11
- "partial/#{File.basename(controller)}/#{context}"
12
- end
13
- end
14
-
15
- class BasicPartial < RenderIt
16
-
17
- def index
18
- render
19
- end
20
- end
21
-
22
- class WithAbsolutePartial < RenderIt
23
-
24
- def index
25
- @absolute_partial_path = File.expand_path(File.dirname(__FILE__)) / 'views' / 'partial' / 'with_absolute_partial' / 'partial'
26
- render
27
- end
28
- end
29
-
30
- class WithPartial < RenderIt
31
-
32
- def index
33
- @foo = "With"
34
- render
35
- end
36
- end
37
-
38
- class WithNilPartial < RenderIt
39
-
40
- def index
41
- render
42
- end
43
- end
44
-
45
- class WithAsPartial < RenderIt
46
-
47
- def index
48
- @foo = "With and As"
49
- render
50
- end
51
- end
52
-
53
- class PartialWithCollections < RenderIt
54
-
55
- def index
56
- @foo = %w{ c o l l e c t i o n }
57
- render
58
- end
59
- end
60
-
61
- class PartialWithCollectionsAndAs < RenderIt
62
-
63
- def index
64
- @foo = %w{ c o l l e c t i o n }
65
- render
66
- end
67
- end
68
-
69
- class PartialWithCollectionsAndCounter < RenderIt
70
- def index
71
- @foo = %w(1 2 3 4 5)
72
- render
73
- end
74
- end
75
-
76
- class PartialWithLocals < RenderIt
77
-
78
- def index
79
- @foo, @bar = %w{ local variables }
80
- render
81
- end
82
- end
83
-
84
- class PartialWithBoth < RenderIt
85
-
86
- def index
87
- @foo = %w{ c o l l e c t i o n }
88
- @delimiter = "-"
89
- render
90
- end
91
- end
92
-
93
- class PartialWithWithAndLocals < RenderIt
94
-
95
- def index
96
- @foo, @bar = "with", "and locals"
97
- render
98
- end
99
- end
100
-
101
- class PartialInAnotherDirectory < RenderIt
102
-
103
- def index
104
- render
105
- end
106
- end
107
-
108
- class NestedPartial < RenderIt
109
- def index
110
- render
111
- end
112
- end
113
-
114
- class BasicPartialWithMultipleRoots < RenderIt
115
- self._template_roots << [File.dirname(__FILE__) / "alt_views", :_template_location]
116
- def index
117
- render
118
- end
119
- end
120
- end
121
- end
@@ -1,113 +0,0 @@
1
-
2
-
3
- module Merb::Test::Fixtures
4
-
5
- module Abstract
6
-
7
- class Testing < Merb::AbstractController
8
- self._template_root = File.dirname(__FILE__) / "views"
9
- end
10
-
11
- class RenderTwoThrowContents < Testing
12
-
13
- def index
14
- render
15
- end
16
- end
17
-
18
- class RenderString < Testing
19
-
20
- def index
21
- render "the index"
22
- end
23
- end
24
-
25
- class RenderStringCustomLayout < RenderString
26
- layout :custom
27
- end
28
-
29
- class RenderStringAppLayout < RenderString
30
- self._template_root = File.dirname(__FILE__) / "alt_views"
31
- end
32
-
33
- class RenderStringControllerLayout < RenderString
34
- self._template_root = File.dirname(__FILE__) / "alt_views"
35
- end
36
-
37
- class RenderStringDynamicLayout < RenderString
38
- layout :determine_layout
39
-
40
- def alt_index
41
- render "the alt index"
42
- end
43
-
44
- def determine_layout
45
- action_name.index('alt') == 0 ? 'alt' : 'custom'
46
- end
47
- end
48
-
49
- class RenderTemplate < Testing
50
-
51
- def index
52
- render
53
- end
54
- end
55
-
56
- class RenderTemplateCustomLayout < RenderString
57
- layout :custom
58
- end
59
-
60
- class RenderTemplateAppLayout < RenderString
61
- self._template_root = File.dirname(__FILE__) / "alt_views"
62
- end
63
-
64
- class RenderTemplateControllerLayout < RenderString
65
- self._template_root = File.dirname(__FILE__) / "alt_views"
66
- end
67
-
68
- class RenderNoDefaultAppLayout < RenderString
69
- self._template_root = File.dirname(__FILE__) / "alt_views"
70
- self.layout false
71
- end
72
-
73
- class RenderNoDefaultAppLayoutInherited < RenderNoDefaultAppLayout
74
- end
75
-
76
- class RenderDefaultAppLayoutInheritedOverride < RenderNoDefaultAppLayout
77
- self.default_layout
78
- end
79
-
80
- class RenderTemplateCustomLocation < RenderTemplate
81
- def _template_location(context, type = nil, controller = controller_name)
82
- "wonderful/#{context}"
83
- end
84
- end
85
-
86
- class RenderTemplateAbsolutePath < RenderTemplate
87
-
88
- def index
89
- render :template => File.expand_path(self._template_root) / 'wonderful' / 'index'
90
- end
91
-
92
- end
93
-
94
- class RenderTemplateMultipleRoots < RenderTemplate
95
- self._template_roots << [File.dirname(__FILE__) / "alt_views", :_template_location]
96
-
97
- def show
98
- render :layout => false
99
- end
100
- end
101
-
102
- class RenderTemplateMultipleRootsAndCustomLocation < RenderTemplate
103
- self._template_roots = [[File.dirname(__FILE__) / "alt_views", :_custom_template_location]]
104
-
105
- def _custom_template_location(context, type = nil, controller = controller_name)
106
- "#{self.class.name.split('::')[-1].to_const_path}/#{context}"
107
- end
108
- end
109
-
110
- class RenderTemplateMultipleRootsInherited < RenderTemplateMultipleRootsAndCustomLocation
111
- end
112
- end
113
- end
@@ -1 +0,0 @@
1
- <% x = capture do -%>Capture<% end -%><%= x %>
@@ -1 +0,0 @@
1
- Pre. <%= helper_using_capture do %>Capturing<% end =%>. Post.
@@ -1 +0,0 @@
1
- <% x = capture('one', 'two') do |one, two| -%>Capture: <%= one %>, <%= two %><% end -%><%= x %>
@@ -1 +0,0 @@
1
- <% concatter do -%>Hello<% end -%>
@@ -1 +0,0 @@
1
- Alt: <%= catch_content(:for_layout) %>
@@ -1 +0,0 @@
1
- Custom: <%= catch_content(:for_layout) %>
@@ -1 +0,0 @@
1
- <% throw_content(:foo, "Foo") %><% throw_content(:foo, "Bar") %><%= catch_content(:foo) %>
@@ -1 +0,0 @@
1
- Index <%= partial :partial %>
@@ -1 +0,0 @@
1
- <%= msg %> <%= partial 'second', :another => 'second' %> <%= msg %>
@@ -1 +0,0 @@
1
- <%= partial 'first', :msg => 'first' %>
@@ -1 +0,0 @@
1
- Index <%= partial 'another_directory/partial' %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :collection, :with => @foo, :as => :letter, :delimiter => @delimiter %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :collection, :with => @foo %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :collection, :with => @foo, :as => :letter %>
@@ -1 +0,0 @@
1
- <%= collection_index %>/<%= collection_size %>
@@ -1 +0,0 @@
1
- Partial counting: <%= partial :collection, :with => @foo %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :variables, :local => @foo, :variables => @bar %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :both, :with => @foo, :as => :first, :second => @bar %>
@@ -1 +0,0 @@
1
- Index <%= partial @absolute_partial_path %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :with_partial, :with => @foo, :as => :w00t %>
@@ -1 +0,0 @@
1
- <%= with_partial || "nil local" %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :with_partial, :with => nil %>
@@ -1 +0,0 @@
1
- <%= with_partial || "nil local" %>
@@ -1 +0,0 @@
1
- Partial with <%= partial :with_partial, :with => @foo %>
@@ -1,37 +0,0 @@
1
- require File.join(File.dirname(__FILE__), "spec_helper")
2
-
3
- describe Merb::AbstractController, " displaying objects with templates" do
4
-
5
- before do
6
- Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")
7
- end
8
-
9
- it "should allow you to pass an object" do
10
- dispatch_should_make_body("DisplayObject", "the index")
11
- end
12
-
13
- it "should allow you to pass an object with an action specified" do
14
- dispatch_should_make_body("DisplayObjectWithAction", "new action", :create)
15
- end
16
-
17
- it "should allow you to pass an object with a path specified for the template" do
18
- dispatch_should_make_body("DisplayObjectWithPath", "fooness")
19
- end
20
-
21
- it "should allow you to pass an object with a path specified for the template via opts" do
22
- dispatch_should_make_body("DisplayObjectWithPathViaOpts", "fooness")
23
- end
24
-
25
- it "should allow you to pass an object using multiple template root" do
26
- dispatch_should_make_body("DisplayObjectWithMultipleRoots", "App: new index")
27
- end
28
-
29
- it "should allow you to pass an object using multiple template root, with layout" do
30
- dispatch_should_make_body("DisplayObjectWithMultipleRoots", "Alt: new show", "show")
31
- end
32
-
33
- it "should allow you to pass an object using multiple template root, without layout" do
34
- dispatch_should_make_body("DisplayObjectWithMultipleRoots", "fooness", "another")
35
- end
36
-
37
- end
@@ -1,136 +0,0 @@
1
- # ==== Public API
2
- # Merb::AbstractController.before(filter<Symbol, Proc>, opts<Hash>)
3
- # Merb::AbstractController.after(filter<Symbol, Proc>, opts<Hash>)
4
- # Merb::AbstractController.skip_before(filter<Symbol>)
5
- # Merb::AbstractController.skip_after(filter<Symbol>)
6
- #
7
- # ==== Semipublic API
8
- # Merb::AbstractController#_body
9
- # Merb::AbstractController#_dispatch(action<~to_s>)
10
-
11
- require File.join(File.dirname(__FILE__), "spec_helper")
12
- AbstractControllers = Merb::Test::Fixtures::Abstract
13
-
14
- describe Merb::AbstractController, " should support before and after filters" do
15
-
16
- it "should support before filters" do
17
- dispatch_should_make_body("TestBeforeFilter", "foo filter")
18
- end
19
-
20
- it "should support after filters" do
21
- dispatch_should_make_body("TestAfterFilter", "foo filter")
22
- end
23
-
24
- it "should support skipping filters that were defined in a superclass" do
25
- dispatch_should_make_body("TestSkipFilter", "")
26
- end
27
-
28
- it "should append before filters when added" do
29
- dispatch_should_make_body("TestBeforeFilterOrder", "bar filter")
30
- end
31
-
32
- it "should append after filters when added" do
33
- dispatch_should_make_body("TestAfterFilterOrder", "bar filter")
34
- end
35
-
36
- it "should support proc arguments to filters evaluated in the controller's instance" do
37
- dispatch_should_make_body("TestProcFilter", "proc filter1 proc filter2")
38
- end
39
-
40
- it "should support proc arguments to filters when called inside a class method" do
41
- dispatch_should_make_body("TestProcFilterViaMethod", "onetwo")
42
- end
43
-
44
- it "should support filters that skip specific actions via :exclude" do
45
- dispatch_should_make_body("TestExcludeFilter", " ", :index)
46
- dispatch_should_make_body("TestExcludeFilter", "foo filter bar filter", :show)
47
- end
48
-
49
- it "should support filters that work only on specific actions via :only" do
50
- dispatch_should_make_body("TestOnlyFilter", "foo filter bar filter", :index)
51
- dispatch_should_make_body("TestOnlyFilter", " ", :show)
52
- end
53
-
54
- it "should throw an error if both :exclude and :only are passed to a filter" do
55
- running { Merb::Test::Fixtures::Abstract.class_eval do
56
-
57
- class TestErrorFilter < Merb::Test::Fixtures::Abstract::Testing
58
- before :foo, :only => :index, :exclude => :show
59
- end
60
- end }.should raise_error(ArgumentError, /either :only or :exclude/)
61
- end
62
-
63
- it "should support filters that work only when a condition is met via :if" do
64
- dispatch_should_make_body("TestConditionalFilterWithMethod", "foo filter", :index, :presets => {:bar= => true})
65
- dispatch_should_make_body("TestConditionalFilterWithMethod", "", :index, :presets => {:bar= => false})
66
- end
67
-
68
- it "should support filters that work only when a condition is met via :unless" do
69
- dispatch_should_make_body("TestConditionalFilterWithProc", "foo filter", :index, :presets => {:bar= => 'baz'})
70
- dispatch_should_make_body("TestConditionalFilterWithProc", "index action", :index, :presets => {:bar= => 'bar'})
71
- end
72
-
73
- it "should throw an error if both :if and :unless are passed to a filter" do
74
- running { Merb::Test::Fixtures::Abstract.class_eval do
75
-
76
- class TestErrorFilter < Merb::Test::Fixtures::Abstract::Testing
77
- before :foo, :if => :index, :unless => :show
78
- end
79
- end }.should raise_error(ArgumentError, /either :if or :unless/)
80
- end
81
-
82
- it "should throw an error" do
83
- running { dispatch_should_make_body("TestConditionalFilterWithNoProcOrSymbol", "") }.should raise_error(ArgumentError, /a Symbol or a Proc/)
84
- end
85
-
86
- it "should throw an error if an unknown option is passed to a filter" do
87
- running { Merb::Test::Fixtures::Abstract.class_eval do
88
-
89
- class TestErrorFilter < Merb::Test::Fixtures::Abstract::Testing
90
- before :foo, :except => :index
91
- end
92
- end }.should raise_error(ArgumentError, /known filter options/)
93
- end
94
-
95
- it "should support passing an argument to a before filter method" do
96
- dispatch_should_make_body("TestBeforeFilterWithArgument", "index action")
97
- end
98
-
99
- it "should support passing arguments to a before filter method" do
100
- dispatch_should_make_body("TestBeforeFilterWithArguments", "index action")
101
- end
102
-
103
- it "should support throwing :halt to block a filter chain" do
104
- dispatch_should_make_body("BeforeFilterWithThrowHalt", "Halt thrown")
105
- end
106
-
107
- it "should support throwing a proc in filters" do
108
- dispatch_should_make_body("BeforeFilterWithThrowProc", "Proc thrown")
109
- end
110
-
111
- it "should raise an InternalServerError if :halt is thrown with unexpected type" do
112
- calling { dispatch_to(AbstractControllers::FilterChainError, :index) }.should(
113
- raise_error(ArgumentError, /Threw :halt, Merb. Expected String/))
114
- end
115
-
116
- it "should print useful HTML if throw :halt is called with nil" do
117
- dispatch_should_make_body("ThrowNil",
118
- "<html><body><h1>Filter Chain Halted!</h1></body></html>")
119
- end
120
-
121
- it "should inherit before filters" do
122
- dispatch_should_make_body("FilterChild2", "Before Limited", :limited)
123
- end
124
-
125
- it "should provide benchmarks" do
126
- controller = dispatch_to(AbstractControllers::Benchmarking, :index)
127
- controller._benchmarks[:before_filters_time].should be_kind_of(Numeric)
128
- controller._benchmarks[:after_filters_time].should be_kind_of(Numeric)
129
- end
130
-
131
- it "should not get contaminated by cousins" do
132
- dispatch_should_make_body("FilterChild2", "Before Index")
133
- dispatch_should_make_body("FilterChild1", "Before Limited", :limited)
134
- dispatch_should_make_body("FilterChild1", " Index")
135
- end
136
- end