b2ffd00832890a37793691854149893eccf0cc31 Sindre Aarsaether sindre@identu.no http://github.com/somebee/merb-core/commit/cfda52e392341f17834c5e2bd3779bc506da5d25 cfda52e392341f17834c5e2bd3779bc506da5d25 2008-04-26T08:03:15-07:00 2008-04-26T08:03:15-07:00 Removed dependency on memcache-client 'memcache_util.rb' which was dependent on ActiveRecord::Base for logging exceptions. Now memcache works with both memcache-client gem and memcached gem. It also works withouth ActiveRecord. ce2822c3e9abedfecb448fa8428b5cc7ed780a5a Sindre Aarsaether sindre@identu.no 7d14e7e28be657c9a1a6b4f0730dd4f6d2f7031b Daniel Neighman has.sox@gmail.com http://github.com/somebee/merb-core/commit/b2ffd00832890a37793691854149893eccf0cc31 b2ffd00832890a37793691854149893eccf0cc31 2008-04-24T20:14:54-07:00 2008-04-24T20:14:54-07:00 Adds the github gemspec file a394495ab94f6cdb0aa1e2349cdf7517e9c76934 Daniel Neighman has.sox@gmail.com 4bb3861e1395061003d3ffadfe69372ed08bd349 Daniel Neighman has.sox@gmail.com http://github.com/somebee/merb-core/commit/7d14e7e28be657c9a1a6b4f0730dd4f6d2f7031b 7d14e7e28be657c9a1a6b4f0730dd4f6d2f7031b 2008-04-24T20:07:49-07:00 2008-04-24T20:07:49-07:00 Adds Code for generating a gemspec for github 509ac76ef05bfa6c86fb01869a0802335cb7d00d Daniel Neighman has.sox@gmail.com dfecddf7718fce102f5619b7f748f28c8c4f2514 Daniel Neighman has.sox@gmail.com http://github.com/somebee/merb-core/commit/4bb3861e1395061003d3ffadfe69372ed08bd349 4bb3861e1395061003d3ffadfe69372ed08bd349 2008-04-24T17:17:56-07:00 2008-04-24T17:17:56-07:00 Adds a question method to determine environment. eg Merb.env?(:production) 901bec03fe1e84547e2556e57c77f34d0f4f76f8 Daniel Neighman has.sox@gmail.com 73291f14ef7391692fd86c0f63895fd3f2a14265 Yehuda Katz wycats@gmail.com http://github.com/somebee/merb-core/commit/dfecddf7718fce102f5619b7f748f28c8c4f2514 dfecddf7718fce102f5619b7f748f28c8c4f2514 2008-04-24T16:54:24-07:00 2008-04-24T16:54:24-07:00 Give useful information when no template is found for a partial 22bcf7218854e9f6f41ccc51cc0aef5044e58634 Yehuda Katz wycats@gmail.com c2a3376d1718e2121334b9d3de22f34980173419 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/73291f14ef7391692fd86c0f63895fd3f2a14265 73291f14ef7391692fd86c0f63895fd3f2a14265 2008-04-24T15:04:36-07:00 2008-04-24T15:04:36-07:00 Really resolve merge conflicts. 707ae8eed52171e4f3d0cda66ad01dcd873ca095 Michael S. Klishin michael@novemberain.com 0a878a8306d917e96bd35f99cd338f5f2bff3b4b ba5e415aac0be3d80c12b85bb38c666f4c9b061a Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/c2a3376d1718e2121334b9d3de22f34980173419 c2a3376d1718e2121334b9d3de22f34980173419 2008-04-24T14:46:55-07:00 2008-04-24T14:46:55-07:00 Resolved conflicts 5a7fc9a2aeb03380ed54cec00ff3bcb776226417 Michael S. Klishin michael@novemberain.com 449b212581a04c4d6fab06afa604eabb662e5cdf Yehuda Katz wycats@gmail.com http://github.com/somebee/merb-core/commit/ba5e415aac0be3d80c12b85bb38c666f4c9b061a ba5e415aac0be3d80c12b85bb38c666f4c9b061a 2008-04-23T11:18:20-07:00 2008-04-23T11:18:20-07:00 Provide hook for param filtering ce151845fe75036b97e54b8adbb82244000a2f86 Yehuda Katz wycats@gmail.com 30769309f5d6290ac2adaf410073bf37e2c1a2b2 Cory ODaniel codaniel@rippletv.com http://github.com/somebee/merb-core/commit/449b212581a04c4d6fab06afa604eabb662e5cdf 449b212581a04c4d6fab06afa604eabb662e5cdf 2008-04-22T22:06:04-07:00 2008-03-26T14:24:21-07:00 hopefully the last fix for session fixation, woot woot Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> f83871b3ca94d066e76828c14be8015ef4166ee5 Michael D. Ivey ivey@gweezlebur.com 1bf2bb4cc66a3f571aa2d505f7aee366a209aa02 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/0a878a8306d917e96bd35f99cd338f5f2bff3b4b 0a878a8306d917e96bd35f99cd338f5f2bff3b4b 2008-04-21T21:09:09-07:00 2008-04-21T21:09:09-07:00 Be clear about what is the default init file Merb uses in RDoc. 12c2142d12aa210c1e56a3b0b73559d5cd25a365 Michael S. Klishin michael@novemberain.com a397e370a7e6f2f8f618355ca60034f942485d10 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/1bf2bb4cc66a3f571aa2d505f7aee366a209aa02 1bf2bb4cc66a3f571aa2d505f7aee366a209aa02 2008-04-21T21:07:59-07:00 2008-04-21T21:07:59-07:00 A bit clearer --init-file option description. b8fe20d9a07dc72533364e1775f7d8e54fe5e4ae Michael S. Klishin michael@novemberain.com 08fdcc9225db541caecacdf3c37607cfc83d9316 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/a397e370a7e6f2f8f618355ca60034f942485d10 a397e370a7e6f2f8f618355ca60034f942485d10 2008-04-21T21:03:00-07:00 2008-04-21T21:03:00-07:00 Fix header shown in help: Merb is not longer 'Mongrel + Erb, a lightweight replacement for ActionPack' but a framework on it's own. d33fb303aa173acae6e85e51875fea78b92c99ba Michael S. Klishin michael@novemberain.com de3d99d74c5b3576345df15c5cad3b81f4d9eb96 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/08fdcc9225db541caecacdf3c37607cfc83d9316 08fdcc9225db541caecacdf3c37607cfc83d9316 2008-04-21T21:00:52-07:00 2008-04-21T21:00:52-07:00 Correct doc in Merb::Controller: it uses SimpleSet for callable actions at the moment. 0c03322bf530d7b9b731ffc1e467a8146033d055 Michael S. Klishin michael@novemberain.com 88d5702505c5d9ad56c18decd59a65a11ae1d0a7 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/de3d99d74c5b3576345df15c5cad3b81f4d9eb96 de3d99d74c5b3576345df15c5cad3b81f4d9eb96 2008-04-21T20:59:48-07:00 2008-04-21T20:59:48-07:00 Document Merb::SimpleSet f5ce0fb788eb6757fbfd9bd4f1241061ad429e7e Michael S. Klishin michael@novemberain.com b43e28bf63f61972c13d12987ec5a50a5b58acbe Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/88d5702505c5d9ad56c18decd59a65a11ae1d0a7 88d5702505c5d9ad56c18decd59a65a11ae1d0a7 2008-04-21T18:29:20-07:00 2008-04-21T18:29:20-07:00 Remove InvalidPathConversion exception: it is used nowhere in the core. 118730cbb60521a4ca6b12febb8018f5fc3214e8 Michael S. Klishin michael@novemberain.com 97ffa0f2b8f63776527f759e47192e64148fb28b Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/b43e28bf63f61972c13d12987ec5a50a5b58acbe b43e28bf63f61972c13d12987ec5a50a5b58acbe 2008-04-21T17:56:40-07:00 2008-04-21T17:56:40-07:00 Update homepage in gem specification. 15ff68a5b023508443e5616e62d14ab7cfb413d8 Michael S. Klishin michael@novemberain.com b35a2da022b4b52e6872361ea59b75051b3fc3c3 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/97ffa0f2b8f63776527f759e47192e64148fb28b 97ffa0f2b8f63776527f759e47192e64148fb28b 2008-04-20T11:17:36-07:00 2008-04-20T11:17:36-07:00 Clean up String extensions spec. e4511f1d67ffb73a996608f3ed438f2ac69f9df1 Michael S. Klishin michael@novemberain.com dd4c45f4d4b223d06d8937365d1362a8551e7283 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/b35a2da022b4b52e6872361ea59b75051b3fc3c3 b35a2da022b4b52e6872361ea59b75051b3fc3c3 2008-04-20T04:28:40-07:00 2008-04-20T04:28:40-07:00 Remove it, hopefully no one seen it. 19849e205285571bcae5771a1d8f339c7df77fb5 Michael S. Klishin michael@novemberain.com 677fd27a6866effc6dbd49944990ad00cca629cd Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/dd4c45f4d4b223d06d8937365d1362a8551e7283 dd4c45f4d4b223d06d8937365d1362a8551e7283 2008-04-20T04:22:11-07:00 2008-04-20T04:22:11-07:00 Add a note on drawbacks of usage of ObjectSpace. f65d8687f7952a0b1857d0f9eb1dc5555f524c48 Michael S. Klishin michael@novemberain.com e98c14698c9ddef90d3871613ae6a18d94e67d33 3278e7ea81a82cfc0a6faa1d40b79f8ff46fadc3 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/677fd27a6866effc6dbd49944990ad00cca629cd 677fd27a6866effc6dbd49944990ad00cca629cd 2008-04-19T20:06:32-07:00 2008-04-19T20:06:32-07:00 Merge branch 'hacking' * hacking: Use @ in publicity markers in RDoc. Use a constant for sleep time in reloading specs 5d864f9a28dae3f9f1fbc22758957138c7ee96dd Michael S. Klishin michael@novemberain.com 30769309f5d6290ac2adaf410073bf37e2c1a2b2 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/e98c14698c9ddef90d3871613ae6a18d94e67d33 e98c14698c9ddef90d3871613ae6a18d94e67d33 2008-04-19T19:36:12-07:00 2008-04-19T19:34:45-07:00 Use a constant for reload spec instead of hardcoding time in 5 places or so. 5d864f9a28dae3f9f1fbc22758957138c7ee96dd Michael S. Klishin michael@novemberain.com 55cc280a3a17f1445bfc24506b6f8f57886f4760 30769309f5d6290ac2adaf410073bf37e2c1a2b2 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/3278e7ea81a82cfc0a6faa1d40b79f8ff46fadc3 3278e7ea81a82cfc0a6faa1d40b79f8ff46fadc3 2008-04-19T19:33:27-07:00 2008-04-19T19:33:27-07:00 Merge reverted commit in master Merge branch 'master' into hacking * master: Revert "Refactor ToHashParser#from_xml a bit to be able to use parser faster than REXML. It is planned to support Hpricot and fall back to REXML." 5d864f9a28dae3f9f1fbc22758957138c7ee96dd Michael S. Klishin michael@novemberain.com 9f3acfc73658b59341f88f6a76b92f008b0a8cb2 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/30769309f5d6290ac2adaf410073bf37e2c1a2b2 30769309f5d6290ac2adaf410073bf37e2c1a2b2 2008-04-19T19:32:34-07:00 2008-04-19T19:32:34-07:00 Revert "Refactor ToHashParser#from_xml a bit to be able to use parser faster than REXML. It is planned to support Hpricot and fall back to REXML." This reverts commit 9f3acfc73658b59341f88f6a76b92f008b0a8cb2. The reason behind it is that REXML pull parser happens to be faster than Hpricot. ffc646a72bd3e33553fe890e94904aee5bbd3510 Michael S. Klishin michael@novemberain.com 0c2827eb402897f1b2e12d236988ae72044c4503 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/55cc280a3a17f1445bfc24506b6f8f57886f4760 55cc280a3a17f1445bfc24506b6f8f57886f4760 2008-04-19T19:20:21-07:00 2008-04-19T19:20:21-07:00 Use @ in publicity markers in RDoc. 9aac79a5ef76a78bb50b4f85f38a4ee1a7a204ec Michael S. Klishin michael@novemberain.com 9f3acfc73658b59341f88f6a76b92f008b0a8cb2 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/0c2827eb402897f1b2e12d236988ae72044c4503 0c2827eb402897f1b2e12d236988ae72044c4503 2008-04-19T19:18:21-07:00 2008-04-19T19:18:21-07:00 Use a constant for sleep time in reloading specs c76def8ecef6b42ac0c6734a61b4507fc0b807f0 Michael S. Klishin michael@novemberain.com 1d72811a528d53c5cd360534197eb2024540218d Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/9f3acfc73658b59341f88f6a76b92f008b0a8cb2 9f3acfc73658b59341f88f6a76b92f008b0a8cb2 2008-04-19T18:33:09-07:00 2008-04-19T18:33:09-07:00 Refactor ToHashParser#from_xml a bit to be able to use parser faster than REXML. It is planned to support Hpricot and fall back to REXML. 8659f599087b74bf1d139995df2d1173112c3bc7 Michael S. Klishin michael@novemberain.com 5e6f6c9603a97d3249e823e466e66c4f17d01450 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/1d72811a528d53c5cd360534197eb2024540218d 1d72811a528d53c5cd360534197eb2024540218d 2008-04-19T18:23:23-07:00 2008-04-19T18:23:23-07:00 Empty lines management, how cool is that? ffc646a72bd3e33553fe890e94904aee5bbd3510 Michael S. Klishin michael@novemberain.com 5d31097ce73e0a8d897aa833764cfe319ebb7aa2 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/5e6f6c9603a97d3249e823e466e66c4f17d01450 5e6f6c9603a97d3249e823e466e66c4f17d01450 2008-04-19T18:20:47-07:00 2008-04-19T18:20:47-07:00 Missing specs and improved documentation for Hash#to_mash. 062304ef45349c9b39f11f6448fd182c9adb5499 Michael S. Klishin michael@novemberain.com 31c3a2041b25a49a0c1bef0b1fe72860c89fa453 Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/5d31097ce73e0a8d897aa833764cfe319ebb7aa2 5d31097ce73e0a8d897aa833764cfe319ebb7aa2 2008-04-19T18:11:54-07:00 2008-04-19T18:11:54-07:00 Tiny improvement to Object extensions documentation. More empty line management. 3a924f2777c9e5d0a420a7c8ea4ccf753ca1c0c5 Michael S. Klishin michael@novemberain.com daa6b9709ef09d45b45013afe49b454983a1b96d Michael S. Klishin michael@novemberain.com http://github.com/somebee/merb-core/commit/31c3a2041b25a49a0c1bef0b1fe72860c89fa453 31c3a2041b25a49a0c1bef0b1fe72860c89fa453 2008-04-19T18:10:55-07:00 2008-04-19T18:10:55-07:00 One more example for Object#full_const_get; new spec group for Object#make_module. ec99da10a3ddbf4cbc4fb8d64899132e9e321d85 Michael S. Klishin michael@novemberain.com