49f4fb672d27f78b2cd9c3c900a4defb456ad9ea b2f7884058e4c9c51e6713157fcd5b79f396798b Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/c4844d90052a530aec0bd43a0fa4acdd5de47e47 c4844d90052a530aec0bd43a0fa4acdd5de47e47

2008-07-08T14:31:33-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: (55 commits) Fix bug with :status Spec for :status in display display handles :status and :location Improved RDoc of Merb#load_dependencies. script/frozen-merb => merb-freezer in RDoc Adjusted logging message for thin sockets vs ports. Added socket option to thin.rb and to the command line options. send_file opens files in 'rb' binary mode so windows doesn't shit itself fix nginx_send_file 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. Update memory session storage documentation. ... 6e12b0aea1b6f534b6f76191cb7256587ca26c26 Michael D. Ivey ivey@gweezlebur.com 3804f0c5b081a26f2b34d3eb89a1dd4634a3785a Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/b2f7884058e4c9c51e6713157fcd5b79f396798b b2f7884058e4c9c51e6713157fcd5b79f396798b

2008-07-06T22:35:19-07:00

Fix bug with :status 6e12b0aea1b6f534b6f76191cb7256587ca26c26 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local e277dc9938996065697e6dcd888fe4fefeeaaed5 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/3804f0c5b081a26f2b34d3eb89a1dd4634a3785a 3804f0c5b081a26f2b34d3eb89a1dd4634a3785a

2008-07-06T21:50:54-07:00

Spec for :status in display 5676ae7ff2e0d52381e8f36587c5bcb92cbc32b5 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local bd11c0b50efaac539606103fe6702a4aaa3ba9ef 0d50ec2931d474acfeaf8138edcd65dd919e752d Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/e277dc9938996065697e6dcd888fe4fefeeaaed5 e277dc9938996065697e6dcd888fe4fefeeaaed5

2008-07-06T21:30:22-07:00

Merge branch 'master' of git@github.com:wycats/merb-core 804d0a85122528b3421234c0dd014a81ef5cc837 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 522e920c75f927bec7b4d7afcd1bca4b7c097987 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/bd11c0b50efaac539606103fe6702a4aaa3ba9ef bd11c0b50efaac539606103fe6702a4aaa3ba9ef

2008-07-06T21:30:15-07:00

display handles :status and :location 749fe0b283f6c23dcd6d11fef786daf6e269429b Yehuda Katz wycats@yehuda-katzs-macbook-pro.local aae145a39e5bdb3e3a061861cd0ad566ca8f4310 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0d50ec2931d474acfeaf8138edcd65dd919e752d 0d50ec2931d474acfeaf8138edcd65dd919e752d

2008-07-05T14:59:50-07:00

Improved RDoc of Merb#load_dependencies. 189a827a485a0bfd9f29a18a478077ada2441da3 Michael S. Klishin michael@novemberain.com 8d73e3baa5ff6bf8149ea01d07d55033e8737cfa Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/aae145a39e5bdb3e3a061861cd0ad566ca8f4310 aae145a39e5bdb3e3a061861cd0ad566ca8f4310

2008-07-05T14:54:37-07:00

script/frozen-merb => merb-freezer in RDoc 6fc154f43b8efe464733ee844da4106f9fd1383d Michael S. Klishin michael@novemberain.com 49ee3a781e25cfd4dde46a417e1d66c3575be540 3951c85b5876556a8e2527967115ac1375b5aa21 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8d73e3baa5ff6bf8149ea01d07d55033e8737cfa 8d73e3baa5ff6bf8149ea01d07d55033e8737cfa

2008-07-05T14:52:57-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Adjusted logging message for thin sockets vs ports. Added socket option to thin.rb and to the command line options. 16ea90bc67cc41e83d95a1c6ea348f90abab0ac6 Michael S. Klishin michael@novemberain.com 4d93d323203a323365e7ae915c73b5f2bc107796 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/3951c85b5876556a8e2527967115ac1375b5aa21 3951c85b5876556a8e2527967115ac1375b5aa21

2008-07-05T11:20:46-07:00

Adjusted logging message for thin sockets vs ports. e1256d414e1ed37acfb4266d0c281a2adf701b08 Wayne E. Seguin wayneeseguin@gmail.com 522e920c75f927bec7b4d7afcd1bca4b7c097987 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/4d93d323203a323365e7ae915c73b5f2bc107796 4d93d323203a323365e7ae915c73b5f2bc107796

2008-07-05T11:12:02-07:00

Added socket option to thin.rb and to the command line options. 02f76029e9bb50b8f4e4eea0e1e019c4541dcaa2 Wayne E. Seguin wayneeseguin@gmail.com 4618d8d0ab8f80848a486e198b55a2cb2d3c556c 522e920c75f927bec7b4d7afcd1bca4b7c097987 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/49ee3a781e25cfd4dde46a417e1d66c3575be540 49ee3a781e25cfd4dde46a417e1d66c3575be540

2008-07-04T13:05:59-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: send_file opens files in 'rb' binary mode so windows doesn't shit itself 694c7c0a4855c49948e00563e9264dc66f14a99b Michael S. Klishin michael@novemberain.com e9007356dde3824ef6ea18a0e9d8796d44251f07 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/522e920c75f927bec7b4d7afcd1bca4b7c097987 522e920c75f927bec7b4d7afcd1bca4b7c097987

2008-06-30T16:52:33-07:00

send_file opens files in 'rb' binary mode so windows doesn't shit itself e49c3f57d48021b5166feb1ebde84aa64519f9d8 Ezra Zygmuntowicz ez@engineyard.com 9778c2109288e66673f1c4846917d5e8aeb54626 e9007356dde3824ef6ea18a0e9d8796d44251f07 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4618d8d0ab8f80848a486e198b55a2cb2d3c556c 4618d8d0ab8f80848a486e198b55a2cb2d3c556c

2008-06-29T09:58:47-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: fix nginx_send_file FileUtils#touch only added mtime option in ruby 1.8.6. let's use File#utime instead 9e432f2ebc549f61e9d258b8d023eca27699e262 Michael S. Klishin michael@novemberain.com 25feab1369eecf5dfa2bbe3a7453f39d9b5e376e 3310cfaf88870f305a4e7e1c34145aa3146199d7 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e9007356dde3824ef6ea18a0e9d8796d44251f07 e9007356dde3824ef6ea18a0e9d8796d44251f07

2008-06-28T23:03:52-07:00

2008-06-28T23:03:07-07:00

Use File.utime instead of FileUtils#touch for 1.8.5 compatibility. 27bde99f3d8a290852619a345a2246b5f85df3f6 Michael S. Klishin michael@novemberain.com eea5ce624df1fda523aad0437e70444b55e0d4a9 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/25feab1369eecf5dfa2bbe3a7453f39d9b5e376e 25feab1369eecf5dfa2bbe3a7453f39d9b5e376e

2008-06-28T12:46:27-07:00

fix nginx_send_file cbc5a21ef9090cd68009e5dab325d04a27240cb9 Ezra Zygmuntowicz ez@engineyard.com d1a25440cf10474f07a8a0aa03a82a9d72533961 eea5ce624df1fda523aad0437e70444b55e0d4a9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9778c2109288e66673f1c4846917d5e8aeb54626 9778c2109288e66673f1c4846917d5e8aeb54626

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

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

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

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

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

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

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

Added spec for the route matcher testing regexp routes. [#386] db483b9d5b9282be24366f8ccea75b0b8846513f Ben Burkert ben@benburkert.com 17079d238fd4058ca357f96b3a832baa88a0a353 1fed4e5b1c95b145e9e30d2679417348678adda5 Abhay Kumar abhay+git@opensynapse.net http://github.com/wycats/merb-core/commit/3310cfaf88870f305a4e7e1c34145aa3146199d7 3310cfaf88870f305a4e7e1c34145aa3146199d7

2008-06-27T16:10:43-07:00

Merge branch 'master' of git://github.com/wycats/merb-core 305ecec8f278041d6bf7190205625e58bf1f5d89 Abhay Kumar abhay+git@opensynapse.net 5cc5ce16bf5bdf17f96a471be7fcbffd795688b6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/1fed4e5b1c95b145e9e30d2679417348678adda5 1fed4e5b1c95b145e9e30d2679417348678adda5

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

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