81f348c40971437c1ed1edaff6fe5fae6951e16a Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/cf52650f9241b94c28665fc9b56e0337adbd950d cf52650f9241b94c28665fc9b56e0337adbd950d

2008-03-24T20:36:55-07:00

Prep 0.9.2 8a0a0b1e92fbb6b56ab040841967eaa651d3ab09 Michael D. Ivey ivey@gweezlebur.com d79c1523cf3de716ba00d36f8e2a4694c1643299 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/81f348c40971437c1ed1edaff6fe5fae6951e16a 81f348c40971437c1ed1edaff6fe5fae6951e16a

2008-03-24T16:27:27-07:00

Resolves #209 83f4c4cd946b4bf6b669991756590291f425e134 Yehuda Katz wycats@gmail.com d7a5f0985eeac9f439324ecd9990d651b336e292 Martin Grund grund@MacGrund.local http://github.com/reframeit/merb-core/commit/d79c1523cf3de716ba00d36f8e2a4694c1643299 d79c1523cf3de716ba00d36f8e2a4694c1643299

2008-03-24T16:11:09-07:00

2008-03-24T12:05:16-07:00

* removed Merb.logger calls due to the fact the bootloader did not ran by now and it is not initialized. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 3f35d83c89e19a938bee2584ecca710739b0c3be Ezra Zygmuntowicz ez@engineyard.com 0f3cc717b6158809625b3b8c6c1597714d9f5f4f Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/d7a5f0985eeac9f439324ecd9990d651b336e292 d7a5f0985eeac9f439324ecd9990d651b336e292

2008-03-24T16:10:56-07:00

use __send__ rather than send b309acf7c6f7ccf364e5011577959e1618c33283 Ezra Zygmuntowicz ez@engineyard.com 76a0dde86f08401ff6dcbda628e5cdee57d103ee Jonathan Younger jonathan@daikini.com http://github.com/reframeit/merb-core/commit/0f3cc717b6158809625b3b8c6c1597714d9f5f4f 0f3cc717b6158809625b3b8c6c1597714d9f5f4f

2008-03-24T11:05:14-07:00

2008-03-24T10:55:01-07:00

Fixed exception setting route when route_index is nil Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> c0f0477d0f3aea571cba804997192dff50cd0255 Michael D. Ivey ivey@gweezlebur.com 22436fe4056bf4ab7e293d0f1a66cff54538f442 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/76a0dde86f08401ff6dcbda628e5cdee57d103ee 76a0dde86f08401ff6dcbda628e5cdee57d103ee

2008-03-23T15:42:38-07:00

memoize the raw_post body after its called once df0dcca1e65c13dce35cd50da9602cf3ef473810 Ezra Zygmuntowicz ez@engineyard.com 312181aade867323834c5031b7e9707f931e9ded Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/22436fe4056bf4ab7e293d0f1a66cff54538f442 22436fe4056bf4ab7e293d0f1a66cff54538f442

2008-03-23T15:40:36-07:00

fix Request#raw_post to respect bodies with no rewind method 0b59a839a84152a0452998df8de20091f19352e0 Ezra Zygmuntowicz ez@engineyard.com 142d85ca7cf7c7a4f5a93b09be12978b39059125 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/312181aade867323834c5031b7e9707f931e9ded 312181aade867323834c5031b7e9707f931e9ded

2008-03-23T15:07:39-07:00

remove Kernel#requires it wasn't being used. get erubis compiled methods to take a locals={} hash in prep for hash as locals. 6280af600d4c35194850e2d3476d431de40c1d54 Ezra Zygmuntowicz ez@engineyard.com 0078e2c4d637a01911209b73de5fe92816a8e390 Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/142d85ca7cf7c7a4f5a93b09be12978b39059125 142d85ca7cf7c7a4f5a93b09be12978b39059125

2008-03-22T20:09:03-07:00

Move fixation to post initialize We no longer have access to the route via the request, but dispatcher will set the route after initialization 6a6b8d9f2b1a4d10033ee96d0353b26018550258 Michael D. Ivey ivey@gweezlebur.com 68cbd675a4fc6433b4ee2d8218bf8e0c29461dfa Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/0078e2c4d637a01911209b73de5fe92816a8e390 0078e2c4d637a01911209b73de5fe92816a8e390

2008-03-22T16:29:15-07:00

typo 6a305a3115cbf3512fbb8b66ecad4dfcfe7d9a62 Michael D. Ivey ivey@gweezlebur.com 7698ddb3d316da71408683158e1adeba6d0cab74 Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/68cbd675a4fc6433b4ee2d8218bf8e0c29461dfa 68cbd675a4fc6433b4ee2d8218bf8e0c29461dfa

2008-03-22T16:26:31-07:00

2008-03-22T16:19:58-07:00

add specs for does_not_provide 1ae2037ead83d4519524472bfd8b299f11e9572a Michael D. Ivey ivey@gweezlebur.com 575f80ac6497ea09c5488656ec5f34e216ba0391 Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/7698ddb3d316da71408683158e1adeba6d0cab74 7698ddb3d316da71408683158e1adeba6d0cab74

2008-03-22T16:26:31-07:00

2008-03-22T16:17:52-07:00

Add specs for action-level only_provides Oh, and fix the bug, so they pass :) 1529f9cca405b94a2b6ab1420503256dc5238325 Michael D. Ivey ivey@gweezlebur.com 8cd7aae5b2d8385eeff04b99bb40b29bb87cdb65 Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/575f80ac6497ea09c5488656ec5f34e216ba0391 575f80ac6497ea09c5488656ec5f34e216ba0391

2008-03-22T16:26:31-07:00

2008-03-22T15:32:32-07:00

Make controller.route work 6c3c13f21d124c4797e2c80db6c6050076480fd0 Michael D. Ivey ivey@gweezlebur.com 170b54198484c0422c922544b56096d422c3a043 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/8cd7aae5b2d8385eeff04b99bb40b29bb87cdb65 8cd7aae5b2d8385eeff04b99bb40b29bb87cdb65

2008-03-22T15:52:45-07:00

Update Ebb adapter to work with latest Ebb 0.1.0 [Ry Dahl] 99c1b260e4662e1cc0efb9284b00b84ccd302874 Ezra Zygmuntowicz ez@engineyard.com ea12c7163f7f56387ec69c4925216e87fba6432c 9858e69815a3a92ca72129c90bdb2442d5e8d879 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/170b54198484c0422c922544b56096d422c3a043 170b54198484c0422c922544b56096d422c3a043

2008-03-22T15:48:59-07:00

Merge conflict 5333c4a23796731e25c884ef6bdb1d6be1206cf4 Ezra Zygmuntowicz ez@engineyard.com b6b9b4a3477901c83752028df9252d6f4d8561e7 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/ea12c7163f7f56387ec69c4925216e87fba6432c ea12c7163f7f56387ec69c4925216e87fba6432c

2008-03-22T15:47:56-07:00

fix PATH_INFO bug for fcgi afed6f74f8182483a202689e40da079eefd56815 Ezra Zygmuntowicz ez@engineyard.com b6b9b4a3477901c83752028df9252d6f4d8561e7 Michael D. Ivey ivey@gweezlebur.com http://github.com/reframeit/merb-core/commit/9858e69815a3a92ca72129c90bdb2442d5e8d879 9858e69815a3a92ca72129c90bdb2442d5e8d879

2008-03-22T08:42:57-07:00

Rename url_with_host to absolute_url Also add alias relative_url for url 66ac56d824641ae940fee9c56090e424809c8b18 Michael D. Ivey ivey@gweezlebur.com c0d463fbb06e58e3a44487d6f61a97b813c2e21a Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/b6b9b4a3477901c83752028df9252d6f4d8561e7 b6b9b4a3477901c83752028df9252d6f4d8561e7

2008-03-21T15:41:11-07:00

Add url_with_host() and allow params to be pushed into FCGI adapter de78ea49dc9412cb15839873d19b55c0ab2f727a Ezra Zygmuntowicz ez@engineyard.com 934c986265f32fc42ee6ea495864d216d421920d Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/c0d463fbb06e58e3a44487d6f61a97b813c2e21a c0d463fbb06e58e3a44487d6f61a97b813c2e21a

2008-03-19T18:55:13-07:00

More correct to_json of dictionary. aa45a6c5f6d6b707ad39e168eef820d8059d1346 Yehuda Katz wycats@gmail.com 47c48645b52b66de1360e3cce5e87035cd36b270 e3a72791eaee77fe360b39a599e3eeaf4dcfcec6 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/934c986265f32fc42ee6ea495864d216d421920d 934c986265f32fc42ee6ea495864d216d421920d

2008-03-19T18:49:09-07:00

Merge branch 'master' of git@github.com:wycats/merb-core 2fb4b18f66ac8dd9238a0291b39c1e5df1fcc265 Yehuda Katz wycats@gmail.com bd6814e14a9da3c161e1f6b14b71f88b5a9f0748 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/47c48645b52b66de1360e3cce5e87035cd36b270 47c48645b52b66de1360e3cce5e87035cd36b270

2008-03-19T18:48:51-07:00

Modify dispatcher to be sane to XHRs; add to_json to dictionaries. c0e167933889cbf59b2600bc69f8d90a4af07f5e Yehuda Katz wycats@gmail.com 130ee1ee30e08e23cd4563bce954ecacff88a5b3 Flea kbarton@rippletv.com http://github.com/reframeit/merb-core/commit/e3a72791eaee77fe360b39a599e3eeaf4dcfcec6 e3a72791eaee77fe360b39a599e3eeaf4dcfcec6

2008-03-19T12:22:25-07:00

2008-03-12T07:22:37-07:00

Added html_escape around the exception.message in the show details section. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 3b0952cf703786f380107cc85e659c4a2b199d4f Ezra Zygmuntowicz ez@engineyard.com ce659ee9d210df80d177d686c836a20d5585c00b Ray Morgan ray@simple-apps.com http://github.com/reframeit/merb-core/commit/130ee1ee30e08e23cd4563bce954ecacff88a5b3 130ee1ee30e08e23cd4563bce954ecacff88a5b3

2008-03-19T12:20:49-07:00

2008-03-15T21:23:26-07:00

Fixed bug not allowing have_tag to be called without a attribute hash, even when one is not desired Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 3040cdac5906c6a4c6c493a49d6e8a59bc6201ba Ezra Zygmuntowicz ez@engineyard.com 18eb76a2a28db4acfd1637d37793f0580146fb02 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/ce659ee9d210df80d177d686c836a20d5585c00b ce659ee9d210df80d177d686c836a20d5585c00b

2008-03-19T12:19:29-07:00

fix typo 3fe5c4f71bb0fbb475abdfb2f89ef77b2ff39a44 Ezra Zygmuntowicz ez@engineyard.com 85b0471e96a7d287401af5c962253d79666de779 Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/18eb76a2a28db4acfd1637d37793f0580146fb02 18eb76a2a28db4acfd1637d37793f0580146fb02

2008-03-19T12:16:54-07:00

refactor and clean up Merb::BootLoader::Dependencies [James Herdman] 161ceb66fe1fc81fa7799fdc001e5a521084aa70 Ezra Zygmuntowicz ez@engineyard.com aea93e8b0c4c492e8437cf3cd5c49eb2c5ccb39f Ezra Zygmuntowicz ez@engineyard.com http://github.com/reframeit/merb-core/commit/85b0471e96a7d287401af5c962253d79666de779 85b0471e96a7d287401af5c962253d79666de779

2008-03-19T12:09:16-07:00

ticket 202 ee31cdf698f7a0e866139d2d6e7c9529744e682e Ezra Zygmuntowicz ez@engineyard.com bcc5121cedaee28b519ccb01accc08f59c3ef236 Cory ODaniel codaniel@rippletv.com http://github.com/reframeit/merb-core/commit/aea93e8b0c4c492e8437cf3cd5c49eb2c5ccb39f aea93e8b0c4c492e8437cf3cd5c49eb2c5ccb39f

2008-03-19T12:07:16-07:00

2008-03-11T12:40:02-07:00

This keeps erroring out, i hope it didnt commit multiple times: Add ability to set session id key and sesion expiry from Merb::Config Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> e957d8ced37e28753bfbd456f93d8a5aa91efc3a Ezra Zygmuntowicz ez@engineyard.com 589c989a4d322575b0dce86ec42000fc4e8d7c60 Fabien Franzen info@atelierfabien.be http://github.com/reframeit/merb-core/commit/bcc5121cedaee28b519ccb01accc08f59c3ef236 bcc5121cedaee28b519ccb01accc08f59c3ef236

2008-03-17T13:31:05-07:00

Merb::BootLoader::LoadClasses should keep unique list of classes When tracking classes that haven't succesfully loaded yet, make sure to keep an unique list. Otherwise the break condition could fail to execute. d0079e7cd9f340c48ee0c757846cfb6bebe56a80 Fabien Franzen info@atelierfabien.be bd6814e14a9da3c161e1f6b14b71f88b5a9f0748 Fabien Franzen info@atelierfabien.be http://github.com/reframeit/merb-core/commit/589c989a4d322575b0dce86ec42000fc4e8d7c60 589c989a4d322575b0dce86ec42000fc4e8d7c60

2008-03-14T02:46:51-07:00

Logger now works as expected, fixed ReloadClasses bootloader Merb.logger will be able to reflect the environment's configuration settings; if the environment config's options are different from the initial logger args a new Logger will be created and assigned. This happens during the Dependencies BootLoader execution, right after the individual configs have been loaded. This means that Rake or other scenario's can be treated as real environments, even with their own config/environment/rake.rb file. Rakefile itself can be cleaned up nicely, and MERB_ENV should default to 'rake'. Be sure to use the most recent Rakefile from merb-gen, and for config/database.yml, add a section for the rake environment (aliased to development by the default generated sample database.yml file). This breaks current Rakefile operations unless you take these steps. The overall benefits are worth it though: you can set config/environments/rake.rb c[:log_file] = STDOUT for example without resorting to any kind of hacks. Also if MERB_ENV is specified, the logger of that env is used accordingly. d7f286c483bb0c995252f0311e1020d8f8216b14 Fabien Franzen info@atelierfabien.be fee90e18ff98e282eb84452216401bbca922f956 c25e77fc8ededd692306415be837df971a7d72c2 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/bd6814e14a9da3c161e1f6b14b71f88b5a9f0748 bd6814e14a9da3c161e1f6b14b71f88b5a9f0748

2008-03-13T16:15:59-07:00

Merge branch 'master' of git@github.com:wycats/merb-core fcbf85f21b53267c559fea7f94efcfbef9dd72f5 Yehuda Katz wycats@gmail.com