4ca5195c6663b0f0060a70643580d358859b42ff 063c4caa2f098d221490418607cd43eab5cce4f3 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8c7398640ba4cafff011a6abd0d5e7655ccc5cec 8c7398640ba4cafff011a6abd0d5e7655ccc5cec 2008-08-08T18:14:19-07:00 2008-08-08T18:14:19-07:00 Resolve conflict. d742a6ccbc2149cf8bfb459408fd1448c7a0e320 Michael S. Klishin michael@novemberain.com 5dcbcc51efcbb62a06e74ee17cf31c39f2682c34 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/063c4caa2f098d221490418607cd43eab5cce4f3 063c4caa2f098d221490418607cd43eab5cce4f3 2008-08-08T15:16:08-07:00 2008-08-08T15:16:08-07:00 Don't need this spec anymore. 0a6948c3faa75d2b79b5ca984c8c5cb2d5920a39 Yehuda Katz wycats@gmail.com e84d44019b416d0b154123cce8843d5a36728584 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5dcbcc51efcbb62a06e74ee17cf31c39f2682c34 5dcbcc51efcbb62a06e74ee17cf31c39f2682c34 2008-08-08T15:15:16-07:00 2008-08-08T15:15:16-07:00 More work on the dispatcher. a1df02dec5bb08f7e8bb1934de3a0d2186d620b3 Yehuda Katz wycats@gmail.com 44e50a4233d8f7c1c730a2759b6558fb2da16c89 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e84d44019b416d0b154123cce8843d5a36728584 e84d44019b416d0b154123cce8843d5a36728584 2008-08-08T13:43:07-07:00 2008-08-08T13:43:07-07:00 Documentation improvement + improvement in division of responsibilities. 9a79f10edca45e600e26a31d24cf59010e280184 Yehuda Katz wycats@gmail.com 261067a44440c6c3cb2c04b9dab917a1aa7eec70 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/44e50a4233d8f7c1c730a2759b6558fb2da16c89 44e50a4233d8f7c1c730a2759b6558fb2da16c89 2008-08-08T07:05:03-07:00 2008-08-08T07:05:03-07:00 Before moving stuff into the Rack adapter. 3fdba1e8231676c6926f4b37df2da9bc629c7144 Yehuda Katz wycats@gmail.com cec5821fa8f504f22eeee36555b9c361280720ee Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/261067a44440c6c3cb2c04b9dab917a1aa7eec70 261067a44440c6c3cb2c04b9dab917a1aa7eec70 2008-08-08T05:35:06-07:00 2008-08-08T05:35:06-07:00 Additional refactor of the default Exceptions to use an actual Merb controller. Almost ready for a merge. Yeehaw! b894ae5806a8365de8ca94c4573cfda81fa07221 Yehuda Katz wycats@gmail.com e075e215f317564a400285d984a757256cb8703c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cec5821fa8f504f22eeee36555b9c361280720ee cec5821fa8f504f22eeee36555b9c361280720ee 2008-08-08T03:42:34-07:00 2008-08-08T03:42:34-07:00 Even more awesome dispatcher improvements. 3715b9726e202324c4bcd8c60cadcd01b802fac0 Yehuda Katz wycats@gmail.com 26a76ff482cb18a15f2fd0af64addbdebbf65c4c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4ca5195c6663b0f0060a70643580d358859b42ff 4ca5195c6663b0f0060a70643580d358859b42ff 2008-08-08T03:18:14-07:00 2008-08-08T03:18:14-07:00 Added one more bench for Responder (out of curiosity). The fastest so far :) a3fecc9447aba51dd8ad39f0e9ea5a9c4a27bbad Michael S. Klishin michael@novemberain.com 0f192988e474bda8b93b565c80988e3dc13c0d64 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/26a76ff482cb18a15f2fd0af64addbdebbf65c4c 26a76ff482cb18a15f2fd0af64addbdebbf65c4c 2008-08-08T02:57:31-07:00 2008-08-08T02:57:31-07:00 One less cryptic exception message in Merb core. 13210c1f45358a4e8e4c77730bd6c2505e06cae3 Michael S. Klishin michael@novemberain.com ab6cbc72da30f4db528c1dec1cad55cb7fb89db9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0f192988e474bda8b93b565c80988e3dc13c0d64 0f192988e474bda8b93b565c80988e3dc13c0d64 2008-08-08T02:25:24-07:00 2008-08-08T02:25:24-07:00 Fix path in Responder benchmark 6f76c9d7af85071bfb32e3e6c10d29a3f8d8416b Michael S. Klishin michael@novemberain.com 808763565212ecdb34bf6ede92c44963bc37af87 2da03d5e818c8d2345e798d2d3cd094173a88990 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ab6cbc72da30f4db528c1dec1cad55cb7fb89db9 ab6cbc72da30f4db528c1dec1cad55cb7fb89db9 2008-08-08T00:02:08-07:00 2008-08-08T00:02:08-07:00 Resolved conflict. 0fd1ec5545046febf1657e6ba6e1839410af6985 Michael S. Klishin michael@novemberain.com 6395c9f84639ad0e671eec00c1ee184cd4d67229 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/808763565212ecdb34bf6ede92c44963bc37af87 808763565212ecdb34bf6ede92c44963bc37af87 2008-08-08T00:00:53-07:00 2008-08-07T23:59:09-07:00 Wording. 0fd1ec5545046febf1657e6ba6e1839410af6985 Michael S. Klishin michael@novemberain.com 2f2c3785199b0bd2d790ab2dcbebed0ef7f82192 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6395c9f84639ad0e671eec00c1ee184cd4d67229 6395c9f84639ad0e671eec00c1ee184cd4d67229 2008-08-08T00:00:53-07:00 2008-08-07T23:57:12-07:00 Make filter exceptions explain what the (user) options are. 585eb07cec22df5f66adb51dd29588ee02cec63b Michael S. Klishin michael@novemberain.com c57114a6bbed34faae15302172db3f2e87961b44 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/2f2c3785199b0bd2d790ab2dcbebed0ef7f82192 2f2c3785199b0bd2d790ab2dcbebed0ef7f82192 2008-08-08T00:00:53-07:00 2008-08-07T08:56:57-07:00 Fixes an issue with status symbols d989b1b4526ecfe9677f63925dc6f8bf4e85961a Michael S. Klishin michael@novemberain.com b476900ca4813b4fac7ca80b3766337615f8340c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c57114a6bbed34faae15302172db3f2e87961b44 c57114a6bbed34faae15302172db3f2e87961b44 2008-08-08T00:00:52-07:00 2008-08-07T08:17:24-07:00 More verbose exception when status value is invalid. f7cac5597bcd3ec06c540711b69bea1643f844d7 Michael S. Klishin michael@novemberain.com 6d744538809c24163f5df2b26ee8dd8b86e23525 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/b476900ca4813b4fac7ca80b3766337615f8340c b476900ca4813b4fac7ca80b3766337615f8340c 2008-08-08T00:00:52-07:00 2008-08-07T08:16:30-07:00 Fixed a problem in new dispatcher. 30504696e33d95beffc25b32289dbbddbb15598f Michael S. Klishin michael@novemberain.com 1fb1fc7a9e9d1d39dd09ab6502f170408fbe8cf5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/6d744538809c24163f5df2b26ee8dd8b86e23525 6d744538809c24163f5df2b26ee8dd8b86e23525 2008-08-08T00:00:52-07:00 2008-08-07T00:19:10-07:00 We don't need this anymore 61cc160ca1d3cef3b8ab2959bac8866baea0a739 Michael S. Klishin michael@novemberain.com 27a337c80a52eaa1703d7ba7d940f1883987cf70 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/1fb1fc7a9e9d1d39dd09ab6502f170408fbe8cf5 1fb1fc7a9e9d1d39dd09ab6502f170408fbe8cf5 2008-08-08T00:00:52-07:00 2008-08-07T00:08:13-07:00 Continues dispatch refactor. Exceptions now maintain a stack that is reported in the case of exceptions that, themselves, throw exceptions. d9470aa7720464007dfb9afc3cbd007ec9eb88c8 Michael S. Klishin michael@novemberain.com f1dca57a3c54c6ba887d81d57201e5e5717b0566 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/27a337c80a52eaa1703d7ba7d940f1883987cf70 27a337c80a52eaa1703d7ba7d940f1883987cf70 2008-08-08T00:00:52-07:00 2008-08-06T12:25:54-07:00 the dispatcher specs c996d7ff37eddfbc596c546ddf493e17ccaa7ee5 Michael S. Klishin michael@novemberain.com 99ed47c02a88c6d9613b28e295745de16d682b80 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f1dca57a3c54c6ba887d81d57201e5e5717b0566 f1dca57a3c54c6ba887d81d57201e5e5717b0566 2008-08-08T00:00:52-07:00 2008-08-06T02:33:02-07:00 Add more edge-case specs to Dispatcher and make sure they pass. 2f24cf4bd85d63b788aa43d834d45f0a1e842ea0 Michael S. Klishin michael@novemberain.com 7e333aed48e5e52c86a0252ef22a9d4a3a4669e2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/99ed47c02a88c6d9613b28e295745de16d682b80 99ed47c02a88c6d9613b28e295745de16d682b80 2008-08-08T00:00:52-07:00 2008-08-04T00:51:02-07:00 Refactor Dispatcher.handle to reduce complexity effc19e0f4644a39015a12134fecf42171d6b627 Michael S. Klishin michael@novemberain.com ccfc759586d8a595b64de0700724dea4b5a5b520 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7e333aed48e5e52c86a0252ef22a9d4a3a4669e2 7e333aed48e5e52c86a0252ef22a9d4a3a4669e2 2008-08-08T00:00:52-07:00 2008-08-03T16:38:48-07:00 Fix some ruby warnings 692eb8374c9ac8317eb7925c0af6a69f3c1c71d7 Michael S. Klishin michael@novemberain.com aa6e37d5c013445ce987384844b807bd45e3935b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ccfc759586d8a595b64de0700724dea4b5a5b520 ccfc759586d8a595b64de0700724dea4b5a5b520 2008-08-08T00:00:52-07:00 2008-08-03T16:37:47-07:00 Added flog tasks to rake d932c7966ac0a29ad6c998d0b2cca3b09f74a91b Michael S. Klishin michael@novemberain.com ae6b8a9cfc0234b944006895ebde3fde9709c75a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/2da03d5e818c8d2345e798d2d3cd094173a88990 2da03d5e818c8d2345e798d2d3cd094173a88990 2008-08-07T23:57:12-07:00 2008-08-07T23:57:12-07:00 Make filter exceptions explain what the (user) options are. 585eb07cec22df5f66adb51dd29588ee02cec63b Michael S. Klishin michael@novemberain.com cdba001ed512a380141310e4040b42418cd8b1af aa6e37d5c013445ce987384844b807bd45e3935b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e075e215f317564a400285d984a757256cb8703c e075e215f317564a400285d984a757256cb8703c 2008-08-07T10:08:38-07:00 2008-08-07T10:08:38-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 82e3e403ac1d854a026aed3323d7f778cb54e7c4 Yehuda Katz wycats@gmail.com 6697034331fca5a7277207d21bbbe3cd4a091584 cdba001ed512a380141310e4040b42418cd8b1af Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ae6b8a9cfc0234b944006895ebde3fde9709c75a ae6b8a9cfc0234b944006895ebde3fde9709c75a 2008-08-07T08:58:31-07:00 2008-08-07T08:58:31-07:00 Merge branch 'dispatcher_refactor' into tmp * dispatcher_refactor: Fixes an issue with status symbols d989b1b4526ecfe9677f63925dc6f8bf4e85961a Michael S. Klishin michael@novemberain.com aa45abf9c5ddb9ef5a148c8c5440dff010af92dc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cdba001ed512a380141310e4040b42418cd8b1af cdba001ed512a380141310e4040b42418cd8b1af 2008-08-07T08:56:57-07:00 2008-08-07T08:56:57-07:00 Fixes an issue with status symbols c2e919aa62f2341c2d7fb631b1977402b361303a Yehuda Katz wycats@gmail.com 12f8e1bbaaed6db993def9ce0f00fba7d6b27eef Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6697034331fca5a7277207d21bbbe3cd4a091584 6697034331fca5a7277207d21bbbe3cd4a091584 2008-08-07T08:17:24-07:00 2008-08-07T08:17:24-07:00 More verbose exception when status value is invalid. f7cac5597bcd3ec06c540711b69bea1643f844d7 Michael S. Klishin michael@novemberain.com 74c00eba2378e125907673fa902abfa1fecdf535 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/12f8e1bbaaed6db993def9ce0f00fba7d6b27eef 12f8e1bbaaed6db993def9ce0f00fba7d6b27eef 2008-08-07T08:16:30-07:00 2008-08-07T08:16:30-07:00 Fixed a problem in new dispatcher. 30504696e33d95beffc25b32289dbbddbb15598f Michael S. Klishin michael@novemberain.com aa45abf9c5ddb9ef5a148c8c5440dff010af92dc aa6e37d5c013445ce987384844b807bd45e3935b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/74c00eba2378e125907673fa902abfa1fecdf535 74c00eba2378e125907673fa902abfa1fecdf535 2008-08-07T08:05:46-07:00 2008-08-07T08:05:46-07:00 Merge branch 'master' into tmp * master: Class extensions spec moved to Extlib. Move all accessors in AbstractController to the top so one can see them easily. Document :with option of filters. Fixed a typo in AbstractController documentation. Extra specs and love to Merb::Controller._session_* Added fixture config/init.rb Resolved conflict after cherry-pick of 9d1a11ff. Fixtures and pending specs for controller/cookie store integration. Re-set session cookie expiry and friends once init file/configuration is loaded. Two more specs for class_inheritable_accessor. Make spec for #342 do correct assertions. Fixed a bug where changes to inherited controller filters would bleed acrosss siblings 61cc160ca1d3cef3b8ab2959bac8866baea0a739 Michael S. Klishin michael@novemberain.com