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 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 8a2e4d1daf96a3beaed151d643d497e8a52cae1f Shalon Wood dstar@pele.cx http://github.com/wycats/merb-core/commit/a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 2008-06-24T15:23:23-07:00 2008-06-06T14:19:24-07:00 Increase header level on sub-headers of Filters in AbstractController Signed-off-by: Michael S. Klishin <michael@novemberain.com> e4cedf165df933769a571eefbb7c326038146a5b Michael S. Klishin michael@novemberain.com 3ce92cba3385373655776f5c99735b3c635a12cd Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/8a2e4d1daf96a3beaed151d643d497e8a52cae1f 8a2e4d1daf96a3beaed151d643d497e8a52cae1f 2008-06-24T15:12:37-07:00 2008-06-24T15:12:37-07:00 Fixes request helper bug [#378: resolved] 743bd4a85889d69a3d59a75a2d96b9b1430d09c2 Yehuda Katz wycats@gmail.com e7d4005e0b4ca89d65c006b7c1bdeabb8cdb1af8 8aa0d96aaf86b0bdfdaa236962d1db58737aba8a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/3ce92cba3385373655776f5c99735b3c635a12cd 3ce92cba3385373655776f5c99735b3c635a12cd 2008-06-24T14:47:35-07:00 2008-06-24T14:47:35-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: If the spec.opts file exists, use it. use Thread.pass to avoid running newly queued item before the action's thread finishes Added Merb::Worker. You can now add a block to be run in a separate thread Fixes the after filters 11ab4efbe7703854b3e0f2045adfc79919dfb527 Yehuda Katz wycats@gmail.com 14449e2544b5db9ba201bb432925c83e5fa1e566 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e7d4005e0b4ca89d65c006b7c1bdeabb8cdb1af8 e7d4005e0b4ca89d65c006b7c1bdeabb8cdb1af8 2008-06-24T14:47:23-07:00 2008-06-24T14:47:23-07:00 Fixes case of :format being ignored. 495b533ea8d1e3f7ac8cb07fd25a927dec35afb9 Yehuda Katz wycats@gmail.com d170d20655d0292f80318484bf757f47c49a2d46 Coda Hale coda.hale@gmail.com http://github.com/wycats/merb-core/commit/8aa0d96aaf86b0bdfdaa236962d1db58737aba8a 8aa0d96aaf86b0bdfdaa236962d1db58737aba8a 2008-06-24T13:57:25-07:00 2008-05-31T20:51:34-07:00 If the spec.opts file exists, use it. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 5cb975db43fff8794ca61a703a36c5e5157c2f42 Michael S. Klishin michael@novemberain.com e0b3cf4abfe775a20113ad0721c924fc0fd92247 09bd2eeac6b990a05f28437ebbfad501d55f6f3a Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/d170d20655d0292f80318484bf757f47c49a2d46 d170d20655d0292f80318484bf757f47c49a2d46 2008-06-23T23:08:36-07:00 2008-06-23T23:08:36-07:00 Merge branch 'master' of git@github.com:wycats/merb-core e4a7fa54bc1ca06013c7b352d5af75cf782b3c3d Ezra Zygmuntowicz ez@engineyard.com 151b0ea4caee07ef0b3a1ab5bb9ffca2ef218cbf Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/e0b3cf4abfe775a20113ad0721c924fc0fd92247 e0b3cf4abfe775a20113ad0721c924fc0fd92247 2008-06-23T23:08:30-07:00 2008-06-23T23:08:30-07:00 use Thread.pass to avoid running newly queued item before the action's thread finishes 739438ed986a6b604b780cd0d8e24aac7cb1c15a Ezra Zygmuntowicz ez@engineyard.com 151b0ea4caee07ef0b3a1ab5bb9ffca2ef218cbf 24905e0428d5dbd5b832e41dcce25380056d1b10 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/09bd2eeac6b990a05f28437ebbfad501d55f6f3a 09bd2eeac6b990a05f28437ebbfad501d55f6f3a 2008-06-23T21:17:22-07:00 2008-06-23T21:17:22-07:00 Merge branch 'after_filter' 0cacd97d5be54c5de0adbfe398b824385c122a1e Daniel Neighman has.sox@gmail.com ff42997e2a50613d37c40012b4cec623c3cc2fd5 14449e2544b5db9ba201bb432925c83e5fa1e566 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/151b0ea4caee07ef0b3a1ab5bb9ffca2ef218cbf 151b0ea4caee07ef0b3a1ab5bb9ffca2ef218cbf 2008-06-23T21:13:13-07:00 2008-06-23T21:13:13-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 56dd17fd89f1a8c72c0b3a907fca89f17fbf8eb5 Ezra Zygmuntowicz ez@engineyard.com 8ceb03e11d386feadfa9dd47b57d72c99e36ee6a Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ff42997e2a50613d37c40012b4cec623c3cc2fd5 ff42997e2a50613d37c40012b4cec623c3cc2fd5 2008-06-23T21:13:05-07:00 2008-06-23T21:13:05-07:00 Added Merb::Worker. You can now add a block to be run in a separate thread from your merb controllers with the run_later method run_later do SomeBackgroundTask.run end The block gets pushed onto a thread safe Queue in the Dispatcher and a Merb::Worker class has a thread that loops over items in the queue and calls the block. The work goes to sleep when the queue is empty and wakes up when items are added to the queue 2d01ce2d4e363690d014714cff3431d2f71b17d0 Ezra Zygmuntowicz ez@engineyard.com eeac765396194f17053de3ccb48db980e280a72d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/14449e2544b5db9ba201bb432925c83e5fa1e566 14449e2544b5db9ba201bb432925c83e5fa1e566 2008-06-23T16:56:27-07:00 2008-06-23T16:56:27-07:00 Let's try again, this time with <% end =%> f746e449ec54bf8439661265a510a698488a8cb1 Yehuda Katz wycats@gmail.com