758a19603ad276a6e95cbaed00bd6b9b4182f0eb Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/6a54e6c391aa01a9223d2b85772c539fa078214b 6a54e6c391aa01a9223d2b85772c539fa078214b 2008-03-03T16:03:11-08:00 2008-03-03T16:03:11-08:00 moved rspec rake tasks into core. Added Merb.rakefiles, which is now used by Merb::Plugins.rakefiles. Changed Kernel#use_test to only load dependency arguments when Merb.env is nil or test. b09899c164266d93cbc809c7ea882a519ac3ebf1 Ben Burkert ben@benburkert.com 451c7857437a4084c00e5057fb6efd2092290342 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/758a19603ad276a6e95cbaed00bd6b9b4182f0eb 758a19603ad276a6e95cbaed00bd6b9b4182f0eb 2008-03-03T15:23:07-08:00 2008-03-03T15:23:07-08:00 do not load test framework unless Merb.env == 'test' cb8c87614cc74668b7d100af29a0165ded7d51ce Ezra Zygmuntowicz ez@engineyard.com 9cd5ae93ea7ffe886edb959162e3b45b23885fec Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/451c7857437a4084c00e5057fb6efd2092290342 451c7857437a4084c00e5057fb6efd2092290342 2008-03-03T15:08:28-08:00 2008-03-03T15:08:28-08:00 Use new Object.make_module to create the module instead of old hackish solution. 560a65df31c2ab6741db2c8f8a20052a96eae372 Yehuda Katz wycats@gmail.com ef0480aec9e5828387480b8f196956e6e6f844b5 7e37e6779f3c64111ec7639f5aaf9095da3a8939 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9cd5ae93ea7ffe886edb959162e3b45b23885fec 9cd5ae93ea7ffe886edb959162e3b45b23885fec 2008-03-03T14:02:52-08:00 2008-03-03T14:02:52-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 8b8c1a06b5cb943f3a7f2e70bcbfe65b8cc1a138 Yehuda Katz wycats@gmail.com ace2bd2aa023b16abc70a83333ffff5e46c65908 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ef0480aec9e5828387480b8f196956e6e6f844b5 ef0480aec9e5828387480b8f196956e6e6f844b5 2008-03-03T14:02:31-08:00 2008-03-03T14:02:31-08:00 Don't clear our mimes previously defined. 6c5a6541245f15ac5a677097a686a4980eec5455 Yehuda Katz wycats@gmail.com 0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/7e37e6779f3c64111ec7639f5aaf9095da3a8939 7e37e6779f3c64111ec7639f5aaf9095da3a8939 2008-03-03T13:40:15-08:00 2008-03-03T13:40:15-08:00 Fixed clean task deleting everything in the lib folder cf4f18dcc07b9b0e65119218306343ce51558760 Ben Burkert ben@benburkert.com ace2bd2aa023b16abc70a83333ffff5e46c65908 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 2008-03-03T12:48:51-08:00 2008-03-03T12:48:51-08:00 Kernel#dependency requires gems/files in a before_app_loads block. 9cb7ca47af9329db802db498a54c17713ba9e3a7 Ben Burkert ben@benburkert.com 9585b19c5b49b02d05a44db457bcbf1f64a28a36 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ace2bd2aa023b16abc70a83333ffff5e46c65908 ace2bd2aa023b16abc70a83333ffff5e46c65908 2008-03-03T12:27:10-08:00 2008-03-03T12:27:10-08:00 Move dependency loading after framework and look for framework.rb aa9ba306cbf8b9c83124f8afb7194877d8561d90 Yehuda Katz wycats@gmail.com ee58c6c141d422f8bc7a7d596fa89071b0c63f8f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/9585b19c5b49b02d05a44db457bcbf1f64a28a36 9585b19c5b49b02d05a44db457bcbf1f64a28a36 2008-03-02T21:04:09-08:00 2008-03-02T21:04:09-08:00 remove vestigal rbx dir 76aacf41ec432fda82a40f15d4fa4874a1c6c81f Ezra Zygmuntowicz ez@engineyard.com 5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ee58c6c141d422f8bc7a7d596fa89071b0c63f8f ee58c6c141d422f8bc7a7d596fa89071b0c63f8f 2008-03-01T19:22:28-08:00 2008-03-01T19:22:28-08:00 Touching up a few things 41a5549cc4aa34f0718ff6600e5f02ecbb5a64a6 Ezra Zygmuntowicz ez@engineyard.com 1cf3ce72950beb0c3e439eae6d4123085607eaac 81f158b07996d9d7522956abdee8fd78bec6e8b2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98 5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98 2008-03-01T13:51:23-08:00 2008-03-01T13:51:23-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 8e3091778e3fe5c7c562042582f9e43ed90f595c Yehuda Katz wycats@gmail.com b4d85b39a0412d96d514275b26513db8936f4967 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/1cf3ce72950beb0c3e439eae6d4123085607eaac 1cf3ce72950beb0c3e439eae6d4123085607eaac 2008-03-01T13:51:02-08:00 2008-03-01T13:51:02-08:00 Creates helper stub modules for controllers. 32da27701fb8cd1c5b68433eb6469eedfdd823f2 Yehuda Katz wycats@gmail.com b4d85b39a0412d96d514275b26513db8936f4967 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/81f158b07996d9d7522956abdee8fd78bec6e8b2 81f158b07996d9d7522956abdee8fd78bec6e8b2 2008-02-29T20:53:30-08:00 2008-02-29T19:54:54-08:00 Prep core for 0.9.1 release 0e1b2f054674918620ddd0e75a2eefc72370c045 Michael D. Ivey ivey@gweezlebur.com ccadba5fba167f309af1828ffa0805816c84a65e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/b4d85b39a0412d96d514275b26513db8936f4967 b4d85b39a0412d96d514275b26513db8936f4967 2008-02-29T20:14:02-08:00 2008-02-29T20:14:02-08:00 Should fix blank path. 5907ee6cb6ef69bdb8ff22eab80822485f3d9fed Yehuda Katz wycats@gmail.com 3365c3e9932894b53f1ec073ba7678bf209b1202 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ccadba5fba167f309af1828ffa0805816c84a65e ccadba5fba167f309af1828ffa0805816c84a65e 2008-02-29T20:01:07-08:00 2008-02-29T20:01:07-08:00 Cooler errors ebea46231c4ae8edbd13901c3cf0566b3b77ec86 Yehuda Katz wycats@gmail.com dd6d8d1206be832567190ec8c843ce7b4b89d5f9 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/3365c3e9932894b53f1ec073ba7678bf209b1202 3365c3e9932894b53f1ec073ba7678bf209b1202 2008-02-29T18:15:10-08:00 2008-02-29T18:15:10-08:00 add named routes to error page d4bb58301476160c98f2a4ff4e11650443df65ef Ezra Zygmuntowicz ez@engineyard.com 17920081dee7d361cf1ec0235edc70be693a1d61 dfc3ab147788c37eb606143dd02b7af857c40c60 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/dd6d8d1206be832567190ec8c843ce7b4b89d5f9 dd6d8d1206be832567190ec8c843ce7b4b89d5f9 2008-02-29T15:08:10-08:00 2008-02-29T15:08:10-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 8e7516f6f7ebae98fd4bbf675f89d1f8daa51fbc Ezra Zygmuntowicz ez@engineyard.com af2ef094e2582bc37e1606040f9b7108088f1058 Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-core/commit/dfc3ab147788c37eb606143dd02b7af857c40c60 dfc3ab147788c37eb606143dd02b7af857c40c60 2008-02-29T14:29:27-08:00 2008-02-29T14:25:01-08:00 update to nested resources fix Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 81b330c40db3a34f5b5c60c7bda62d217eda50cd Michael D. Ivey ivey@gweezlebur.com af2ef094e2582bc37e1606040f9b7108088f1058 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/17920081dee7d361cf1ec0235edc70be693a1d61 17920081dee7d361cf1ec0235edc70be693a1d61 2008-02-29T13:50:54-08:00 2008-02-29T13:50:54-08:00 remove rbc files from rubinius experiments. 844254d0e7fbb6c5fca44420e85f89875f2a883a Ezra Zygmuntowicz ez@engineyard.com f66745664c774ed84b9a3a7740290dbf6ef338d5 c233e7fc252ba5a7850702bf7f014487885cd40c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/af2ef094e2582bc37e1606040f9b7108088f1058 af2ef094e2582bc37e1606040f9b7108088f1058 2008-02-29T13:05:58-08:00 2008-02-29T13:05:58-08:00 Merge branch 'rspec' of git://github.com/benburkert/merb-core 8589877ca08428721e3436c2e0178e9513a42f24 Yehuda Katz wycats@gmail.com 0b7f94a35d25057b7cccd593cea3abaae3efa72a Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-core/commit/f66745664c774ed84b9a3a7740290dbf6ef338d5 f66745664c774ed84b9a3a7740290dbf6ef338d5 2008-02-29T12:53:30-08:00 2008-02-29T08:24:33-08:00 nested resources changes Signed-off-by: Yehuda Katz <wycats@gmail.com> 63d0df39cde1ad168fa7bc40454fb6cf9cce2d61 Yehuda Katz wycats@gmail.com ff6e1a92e276b04529e7cea4ceb97c5ced4246aa Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/0b7f94a35d25057b7cccd593cea3abaae3efa72a 0b7f94a35d25057b7cccd593cea3abaae3efa72a 2008-02-29T08:57:47-08:00 2008-02-29T08:57:47-08:00 get autotest working for merb-core Extracted run_specs from Rakefile into lib/merb-core/test/run_specs.rb, and call that from bin/merb-specs Specs now run individually, as designed. autotest still chokes up and runs the failing specs 8 or 9 times in rapid succession, but that's a bug we can live with for the time being. e95572c74de4199533828dc3509fa7e6f0ef1c8a Michael D. Ivey ivey@gweezlebur.com 6331b638776cc36b8d30f72e6fdf3e8c15ddde28 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/c233e7fc252ba5a7850702bf7f014487885cd40c c233e7fc252ba5a7850702bf7f014487885cd40c 2008-02-28T21:46:57-08:00 2008-02-28T21:46:57-08:00 Adding mime-types dependency for real this time 4b4a68b7d818326dbe5a12942b0c664fb0dea073 Ben Burkert ben@benburkert.com 4a49a1705d05ff077a74c9af55729af141dbb670 ff6e1a92e276b04529e7cea4ceb97c5ced4246aa Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/6331b638776cc36b8d30f72e6fdf3e8c15ddde28 6331b638776cc36b8d30f72e6fdf3e8c15ddde28 2008-02-28T21:36:08-08:00 2008-02-28T21:36:08-08:00 Merge branch 'master' into rspec 4cb52f2bedeca36d2a2dd5ecd5bc17dda7bbcc31 Ben Burkert ben@benburkert.com 7ad2ede9286a8d835e9dd4b730a1d585ac931f3f Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/ff6e1a92e276b04529e7cea4ceb97c5ced4246aa ff6e1a92e276b04529e7cea4ceb97c5ced4246aa 2008-02-28T20:34:24-08:00 2008-02-28T20:34:24-08:00 Symbolize params in route generation, to accomodate Mashes b13eb1d2959f937aa528fbf7bae91891193b6dc0 Michael D. Ivey ivey@gweezlebur.com 5e485b5844f8037771886be200d49d7bed480bf2 7ad2ede9286a8d835e9dd4b730a1d585ac931f3f Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/4a49a1705d05ff077a74c9af55729af141dbb670 4a49a1705d05ff077a74c9af55729af141dbb670 2008-02-28T20:33:56-08:00 2008-02-28T20:33:56-08:00 merging with master 4d1d0492d0a9947b0f27464819c8e45e77aad3f4 Ben Burkert ben@benburkert.com 55d436bd977184021274bec3c58cd876ccf9e21d Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/5e485b5844f8037771886be200d49d7bed480bf2 5e485b5844f8037771886be200d49d7bed480bf2 2008-02-28T20:19:19-08:00 2008-02-28T20:19:19-08:00 imported the /lib/merb-core/test/matchers rspec matchers and specs from merb_rspec 1d86bd9a46170514978ce8d9026ffa6c20a3a5fc Ben Burkert ben@benburkert.com 8051d3c8b8feb45ec52aed76551cbc6a1fc4a2b2 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/55d436bd977184021274bec3c58cd876ccf9e21d 55d436bd977184021274bec3c58cd876ccf9e21d 2008-02-28T20:18:12-08:00 2008-02-28T20:18:12-08:00 removed old test specs that have been refactored into the spec/public/test directory 2e2e3f21bb6621d3c7930c8030e0fad89f1ed49a Ben Burkert ben@benburkert.com ac52ed0a1c9b41df62ae830e230870f02f63b1ff Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/8051d3c8b8feb45ec52aed76551cbc6a1fc4a2b2 8051d3c8b8feb45ec52aed76551cbc6a1fc4a2b2 2008-02-28T20:16:58-08:00 2008-02-28T20:16:58-08:00 removed request_helper file that was refactored into the helpers directory 2ee37659bca0db1d0da7fb80a151e09e46af344b Ben Burkert ben@benburkert.com 541c7492460267697c9c97a4cc500058fd3308fb Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/ac52ed0a1c9b41df62ae830e230870f02f63b1ff ac52ed0a1c9b41df62ae830e230870f02f63b1ff 2008-02-28T20:15:48-08:00 2008-02-28T20:15:48-08:00 added the helpers.rb file and updated multipart_spec.rb to use the refactored multipart request helpers 23c18a99bc62fc884d8717ac5fb0ef30ed110293 Ben Burkert ben@benburkert.com