7f76614569ea94348364384ac02db4c3dba2709d Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/9c39944389993f22418a9c4233f327adc0069b2e 9c39944389993f22418a9c4233f327adc0069b2e

2008-02-13T20:54:34-08:00

Not sure how this didn't get commited 3114b07c186b465a00e157bec793361a5a9d9362 Michael D. Ivey ivey@gweezlebur.com f32b4cbf96c307cf913102b676fb379c847daa80 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/7f76614569ea94348364384ac02db4c3dba2709d 7f76614569ea94348364384ac02db4c3dba2709d

2008-02-13T20:33:01-08:00

2008-02-12T20:43:18-08:00

added test plugin dependency call to use_test Modifies Kernel#use_test to include a dependency for the test library specified by the use_test parameter. Supported test plugins are merb_rspec and merb_test_unit. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 65ff946b7fdfd0d447e6b1eba98e66a92feff0f6 Michael D. Ivey ivey@gweezlebur.com baf74321765d1ab799dc4a51f44766f6ad1a8e45 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/f32b4cbf96c307cf913102b676fb379c847daa80 f32b4cbf96c307cf913102b676fb379c847daa80

2008-02-13T20:30:52-08:00

2008-02-12T20:40:42-08:00

updated kernel.rb documentation documentation for Kernel#use_orm and Kernel#use_test reference Merb.root/dependencies.yml instead of Merb.root/config/init.rb Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 405349f490e498e52527df83e7ad9dd193522ed7 Michael D. Ivey ivey@gweezlebur.com ab721722d8d076c11190330b93f62c85f7f8a074 8abb459d89ccb6061fa9dc59c380823619de1706 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/baf74321765d1ab799dc4a51f44766f6ad1a8e45 baf74321765d1ab799dc4a51f44766f6ad1a8e45

2008-02-13T20:10:20-08:00

Merge branch 'master' of git@github.com:wycats/merb-core b889c3cfaf30ac4b3161d6acf6f87523c429bf79 Michael D. Ivey ivey@gweezlebur.com c694ac78a188037cdaf4584c3dc2fd37b613b541 Diego Scataglini dwebsubmit@gmail.com http://github.com/wycats/merb-core/commit/ab721722d8d076c11190330b93f62c85f7f8a074 ab721722d8d076c11190330b93f62c85f7f8a074

2008-02-13T20:07:23-08:00

2008-02-13T19:16:13-08:00

Added some rdoc documentation to the Behavior class Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 6e932b46643f7269b336b807e368af4f27a8b324 Michael D. Ivey ivey@gweezlebur.com a15b2e9aa1eb31f0a3fa7b2568f3ed25968e8433 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/8abb459d89ccb6061fa9dc59c380823619de1706 8abb459d89ccb6061fa9dc59c380823619de1706

2008-02-13T18:06:57-08:00

Add back support for streaming when using Mongrel or evented mongrel e2308b970c53f0c54731eacc31683f0138fce10f Ezra Zygmuntowicz ez@engineyard.com ab2c368f9296531260530fc054fe89ef6c7b7d17 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/a15b2e9aa1eb31f0a3fa7b2568f3ed25968e8433 a15b2e9aa1eb31f0a3fa7b2568f3ed25968e8433

2008-02-13T14:27:00-08:00

No longer need the response object in Dispatcher f33dce37aae0bd88796d3661e93f3477a606424f Ezra Zygmuntowicz ez@engineyard.com c694ac78a188037cdaf4584c3dc2fd37b613b541 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ab2c368f9296531260530fc054fe89ef6c7b7d17 ab2c368f9296531260530fc054fe89ef6c7b7d17

2008-02-13T14:23:33-08:00

Remove the @response object as we do not need it. 14400c412c8c82b4ab3a299b47c2d9ea5b0e6cbb Ezra Zygmuntowicz ez@engineyard.com b3d1385cd1b950d1ce32e709cc1b937d1755c3d1 f9b8d869671346f68f64c01db29106e0e56ed20c Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/c694ac78a188037cdaf4584c3dc2fd37b613b541 c694ac78a188037cdaf4584c3dc2fd37b613b541

2008-02-13T14:00:16-08:00

Merge branch 'master' of git@github.com:wycats/merb-core ddb2282997d73510721206294fee9c5c32882e1c Michael D. Ivey ivey@gweezlebur.com bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/b3d1385cd1b950d1ce32e709cc1b937d1755c3d1 b3d1385cd1b950d1ce32e709cc1b937d1755c3d1

2008-02-13T13:57:16-08:00

2008-02-12T22:50:22-08:00

Server documentation Added documentation for Merb::Server methods. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 04d99370e31cbcab57c204f5d0e30eb203cf5775 Michael D. Ivey ivey@gweezlebur.com 39973931efc14ed19445b64dc3ee4296e8c5b82f bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f9b8d869671346f68f64c01db29106e0e56ed20c f9b8d869671346f68f64c01db29106e0e56ed20c

2008-02-13T11:48:05-08:00

Fix conflict 9244f3a93f5f83fcb6c4c95eb8df5803596fc5fe Yehuda Katz wycats@gmail.com a35e3427181f46dcd75a3fb419a9ed45a8cdb963 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/39973931efc14ed19445b64dc3ee4296e8c5b82f 39973931efc14ed19445b64dc3ee4296e8c5b82f

2008-02-13T11:46:44-08:00

Make query-strings actually work 8d9d1fec40102e99c1221348dfaf53f0b206e1af Yehuda Katz wycats@gmail.com d1d519fe19dcd2d58d349f4216c642588278997d Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-core/commit/bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85 bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85

2008-02-13T08:55:22-08:00

Fix for merb.url in merb console causing the error NameError: undefined local variable or method `controller_name'. The irb rack adapter url() method was attempting to set a fallback in the call to Merb::Router.generate. The fallback was trying to use controller_name and action_name which are not available in the irb rack adapter. The explicit fallback has been removed and now the call to Merb::Router.generate uses the default fallback. 1caaaa691b1a64a76ebfbf4cd6bc59c8a8cba603 Jonathan Younger jonathan@daikini.com 69b0af440c26bf218c1098461df2fb398e129909 6e5c54fe6390ed1c250b0e839b16cf83c32d172b Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/d1d519fe19dcd2d58d349f4216c642588278997d d1d519fe19dcd2d58d349f4216c642588278997d

2008-02-13T07:55:51-08:00

Merge branch 'master' of git@github.com:wycats/merb-core b328533aef28097d6e0aa3e883fe678d9e4a241a Michael D. Ivey ivey@gweezlebur.com ad3e06a43829672f554bcf0d8bdc21154f9c9538 2668a7dc953d2b32f2a76e522988b9aefccc9d39 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/6e5c54fe6390ed1c250b0e839b16cf83c32d172b 6e5c54fe6390ed1c250b0e839b16cf83c32d172b

2008-02-13T01:23:28-08:00

Merge branch 'master' of git@github.com:wycats/merb-core 2f84fddd5fa98e202d391736c73c466fb01bbb84 Ezra Zygmuntowicz ez@engineyard.com f6221a29e05685344d67146ca9ec7bd12b9abb47 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ad3e06a43829672f554bcf0d8bdc21154f9c9538 ad3e06a43829672f554bcf0d8bdc21154f9c9538

2008-02-13T01:23:05-08:00

minor refactor 0c8c7b095e91c9bca2ae952730a5eccfbabb81c1 Ezra Zygmuntowicz ez@engineyard.com 2668a7dc953d2b32f2a76e522988b9aefccc9d39 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/69b0af440c26bf218c1098461df2fb398e129909 69b0af440c26bf218c1098461df2fb398e129909

2008-02-13T00:03:30-08:00

Add Merb.frozen and change how dependency() works when frozen? == true 0386d6818c1f2cb037fea819a92ba8c79e991810 Michael D. Ivey ivey@gweezlebur.com ecf073ffefe9b59d490f4ab3be2784ea8818b7fc Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-core/commit/2668a7dc953d2b32f2a76e522988b9aefccc9d39 2668a7dc953d2b32f2a76e522988b9aefccc9d39

2008-02-12T21:41:30-08:00

2008-02-12T11:22:14-08:00

Removed sample apps, moving to merb-gen. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 80707e81f89d15df65d1cd4c38f298206a2cbda6 Michael D. Ivey ivey@gweezlebur.com 7551b32f2390cef055f664e75c9d9aafbe3e9464 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/ecf073ffefe9b59d490f4ab3be2784ea8818b7fc ecf073ffefe9b59d490f4ab3be2784ea8818b7fc

2008-02-12T21:16:53-08:00

2008-02-12T21:01:25-08:00

Added documentation for Config and Exceptions. Includes documentation for all methods in Config and for the methods in ControllerExceptions::Base. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 615bb477cdfbcdfe2e9e847e16cf5094b2fb766b Michael D. Ivey ivey@gweezlebur.com 414d44d81489232e7e65b3ff84499ea0d476b70e Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/7551b32f2390cef055f664e75c9d9aafbe3e9464 7551b32f2390cef055f664e75c9d9aafbe3e9464

2008-02-12T21:04:26-08:00

Hash#environmentize_keys! will ignore nil keys Thanks jamie 85c6a999c1f7bf49dfed97ed393f171e2aa17525 Michael D. Ivey ivey@gweezlebur.com 670e2c6a830615c02576a2a4d7179f2fb84a38a7 f6221a29e05685344d67146ca9ec7bd12b9abb47 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/414d44d81489232e7e65b3ff84499ea0d476b70e 414d44d81489232e7e65b3ff84499ea0d476b70e

2008-02-12T20:40:55-08:00

Merge branch 'master' of git@github.com:wycats/merb-core 2f2e71471dd2396153bc4cd2f460716f1a4dabcc Michael D. Ivey ivey@gweezlebur.com f30da42347fb8547f4514f9970f05604790b95b5 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/670e2c6a830615c02576a2a4d7179f2fb84a38a7 670e2c6a830615c02576a2a4d7179f2fb84a38a7

2008-02-12T20:38:25-08:00

someone forgot to add ostruct 2f2e71471dd2396153bc4cd2f460716f1a4dabcc Michael D. Ivey ivey@gweezlebur.com dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/f30da42347fb8547f4514f9970f05604790b95b5 f30da42347fb8547f4514f9970f05604790b95b5

2008-02-12T20:20:24-08:00

2008-02-12T20:15:46-08:00

Remove DOC annotations and funky formatting, meh 618c006fa3d5183fa19b8eaf4ebd89c3222f8e7d Michael D. Ivey ivey@gweezlebur.com cdbf6e8fe7eee4ae751d8e29b1400bafaa472452 Dudley Flanders dudley@misnomer.us http://github.com/wycats/merb-core/commit/dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f

2008-02-12T20:20:24-08:00

2008-02-12T08:46:48-08:00

Allow for running specs with different Ruby implementations Adds tasks for running specs under JRuby. The tasks still need to be run from MRI, since popen3 isn't portable. This means that running the specs with JRuby is extra slow because we spin up a new JVM for each spec file, but it's better than nothing. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 5324f1b6e7fe7cc9d5fb9d3015941d763e27e079 Michael D. Ivey ivey@gweezlebur.com cb5e21f071c077268c32b658c4695c86839ee7d3 Dudley Flanders dudley@misnomer.us http://github.com/wycats/merb-core/commit/cdbf6e8fe7eee4ae751d8e29b1400bafaa472452 cdbf6e8fe7eee4ae751d8e29b1400bafaa472452

2008-02-12T20:20:24-08:00

2008-02-12T17:48:49-08:00

Fix rendering partials from a different controller, e.g: partial('other_controller/partial.html.erb') Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> ea7ae8cf6d08e7edb844d0892d310207d29510fe Michael D. Ivey ivey@gweezlebur.com 2bcf951fce21c554cb39dfb1419206201f007b30 Dudley Flanders dudley@misnomer.us http://github.com/wycats/merb-core/commit/cb5e21f071c077268c32b658c4695c86839ee7d3 cb5e21f071c077268c32b658c4695c86839ee7d3

2008-02-12T20:20:24-08:00

2008-02-12T09:15:26-08:00

Allow Merb.root_path to take a list of directories Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> e4f718fe76dd644832f9c39475f365495d9b8925 Michael D. Ivey ivey@gweezlebur.com 3a9c3d7e95f44c2083547ba055077b221ba66236 Steve Tooke steve.tooke@gmail.com http://github.com/wycats/merb-core/commit/2bcf951fce21c554cb39dfb1419206201f007b30 2bcf951fce21c554cb39dfb1419206201f007b30

2008-02-12T20:20:24-08:00

2008-02-12T03:39:53-08:00

added spec for single resource 14b965a99a52bc3da38ecb2c7900009114875e69 Michael D. Ivey ivey@gweezlebur.com 771e464a71d6309098def4754a25124408a28700 Steve Tooke steve.tooke@gmail.com http://github.com/wycats/merb-core/commit/3a9c3d7e95f44c2083547ba055077b221ba66236 3a9c3d7e95f44c2083547ba055077b221ba66236

2008-02-12T20:20:23-08:00

2008-02-12T01:48:02-08:00

added routing for delete action on single resource 473872d483d4efe83df5afb05c0a231611dc979e Michael D. Ivey ivey@gweezlebur.com d6afdf2cce03c26fca912de57e6d112aaf2dcfd2 Steve Tooke steve.tooke@gmail.com http://github.com/wycats/merb-core/commit/771e464a71d6309098def4754a25124408a28700 771e464a71d6309098def4754a25124408a28700

2008-02-12T20:20:23-08:00

2008-02-12T01:30:29-08:00

added restful delete action reimplementing 0.5.x patch from this ticket: http://merb.lighthouseapp.com/projects/7433/tickets/26-patch-add-a-delete-action-to-restful-routes started to move across some of the resource routes specs. f4efa45395ce043c0756f80af92784b21e94f87a Michael D. Ivey ivey@gweezlebur.com 9c8000fbc06dca856a493a5aadfa96e762ff425c Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/f6221a29e05685344d67146ca9ec7bd12b9abb47 f6221a29e05685344d67146ca9ec7bd12b9abb47

2008-02-12T20:15:46-08:00

Remove DOC annotations and funky formatting, meh 02b386f27074259a97d2086a7314070e02ea9547 Ezra Zygmuntowicz ez@engineyard.com