c2fc436e11ba8ee8ae857534b83ca217f27447b4 4907a07e219f055b093604f2f681c8597db8ad49 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/ce0365f0ca5f96a6d4589799f37d1a5e0251fecf ce0365f0ca5f96a6d4589799f37d1a5e0251fecf 2008-02-13T20:37:09-08:00 2008-02-13T20:37:09-08:00 Merge branch 'merb-test' of git://github.com/benburkert/merb-more 6f5bd1f0ebf9e9da67d6341fbb8b4eea5fbdcdd4 Michael D. Ivey ivey@gweezlebur.com 999d60d327bbf8382bc2ff54fbbff1b52f014364 Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-more/commit/c2fc436e11ba8ee8ae857534b83ca217f27447b4 c2fc436e11ba8ee8ae857534b83ca217f27447b4 2008-02-13T20:21:45-08:00 2008-02-13T17:34:24-08:00 Cleanup merb-parts, fix part_controller generator, and random spelling error. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 99b9881031a24a05567bae14690a7074661c3c24 Michael D. Ivey ivey@gweezlebur.com 1feb11fbc447a733c5b851c7da969e9020ae2c08 999d60d327bbf8382bc2ff54fbbff1b52f014364 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/4907a07e219f055b093604f2f681c8597db8ad49 4907a07e219f055b093604f2f681c8597db8ad49 2008-02-13T14:25:36-08:00 2008-02-13T14:25:36-08:00 Merge branch 'master' of git://github.com/wycats/merb-more into merb-test feb318771494f1020d9d35f089b443ce510bcf41 Ben Burkert ben@benburkert.com 1b5c596d6cc7fce26df3814b99239009ff40ab5b Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/1feb11fbc447a733c5b851c7da969e9020ae2c08 1feb11fbc447a733c5b851c7da969e9020ae2c08 2008-02-13T13:23:58-08:00 2008-02-13T13:23:58-08:00 cleaning up merb-test 928194d20d2c242f3285ca9f048a0b4501ea7024 Ben Burkert ben@benburkert.com cb5d34d7a836f5156f4cf82c013f568eaed88491 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/1b5c596d6cc7fce26df3814b99239009ff40ab5b 1b5c596d6cc7fce26df3814b99239009ff40ab5b 2008-02-13T13:12:29-08:00 2008-02-13T13:12:29-08:00 added Object#assigns per brapse's ticket. Moved merb-test to test_ext b/c this will house mixins and extra methods used only in testing. 861b906319f6b893dacb0d375e4581b7ef0a80ed Ben Burkert ben@benburkert.com d3749ff9562160ccb5b0f55ec46d1b993d9e5e8e Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/cb5d34d7a836f5156f4cf82c013f568eaed88491 cb5d34d7a836f5156f4cf82c013f568eaed88491 2008-02-13T12:42:45-08:00 2008-02-13T12:42:45-08:00 added Merb::Test::Multipart helpers in ControllerHelper 82cd8688c3e02f8f44a87408d11916d4a9ac9377 Ben Burkert ben@benburkert.com 90c74fbf6b64892e812442f8c96079b7b8fc56e4 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/999d60d327bbf8382bc2ff54fbbff1b52f014364 999d60d327bbf8382bc2ff54fbbff1b52f014364 2008-02-13T00:48:55-08:00 2008-02-13T00:48:55-08:00 Fix frozen-merb (remove debugging...it's so late) a3adb86191d24be9006d80b199ba11efd9b207c5 Michael D. Ivey ivey@gweezlebur.com ffa7f49f5928565b899f1d96f853e1ab0940ccb3 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/90c74fbf6b64892e812442f8c96079b7b8fc56e4 90c74fbf6b64892e812442f8c96079b7b8fc56e4 2008-02-13T00:44:28-08:00 2008-02-13T00:44:28-08:00 Add frozen framework script: merb-gen frozen-merb Adds a Freezer generator, plus a merb-gen shortcut f1d5cc287f1ca5ede3313be629226e70b8fbb2ae Michael D. Ivey ivey@gweezlebur.com d0a1a5ae85e6f32e98aa174b7762fb0667717942 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/d3749ff9562160ccb5b0f55ec46d1b993d9e5e8e d3749ff9562160ccb5b0f55ec46d1b993d9e5e8e 2008-02-12T22:45:10-08:00 2008-02-12T22:45:10-08:00 removed RSpec and Test::Unit tasks from the default Rakefile, they are now loaded in the test plugin 081da5de46ac27a73ca2949a09335427a7f33ce6 Ben Burkert ben@benburkert.com 9ea471c7ff16ee486fe00277b00b0e48fdf1f319 ffa7f49f5928565b899f1d96f853e1ab0940ccb3 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/d0a1a5ae85e6f32e98aa174b7762fb0667717942 d0a1a5ae85e6f32e98aa174b7762fb0667717942 2008-02-12T22:40:13-08:00 2008-02-12T22:40:13-08:00 Merge branch 'master' of git://github.com/wycats/merb-more into merb-test 21e6e1539a73b590fa152ca653bdd565cadc9e67 Ben Burkert ben@benburkert.com 69902af8275031c2856ed0b930f53e240ff01d3c Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/9ea471c7ff16ee486fe00277b00b0e48fdf1f319 9ea471c7ff16ee486fe00277b00b0e48fdf1f319 2008-02-12T22:38:49-08:00 2008-02-12T22:38:49-08:00 added output parameter to get_elements e97b2217ebc36211ee07098ae25344bfee4a822e Ben Burkert ben@benburkert.com c7e82e82f0531337b379018c45f5d6666499b3ee Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-more/commit/ffa7f49f5928565b899f1d96f853e1ab0940ccb3 ffa7f49f5928565b899f1d96f853e1ab0940ccb3 2008-02-12T21:57:09-08:00 2008-02-12T15:23:13-08:00 More robust merb-gen commandline Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 6388ec15bebda9629cc41836c73e00aa3641e0f8 Michael D. Ivey ivey@gweezlebur.com 3a0453caa41625708cfdcb2e166c479d0f110058 Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-more/commit/c7e82e82f0531337b379018c45f5d6666499b3ee c7e82e82f0531337b379018c45f5d6666499b3ee 2008-02-12T21:42:21-08:00 2008-02-12T18:35:20-08:00 Fixed generated route to match controller. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> f64d3cbe2e93c48c404728318983ca30574edb53 Michael D. Ivey ivey@gweezlebur.com 7696256910f8deabc92cc406bb70a0473e520267 Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-more/commit/3a0453caa41625708cfdcb2e166c479d0f110058 3a0453caa41625708cfdcb2e166c479d0f110058 2008-02-12T21:42:11-08:00 2008-02-12T17:47:51-08:00 Made single file app base its filename and classname from the application name provided at command prompt Changed README to reflect the app name as well. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> e12bc65927fb923628d193c5e130756d69d9b055 Michael D. Ivey ivey@gweezlebur.com 160cf60a59af602eed693f7f0a526d18dbf2d6cc Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-more/commit/7696256910f8deabc92cc406bb70a0473e520267 7696256910f8deabc92cc406bb70a0473e520267 2008-02-12T21:41:58-08:00 2008-02-12T17:02:52-08:00 Added generators for --flat and --very-flat applications. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> cb13f2508fce88451bdeadad62d61a4efef2d4b6 Michael D. Ivey ivey@gweezlebur.com 98b1750acd4e4e7cfbb07ae80f01660156022138 Nathan Weizenbaum nex342@gmail.com http://github.com/wycats/merb-more/commit/160cf60a59af602eed693f7f0a526d18dbf2d6cc 160cf60a59af602eed693f7f0a526d18dbf2d6cc 2008-02-12T21:34:15-08:00 2008-02-05T18:35:07-08:00 Read Haml configuration information from config/plugins.yml. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 389ac6e2687ba2ec11186d9aa3aa1d96131d555e Michael D. Ivey ivey@gweezlebur.com 9cb01346bfdf8918057e2c24028d5f2861447487 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/69902af8275031c2856ed0b930f53e240ff01d3c 69902af8275031c2856ed0b930f53e240ff01d3c 2008-02-12T20:59:31-08:00 2008-02-12T20:59:31-08:00 Using request_helper, multipart_helper, and fake_request from merb-core instead 8577d3974671b62e34e4b8885001b423fb478c3b Ben Burkert ben@benburkert.com 565d77437e6a6bfd021519bb3a856a700e60af83 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/9cb01346bfdf8918057e2c24028d5f2861447487 9cb01346bfdf8918057e2c24028d5f2861447487 2008-02-12T19:25:35-08:00 2008-02-12T19:25:35-08:00 refactoring & specs for hpricot helper 5628051c5c86793c3fdf44ff21a74414d18e8087 Ben Burkert ben@benburkert.com 6308744d4a3d8c993d377fed5caec765692e27b2 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/565d77437e6a6bfd021519bb3a856a700e60af83 565d77437e6a6bfd021519bb3a856a700e60af83 2008-02-12T14:50:41-08:00 2008-02-12T14:50:41-08:00 about to merge with master fd99ea5ac2ae5df75cad20df2e4340f5ca16b5b1 Ben Burkert ben@benburkert.com ea1d028aeb26d65e0397d84cb059e7dac550720f 98b1750acd4e4e7cfbb07ae80f01660156022138 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/6308744d4a3d8c993d377fed5caec765692e27b2 6308744d4a3d8c993d377fed5caec765692e27b2 2008-02-11T19:33:13-08:00 2008-02-11T19:33:13-08:00 Merge branch 'master' of git://github.com/wycats/merb-more into merb-test e92bbbf21048dee6cebf8c2729d4da59047193cd Ben Burkert ben@benburkert.com 90fb36afc9f831975d7f292b8a7cfa36e8318fcd Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/ea1d028aeb26d65e0397d84cb059e7dac550720f ea1d028aeb26d65e0397d84cb059e7dac550720f 2008-02-11T19:33:04-08:00 2008-02-11T19:33:04-08:00 Added the request helpers for get, post, multipart_post, etc. Added specs for the request helper, and the fake and multipart request classes. TODO: specs for hpricot helpers and extensions. 5077dba8d18a50ec8f4b14315dbedea8d49a6040 Ben Burkert ben@benburkert.com ca9772e1808afb83ce79e3c5e24934a3bf6dc282 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/98b1750acd4e4e7cfbb07ae80f01660156022138 98b1750acd4e4e7cfbb07ae80f01660156022138 2008-02-11T16:00:32-08:00 2008-02-11T16:00:32-08:00 globalhelpers not globalhelper dff86a3915ca1b2480ef764b56e03b0f752674e4 Michael D. Ivey ivey@gweezlebur.com ca9772e1808afb83ce79e3c5e24934a3bf6dc282 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/90fb36afc9f831975d7f292b8a7cfa36e8318fcd 90fb36afc9f831975d7f292b8a7cfa36e8318fcd 2008-02-10T19:15:45-08:00 2008-02-10T19:15:45-08:00 Porting merb-test from merb-core/lib/merb-core/test 478146baa82c2a36b4140d0ee41ddb8e8cc85e17 Ben Burkert ben@benburkert.com e29c987cebbb388bcd648b1753763da3c5ac2216 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/ca9772e1808afb83ce79e3c5e24934a3bf6dc282 ca9772e1808afb83ce79e3c5e24934a3bf6dc282 2008-02-10T07:03:27-08:00 2008-02-10T07:03:27-08:00 [merb-gen] Fixes spec_helper for apps so that it works 6676e1b32ecdb1350211508f1fc6e8cc2fd92f89 Daniel Neighman has.sox@gmail.com 522d2ea47bc51796d6cdc255ccd9dfc8f190cb09 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/e29c987cebbb388bcd648b1753763da3c5ac2216 e29c987cebbb388bcd648b1753763da3c5ac2216 2008-02-10T06:34:47-08:00 2008-02-10T06:34:47-08:00 [merb-parts] A first attempt at merb part controller support a2c56a3567c4da3b89e297c71effb716c7849b54 Daniel Neighman has.sox@gmail.com 9fccea51716e89df037b0b322fb83607a2fc7d7f Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/522d2ea47bc51796d6cdc255ccd9dfc8f190cb09 522d2ea47bc51796d6cdc255ccd9dfc8f190cb09 2008-02-08T23:17:46-08:00 2008-02-08T23:17:46-08:00 merb-more install task for installing all gems 20f9be42e5ad2eb6eb3d046b52bbeeff58fffc70 Michael D. Ivey ivey@gweezlebur.com eb2ddf273f824f799189ba5be52055a0c77ee829 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/9fccea51716e89df037b0b322fb83607a2fc7d7f 9fccea51716e89df037b0b322fb83607a2fc7d7f 2008-02-08T23:05:03-08:00 2008-02-08T23:05:03-08:00 using /dev/null was a dumb idea, since windows doesn't have that. 0b2caf8da44543392b615e0b2a3c1f3bf58d5d41 Michael D. Ivey ivey@gweezlebur.com 78af4d0af0809cbdcd0ad54285cd34004e069126 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/eb2ddf273f824f799189ba5be52055a0c77ee829 eb2ddf273f824f799189ba5be52055a0c77ee829 2008-02-08T22:55:04-08:00 2008-02-08T22:55:04-08:00 setup merb-more Rakefile getting ready for 0.9 release 223c0b98ca62786b22de0488171697eaf9e6eb5e Michael D. Ivey ivey@gweezlebur.com 067271b5a5ac3b87896981b6b0da1cf40d46ba30 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/78af4d0af0809cbdcd0ad54285cd34004e069126 78af4d0af0809cbdcd0ad54285cd34004e069126 2008-02-08T22:30:07-08:00 2008-02-08T22:30:07-08:00 merb-more Rakefile now builds merb and merb-more meta gems f431b668e9f04867eac951faf48f5a80fb727744 Michael D. Ivey ivey@gweezlebur.com 008d302d2bc31b8523282db9d7f250ae0cded8ec Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/067271b5a5ac3b87896981b6b0da1cf40d46ba30 067271b5a5ac3b87896981b6b0da1cf40d46ba30 2008-02-08T22:17:27-08:00 2008-02-08T22:17:27-08:00 merb-gen should use /dev/null for log and pid 5e88cb8d246dae4e6d4aebd98a113b4ff9700e65 Michael D. Ivey ivey@gweezlebur.com