55ca471e6f0dffa88b5c5d84d0f1b630f9c66495 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/25c70d19493a80532626c3b7b3c1b396fbeb5f19 25c70d19493a80532626c3b7b3c1b396fbeb5f19 2008-08-25T13:01:08-07:00 2008-08-25T13:01:08-07:00 Use debug log level in development environment by default. This makes ActiveRecord log SQL statements and benchmarks automagically. 2cbb9bb3f969d224ec933d1c8c39a8187de79c4b Michael S. Klishin michael@novemberain.com 67a0d083c1707fe0873125d1378f43e568b68199 Richard Grundy rich@27smiles.com http://github.com/wycats/merb-more/commit/55ca471e6f0dffa88b5c5d84d0f1b630f9c66495 55ca471e6f0dffa88b5c5d84d0f1b630f9c66495 2008-08-23T01:40:06-07:00 2008-08-23T01:40:06-07:00 Removed require for rubygems as file no longer exists in merb-core. cd541e6a884fe058bf2593ff5146b96be4e25599 Richard Grundy rich@27smiles.com 98bf2e612f75e244871585e5b864899ba450ebc7 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/67a0d083c1707fe0873125d1378f43e568b68199 67a0d083c1707fe0873125d1378f43e568b68199 2008-08-21T11:50:43-07:00 2008-08-21T11:50:43-07:00 Exclude .git, .hg, .svn and friends in Autotest config. Otherwise it consumes CPU like crazy. 8eb18d1fafe2565193f1b84a5e8610ce8c5e3e7a Michael S. Klishin michael@novemberain.com 1107ccd6d8e91fdcf74643fbb7fb10414bd8a906 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/98bf2e612f75e244871585e5b864899ba450ebc7 98bf2e612f75e244871585e5b864899ba450ebc7 2008-08-20T03:38:06-07:00 2008-08-20T03:38:06-07:00 Generate spec helper for flat and very flat applications. 42a1a35647618102a0466fa78353f1c910fccd5f Michael S. Klishin michael@novemberain.com a19a586f1ffee548372a88e9a93a8f2ec76c2474 Cristi Balan evil@che.lu http://github.com/wycats/merb-more/commit/1107ccd6d8e91fdcf74643fbb7fb10414bd8a906 1107ccd6d8e91fdcf74643fbb7fb10414bd8a906 2008-08-19T23:20:01-07:00 2008-08-19T15:51:14-07:00 check git url and extract component name from git url correctly Signed-off-by: Michael S. Klishin <michael@novemberain.com> a7455e4efe27e09ca899b1c3e3779969fe6fb509 Michael S. Klishin michael@novemberain.com 23fbbf5375486acdb02d8470f8c42c5b2c2a2c5d Cristi Balan evil@che.lu http://github.com/wycats/merb-more/commit/a19a586f1ffee548372a88e9a93a8f2ec76c2474 a19a586f1ffee548372a88e9a93a8f2ec76c2474 2008-08-19T23:19:52-07:00 2008-08-19T15:34:04-07:00 steal sudo checks from merb-more Signed-off-by: Michael S. Klishin <michael@novemberain.com> 586819428d1064d1e189e4f1dec5455942916692 Michael S. Klishin michael@novemberain.com 84a1bc08ce4f523f0ac65c87393c29f79c79609b Cristi Balan evil@che.lu http://github.com/wycats/merb-more/commit/23fbbf5375486acdb02d8470f8c42c5b2c2a2c5d 23fbbf5375486acdb02d8470f8c42c5b2c2a2c5d 2008-08-19T23:19:44-07:00 2008-08-19T15:31:27-07:00 remove dashes from git paths so they work on 1.6.0+ Signed-off-by: Michael S. Klishin <michael@novemberain.com> e608421dbf1ffa2e1bc5b78e27c018108fad8dff Michael S. Klishin michael@novemberain.com df613bce32917de24967c260026e61cd21bb15f6 Matthew Windwer matt@reframeit.local http://github.com/wycats/merb-more/commit/84a1bc08ce4f523f0ac65c87393c29f79c79609b 84a1bc08ce4f523f0ac65c87393c29f79c79609b 2008-08-19T02:41:09-07:00 2008-06-10T13:28:39-07:00 PartController actions should be set as a string Signed-off-by: Michael S. Klishin <michael@novemberain.com> 4cdf20e2095f5284e381bade04da16f3aa6d9bf5 Michael S. Klishin michael@novemberain.com e555a8f16b1e38b16c18bcb38b224694d81f50b3 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/df613bce32917de24967c260026e61cd21bb15f6 df613bce32917de24967c260026e61cd21bb15f6 2008-08-18T14:44:33-07:00 2008-08-18T14:44:33-07:00 Refactored the generators by inheritance from BaseSliceGenerator 5beb06778c01afbe69205bbb0e281caab70c47db Fabien Franzen info@atelierfabien.be 00cc2d9694f4b6499f19a753c39db54cc308f282 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/e555a8f16b1e38b16c18bcb38b224694d81f50b3 e555a8f16b1e38b16c18bcb38b224694d81f50b3 2008-08-18T08:45:58-07:00 2008-08-18T08:45:58-07:00 Re-added full/Rakefile template because of specific differences 688438a2c78d578af7a5810e9cababd56cf7bd77 Fabien Franzen info@atelierfabien.be 48e007d5f5314dcd227c90555f7549abf242ddca Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/00cc2d9694f4b6499f19a753c39db54cc308f282 00cc2d9694f4b6499f19a753c39db54cc308f282 2008-08-18T08:31:09-07:00 2008-08-18T08:31:09-07:00 Added common generator templates 37e8cda25491d8583099c709013bdf1b8bd4f3f7 Fabien Franzen info@atelierfabien.be efd0f81de6c66713b7c9c59c1b4d43c3792274b3 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/48e007d5f5314dcd227c90555f7549abf242ddca 48e007d5f5314dcd227c90555f7549abf242ddca 2008-08-18T08:14:43-07:00 2008-08-18T08:14:43-07:00 Removed generator redundancy where possible - awaiting Templater support for common templating needs b6f32e4033ff2d1f04f6929de5186e9965b86aca Fabien Franzen info@atelierfabien.be 65cd7bcfa3d62fe99fe63c1946517237a8386e00 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/efd0f81de6c66713b7c9c59c1b4d43c3792274b3 efd0f81de6c66713b7c9c59c1b4d43c3792274b3 2008-08-18T06:47:33-07:00 2008-08-18T06:47:33-07:00 Fixed tiny bug in full slice spec generator 2e6e7a8a9a0d3aa95f6dae3c35bf04863879081d Fabien Franzen info@atelierfabien.be 73a065417d3c5b0e8178d16ef1fec81aaeb99d34 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/65cd7bcfa3d62fe99fe63c1946517237a8386e00 65cd7bcfa3d62fe99fe63c1946517237a8386e00 2008-08-17T14:40:50-07:00 2008-08-17T14:40:50-07:00 resource generator no longer singularizes parameter This makes it possible to have resources that end in -s, those would previously break. 413dc02ea1766fd690e29261c59a7c2ca751b03d Jonas Nicklas jonas.nicklas@gmail.com 6409e9ce7569593fe0ff418ee22ed8e36473e272 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/73a065417d3c5b0e8178d16ef1fec81aaeb99d34 73a065417d3c5b0e8178d16ef1fec81aaeb99d34 2008-08-16T11:56:26-07:00 2008-08-16T11:41:40-07:00 made comments for rest controller respect namespaces a6be864313283dffb4964f9f2c03a94c157551e6 Jonas Nicklas jonas.nicklas@gmail.com a4c4f71333a8dfbc23fa2f861fa74ea2033566d5 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/6409e9ce7569593fe0ff418ee22ed8e36473e272 6409e9ce7569593fe0ff418ee22ed8e36473e272 2008-08-16T11:43:05-07:00 2008-08-13T15:08:51-07:00 spec helpers now moved into templater (merb gen specs require edge templater for now) b0bcda4014ef5adbc93f72ac7b6af3cda8c2f92f Jonas Nicklas jonas.nicklas@gmail.com 6b598031ea9a349fa7b7a25fe296189c4c6e93ff Gert Goet gert_at_thinkcreate_dot_nl http://github.com/wycats/merb-more/commit/a4c4f71333a8dfbc23fa2f861fa74ea2033566d5 a4c4f71333a8dfbc23fa2f861fa74ea2033566d5 2008-08-15T13:15:08-07:00 2008-08-15T06:55:06-07:00 suggest rspec not spec for option testing_framework Signed-off-by: Michael S. Klishin <michael@novemberain.com> 950886d532914e50c56e357218aa67b6aa004757 Michael S. Klishin michael@novemberain.com 936bf68a51f2fc614bbdfa02b1b649368b8caa73 25e73978a918938d36047149d19228629ee86d45 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/6b598031ea9a349fa7b7a25fe296189c4c6e93ff 6b598031ea9a349fa7b7a25fe296189c4c6e93ff 2008-08-14T10:06:51-07:00 2008-08-14T10:06:51-07:00 Merge branch 'core_internal_adapt' * core_internal_adapt: made application generator add use_template_engine adapted merb-gen to new Merb.orm, etc... methods b746c5130b0ab9bb9a49b8d08ad3eb503acc0082 Michael S. Klishin michael@novemberain.com 87479e11e73a8e12ced3fc92bda2d2182bad5e2e 0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/936bf68a51f2fc614bbdfa02b1b649368b8caa73 936bf68a51f2fc614bbdfa02b1b649368b8caa73 2008-08-14T10:06:48-07:00 2008-08-14T10:06:48-07:00 Merge branch 'haml_generators' * haml_generators: added haml templates for layout, resource_controller and controller generators (thanks jonuts) made erb template engine explicit for controller generator 6f1226c707b518f2d72dcf00f455308626fa9142 Michael S. Klishin michael@novemberain.com af16bc43a678a1f0c08e714dbdee22c6824843e4 Dirkjan Bussink d.bussink@gmail.com http://github.com/wycats/merb-more/commit/87479e11e73a8e12ced3fc92bda2d2182bad5e2e 87479e11e73a8e12ced3fc92bda2d2182bad5e2e 2008-08-14T03:25:09-07:00 2008-08-14T02:50:39-07:00 Use clear_content to prevent double rendering issues in mails Signed-off-by: Michael S. Klishin <michael@novemberain.com> 6f1226c707b518f2d72dcf00f455308626fa9142 Michael S. Klishin michael@novemberain.com 6bbf3157e60d009d7821ff4ef0f595cff5c8f309 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/af16bc43a678a1f0c08e714dbdee22c6824843e4 af16bc43a678a1f0c08e714dbdee22c6824843e4 2008-08-13T12:10:15-07:00 2008-08-13T12:10:15-07:00 Fixes merb-more version a790431fe4ef210c05a6e0448906bf751153e91a Yehuda Katz wycats@gmail.com e9f309ede5289fc80b6ac04e28cd8727f1a63677 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/6bbf3157e60d009d7821ff4ef0f595cff5c8f309 6bbf3157e60d009d7821ff4ef0f595cff5c8f309 2008-08-12T21:05:51-07:00 2008-08-12T21:05:51-07:00 Bump up versions. 17162109d84843555634eb85a60a64f55bb7fa38 Michael S. Klishin michael@novemberain.com ae4003bbbd9e02f86f563f80c37d957a2addd5bd Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/25e73978a918938d36047149d19228629ee86d45 25e73978a918938d36047149d19228629ee86d45 2008-08-09T14:29:25-07:00 2008-08-09T14:29:25-07:00 made application generator add use_template_engine 41bb7300fc89bdd742ad85e287d24fe5acf3a70f Jonas Nicklas jonas.nicklas@gmail.com e9f309ede5289fc80b6ac04e28cd8727f1a63677 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/ae4003bbbd9e02f86f563f80c37d957a2addd5bd ae4003bbbd9e02f86f563f80c37d957a2addd5bd 2008-08-09T14:28:53-07:00 2008-08-09T14:15:20-07:00 adapted merb-gen to new Merb.orm, etc... methods f3ffc4d5d15885275499bdcb4832267133502bba Jonas Nicklas jonas.nicklas@gmail.com 0232f1c07806a756e22b4a2488fe35101376020c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/e9f309ede5289fc80b6ac04e28cd8727f1a63677 e9f309ede5289fc80b6ac04e28cd8727f1a63677 2008-08-09T12:01:23-07:00 2008-08-09T12:01:23-07:00 Merged in HAML generators. This adds --template-engine option to generator and HAML templates. Squashed commit of the following: commit 0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 9 15:14:17 2008 +0200 added haml templates for layout, resource_controller and controller generators (thanks jonuts) commit eeecf5ff05677b11e39bcf310271dca5a155253d Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 9 14:30:16 2008 +0200 made erb template engine explicit for controller generator b1582331b26033f785e47f47f16b1b12b038b6ea Michael S. Klishin michael@novemberain.com eeecf5ff05677b11e39bcf310271dca5a155253d Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b 0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b 2008-08-09T06:14:17-07:00 2008-08-09T06:14:17-07:00 added haml templates for layout, resource_controller and controller generators (thanks jonuts) b1582331b26033f785e47f47f16b1b12b038b6ea Jonas Nicklas jonas.nicklas@gmail.com 0232f1c07806a756e22b4a2488fe35101376020c Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/eeecf5ff05677b11e39bcf310271dca5a155253d eeecf5ff05677b11e39bcf310271dca5a155253d 2008-08-09T05:40:57-07:00 2008-08-09T05:30:16-07:00 made erb template engine explicit for controller generator 80b3917cdd92c7664d866d71c33ceb1bd191613d Jonas Nicklas jonas.nicklas@gmail.com 48f7e61b84a363c16bf7ca3be23886fa8c08e136 913ebcd3d3390bd8935121bfa2cece18ecb1b9a2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/0232f1c07806a756e22b4a2488fe35101376020c 0232f1c07806a756e22b4a2488fe35101376020c 2008-08-08T14:35:02-07:00 2008-08-08T14:35:02-07:00 Merge branch 'go_up' * go_up: removed migration invocation from model added some documentation added go up method and specced with_modules method 20ea8a4cd47bcfe2cdbd431858e6ba45fbd02169 Michael S. Klishin michael@novemberain.com becc129670d67971258f42a8bda53661ec2d4d8e Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/913ebcd3d3390bd8935121bfa2cece18ecb1b9a2 913ebcd3d3390bd8935121bfa2cece18ecb1b9a2 2008-08-08T04:03:08-07:00 2008-08-08T04:03:08-07:00 removed migration invocation from model fc20c05cc96d9405d7bfed2adbafe5cad6999e28 Jonas Nicklas jonas.nicklas@gmail.com 202812e30b9cefc6da520f07b834514460bd2fcd Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/becc129670d67971258f42a8bda53661ec2d4d8e becc129670d67971258f42a8bda53661ec2d4d8e 2008-08-08T04:00:38-07:00 2008-08-08T04:00:38-07:00 added some documentation 939c68109a0b6bf0ec5356601b412f7f4e785f11 Jonas Nicklas jonas.nicklas@gmail.com