feaed59155bc9d762176914802284a46a0cf50db Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local http://github.com/fightinjoe/merb-more/commit/5dcb1fa3d603ab749e1557041fb7238478644d4e 5dcb1fa3d603ab749e1557041fb7238478644d4e 2008-03-21T17:39:31-07:00 2008-03-21T17:39:31-07:00 Addded documentation notes on how to access options passed into #part 28c1f93e29229911fb1a38bf3de9290ad7d2e68d Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local cd8d13709833abf4e68b2ca855a9f2d616263f74 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local http://github.com/fightinjoe/merb-more/commit/feaed59155bc9d762176914802284a46a0cf50db feaed59155bc9d762176914802284a46a0cf50db 2008-03-21T17:36:13-07:00 2008-03-21T17:36:13-07:00 Minor documentation examples added. Added flag to turn off page caching when caching is disabled. NOTE: disabled caching won't cache new page_cache requests, but will serve stale ones. NOTE: there are no tests for this, primarily because most of the specs fail when run against a dummy store. 36dae16853ab23c4b4dde8ddbc006fcc0af768b6 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 628b17c6f0637652a3ed472181436669c3026e3a booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/cd8d13709833abf4e68b2ca855a9f2d616263f74 cd8d13709833abf4e68b2ca855a9f2d616263f74 2008-03-21T01:05:45-07:00 2008-03-16T00:16:37-07:00 added merb-cache to the array of gems in Rakefile. closing #79 d9f7e99ac956908bfb061d41dff762debdbe6ea0 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local e5081deb94ed072ae45ae2266c80cc2edddbf34e booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/628b17c6f0637652a3ed472181436669c3026e3a 628b17c6f0637652a3ed472181436669c3026e3a 2008-03-21T01:05:45-07:00 2008-03-15T23:50:26-07:00 updated page caching to use logger f53628a2bc6cbf95268e515dc5618495aa9129f3 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 0578013c549b7135aa341737c96bc8454241bfd6 booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/e5081deb94ed072ae45ae2266c80cc2edddbf34e e5081deb94ed072ae45ae2266c80cc2edddbf34e 2008-03-21T01:05:45-07:00 2008-03-14T15:55:24-07:00 rearranged module/class structure 464212771a8a99a5dcf7b1696a93197d99d52b37 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 36b89fc9e4d93413013548198f8a1773cdfd9239 booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/0578013c549b7135aa341737c96bc8454241bfd6 0578013c549b7135aa341737c96bc8454241bfd6 2008-03-21T01:05:45-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 85bbd1938f57e16486b8bdc7822c99d22d18cb24 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 8cf78f567d30ddc5ffc24881dc9029b7a9f843e4 Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/36b89fc9e4d93413013548198f8a1773cdfd9239 36b89fc9e4d93413013548198f8a1773cdfd9239 2008-03-21T01:05:44-07:00 2008-03-14T03:19:11-07:00 config/environments/rake.rb now defaults to log/merb_rake.log af4bbc699b355b7262549b3d8cc6c1d85d3805ed Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 34eb0c94eaafc78f160dbde9b36c9d82f1e5bdf7 Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/8cf78f567d30ddc5ffc24881dc9029b7a9f843e4 8cf78f567d30ddc5ffc24881dc9029b7a9f843e4 2008-03-21T01:05:44-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) 14db78ff8ee3f2bc059227ddfffe6b961b39d6ec Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local f7fc21c3d30e47119c9219b80aaf053f37f2e67e Yehuda Katz wycats@gmail.com http://github.com/fightinjoe/merb-more/commit/34eb0c94eaafc78f160dbde9b36c9d82f1e5bdf7 34eb0c94eaafc78f160dbde9b36c9d82f1e5bdf7 2008-03-21T01:05:44-07:00 2008-03-13T16:53:10-07:00 Make symbolize_keys! a noop temporarily. 18893bf0c1892de60be7af3c38fa2452686a5ede Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local ece9c6b375358c0b7f1914a091f6962f36eb445e Ezra Zygmuntowicz ez@engineyard.com http://github.com/fightinjoe/merb-more/commit/f7fc21c3d30e47119c9219b80aaf053f37f2e67e f7fc21c3d30e47119c9219b80aaf053f37f2e67e 2008-03-21T01:05:44-07:00 2008-03-11T15:03:47-07:00 missed a { 661ff73a41c178e980dd9e51cd25bf197b6e9b38 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local d1ddb252c038d78a9817d769a3ab78476f45d16c Ezra Zygmuntowicz ez@engineyard.com http://github.com/fightinjoe/merb-more/commit/ece9c6b375358c0b7f1914a091f6962f36eb445e ece9c6b375358c0b7f1914a091f6962f36eb445e 2008-03-21T01:05:44-07:00 2008-03-11T15:02:41-07:00 move plugin config to main file in merb-assets 628e4aeacea5960c86790fb4486a088b7d7106f6 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local e45c2c4198b78280838ad3d40e55e40b1dd462b0 booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/d1ddb252c038d78a9817d769a3ab78476f45d16c d1ddb252c038d78a9817d769a3ab78476f45d16c 2008-03-21T01:05:44-07:00 2008-03-11T06:04:45-07:00 merb-cache can be disabled with config key :disable ae3479ff41cf737216e4746f20b1d4c168842de9 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 6cfdb1c3b2f8101e61dda55d4120f689cc809e69 booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/e45c2c4198b78280838ad3d40e55e40b1dd462b0 e45c2c4198b78280838ad3d40e55e40b1dd462b0 2008-03-21T01:05:44-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 7f39cee92da53e58124a2b7f301b04565ef9fe3e Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 216696901d83439fa6d9bf9b2c047c35f60a749f Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/6cfdb1c3b2f8101e61dda55d4120f689cc809e69 6cfdb1c3b2f8101e61dda55d4120f689cc809e69 2008-03-21T01:05:44-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. 8c06d238b420e61e202e74564ecc9a220ca049cc Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 3356ed99b1700d83e2ff672b83596ef2dce2889f Yehuda Katz wycats@gmail.com http://github.com/fightinjoe/merb-more/commit/216696901d83439fa6d9bf9b2c047c35f60a749f 216696901d83439fa6d9bf9b2c047c35f60a749f 2008-03-21T01:05:44-07:00 2008-03-10T23:08:36-07:00 framework.rb needs to be here. 72b84aee09b2390bceff81a5704a3b6fb7b1fd72 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local c5dd326ccf57b9902fa136676ca6379e91d68a71 Cory ODaniel codaniel@rippletv.com http://github.com/fightinjoe/merb-more/commit/3356ed99b1700d83e2ff672b83596ef2dce2889f 3356ed99b1700d83e2ff672b83596ef2dce2889f 2008-03-21T01:05:44-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> 79aab55823006650e23aaa5b913684dad6866ce4 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 3b97a82aff6aa6252480f9ee357b76699a35fb33 Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/c5dd326ccf57b9902fa136676ca6379e91d68a71 c5dd326ccf57b9902fa136676ca6379e91d68a71 2008-03-21T01:05:44-07:00 2008-03-10T15:19:37-07:00 The :merb_env task now logs to log/rake.log by default a0076b25f580aed8f6720cb7c597ccc8e46aee18 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local cb7ed479504f5608796843ecdb00d6f04d2c6806 Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/3b97a82aff6aa6252480f9ee357b76699a35fb33 3b97a82aff6aa6252480f9ee357b76699a35fb33 2008-03-21T01:05:44-07:00 2008-03-10T14:54:11-07:00 Added merbtasks.rb 94b75b6c446000b9ceb72ea5c5672dd57620b9f8 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 1b2b6d56071bea191e834e3851970ae9f38822b6 Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/cb7ed479504f5608796843ecdb00d6f04d2c6806 cb7ed479504f5608796843ecdb00d6f04d2c6806 2008-03-21T01:05:43-07:00 2008-03-10T12:13:00-07:00 Cleanup of merb-gen generated Rakefile The default generated Rakefile (standard Merb layout) has been cleaned up a bit; the task haml:compile_sass has been added to the merb-haml plugin's own merbtasks.rb. Merb.start_environment is used for the :merb_env task (which requires changes to merb-core - as a seperate patch). 5e26972746b41970c00a2d38f931fb6c1e7dd020 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local f5dcd28c4d7fb0f498c2ddb029646bfc3a9d1baa Fabien Franzen info@atelierfabien.be http://github.com/fightinjoe/merb-more/commit/1b2b6d56071bea191e834e3851970ae9f38822b6 1b2b6d56071bea191e834e3851970ae9f38822b6 2008-03-21T01:05:43-07:00 2008-03-10T12:12:21-07:00 By default classes should not be reloaded (reload_classes = false) in the TEST environment. e17c16bd7b12fa0e159bae0225193e013a6d7194 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local f4aa77fb33ed25fb2d2511f4355aa022b5a796e8 Michael D. Ivey ivey@gweezlebur.com http://github.com/fightinjoe/merb-more/commit/f5dcd28c4d7fb0f498c2ddb029646bfc3a9d1baa f5dcd28c4d7fb0f498c2ddb029646bfc3a9d1baa 2008-03-21T01:05:43-07:00 2008-03-10T10:25:52-07:00 add clean task 5478f344cab250a21466b9b5dc69141647afde08 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 27d79c9e7459d2607d2d9e494899226e19719c28 Jack Dempsey jack.dempsey@gmail.com http://github.com/fightinjoe/merb-more/commit/f4aa77fb33ed25fb2d2511f4355aa022b5a796e8 f4aa77fb33ed25fb2d2511f4355aa022b5a796e8 2008-03-21T01:05:43-07:00 2008-03-10T08:12:57-07:00 Update task name to have dependencies handled correctly. We need a rule for lib/merb-more.rb as its a dependency of merb-more and will fail without a rule defined. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> badd898728498a51a99a3de0ff495f7e4e40c22a Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local daf9d8f73ead713a007cb46dc81462c49db34fbe Daniel Neighman has.sox@gmail.com http://github.com/fightinjoe/merb-more/commit/27d79c9e7459d2607d2d9e494899226e19719c28 27d79c9e7459d2607d2d9e494899226e19719c28 2008-03-21T01:05:43-07:00 2008-03-10T02:35:57-07:00 Corrects a spec that uses a helper. The helper needs to be in the Merb namespace 280c15cf00983889d751a3440fb22816f4a66c9b Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 89c2bf923827d2e2d7764b627742af11760e23ef Lachie Cox lachie@smartbomb.com.au http://github.com/fightinjoe/merb-more/commit/daf9d8f73ead713a007cb46dc81462c49db34fbe daf9d8f73ead713a007cb46dc81462c49db34fbe 2008-03-21T01:05:43-07:00 2008-03-10T00:06:14-07:00 Fixed typo in freezer generator template 9e701b96ceb34a1a954d0004dd93f6d266f38b18 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local cde80d24b1eb7eb0152a042bba78f0f166b293d4 Michael D. Ivey ivey@gweezlebur.com http://github.com/fightinjoe/merb-more/commit/89c2bf923827d2e2d7764b627742af11760e23ef 89c2bf923827d2e2d7764b627742af11760e23ef 2008-03-21T01:05:43-07:00 2008-03-09T22:48:05-07:00 fix Rakefile ... lame f46e0f1bda2466ffb00d4d36e75c691aa9061ed1 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 01b14b31e820b5bc7700c992a46d64857b37910b Janne Asmala janne@mindvalley.com http://github.com/fightinjoe/merb-more/commit/cde80d24b1eb7eb0152a042bba78f0f166b293d4 cde80d24b1eb7eb0152a042bba78f0f166b293d4 2008-03-21T01:05:43-07:00 2008-03-04T21:58:23-08:00 Template extension documentation Added documentation for all methods in merb-builder and merb-haml. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 4112d44036de5cf0e3195526af94d179506f958a Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 1a623bb255f436ba88cf1a00916a02de98f4c1b3 Michael D. Ivey ivey@gweezlebur.com http://github.com/fightinjoe/merb-more/commit/01b14b31e820b5bc7700c992a46d64857b37910b 01b14b31e820b5bc7700c992a46d64857b37910b 2008-03-21T01:05:43-07:00 2008-03-09T21:06:29-07:00 Revert "Adds a haml_buffer method to Haml::Helpers. This was reporting being missing when using haml in a form." This reverts commit 92c5b539c4bccebbc4b31ef9feb9e67dfd37fd6b. See http://merb.lighthouseapp.com/projects/7435/tickets/72 b3742464a8e6264eb2299f03177b8f9cc3c2e078 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 96f822b49cf317ddb6e9bc6804f8b397c0aeb7ba Michael D. Ivey ivey@gweezlebur.com http://github.com/fightinjoe/merb-more/commit/1a623bb255f436ba88cf1a00916a02de98f4c1b3 1a623bb255f436ba88cf1a00916a02de98f4c1b3 2008-03-21T01:05:43-07:00 2008-03-04T21:54:35-08:00 ignore bundle, and merb-more.rb b62325edd1401a503940182d5f983e493141b5a8 Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local 126ae26a51f545b043e1b0c9e0c6ee8b98b1ff94 Michael D. Ivey ivey@gweezlebur.com http://github.com/fightinjoe/merb-more/commit/96f822b49cf317ddb6e9bc6804f8b397c0aeb7ba 96f822b49cf317ddb6e9bc6804f8b397c0aeb7ba 2008-03-21T01:05:43-07:00 2008-03-04T21:39:13-08:00 create merb-more.rb 8f492c683da897f21bbcdfc6dda637db086ebbbb Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local a32f90334a7795c690775e399a193c975dd95118 booss alex.boussinet@gmail.com http://github.com/fightinjoe/merb-more/commit/126ae26a51f545b043e1b0c9e0c6ee8b98b1ff94 126ae26a51f545b043e1b0c9e0c6ee8b98b1ff94 2008-03-21T01:05:42-07:00 2008-03-09T03:06:37-07:00 capture and concat from AbstractController are private 51c592e8ab86855b06457b703fff19bd4272038b Aaron Wheeler aaronwheeler@aaron-wheelers-macbook-pro-15.local