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 496851823daac87de7515ad0ff3431014054dec3 1ea6ec7f0d68357a23308c81d421117261e96af0 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/48f7e61b84a363c16bf7ca3be23886fa8c08e136 48f7e61b84a363c16bf7ca3be23886fa8c08e136 2008-08-08T02:46:10-07:00 2008-08-08T02:46:10-07:00 Merge branch 'the_move' * the_move: removed old rubigen generators for merb-gen using namespaced generator in merb-mailer moved templates to conform to new voncentions e6be5574fc211f6456b897e860048e24a28fa17c Michael S. Klishin michael@novemberain.com 1ea6ec7f0d68357a23308c81d421117261e96af0 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/202812e30b9cefc6da520f07b834514460bd2fcd 202812e30b9cefc6da520f07b834514460bd2fcd 2008-08-08T01:33:07-07:00 2008-08-08T01:29:11-07:00 added go up method and specced with_modules method bfbfe2685cce45774ed3d62d18b5332b7cbf641e Jonas Nicklas jonas.nicklas@gmail.com 9ca55bc2cb3699644331e80b9e4049c89f099dd5 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/1ea6ec7f0d68357a23308c81d421117261e96af0 1ea6ec7f0d68357a23308c81d421117261e96af0 2008-08-08T00:36:42-07:00 2008-08-08T00:36:42-07:00 removed old rubigen generators for merb-gen 8f36ca45e10f486cbf4e332e1daa7efe4fb04952 Jonas Nicklas jonas.nicklas@gmail.com 07ba43b928f0132473c9c09700174a8282e1717f Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/9ca55bc2cb3699644331e80b9e4049c89f099dd5 9ca55bc2cb3699644331e80b9e4049c89f099dd5 2008-08-08T00:36:12-07:00 2008-08-08T00:36:12-07:00 using namespaced generator in merb-mailer 99254d9b9f02c0d90cbbf74f6baf7e09e27f7fe4 Jonas Nicklas jonas.nicklas@gmail.com f6681ebe138afebdbb45e88cfa0d8399532f3771 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/07ba43b928f0132473c9c09700174a8282e1717f 07ba43b928f0132473c9c09700174a8282e1717f 2008-08-08T00:32:14-07:00 2008-08-08T00:32:14-07:00 moved templates to conform to new voncentions f22d1dabebbf227ea9cd9056baea1c0f22fb5860 Jonas Nicklas jonas.nicklas@gmail.com c97f75937fe155ea96d0c2288b2a779979f0220c f6681ebe138afebdbb45e88cfa0d8399532f3771 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/496851823daac87de7515ad0ff3431014054dec3 496851823daac87de7515ad0ff3431014054dec3 2008-08-07T17:21:01-07:00 2008-08-07T17:21:01-07:00 Merge branch 'jnicklas_move' * jnicklas_move: cleaned up after removal of orm specific generators, for clearer directory structure removed datamapper templates, they'll be in merb_datamapper moved sequel generators back into merb_sequel moved activerecord generators back into merb_activerecord 5106d1e0ce0c7a50d3fb0becbb63a53b157e802f Michael S. Klishin michael@novemberain.com 83d584c4b5c1b635993c2a1a735d5269a1529538 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/f6681ebe138afebdbb45e88cfa0d8399532f3771 f6681ebe138afebdbb45e88cfa0d8399532f3771 2008-08-07T14:33:26-07:00 2008-08-07T14:33:26-07:00 cleaned up after removal of orm specific generators, for clearer directory structure ef78e832295045578967997281a70e577f5e1ae2 Jonas Nicklas jonas.nicklas@gmail.com 10fa3af5f86ed884ed200b189705c5e5d37e792a Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/83d584c4b5c1b635993c2a1a735d5269a1529538 83d584c4b5c1b635993c2a1a735d5269a1529538 2008-08-07T14:04:38-07:00 2008-08-07T14:04:38-07:00 removed datamapper templates, they'll be in merb_datamapper cbf681b728f75bfd727f056c9dd92c7ccc25fafb Jonas Nicklas jonas.nicklas@gmail.com 5cad5f8d3c3baed6befa9fabf8a5915c77ea896a Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/10fa3af5f86ed884ed200b189705c5e5d37e792a 10fa3af5f86ed884ed200b189705c5e5d37e792a 2008-08-07T13:57:49-07:00 2008-08-07T13:57:49-07:00 moved sequel generators back into merb_sequel 2de4c3abbb1a0a837704fac170241c291a36db86 Jonas Nicklas jonas.nicklas@gmail.com 0205b2d39c3b02047de7dfde28c988e22fd9bd00 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/5cad5f8d3c3baed6befa9fabf8a5915c77ea896a 5cad5f8d3c3baed6befa9fabf8a5915c77ea896a 2008-08-07T13:22:31-07:00 2008-08-07T13:22:31-07:00 moved activerecord generators back into merb_activerecord 3337621eb9a8f5511bf78772207b4ccff267f6e8 Jonas Nicklas jonas.nicklas@gmail.com 9c40b026693bacfc19eadbec347b0349488a40e2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/c97f75937fe155ea96d0c2288b2a779979f0220c c97f75937fe155ea96d0c2288b2a779979f0220c 2008-08-07T00:17:43-07:00 2008-08-07T00:17:43-07:00 Fix a problem when Autotest in generated app did not run spec on change to helper file. 8a9310b212051543691e6cec022bc8a309fc8f47 Michael S. Klishin michael@novemberain.com cd4267ad7cde543d1308cc293cd7d1b1bb204ebf 0205b2d39c3b02047de7dfde28c988e22fd9bd00 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/9c40b026693bacfc19eadbec347b0349488a40e2 9c40b026693bacfc19eadbec347b0349488a40e2 2008-08-07T00:04:18-07:00 2008-08-07T00:04:18-07:00 Merge branch 'jnicklas_merbgen_refactoring' * jnicklas_merbgen_refactoring: added some basic specs for slice generators removed redundant stuff from slice generators removed redundant base_name declarations added base_name and module_name methods fixed class names for names with dashes forgot one moved templates into generator directory made merb-slices generators accept names with dashes (kinda) moved slices to named generators fixed plugin generator to work when generating plugins that have dashes in their names removed named and namespaced generator into own file and added specs for them removed references to chunky generator from specs removed ApplicationGenerator and ComponentGenerator, since they have no useful purpose added symbol name method added spec stubs for all generators renamed ChunkyGenerator to the more sensible NamespacedGenerator 57e97c9b8c4ad9c20bd1122851a96476538273dc Michael S. Klishin michael@novemberain.com dccf6a0663333eb927e3c32b2f6a47ab0afd945e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/cd4267ad7cde543d1308cc293cd7d1b1bb204ebf cd4267ad7cde543d1308cc293cd7d1b1bb204ebf 2008-08-06T23:31:12-07:00 2008-08-06T23:31:12-07:00 Update Merb::Mailer documentation. 8aa187093692d3216a3efbd421b963f7b41eea3d Michael S. Klishin michael@novemberain.com