3a13dac3bfdb4e37d20095e254f36437fcf0cc84 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/b5467e5138b8c18c0c521a5fce5ea529f1a090d6 b5467e5138b8c18c0c521a5fce5ea529f1a090d6 2008-03-24T16:17:33-07:00 2008-03-24T16:17:33-07:00 fix up merb-fcgi binary to work out of the box b201cfab820b88a522c79ded9239eba53625ee28 Ezra Zygmuntowicz ez@engineyard.com df04185c17e981aa4c7f86b5a7e21e74aafc3ce9 Martin Grund grund@MacGrund.local http://github.com/wycats/merb-more/commit/3a13dac3bfdb4e37d20095e254f36437fcf0cc84 3a13dac3bfdb4e37d20095e254f36437fcf0cc84 2008-03-24T16:15:03-07:00 2008-03-24T10:44:22-07:00 * adds implementation for #220 * modifies merb.fcgi to enable really working with fcgi setups * adds default .htaccess that manages the redirection to the CGI script Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 08a3e1101c6437f8d5bb6bc774b0c0caf8cf1f2c Ezra Zygmuntowicz ez@engineyard.com df2123a1fad10bceb52404b9a26da9045c76d980 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/df04185c17e981aa4c7f86b5a7e21e74aafc3ce9 df04185c17e981aa4c7f86b5a7e21e74aafc3ce9 2008-03-24T16:13:28-07:00 2008-03-24T16:13:28-07:00 use __send__ not send, use require in merb-haml 0dd290a45c889b6e66ff8304564e9d41d48fad95 Ezra Zygmuntowicz ez@engineyard.com 00ed43b22cb22fc48bb28399e8e057bfc5970e87 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/df2123a1fad10bceb52404b9a26da9045c76d980 df2123a1fad10bceb52404b9a26da9045c76d980 2008-03-24T16:08:47-07:00 2008-03-24T15:03:00-07:00 Fix merb-haml spec to pull proper config Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 58e7cef5095d250d60942d5d8037cfc5beb1d64e Ezra Zygmuntowicz ez@engineyard.com b8cc233cb459054ea4368f71d9485c20c041c2b3 Seth Thomas Rasmussen sethrasmussen@gmail.com http://github.com/wycats/merb-more/commit/00ed43b22cb22fc48bb28399e8e057bfc5970e87 00ed43b22cb22fc48bb28399e8e057bfc5970e87 2008-03-24T16:07:15-07:00 2008-03-24T09:08:00-07:00 Fix action-args to honor controller actions defined using :define_method A host of other cleanups including fixes to allow the action-args spec to run at all as well as in isolation. Part of the changes to accomodate that included fixing some templates for merb-gen for some reason. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 6300173b5a151b2b27275043341629f6977740f2 Ezra Zygmuntowicz ez@engineyard.com 8e4a25f9a0bc859a6b8feb5e77d5368dd032966b Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/b8cc233cb459054ea4368f71d9485c20c041c2b3 b8cc233cb459054ea4368f71d9485c20c041c2b3 2008-03-22T15:45:05-07:00 2008-03-22T15:45:05-07:00 fix merb-more rakefiles, fix haml config options 713f78558947af4636a6aa405b9197b5b97cf38b Ezra Zygmuntowicz ez@engineyard.com 9a54e81a254c6525e3c925e050d4756e498788ad Ho-Sheng Hsiao hosh@isshen.com http://github.com/wycats/merb-more/commit/8e4a25f9a0bc859a6b8feb5e77d5368dd032966b 8e4a25f9a0bc859a6b8feb5e77d5368dd032966b 2008-03-21T15:38:07-07:00 2008-03-20T22:30:27-07:00 Added support for charset in css_include_tag Added support for the charset attribute in the css_include_tag helper of merb-assets. It will Now default to utf-8. To change the charset, pass :charset to the helper. Examples: css_include_tag 'style' => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" /> css_include_tag 'style', :charset => 'iso-8895-1' => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="iso-8895-1" /> Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 24298ff72c267b73604306c9b21b4524c3618a49 Ezra Zygmuntowicz ez@engineyard.com 450d0cfe957357ca0e2bc8d7c0b47c1c4569008e booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/9a54e81a254c6525e3c925e050d4756e498788ad 9a54e81a254c6525e3c925e050d4756e498788ad 2008-03-16T00:16:37-07:00 2008-03-16T00:16:37-07:00 added merb-cache to the array of gems in Rakefile. closing #79 d9f7e99ac956908bfb061d41dff762debdbe6ea0 booss alex.boussinet@gmail.com bb6eb59fa4b037b0e88ae4e1976de518fd717d55 209c802d76df965349d6867c3fb184baa83c2ddb booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/450d0cfe957357ca0e2bc8d7c0b47c1c4569008e 450d0cfe957357ca0e2bc8d7c0b47c1c4569008e 2008-03-15T23:50:52-07:00 2008-03-15T23:50:52-07:00 Merge branch 'master' of git@github.com:wycats/merb-more f53628a2bc6cbf95268e515dc5618495aa9129f3 booss alex.boussinet@gmail.com cf2bcfa9530f20b1983d986d25de60bee729432f booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/bb6eb59fa4b037b0e88ae4e1976de518fd717d55 bb6eb59fa4b037b0e88ae4e1976de518fd717d55 2008-03-15T23:50:26-07:00 2008-03-15T23:50:26-07:00 updated page caching to use logger 2c1c6cb59a61523ad2cab5b73cee1a9f35316062 booss alex.boussinet@gmail.com 2cec7bbd6217ba7d328ee31ce019122f111c9dc3 cf2bcfa9530f20b1983d986d25de60bee729432f Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/209c802d76df965349d6867c3fb184baa83c2ddb 209c802d76df965349d6867c3fb184baa83c2ddb 2008-03-14T23:21:40-07:00 2008-03-14T23:21:40-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 464212771a8a99a5dcf7b1696a93197d99d52b37 Fabien Franzen info@atelierfabien.be 785409b787076d458f6c933326b3886d1ddd47c1 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/cf2bcfa9530f20b1983d986d25de60bee729432f cf2bcfa9530f20b1983d986d25de60bee729432f 2008-03-14T15:55:24-07:00 2008-03-14T15:55:24-07:00 rearranged module/class structure 0e0cf2b1119412ffd656aedfcb7d513665489e20 booss alex.boussinet@gmail.com 2bb66a5c6b0b9c00ef8649afe6f1026b44a5fe06 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/785409b787076d458f6c933326b3886d1ddd47c1 785409b787076d458f6c933326b3886d1ddd47c1 2008-03-14T04:24:08-07:00 2008-03-14T04:24:08-07:00 added expire_match support for memcache backend In order to work, it needs to keep track of all keys. You can disable the tracking by setting :no_tracking => true in the config bb197466387c4176d7dd0a9f0fd730a6cdcb055c booss alex.boussinet@gmail.com be3b1a7d2e28ed86c15e7bacf7d5b2fe38ebc61b Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/2cec7bbd6217ba7d328ee31ce019122f111c9dc3 2cec7bbd6217ba7d328ee31ce019122f111c9dc3 2008-03-14T03:19:11-07:00 2008-03-14T03:19:11-07:00 config/environments/rake.rb now defaults to log/merb_rake.log af4bbc699b355b7262549b3d8cc6c1d85d3805ed Fabien Franzen info@atelierfabien.be 70dbcf7c3e916fb38be16042b75019cda9d84f0e 2bb66a5c6b0b9c00ef8649afe6f1026b44a5fe06 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/be3b1a7d2e28ed86c15e7bacf7d5b2fe38ebc61b be3b1a7d2e28ed86c15e7bacf7d5b2fe38ebc61b 2008-03-14T02:55:04-07:00 2008-03-14T02:55:04-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 14db78ff8ee3f2bc059227ddfffe6b961b39d6ec Fabien Franzen info@atelierfabien.be 0a8444352294d3d7e68d20b09bc9025b86692751 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/70dbcf7c3e916fb38be16042b75019cda9d84f0e 70dbcf7c3e916fb38be16042b75019cda9d84f0e 2008-03-14T02:54:40-07:00 2008-03-14T02:54:40-07:00 Now generates config/environments/rake.rb, so Rakefile uses a real environment for Rake (which you can override with MERB_ENV) 56a3bf71102164305e4f0dd2b83bba3e02c3014b Fabien Franzen info@atelierfabien.be fd40129309b1ecbe3c9ecb0e256ce4022a201642 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/2bb66a5c6b0b9c00ef8649afe6f1026b44a5fe06 2bb66a5c6b0b9c00ef8649afe6f1026b44a5fe06 2008-03-13T16:53:10-07:00 2008-03-13T16:53:10-07:00 Make symbolize_keys! a noop temporarily. 18893bf0c1892de60be7af3c38fa2452686a5ede Yehuda Katz wycats@gmail.com e5f3bd0de92e64c81ae1be533d7b6dd03044a611 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/fd40129309b1ecbe3c9ecb0e256ce4022a201642 fd40129309b1ecbe3c9ecb0e256ce4022a201642 2008-03-11T15:03:47-07:00 2008-03-11T15:03:47-07:00 missed a { 661ff73a41c178e980dd9e51cd25bf197b6e9b38 Ezra Zygmuntowicz ez@engineyard.com 0a8444352294d3d7e68d20b09bc9025b86692751 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/e5f3bd0de92e64c81ae1be533d7b6dd03044a611 e5f3bd0de92e64c81ae1be533d7b6dd03044a611 2008-03-11T15:02:41-07:00 2008-03-11T15:02:41-07:00 move plugin config to main file in merb-assets 628e4aeacea5960c86790fb4486a088b7d7106f6 Ezra Zygmuntowicz ez@engineyard.com 1a45a1fd8cb5e5e5c5c6201329e77d740d720076 8cfc09c264eae75777fb78ced39c143c84538812 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/0a8444352294d3d7e68d20b09bc9025b86692751 0a8444352294d3d7e68d20b09bc9025b86692751 2008-03-11T10:23:05-07:00 2008-03-11T01:57:54-07:00 Auto-generated spec_helper.rb now uses :testing option instead of $TESTING global var Note that config/environments/test.rb also sets :testing => true, but this is only available once Merb::BootLoader::Dependencies has run. While this is useful for the overall environment setup, it has no effect for spec_helper.rb; that's why it is set explicitly there. The ugly $TESTING global var has been removed from it though, but it's still usable ($TESTING is currently used in all the internal Merb spec_helpers, as well as for its plugins) keeping full backwards-compatibility - but hiding the internals from the public. ae3479ff41cf737216e4746f20b1d4c168842de9 Fabien Franzen info@atelierfabien.be f022d6a8736feb038f36b8e77972a62942d4697c booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/8cfc09c264eae75777fb78ced39c143c84538812 8cfc09c264eae75777fb78ced39c143c84538812 2008-03-11T06:04:45-07:00 2008-03-11T06:04:45-07:00 merb-cache can be disabled with config key :disable ab0ebe63d44573a9145706b5be8f96e422d676cd booss alex.boussinet@gmail.com f13c743f75699eb9c69c1d525b3be034d506520e 47f5091bea02db19f0db0601d4bd091627a7104d booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/f022d6a8736feb038f36b8e77972a62942d4697c f022d6a8736feb038f36b8e77972a62942d4697c 2008-03-11T04:08:17-07:00 2008-03-11T04:08:17-07:00 Merge branch 'master' of git@github.com:wycats/merb-more db5aa2f7d323d8b83a173afd43cb72ad684140d9 booss alex.boussinet@gmail.com 74ad6ee4a30d53b7b7d95efb9ce1165246aa5bd1 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/f13c743f75699eb9c69c1d525b3be034d506520e f13c743f75699eb9c69c1d525b3be034d506520e 2008-03-11T04:02:56-07:00 2008-03-11T04:02:56-07:00 implemented dummy cache store in order to be able to disable caching - new configuration flag: :disable_cache ("all", "development", "test", ...) - updated README - cache hit/miss/set/expired are logged e29ec0f6c13bd1161a044fb8ae25bb9b502b4fd7 booss alex.boussinet@gmail.com 002ff6681a40de9718b08021b50606aff51180ca Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/1a45a1fd8cb5e5e5c5c6201329e77d740d720076 1a45a1fd8cb5e5e5c5c6201329e77d740d720076 2008-03-11T01:57:54-07:00 2008-03-11T01:57:54-07:00 Auto-generated spec_helper.rb now uses :testing option instead of $TESTING global var Note that config/environments/test.rb also sets :testing => true, but this is only available once Merb::BootLoader::Dependencies has run. While this is useful for the overall environment setup, it has no effect for spec_helper.rb; that's why it is set explicitly there. The ugly $TESTING global var has been removed from it though, but it's still usable ($TESTING is currently used in all the internal Merb spec_helpers, as well as for its plugins) keeping full backwards-compatibility - but hiding the internals from the public. e57872c5fdcba1dc80816f958306f8127f450d2f Fabien Franzen info@atelierfabien.be 9158440a0735ca0740e08ec7ec2dfd721108590a e30a3f0470607d3b39c73454eddf5d9ecd9f4b9c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/47f5091bea02db19f0db0601d4bd091627a7104d 47f5091bea02db19f0db0601d4bd091627a7104d 2008-03-10T23:13:38-07:00 2008-03-10T23:13:38-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 72b84aee09b2390bceff81a5704a3b6fb7b1fd72 Yehuda Katz wycats@gmail.com c32244c0809448969e08c5c05e1c364fdc482274 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/9158440a0735ca0740e08ec7ec2dfd721108590a 9158440a0735ca0740e08ec7ec2dfd721108590a 2008-03-10T23:08:36-07:00 2008-03-10T23:08:36-07:00 framework.rb needs to be here. 4826bd05fb8443dc1fe658ed1e265de0172448f4 Yehuda Katz wycats@gmail.com 1db85514c7710acd1bbce3bbdb18ec9a17847c99 002ff6681a40de9718b08021b50606aff51180ca Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/e30a3f0470607d3b39c73454eddf5d9ecd9f4b9c e30a3f0470607d3b39c73454eddf5d9ecd9f4b9c 2008-03-10T16:49:47-07:00 2008-03-10T16:49:47-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 79aab55823006650e23aaa5b913684dad6866ce4 Ezra Zygmuntowicz ez@engineyard.com 74ad6ee4a30d53b7b7d95efb9ce1165246aa5bd1 Cory ODaniel codaniel@rippletv.com http://github.com/wycats/merb-more/commit/1db85514c7710acd1bbce3bbdb18ec9a17847c99 1db85514c7710acd1bbce3bbdb18ec9a17847c99 2008-03-10T16:49:24-07:00 2008-03-06T19:54:17-08:00 Added ability to create unique, consistant paths to a static asset (js, css, image, video, etc) based on file name to assist in browsers slowed by HTTP Pipelining. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 1a514e89f5c6a46e103d286eebc6778f34bdfdc5 Ezra Zygmuntowicz ez@engineyard.com dd0241f9ef6e8d1d752e4a5bfa5cf8343fd28ddd Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/002ff6681a40de9718b08021b50606aff51180ca 002ff6681a40de9718b08021b50606aff51180ca 2008-03-10T15:19:37-07:00 2008-03-10T15:19:37-07:00 The :merb_env task now logs to log/rake.log by default a0076b25f580aed8f6720cb7c597ccc8e46aee18 Fabien Franzen info@atelierfabien.be c32244c0809448969e08c5c05e1c364fdc482274 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/dd0241f9ef6e8d1d752e4a5bfa5cf8343fd28ddd dd0241f9ef6e8d1d752e4a5bfa5cf8343fd28ddd 2008-03-10T14:54:11-07:00 2008-03-10T14:54:11-07:00 Added merbtasks.rb 94b75b6c446000b9ceb72ea5c5672dd57620b9f8 Fabien Franzen info@atelierfabien.be