d1a25440cf10474f07a8a0aa03a82a9d72533961 eea5ce624df1fda523aad0437e70444b55e0d4a9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9778c2109288e66673f1c4846917d5e8aeb54626 9778c2109288e66673f1c4846917d5e8aeb54626 2008-06-28T04:25:56-07:00 2008-06-28T04:25:56-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Spec for previously applied patch to Behavior#defer_to. use Route#register in defer_to so that deferred routes get an index Make Autotest ignore doc/ as well. Ensure Autotest ignores changes in log directory. Add helpers directory to load path Modules don't get duped right. Redo Merb's inheritable_accessors so that they have correct semantics, then redo everything that uses inheritable_accessors so they don't have to hack around the bad semantics. Added spec for the route matcher testing regexp routes. [#386] Add Merb.started? alias for Merb.started reader. Add reader for @started flag which shows when Merb environment is started. ebd079a5820f5ff8b1ce63ae6dda3084e59465b7 Michael S. Klishin michael@novemberain.com 4255bdbc4aa107775ea8cec5fac43fdf92b22829 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/eea5ce624df1fda523aad0437e70444b55e0d4a9 eea5ce624df1fda523aad0437e70444b55e0d4a9 2008-06-28T04:12:36-07:00 2008-06-28T04:12:36-07:00 Spec for previously applied patch to Behavior#defer_to. b3e2d128d82f752a034fd2fa26c7d40eb9dbf698 Michael S. Klishin michael@novemberain.com 6c350138fe7e05ac2069a069719eb3d07ebe04a3 Shalon Wood dstar@pele.cx http://github.com/wycats/merb-core/commit/4255bdbc4aa107775ea8cec5fac43fdf92b22829 4255bdbc4aa107775ea8cec5fac43fdf92b22829 2008-06-28T03:53:23-07:00 2008-06-18T09:35:41-07:00 use Route#register in defer_to so that deferred routes get an index Signed-off-by: Michael S. Klishin <michael@novemberain.com> 0bf275442a87822ddb0d501b8fec7f184f74349f Michael S. Klishin michael@novemberain.com 4982a0aaf86eb5e0246816a87782bf4266dc88a5 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6c350138fe7e05ac2069a069719eb3d07ebe04a3 6c350138fe7e05ac2069a069719eb3d07ebe04a3 2008-06-28T03:49:26-07:00 2008-06-28T03:49:26-07:00 Make Autotest ignore doc/ as well. 776a84bf2ce67152c1b8e5ed0da47bf88c3f07c0 Michael S. Klishin michael@novemberain.com 2ca81c5a87052bd2b5321551ffa4107b6f0a4687 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4982a0aaf86eb5e0246816a87782bf4266dc88a5 4982a0aaf86eb5e0246816a87782bf4266dc88a5 2008-06-28T03:45:19-07:00 2008-06-28T03:45:19-07:00 Ensure Autotest ignores changes in log directory. cefc11b04a0f2679c3e26d595736966cbad6745b Michael S. Klishin michael@novemberain.com 20b13c1d846cd755222486694b42a00cb07725c9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/2ca81c5a87052bd2b5321551ffa4107b6f0a4687 2ca81c5a87052bd2b5321551ffa4107b6f0a4687 2008-06-28T03:39:08-07:00 2008-06-28T03:03:24-07:00 Add helpers directory to load path 1f29c6067d481ab04aeccfe90b01f4602ff81cee Michael S. Klishin michael@novemberain.com aee1144d79c63a4ecd6ba5a2e1a8ddca9aaef70c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/20b13c1d846cd755222486694b42a00cb07725c9 20b13c1d846cd755222486694b42a00cb07725c9 2008-06-27T23:34:49-07:00 2008-06-27T23:34:49-07:00 Modules don't get duped right. af0bdad4cfb48b362f0cdf40bd05c4146a277cc9 Yehuda Katz wycats@gmail.com b5e42a1d7e1000516b7799bbc35efe442bbea6c9 38f1b58fc2a0c9be3b21ccb5da03f38d4c9166a9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/aee1144d79c63a4ecd6ba5a2e1a8ddca9aaef70c aee1144d79c63a4ecd6ba5a2e1a8ddca9aaef70c 2008-06-27T21:36:19-07:00 2008-06-27T21:36:19-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Added spec for the route matcher testing regexp routes. [#386] Add Merb.started? alias for Merb.started reader. Add reader for @started flag which shows when Merb environment is started. better log message rescue excpetions in Worker thread, log them and then restart the work queue Router now can do r.match("/this/old/url").redirect("/where/this/resides/now"). Refactor Merb::Test::RequestHelper and introduce build_request helper. spoke too soon. we actually don't need to log this at all as its logged latert in the _benchmarks Update link to wiki page on Rack in exception. Add link to Rack page at wiki to Controller not found exception. This confuses people a lot. Log namespaced controller name when it's class is not found. I will test first next time, I promise. Tell what's actually started when Dispatcher begins to handle request. Fixed typo in yet another exception message. Log an info message when route fixation actually happens. Those heavily using Flash will find it helpful. Log a warning if controller class cannot be found. A bit more verbose exception message when route does not specify a controller. Documentation: add deprecation warning to AbstractController. Manually applied patch from dstar. Increase header level on sub-headers of Filters in AbstractController a0f90baa6fe4d4da4542a99717a17883da2881ad Yehuda Katz wycats@gmail.com 8a2e4d1daf96a3beaed151d643d497e8a52cae1f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/b5e42a1d7e1000516b7799bbc35efe442bbea6c9 b5e42a1d7e1000516b7799bbc35efe442bbea6c9 2008-06-27T21:36:13-07:00 2008-06-27T21:36:13-07:00 Redo Merb's inheritable_accessors so that they have correct semantics, then redo everything that uses inheritable_accessors so they don't have to hack around the bad semantics. b23327b14d1f1e72fc1b368ecae8f2670f8aa6c1 Yehuda Katz wycats@gmail.com 1fed4e5b1c95b145e9e30d2679417348678adda5 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/38f1b58fc2a0c9be3b21ccb5da03f38d4c9166a9 38f1b58fc2a0c9be3b21ccb5da03f38d4c9166a9 2008-06-27T16:16:40-07:00 2008-06-27T16:16:40-07:00 Added spec for the route matcher testing regexp routes. [#386] db483b9d5b9282be24366f8ccea75b0b8846513f Ben Burkert ben@benburkert.com 5cc5ce16bf5bdf17f96a471be7fcbffd795688b6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/1fed4e5b1c95b145e9e30d2679417348678adda5 1fed4e5b1c95b145e9e30d2679417348678adda5 2008-06-27T12:08:26-07:00 2008-06-27T12:08:26-07:00 Add Merb.started? alias for Merb.started reader. 0ea88d212e3d9b3783aeb45021db52e60a6462cc Michael S. Klishin michael@novemberain.com 848b9ac331085257281ac3be222fbf17f480ad18 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5cc5ce16bf5bdf17f96a471be7fcbffd795688b6 5cc5ce16bf5bdf17f96a471be7fcbffd795688b6 2008-06-27T12:04:47-07:00 2008-06-27T12:04:47-07:00 Add reader for @started flag which shows when Merb environment is started. 02e5c4d7c5ff84d817273822ce85f2068f9480e5 Michael S. Klishin michael@novemberain.com ca87d5b62a62c4de319f943aa3e445bb21aeac3e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/d1a25440cf10474f07a8a0aa03a82a9d72533961 d1a25440cf10474f07a8a0aa03a82a9d72533961 2008-06-25T16:33:35-07:00 2008-06-25T16:27:42-07:00 Update memory session storage documentation. 578ce939bfad90589f3e4f7b1ff763cb723b4e20 Michael S. Klishin michael@novemberain.com 848b9ac331085257281ac3be222fbf17f480ad18 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ca87d5b62a62c4de319f943aa3e445bb21aeac3e ca87d5b62a62c4de319f943aa3e445bb21aeac3e 2008-06-25T16:33:35-07:00 2008-06-25T16:24:43-07:00 Use warn logger level instead of debug, if session persisting fails. e662ae77e42c90c9053fde90419c552c7d851743 Michael S. Klishin michael@novemberain.com 69e1f1d3f71b0691c49ea91fd1d3a4b3fcb345be Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/848b9ac331085257281ac3be222fbf17f480ad18 848b9ac331085257281ac3be222fbf17f480ad18 2008-06-24T19:51:44-07:00 2008-06-24T19:51:44-07:00 better log message 220157ed07a4f05300498df46ac7df6ed99f92fe Ezra Zygmuntowicz ez@engineyard.com 435cd738e91e56e4acf89fbd7335281a1e33152c Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/69e1f1d3f71b0691c49ea91fd1d3a4b3fcb345be 69e1f1d3f71b0691c49ea91fd1d3a4b3fcb345be 2008-06-24T19:48:57-07:00 2008-06-24T19:48:57-07:00 rescue excpetions in Worker thread, log them and then restart the work queue dc4c78470054ec793f62c18c77230018c2fb5787 Ezra Zygmuntowicz ez@engineyard.com c3fc0abd813c1a06091610dbb8e798494db35281 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/435cd738e91e56e4acf89fbd7335281a1e33152c 435cd738e91e56e4acf89fbd7335281a1e33152c 2008-06-24T19:13:27-07:00 2008-06-24T19:13:27-07:00 Router now can do r.match("/this/old/url").redirect("/where/this/resides/now"). * Redirects without instantiating controller and processing action and filters. * Brought you by Cory O'Daniel (dispatcher changes) and Michael Klishin (router/behavior changes). * See http://merb.lighthouseapp.com/projects/7433/tickets/305. e8b359245dea10e29a554d6ed1a26f5bf904f572 Michael S. Klishin michael@novemberain.com e522f1c24a6b9bd9c1249dba41b8c3764e4d59b4 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c3fc0abd813c1a06091610dbb8e798494db35281 c3fc0abd813c1a06091610dbb8e798494db35281 2008-06-24T18:52:19-07:00 2008-06-24T18:52:19-07:00 Refactor Merb::Test::RequestHelper and introduce build_request helper. * Credit should go to dstar but his patch did not apply to HEAD so I manually applied it and removed some extra variables. * Extracted duplicated messy code in dispatch_to* helpers. * Introduced build_request helper that is helpful when you add cookies, etc. * See http://merb.lighthouseapp.com/projects/7433-merb-core/tickets/368 for other details and background. bc810484376ea407ee2d5850fd0e1bd303cb8676 Michael S. Klishin michael@novemberain.com b414694458602271824a24c7b04f511312994c2e Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/e522f1c24a6b9bd9c1249dba41b8c3764e4d59b4 e522f1c24a6b9bd9c1249dba41b8c3764e4d59b4 2008-06-24T16:35:57-07:00 2008-06-24T16:35:57-07:00 spoke too soon. 6e019d33e8eeec06102a914080619b37a593c3fa Ezra Zygmuntowicz ez@engineyard.com 3c26ed7476550514284826fedaebf446694d8679 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/b414694458602271824a24c7b04f511312994c2e b414694458602271824a24c7b04f511312994c2e 2008-06-24T16:32:58-07:00 2008-06-24T16:32:58-07:00 we actually don't need to log this at all as its logged latert in the _benchmarks 0cf23367218ef278ef22008d056e55f6511f41a5 Ezra Zygmuntowicz ez@engineyard.com 3ee33dd46b531aac77b27c138064d7e846ec8c6d Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3c26ed7476550514284826fedaebf446694d8679 3c26ed7476550514284826fedaebf446694d8679 2008-06-24T16:22:58-07:00 2008-06-24T16:22:58-07:00 Update link to wiki page on Rack in exception. 6e019d33e8eeec06102a914080619b37a593c3fa Michael S. Klishin michael@novemberain.com 9f368ca101d30bc61f05d033c671d3013817dcfa Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3ee33dd46b531aac77b27c138064d7e846ec8c6d 3ee33dd46b531aac77b27c138064d7e846ec8c6d 2008-06-24T16:18:17-07:00 2008-06-24T16:18:17-07:00 Add link to Rack page at wiki to Controller not found exception. This confuses people a lot. 33e5e803907ed36e7b86014b9e48ba72d57286dc Michael S. Klishin michael@novemberain.com 6056b0ebf6cba40cf9632ea1188ae832dcc9d11f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9f368ca101d30bc61f05d033c671d3013817dcfa 9f368ca101d30bc61f05d033c671d3013817dcfa 2008-06-24T16:10:17-07:00 2008-06-24T16:10:17-07:00 Log namespaced controller name when it's class is not found. 713c44af9b612b2265f8586647e46467c7e6e5e5 Michael S. Klishin michael@novemberain.com 0f7f7d5c8bfdc768d921b0dee463aac25b41d9c3 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6056b0ebf6cba40cf9632ea1188ae832dcc9d11f 6056b0ebf6cba40cf9632ea1188ae832dcc9d11f 2008-06-24T15:56:16-07:00 2008-06-24T15:56:16-07:00 I will test first next time, I promise. 3d5e043f8150bf604c1638d261ad664f93df3c4c Michael S. Klishin michael@novemberain.com 1f1da9f29c71c2149b7a425c8de90e067ef9ec0a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0f7f7d5c8bfdc768d921b0dee463aac25b41d9c3 0f7f7d5c8bfdc768d921b0dee463aac25b41d9c3 2008-06-24T15:54:43-07:00 2008-06-24T15:54:43-07:00 Tell what's actually started when Dispatcher begins to handle request. 03b871d59e42e9efe995ca79333afad6863baa92 Michael S. Klishin michael@novemberain.com 5271af61448fd9a146d3f2b3e6ccf376870752ae Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/1f1da9f29c71c2149b7a425c8de90e067ef9ec0a 1f1da9f29c71c2149b7a425c8de90e067ef9ec0a 2008-06-24T15:53:57-07:00 2008-06-24T15:53:57-07:00 Fixed typo in yet another exception message. 2598cf6a6746899fe53528e763235e96a2c1bb0c Michael S. Klishin michael@novemberain.com f21ca057ba8f0c5c8767398fc35bcecffaad5fdb Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5271af61448fd9a146d3f2b3e6ccf376870752ae 5271af61448fd9a146d3f2b3e6ccf376870752ae 2008-06-24T15:53:02-07:00 2008-06-24T15:53:02-07:00 Log an info message when route fixation actually happens. Those heavily using Flash will find it helpful. d9ea0a64954c0e344e3fb67e67370739cdca1533 Michael S. Klishin michael@novemberain.com c13972d77d4c16d6113e216aa24fbf55dd0b37e5 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/f21ca057ba8f0c5c8767398fc35bcecffaad5fdb f21ca057ba8f0c5c8767398fc35bcecffaad5fdb 2008-06-24T15:49:31-07:00 2008-06-24T15:49:31-07:00 Log a warning if controller class cannot be found. 40618fbe2e507c6952ade58285e76545d173e45f Michael S. Klishin michael@novemberain.com f97d7f0f0de8eac753c0270526281d587623f790 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c13972d77d4c16d6113e216aa24fbf55dd0b37e5 c13972d77d4c16d6113e216aa24fbf55dd0b37e5 2008-06-24T15:34:41-07:00 2008-06-24T15:34:41-07:00 A bit more verbose exception message when route does not specify a controller. 40df8b541a4f1a43ccdfe77244091a56bb79103f Michael S. Klishin michael@novemberain.com a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/f97d7f0f0de8eac753c0270526281d587623f790 f97d7f0f0de8eac753c0270526281d587623f790 2008-06-24T15:23:23-07:00 2008-06-24T15:22:21-07:00 Documentation: add deprecation warning to AbstractController. Manually applied patch from dstar. d687b963877a416ef989c6e119c7d27560a1f2c3 Michael S. Klishin michael@novemberain.com