5078b8bf11f23b1f4e42c701438c37c6140fd93e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0 9191176c4c189bb793688dcce1f6075182c6ecc0 2008-10-29T13:30:01-07:00 2008-10-29T13:27:37-07:00 Removes merb-core de52a19262c08e7dbd41ebb6d0c08a489f0c5732 Yehuda Katz wycats@gmail.com a43bd42d1b5739639fb02c7a4d2e0f217ef31a56 Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/40cc199d99067a0cf3baf72a85b3ef531414dcd5 40cc199d99067a0cf3baf72a85b3ef531414dcd5 2008-10-10T17:45:16-07:00 2008-10-10T17:45:16-07:00 updated filter chain documentation in abstract controller 9f339429700ea795cfea3d0ea25c2ea636b07689 Andy Delcambre adelcambre@engineyard.com d0543718e92aafa14b5a70c1a3125b63320792f2 Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/dd1e8ead217a2bada92719979ff67bb2bddddd20 dd1e8ead217a2bada92719979ff67bb2bddddd20 2008-10-10T12:26:28-07:00 2008-10-10T12:26:28-07:00 inline documentation cleanup for MerbController e654b178dadbbd8a3bb3428aaa6aae42e08da2fe Andy Delcambre adelcambre@engineyard.com ea52be274b4dc5369553736c2b93e4988a2bb18e Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/d0543718e92aafa14b5a70c1a3125b63320792f2 d0543718e92aafa14b5a70c1a3125b63320792f2 2008-10-10T10:50:41-07:00 2008-10-10T10:50:41-07:00 updated inline docs for AbstractController cbf77115b30a2ec5fd10adeb567f390ecf041f87 Andy Delcambre adelcambre@engineyard.com 906cbe4e3979374774e5ed43491b45877237fb46 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a84863d5f54134d51677247a489543c5c7a5f3ad a84863d5f54134d51677247a489543c5c7a5f3ad 2008-10-08T15:36:42-07:00 2008-10-08T15:36:13-07:00 Adds better warnings when things go wrong early in a Merb app 93395f40013f8e35c529be5f9497427bbcf162c3 Yehuda Katz wycats@gmail.com 87e3aa5f65f72fe2c0547484299312578adea4cd Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/a70d4a26a96c18f79de1bc4c2ecbcc46c4556cb9 a70d4a26a96c18f79de1bc4c2ecbcc46c4556cb9 2008-10-05T20:44:50-07:00 2008-10-05T20:44:50-07:00 remove vestigal @_template_stack variable. d66052f4a7c5d95553cbe163126e6783300badc3 Ezra Zygmuntowicz ez@engineyard.com 3ef9115ad5c332abdbc0f880e4d455259b649854 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/59c0379aac67576e470e06e8c0cece67d25cb491 59c0379aac67576e470e06e8c0cece67d25cb491 2008-10-05T19:23:20-07:00 2008-10-05T10:03:08-07:00 compile templates with preambles to assign locals, support recompiling partial templates if previously unseen locals are provided Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 91b044abb37fc095dcf5c65ca2dc931619b4efe0 Ezra Zygmuntowicz ez@engineyard.com 62bbcc46c28e3921a1efb43b02da4f20b51d080e Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/b085564bc37ed1a46d1a727b533cd4a03097e2ab b085564bc37ed1a46d1a727b533cd4a03097e2ab 2008-09-30T13:54:10-07:00 2008-09-30T13:54:10-07:00 Reorganized URL generation methods across Controller classes Organized the #url, #relative_url, and #absolute_url methods across Merb::AbstractController and Merb::Controller b232b0e212afef5bf1caa827ccd7eb141a130984 Carl Lerche carllerche@mac.com 21db301aa5d4277dd19d9b1b1a30e469de012298 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/36e76f35b62860bec3f63c30177115778586b618 36e76f35b62860bec3f63c30177115778586b618 2008-09-29T11:10:32-07:00 2008-09-29T11:10:32-07:00 Added the #resource controller helper for URL generation. The #resource controller helper is a convenience method for generating resource routes. It tracks the resource declarations in the router file and is able to generate URLs from only models passed as arguments. 7dce5b2c882ff9b16813f6f8a1db5465220eefe6 Carl Lerche carllerche@mac.com 03ff7c4957115750d6802b9dee969be14a4b3057 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0f4957f2e03ba79eb914563507b0582738fb5d37 0f4957f2e03ba79eb914563507b0582738fb5d37 2008-09-27T23:05:35-07:00 2008-09-25T00:46:17-07:00 Use trenary operator here. Don't pay *too* much attention to this change. b996291521cd349603512f692b9c3d8e1b4e1442 Michael S. Klishin michael@novemberain.com 15ac66c1907732d254765c67551be42ef4a76d61 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/03ff7c4957115750d6802b9dee969be14a4b3057 03ff7c4957115750d6802b9dee969be14a4b3057 2008-09-27T23:05:35-07:00 2008-09-24T18:58:52-07:00 capture returns return value of passed in block if it is not a template block Signed-off-by: Michael S. Klishin <michael@novemberain.com> ace4ba2fc9e4d656eed17a208a3aece8757d6aba Michael S. Klishin michael@novemberain.com 1262e1ba7cdc5722b9cde36aeac70fcb2e5e692e Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/654e81e5cc3afb206316d13f66b9424e9cfe78ea 654e81e5cc3afb206316d13f66b9424e9cfe78ea 2008-09-27T06:26:09-07:00 2008-09-27T06:26:09-07:00 reverts URI generation on requests 1daec13e380b3add386b351338cf13b77b21ab05 Daniel Neighman has.sox@gmail.com 2ac32d35a17da05f6026fe256554f186ab68f4ee Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/05342354956a9d04191d4a91131fbde94c3b044d 05342354956a9d04191d4a91131fbde94c3b044d 2008-09-23T06:21:41-07:00 2008-09-23T06:21:41-07:00 Moves actual url generation methods onto the request object from the controller. Also updates the Merb::Request#redirect method to be usable just like the controller version. c89b0d210fe2e10791be6b6ae0657ba6adb3219c Daniel Neighman has.sox@gmail.com 358d889f4a089af9693ab242161c9fc93af62b5b Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/2ac32d35a17da05f6026fe256554f186ab68f4ee 2ac32d35a17da05f6026fe256554f186ab68f4ee 2008-09-22T01:57:24-07:00 2008-09-22T01:57:24-07:00 Throw the correct error when generating a non existent route. Fixed a bug in #url where the error thrown when trying to generate a route that does not exist was not being referenced by its full name. 83193d4d9a7cd0cab75eff6bd992598d34a6213c Carl Lerche carllerche@mac.com 7d6232347057097cdc0c0bddb2a334bd12620194 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/80b01f996df6d26a76e37af23128d3bf650da688 80b01f996df6d26a76e37af23128d3bf650da688 2008-09-20T14:17:36-07:00 2008-09-20T01:30:55-07:00 Significant router refactoring and feature development Performed a significant refactoring of the Router module. Organized the code so that Behavior only contains methods that are used for route table definition and Route is a private class. Cleaned up the route definition API and added a number of features: - Removed the need for block arguments when building routes - Added the ability to generate routes with Regexp conditions - Added the ability to specify a method to call on objects being used to generate routes.# Please enter the commit message for your changes. 1cde1257edb601195b3cd51758db1debd1476f42 Carl Lerche carllerche@mac.com 80098c0d295795b8a67caf2c436775e412e93ee9 Paul Barry mail@paulbarry.com http://github.com/wycats/merb-core/commit/6bbc95a7299d829aea5fd584ad47d079d21f30e3 6bbc95a7299d829aea5fd584ad47d079d21f30e3 2008-09-09T18:25:25-07:00 2008-09-09T14:12:58-07:00 Modified absolute_url to handle an object as well as a Hash Signed-off-by: Michael S. Klishin <michael@novemberain.com> 6cf33dc52496fa39424319c07a05adf9fdb84040 Michael S. Klishin michael@novemberain.com 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/2369da6c785948026e4c90a1e53ad2f485ee8c21 2369da6c785948026e4c90a1e53ad2f485ee8c21 2008-09-07T09:41:29-07:00 2008-09-07T09:41:29-07:00 Merged in new-sessions branch 152b17c6ff74bb11542e5068873e4e8e28224944 Fabien Franzen info@atelierfabien.be a59cf4cbaf958d5a1be95db57c31a54371e69daf Lori Holden email+git@loriholden.com http://github.com/wycats/merb-core/commit/db2758f6e4723e3b73fcf9a251da48e935bb22c1 db2758f6e4723e3b73fcf9a251da48e935bb22c1 2008-09-06T02:15:39-07:00 2008-09-05T21:14:19-07:00 Filters with procs created via class methods have identical signatures regardless if they handle content differently or not. So modified add_filter to just append procs to the filter list. 18d13e611efdae35c411f2257af258a77f816fed Michael S. Klishin michael@novemberain.com f4f890c31f206a4e080e04c571d6780ee0e596ee Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b342fcb58cb5cf82d3c946ca74dd5ed34dfb4155 b342fcb58cb5cf82d3c946ca74dd5ed34dfb4155 2008-09-02T10:54:32-07:00 2008-09-02T10:54:32-07:00 AbstractController now uniformly uses instance_eval for Procs where previously the controller instance (self) was passed as an argument 9d04c912e77d2dd03050a5bd2ce9729b9a9ece43 Fabien Franzen info@atelierfabien.be b3fd54e2a70e5fe5bf69307249577afab7f6fa9c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f4f890c31f206a4e080e04c571d6780ee0e596ee f4f890c31f206a4e080e04c571d6780ee0e596ee 2008-08-31T17:15:33-07:00 2008-08-31T17:15:33-07:00 Revert "Make Merb::Request#protocol return valid protocol names (http, not http://)." This reverts commit 563e7b29f326434a2fcc4b45b0da50d39e2052c8. * Somehow this commit is breaking static assets in certain cases. 2dc134375931f51cb369eb0bd48b8f527b043903 Yehuda Katz wycats@gmail.com 8ebe011eb9b69c2e6f4af23d6f71b165e36c06d9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/563e7b29f326434a2fcc4b45b0da50d39e2052c8 563e7b29f326434a2fcc4b45b0da50d39e2052c8 2008-08-27T04:14:56-07:00 2008-08-27T04:14:56-07:00 Make Merb::Request#protocol return valid protocol names (http, not http://). * AbstractController#absolute_url updated. 4d7c7eb8d8c41b48da3ede7696722fb4e3036665 Michael S. Klishin michael@novemberain.com f48d278833b98e1e316c16d0010f3e83031f5284 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8ebe011eb9b69c2e6f4af23d6f71b165e36c06d9 8ebe011eb9b69c2e6f4af23d6f71b165e36c06d9 2008-08-27T04:04:47-07:00 2008-08-27T04:04:47-07:00 Add :protocol and :host options to absolute_url e872fbd241bb1239c8c15dae180bb93e3fb9d6a0 Michael S. Klishin michael@novemberain.com c456ae24dae8ccf8f3cfa32a9e564cb3dfed508c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/6d45ab7377ba6110e48a12b92e046b8546209a78 6d45ab7377ba6110e48a12b92e046b8546209a78 2008-08-20T00:39:11-07:00 2008-08-20T00:39:11-07:00 What was I thinking? 6b88cf543068f62d4cd9b25b85d7ebcf4db7ec25 Yehuda Katz wycats@gmail.com 3ff776cfa9ba9de3725a568a072ff3a051a6f633 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/2e7c9c3329809d80abf1ff80c5446e753c3474a9 2e7c9c3329809d80abf1ff80c5446e753c3474a9 2008-08-20T00:27:29-07:00 2008-08-20T00:27:18-07:00 More rigid specs cd04a2b331dc014a0c59cd9ba8887425bbdd90f7 Yehuda Katz wycats@gmail.com 0b3c5e1a399b794a9ab29482d7e894eb64b22a7c Daniel Schierbeck daniel.schierbeck@gmail.com http://github.com/wycats/merb-core/commit/24f22c1c794358f205f0478ab1f5c25d199a7d3c 24f22c1c794358f205f0478ab1f5c25d199a7d3c 2008-08-17T15:39:13-07:00 2008-08-17T14:31:39-07:00 Improve the documentation of AbstractController. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 2810277ab8d4eb248a76a8613f58e58250841db2 Michael S. Klishin michael@novemberain.com 060aca2cd036a7e6ff759f4b3d1c7231432206d9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/cb7a1cf100eae8a896e602c15e186ffa12fa4a0e cb7a1cf100eae8a896e602c15e186ffa12fa4a0e 2008-08-07T00:36:01-07:00 2008-08-07T00:36:01-07:00 Move all accessors in AbstractController to the top so one can see them easily. 86f3bfe93930d8fc9679798627205eb38c493f41 Michael S. Klishin michael@novemberain.com 3cdd4137858b2d4f8ebece842c544ccff2b024e5 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/060aca2cd036a7e6ff759f4b3d1c7231432206d9 060aca2cd036a7e6ff759f4b3d1c7231432206d9 2008-08-06T23:00:22-07:00 2008-08-06T23:00:22-07:00 Document :with option of filters. 5367c0d450882e8cca8776ab22673cd43feb75b7 Michael S. Klishin michael@novemberain.com 7488d1b4a61f83009bea946c4bb6620d8f0d30cd Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3cdd4137858b2d4f8ebece842c544ccff2b024e5 3cdd4137858b2d4f8ebece842c544ccff2b024e5 2008-08-06T22:23:51-07:00 2008-08-06T22:23:51-07:00 Fixed a typo in AbstractController documentation. 73de55f476e4c16f10572cbf5f90b7d42e6dbbc9 Michael S. Klishin michael@novemberain.com 558ba135fab702c51ba5cac531c3c5aa3d57c1a3 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/4ee2b527328691d685eac090e891bbac61d316c6 4ee2b527328691d685eac090e891bbac61d316c6 2008-08-06T19:49:34-07:00 2008-08-06T19:49:34-07:00 Fixed a bug where changes to inherited controller filters would bleed acrosss siblings c0f8e6e2d5a044311c49f9822302764e8b013fbf Carl Lerche carllerche@mac.com 9278af27997916c9b96ccc4d93a0d7571465a965 Shay Arnett shayarnett@gmail.com http://github.com/wycats/merb-core/commit/7dc54ee152789b22088cca58d01a8df17d2e12cb 7dc54ee152789b22088cca58d01a8df17d2e12cb 2008-08-01T04:35:10-07:00 2008-07-09T09:43:30-07:00 resource urls with additional params Signed-off-by: Michael S. Klishin <michael@novemberain.com> 470d57b00b58eab3be306a1a19b256b85181c33f Michael S. Klishin michael@novemberain.com 5ae0124fd58464e668896335c5015b786fbb591c Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d 2008-07-11T07:23:10-07:00 2008-07-11T07:23:10-07:00 Small doc update. Thanx jackdempsey 1ba543b7a74f8893f2fdb74e9a288581c25b98f7 Daniel Neighman has.sox@gmail.com b5e42a1d7e1000516b7799bbc35efe442bbea6c9 38f1b58fc2a0c9be3b21ccb5da03f38d4c9166a9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/aee1144d79c63a4ecd6ba5a2e1a8ddca9aaef70c aee1144d79c63a4ecd6ba5a2e1a8ddca9aaef70c 2008-06-27T21:36:19-07:00 2008-06-27T21:36:19-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Added spec for the route matcher testing regexp routes. [#386] Add Merb.started? alias for Merb.started reader. Add reader for @started flag which shows when Merb environment is started. better log message rescue excpetions in Worker thread, log them and then restart the work queue Router now can do r.match("/this/old/url").redirect("/where/this/resides/now"). Refactor Merb::Test::RequestHelper and introduce build_request helper. spoke too soon. we actually don't need to log this at all as its logged latert in the _benchmarks Update link to wiki page on Rack in exception. Add link to Rack page at wiki to Controller not found exception. This confuses people a lot. Log namespaced controller name when it's class is not found. I will test first next time, I promise. Tell what's actually started when Dispatcher begins to handle request. Fixed typo in yet another exception message. Log an info message when route fixation actually happens. Those heavily using Flash will find it helpful. Log a warning if controller class cannot be found. A bit more verbose exception message when route does not specify a controller. Documentation: add deprecation warning to AbstractController. Manually applied patch from dstar. Increase header level on sub-headers of Filters in AbstractController a0f90baa6fe4d4da4542a99717a17883da2881ad Yehuda Katz wycats@gmail.com 8a2e4d1daf96a3beaed151d643d497e8a52cae1f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/b5e42a1d7e1000516b7799bbc35efe442bbea6c9 b5e42a1d7e1000516b7799bbc35efe442bbea6c9 2008-06-27T21:36:13-07:00 2008-06-27T21:36:13-07:00 Redo Merb's inheritable_accessors so that they have correct semantics, then redo everything that uses inheritable_accessors so they don't have to hack around the bad semantics. b23327b14d1f1e72fc1b368ecae8f2670f8aa6c1 Yehuda Katz wycats@gmail.com a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/f97d7f0f0de8eac753c0270526281d587623f790 f97d7f0f0de8eac753c0270526281d587623f790 2008-06-24T15:23:23-07:00 2008-06-24T15:22:21-07:00 Documentation: add deprecation warning to AbstractController. Manually applied patch from dstar. d687b963877a416ef989c6e119c7d27560a1f2c3 Michael S. Klishin michael@novemberain.com 8a2e4d1daf96a3beaed151d643d497e8a52cae1f Shalon Wood dstar@pele.cx http://github.com/wycats/merb-core/commit/a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 a7d83f33a21900b02f9cdac6b4b8b1e3bd9e1a51 2008-06-24T15:23:23-07:00 2008-06-06T14:19:24-07:00 Increase header level on sub-headers of Filters in AbstractController Signed-off-by: Michael S. Klishin <michael@novemberain.com> e4cedf165df933769a571eefbb7c326038146a5b Michael S. Klishin michael@novemberain.com