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 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 dbdde10384c96868063b9ffba0d90a04e5c84719 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/0205b2d39c3b02047de7dfde28c988e22fd9bd00 0205b2d39c3b02047de7dfde28c988e22fd9bd00 2008-08-06T16:26:38-07:00 2008-08-06T16:26:38-07:00 added some basic specs for slice generators cf9bc1802b2ca0dbbea73c4240b487bdf004cf2b Jonas Nicklas jonas.nicklas@gmail.com ae274841df884076bc953b944c5d4e7ebbfd6901 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/dbdde10384c96868063b9ffba0d90a04e5c84719 dbdde10384c96868063b9ffba0d90a04e5c84719 2008-08-06T16:17:00-07:00 2008-08-06T16:17:00-07:00 removed redundant stuff from slice generators e66468c20f85a1300ca068f4bb64eee5535c1fef Jonas Nicklas jonas.nicklas@gmail.com 48419cfac8afcf631bdda717c3395d84049f59e2 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/ae274841df884076bc953b944c5d4e7ebbfd6901 ae274841df884076bc953b944c5d4e7ebbfd6901 2008-08-06T16:10:28-07:00 2008-08-06T16:10:28-07:00 removed redundant base_name declarations d76c9e270792a73fba2b469c27b13d7524f57c70 Jonas Nicklas jonas.nicklas@gmail.com 9d5b7a5e204ea77fe85a668b0ed1d22b5e5785a0 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/48419cfac8afcf631bdda717c3395d84049f59e2 48419cfac8afcf631bdda717c3395d84049f59e2 2008-08-06T16:06:09-07:00 2008-08-06T16:06:09-07:00 added base_name and module_name methods cdb748c410aa878a43db806fea03bd27eb75c5e2 Jonas Nicklas jonas.nicklas@gmail.com 2b4b777d4ff8f1d837e73ffc5620b1ec9c892758 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/9d5b7a5e204ea77fe85a668b0ed1d22b5e5785a0 9d5b7a5e204ea77fe85a668b0ed1d22b5e5785a0 2008-08-06T16:00:55-07:00 2008-08-06T16:00:55-07:00 fixed class names for names with dashes 938e6beea58e05e4c530eba5dfbce362e0c5b118 Jonas Nicklas jonas.nicklas@gmail.com 1769de766ccac90cc3260f3038db3590bd7ccf81 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/2b4b777d4ff8f1d837e73ffc5620b1ec9c892758 2b4b777d4ff8f1d837e73ffc5620b1ec9c892758 2008-08-06T15:53:03-07:00 2008-08-06T15:53:03-07:00 forgot one 4c5661806c81ff520323eb8a5512210e2942d041 Jonas Nicklas jonas.nicklas@gmail.com 4fde6d0c072daff83b94da0e0bd15935e622ef93 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/1769de766ccac90cc3260f3038db3590bd7ccf81 1769de766ccac90cc3260f3038db3590bd7ccf81 2008-08-06T15:52:51-07:00 2008-08-06T15:52:51-07:00 moved templates into generator directory eb5c4f92a49e69a3b8d27e3b8c291c0f0ed2bcf2 Jonas Nicklas jonas.nicklas@gmail.com 881d3a9178d31d12462b22a756e1cdb90bbbbe96 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/4fde6d0c072daff83b94da0e0bd15935e622ef93 4fde6d0c072daff83b94da0e0bd15935e622ef93 2008-08-06T15:49:53-07:00 2008-08-06T15:49:53-07:00 made merb-slices generators accept names with dashes (kinda) 1d84299fc7b55734cdfd8faa46cfa45045cf95cc Jonas Nicklas jonas.nicklas@gmail.com 5978ee22b32117c9f30cdd590905216d8dd3dc88 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/881d3a9178d31d12462b22a756e1cdb90bbbbe96 881d3a9178d31d12462b22a756e1cdb90bbbbe96 2008-08-06T15:08:45-07:00 2008-08-06T15:08:45-07:00 moved slices to named generators 82724366124819b4994d3d46e047abc92401698e Jonas Nicklas jonas.nicklas@gmail.com dc5c374e09b7bd01829ee0a28ceabc4f991d7ec8 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/5978ee22b32117c9f30cdd590905216d8dd3dc88 5978ee22b32117c9f30cdd590905216d8dd3dc88 2008-08-06T15:08:07-07:00 2008-08-06T15:08:07-07:00 fixed plugin generator to work when generating plugins that have dashes in their names b35738ba8d631c45fb94ea7bdf2c3172494365f2 Jonas Nicklas jonas.nicklas@gmail.com 08b50d7117a173f6bd50176be6f682c36cd13863 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/dc5c374e09b7bd01829ee0a28ceabc4f991d7ec8 dc5c374e09b7bd01829ee0a28ceabc4f991d7ec8 2008-08-06T14:53:02-07:00 2008-08-06T14:53:02-07:00 removed named and namespaced generator into own file and added specs for them 0247b3b3e9c837abaa82fb59c823cd5285ca39e7 Jonas Nicklas jonas.nicklas@gmail.com 583345260d02bf219ec14dd3a2e15f2faa7ec00e Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/08b50d7117a173f6bd50176be6f682c36cd13863 08b50d7117a173f6bd50176be6f682c36cd13863 2008-08-06T14:52:09-07:00 2008-08-06T14:52:09-07:00 removed references to chunky generator from specs 16376078cc6221dffaea62b3fae5efea2854019b Jonas Nicklas jonas.nicklas@gmail.com 5d5591bd594cc4f56b03e85d21d7b0304f85c0f2 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/583345260d02bf219ec14dd3a2e15f2faa7ec00e 583345260d02bf219ec14dd3a2e15f2faa7ec00e 2008-08-06T14:44:27-07:00 2008-08-06T14:44:27-07:00 removed ApplicationGenerator and ComponentGenerator, since they have no useful purpose af91488bd3476f92bac8f50f49e14a66fa035dfd Jonas Nicklas jonas.nicklas@gmail.com