462369c5d8f244873aef1352a24410c20ecf0321 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/bef3a6fc47a0c7fe83be54f69895952e175abc16 bef3a6fc47a0c7fe83be54f69895952e175abc16 2008-10-06T11:26:52-07:00 2008-10-06T11:26:52-07:00 Add staging environment to generated application skeleton (just a copy of production). 13b5fce7a58f428cac0f174db1f14261830773ce Michael S. Klishin michael@novemberain.com e76d7eb2b4ca45065bb990837fa60324055f7d27 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/462369c5d8f244873aef1352a24410c20ecf0321 462369c5d8f244873aef1352a24410c20ecf0321 2008-10-05T23:50:52-07:00 2008-10-05T23:50:52-07:00 optimized two_digits Numeric helper thanks to GMFlash 3c1496b463d5ba7b8ba060f108153479ce5fadba Matt Aimonetti mattaimonetti@gmail.com 5ae7e4a23321bcad29ebccef7820b6e1b60e80e9 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/e76d7eb2b4ca45065bb990837fa60324055f7d27 e76d7eb2b4ca45065bb990837fa60324055f7d27 2008-10-05T22:13:25-07:00 2008-10-05T22:13:25-07:00 added minutes_to_hours and two_digits numeric helpers to merb-helpers bd6aad817e06a30269ad764f291af80c226330ed Matt Aimonetti mattaimonetti@gmail.com 2f9591af190b5b4550cd708df379336d98e455dc 0a4a3ab05a057b0e85de9d7e3b088372b112f4ed Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/5ae7e4a23321bcad29ebccef7820b6e1b60e80e9 5ae7e4a23321bcad29ebccef7820b6e1b60e80e9 2008-10-05T21:15:30-07:00 2008-10-05T21:15:30-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 453b39850b30985cb816fa6411585f6095e212db Matt Aimonetti mattaimonetti@gmail.com 9383f47c76665b6d4b299b66b31b68d8ad71ef8f Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/2f9591af190b5b4550cd708df379336d98e455dc 2f9591af190b5b4550cd708df379336d98e455dc 2008-10-05T21:14:05-07:00 2008-10-05T21:14:05-07:00 started moving some of the numeric extension helpers to full stack specs 303a483ad4f235f85af8f39c8009777d40b8036e Matt Aimonetti mattaimonetti@gmail.com 61ba717de9c66daa4fda003526c22dc61c7761b6 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-more/commit/0a4a3ab05a057b0e85de9d7e3b088372b112f4ed 0a4a3ab05a057b0e85de9d7e3b088372b112f4ed 2008-10-05T20:11:28-07:00 2008-10-05T16:16:48-07:00 support local assignment preambles in haml and builder templates Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> d292c8488ad0d0291969eec446c253e9d4b3796f Ezra Zygmuntowicz ez@engineyard.com 61ba717de9c66daa4fda003526c22dc61c7761b6 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/9383f47c76665b6d4b299b66b31b68d8ad71ef8f 9383f47c76665b6d4b299b66b31b68d8ad71ef8f 2008-10-05T19:27:33-07:00 2008-10-05T19:27:33-07:00 added documentation for delete_button (merb-helpers) 2488b89cf7dadde8c1f14205c51c6f1eed88768e Matt Aimonetti mattaimonetti@gmail.com 387b255f31f26a5850886d773358b089c68435a9 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/61ba717de9c66daa4fda003526c22dc61c7761b6 61ba717de9c66daa4fda003526c22dc61c7761b6 2008-10-05T17:41:12-07:00 2008-10-05T17:41:12-07:00 updated test documentation for merb-helpers ffbab9a3b82e5040948aab4a93cb5893ae880842 Matt Aimonetti mattaimonetti@gmail.com 0a3ad0b857c16380a227f4e991b2439400e2b81d ed0a7938766344a2130d20e26770464a391b5730 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/387b255f31f26a5850886d773358b089c68435a9 387b255f31f26a5850886d773358b089c68435a9 2008-10-05T14:48:19-07:00 2008-10-05T14:48:19-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 297eabae133557f48455a98b559e889305806c86 Fabien Franzen info@atelierfabien.be b9faa6b46b2b0f3d6dbe4590f35520857a10595f Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/0a3ad0b857c16380a227f4e991b2439400e2b81d 0a3ad0b857c16380a227f4e991b2439400e2b81d 2008-10-05T14:47:51-07:00 2008-10-05T14:47:51-07:00 Reverted MinimalPrivilege in merb.thor for now 1b17666b4c7623657c690a9f832260442ace436f Fabien Franzen info@atelierfabien.be a6dd6070e64e0dbb157d29bd2705571bc63f98aa Carl Lerche carllerche@mac.com http://github.com/wycats/merb-more/commit/ed0a7938766344a2130d20e26770464a391b5730 ed0a7938766344a2130d20e26770464a391b5730 2008-10-05T13:11:24-07:00 2008-10-05T13:11:24-07:00 Added a Generators file to merb-mailer Templater and merb-gen require a Generators file in the root of any gem that provides generation templates. 313e62518243ad9d5d0aeafa1aa5c66e3a306076 Carl Lerche carllerche@mac.com 0120ebc68c0f6c7e3ee6ffc11f888f23ede94a1e Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/a6dd6070e64e0dbb157d29bd2705571bc63f98aa a6dd6070e64e0dbb157d29bd2705571bc63f98aa 2008-10-05T12:56:42-07:00 2008-10-05T12:56:42-07:00 Changed the behaviour of AdhocStore#fetch, updated the specs 1c6d3a6623c999f70fb56cd5bb70a4567a03fd29 Ben Burkert ben@benburkert.com 86ae8209d62f34e27ba2801d2c8b59c4eff11125 Richard Grundy rich@27smiles.com http://github.com/wycats/merb-more/commit/0120ebc68c0f6c7e3ee6ffc11f888f23ede94a1e 0120ebc68c0f6c7e3ee6ffc11f888f23ede94a1e 2008-10-05T12:51:19-07:00 2008-09-29T09:06:44-07:00 Add support for custom cache key in fragment caching. (cherry picked from commit 14db4f47bb9b7fc6cd434501c34b2f72d949237d) 66202e5cd01b09cb2572f2e2a0b332b1d8985f87 Ben Burkert ben@benburkert.com 5d0f4ab221a6f05cc0f238d8d935da056fed99a1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/86ae8209d62f34e27ba2801d2c8b59c4eff11125 86ae8209d62f34e27ba2801d2c8b59c4eff11125 2008-10-05T09:33:26-07:00 2008-10-05T09:33:26-07:00 Move fake models to fixtures/app/models. Sigh. Fake objects bring pain. 71c8ed6cf2653982751736259ddc34a9ef2e3fd3 Michael S. Klishin michael@novemberain.com b9faa6b46b2b0f3d6dbe4590f35520857a10595f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/5d0f4ab221a6f05cc0f238d8d935da056fed99a1 5d0f4ab221a6f05cc0f238d8d935da056fed99a1 2008-10-05T09:22:28-07:00 2008-10-05T09:18:23-07:00 Start moving merb-helpers fixtures towards a real app. Using real small app gives us some nice possibilities: * It lets us figure out how well view matchers work. * It lets us use real models instead of fake objects. * It lets us easily add use cases from reports. * It lets us reveal issues with -helpers related to changes in ORMs. * It provides a lot of examples of how people test views => we can copy them over to documentation as examples. Please consider never using fake objects in helper specs. fbaa4acc7e9be319d3206f0992648bada2954516 Michael S. Klishin michael@novemberain.com 9cad78d60ad52634ffbaacd76f3517d1ac388ded Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/b9faa6b46b2b0f3d6dbe4590f35520857a10595f b9faa6b46b2b0f3d6dbe4590f35520857a10595f 2008-10-05T09:03:11-07:00 2008-10-05T08:55:39-07:00 Added MinimalPrivilege to merb.thor. Thanks namelessjon. e1a9f7665141787e130acda0915eb622819d1f13 Fabien Franzen info@atelierfabien.be 1b1ee40231ba3a4a8da5b0b6b09f3b06a742374c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/9cad78d60ad52634ffbaacd76f3517d1ac388ded 9cad78d60ad52634ffbaacd76f3517d1ac388ded 2008-10-05T07:52:08-07:00 2008-10-05T07:52:08-07:00 Bunch of improvements to merb-gen. * Add merb.thor to flat and very flat apps. * Move Rakefile and merb.thor to common templates directory. * Do not force RSpec down test_unit users' throat. * Annotate generators code. f735924a8f33a60728fa110fdc1a891a9aaceb64 Michael S. Klishin michael@novemberain.com ce131713b0d791eb3185a78fd0105e35adf5fa43 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/1b1ee40231ba3a4a8da5b0b6b09f3b06a742374c 1b1ee40231ba3a4a8da5b0b6b09f3b06a742374c 2008-10-05T06:08:16-07:00 2008-10-05T06:07:44-07:00 Generate controller spec for resource no matter what ORM is used (we do not have specific templates yet). 73e92ae1721d9a1e275467ac381fbdc9d40e221a Michael S. Klishin michael@novemberain.com 19dc44346a0366106766cb99df8d28da866238bc Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/ce131713b0d791eb3185a78fd0105e35adf5fa43 ce131713b0d791eb3185a78fd0105e35adf5fa43 2008-10-05T05:41:45-07:00 2008-10-05T05:41:45-07:00 Handle migration numbers properly when --delete option is used. af5c9cae55dd8877585dcc002fd648d47bc62af6 Michael S. Klishin michael@novemberain.com d8955098c46585e02abc723f8dde0d9f5e43276b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/19dc44346a0366106766cb99df8d28da866238bc 19dc44346a0366106766cb99df8d28da866238bc 2008-10-05T05:05:20-07:00 2008-10-05T05:05:20-07:00 Add an edge case that reveals a bug in Extlib. 79aca0e0c732466b48b34328759e7d099ff8471b Michael S. Klishin michael@novemberain.com a89e53106a96478b1211c607d287b1713692104c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/d8955098c46585e02abc723f8dde0d9f5e43276b d8955098c46585e02abc723f8dde0d9f5e43276b 2008-10-05T05:02:37-07:00 2008-10-05T05:02:37-07:00 Remove extra puts in spec example. ff7dde4269f448f25eaef0f3086a0815d701ac80 Michael S. Klishin michael@novemberain.com f874e5d1c3696859cdcac5e6e8b820dcfa67593e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/a89e53106a96478b1211c607d287b1713692104c a89e53106a96478b1211c607d287b1713692104c 2008-10-05T04:44:01-07:00 2008-10-05T04:43:32-07:00 Spec examples for tag that prove #212 in -more is resolved. 1694b0b181b4297ef6ea4c7722c55b26f0eccf49 Michael S. Klishin michael@novemberain.com f63a86438c2dd8fd622155f41af388f3a54fefd8 a014a3a215b623a3dfa07673e8c83cb7e4eb90c1 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/f874e5d1c3696859cdcac5e6e8b820dcfa67593e f874e5d1c3696859cdcac5e6e8b820dcfa67593e 2008-10-05T04:41:52-07:00 2008-10-05T04:41:52-07:00 Merge branch 'master' of git@github.com:wycats/merb-more dd18528cbf9ddda5b02ca0751b42c3c6edc73ce7 Fabien Franzen info@atelierfabien.be f9369b1b20cc832318b48c48a67143c43ab83f7b Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/f63a86438c2dd8fd622155f41af388f3a54fefd8 f63a86438c2dd8fd622155f41af388f3a54fefd8 2008-10-05T04:40:53-07:00 2008-10-05T04:40:53-07:00 reload_router! now uses Merb::BootLoader::Router.reload af14fb27fe9b5f73d009a8934217ad718a2e6231 Fabien Franzen info@atelierfabien.be a911ea6d323dff98740b5998dad82d27f0063424 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/f9369b1b20cc832318b48c48a67143c43ab83f7b f9369b1b20cc832318b48c48a67143c43ab83f7b 2008-10-05T03:16:18-07:00 2008-10-05T03:16:18-07:00 Added some specs 7840db4f6e15c9b96896cd318e6e54fe2165f405 Fabien Franzen info@atelierfabien.be 7ba7d7d4313478d776c7ffc6672c1a6cf1992979 Richard Grundy rich@27smiles.com http://github.com/wycats/merb-more/commit/a014a3a215b623a3dfa07673e8c83cb7e4eb90c1 a014a3a215b623a3dfa07673e8c83cb7e4eb90c1 2008-10-05T02:54:43-07:00 2008-10-03T03:54:48-07:00 Updated generator templates to include the correct output method of exceptions. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 5cd8d6788ae49cda8dba0aadc63354698ddfb7a2 Michael S. Klishin michael@novemberain.com a911ea6d323dff98740b5998dad82d27f0063424 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/7ba7d7d4313478d776c7ffc6672c1a6cf1992979 7ba7d7d4313478d776c7ffc6672c1a6cf1992979 2008-10-05T02:54:43-07:00 2008-10-05T02:23:54-07:00 Update generated templates to mention merb-helpers (in merb-more), not merb_helpers. 2cfbe3e92356e9cdefe23ffeb83237b3f6b2fbf0 Michael S. Klishin michael@novemberain.com 4b6da938bd284d2a9d0ceec6717f5a7520b3b594 ab06838a1db4b365f45129a3f739679ec3881e9e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/a911ea6d323dff98740b5998dad82d27f0063424 a911ea6d323dff98740b5998dad82d27f0063424 2008-10-05T02:43:56-07:00 2008-10-05T02:43:56-07:00 Merge branch 'master' of git@github.com:wycats/merb-more a15ce45c3ca4af5b78b28f30631f8cd603bfdb6f Fabien Franzen info@atelierfabien.be 658b6c957f2d87b9bf17c6cf2c99ba8e16efda9d c7a05da128cd387a4746c74c602dbfa134308309 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/ab06838a1db4b365f45129a3f739679ec3881e9e ab06838a1db4b365f45129a3f739679ec3881e9e 2008-10-05T02:01:17-07:00 2008-10-05T02:01:17-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 7ae3bb5a1a33f8b0115a93813944755a940aaa09 Matt Aimonetti mattaimonetti@gmail.com 5da66e12ae9f01da89a1e7723f4b30a2b477b05d Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/658b6c957f2d87b9bf17c6cf2c99ba8e16efda9d 658b6c957f2d87b9bf17c6cf2c99ba8e16efda9d 2008-10-05T01:58:08-07:00 2008-10-05T01:58:08-07:00 made delete_button API nicer by adding a bit more magic: delete_button(@object) 3217318115fa4ba6aa6777046ac954767b3b813d Matt Aimonetti mattaimonetti@gmail.com