<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>5078b8bf11f23b1f4e42c701438c37c6140fd93e</id>
      </parent>
    </parents>
    <author>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0</url>
    <id>9191176c4c189bb793688dcce1f6075182c6ecc0</id>
    <committed-date>2008-10-29T13:30:01-07:00</committed-date>
    <authored-date>2008-10-29T13:27:37-07:00</authored-date>
    <message>Removes merb-core</message>
    <tree>de52a19262c08e7dbd41ebb6d0c08a489f0c5732</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>db55fff490cd3c341e6f7038920e5e2b18f4b1d2</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/75862997bcc7c16c8d985be0d87cf33e73b2121f</url>
    <id>75862997bcc7c16c8d985be0d87cf33e73b2121f</id>
    <committed-date>2008-10-10T13:06:06-07:00</committed-date>
    <authored-date>2008-10-10T12:55:29-07:00</authored-date>
    <message>Allow routing deferred blocks to return a rack array

Improved the dispatcher and router so that deferred blocks are
able to return a rack array. Also added some helper methods to
create a redirecting rack array.</message>
    <tree>9ac6d501de2476b64a5c73fe2c38c20b9985c3bf</tree>
    <committer>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a70d4a26a96c18f79de1bc4c2ecbcc46c4556cb9</id>
      </parent>
    </parents>
    <author>
      <name>David James</name>
      <email>dj@collectiveinsight.net</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/de635515deaa3d148340643b5e54631c0ceb4506</url>
    <id>de635515deaa3d148340643b5e54631c0ceb4506</id>
    <committed-date>2008-10-05T21:33:54-07:00</committed-date>
    <authored-date>2008-10-05T21:33:54-07:00</authored-date>
    <message>Fixes up RSpec matcher for request helper

Take for example:
request(&quot;/&quot;, :method =&gt; &quot;POST&quot;)

Before this commit, here was the rspec failure message:
Expected a GET to '/' to be successful, but it returned a 500

After this commit, the failure message is correct:
Expected a POST to '/' to be successful, but it returned a 500</message>
    <tree>945fb38641bf07605138b574417c24443e1b01aa</tree>
    <committer>
      <name>David James</name>
      <email>dj@collectiveinsight.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>01cfff86f0c9b96cdd1fdd9355c2d32605738723</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/0a7e8fad71771df214d71d71024ea891a64d2223</url>
    <id>0a7e8fad71771df214d71d71024ea891a64d2223</id>
    <committed-date>2008-10-02T16:37:48-07:00</committed-date>
    <authored-date>2008-10-02T16:37:48-07:00</authored-date>
    <message>Added stacking and redirecting deferred routing blocks.

Added the ability to redirect requests from inside a deferred
block using the #redirect helper. Also made the #url helper
available in redirect blocks.

Defer blocks are now stackable using #defer. #defer_to is
still available, but it is a terminator (as in the route
cannot be further customized after.)

Also cleaned up a bunch of specs and miscellaneous routing
code.</message>
    <tree>e0ef928e9b32c5e86ea66105ecb3b54ecf20acce</tree>
    <committer>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f57cc0ce87f02e5a1941fd903f12d55a1d1ad693</id>
      </parent>
    </parents>
    <author>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/e3159c418376bab845df40ed733960b62818581a</url>
    <id>e3159c418376bab845df40ed733960b62818581a</id>
    <committed-date>2008-09-28T09:40:58-07:00</committed-date>
    <authored-date>2008-09-28T09:40:58-07:00</authored-date>
    <message>We shouldn't use minigems explicitly in our code (yet)</message>
    <tree>651355d5c3042bbc210956050d0d58a94bc25b45</tree>
    <committer>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>aa98232a9908abbdb75baca5093a77734e7dfbe2</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/f57cc0ce87f02e5a1941fd903f12d55a1d1ad693</url>
    <id>f57cc0ce87f02e5a1941fd903f12d55a1d1ad693</id>
    <committed-date>2008-09-28T04:35:43-07:00</committed-date>
    <authored-date>2008-09-28T04:35:25-07:00</authored-date>
    <message>Add missing pieces of forking awesomeness.</message>
    <tree>4bfccfe7407405101a90582910efb563530ea13c</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7d6232347057097cdc0c0bddb2a334bd12620194</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/80b01f996df6d26a76e37af23128d3bf650da688</url>
    <id>80b01f996df6d26a76e37af23128d3bf650da688</id>
    <committed-date>2008-09-20T14:17:36-07:00</committed-date>
    <authored-date>2008-09-20T01:30:55-07:00</authored-date>
    <message>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.</message>
    <tree>1cde1257edb601195b3cd51758db1debd1476f42</tree>
    <committer>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b74e507f76bf7775e860d2cd47c9ff736d79c868</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/4b520c316dc381c2627cc46af6d1d975ff8fbc76</url>
    <id>4b520c316dc381c2627cc46af6d1d975ff8fbc76</id>
    <committed-date>2008-05-14T18:31:06-07:00</committed-date>
    <authored-date>2008-05-14T18:31:06-07:00</authored-date>
    <message>Working on Behaviour#redirect feature: stashing changes.</message>
    <tree>b6595e702f780013741e6643711f24188ec6dc77</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>677c6447b31f0b0cfab8db2f7382c37ef64bc209</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/aef5586002ec6b455b27a87c246d932e044f5e58</url>
    <id>aef5586002ec6b455b27a87c246d932e044f5e58</id>
    <committed-date>2008-05-12T10:57:47-07:00</committed-date>
    <authored-date>2008-05-12T10:57:47-07:00</authored-date>
    <message>Add matched_route_for spec helper to get raw Route instance.</message>
    <tree>21681ef5bf3fac65120728841f15d64b5728156f</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f30da42347fb8547f4514f9970f05604790b95b5</id>
      </parent>
    </parents>
    <author>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/670e2c6a830615c02576a2a4d7179f2fb84a38a7</url>
    <id>670e2c6a830615c02576a2a4d7179f2fb84a38a7</id>
    <committed-date>2008-02-12T20:38:25-08:00</committed-date>
    <authored-date>2008-02-12T20:38:25-08:00</authored-date>
    <message>someone forgot to add ostruct</message>
    <tree>2f2e71471dd2396153bc4cd2f460716f1a4dabcc</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d6afdf2cce03c26fca912de57e6d112aaf2dcfd2</id>
      </parent>
    </parents>
    <author>
      <name>Steve Tooke</name>
      <email>steve.tooke@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/771e464a71d6309098def4754a25124408a28700</url>
    <id>771e464a71d6309098def4754a25124408a28700</id>
    <committed-date>2008-02-12T20:20:23-08:00</committed-date>
    <authored-date>2008-02-12T01:30:29-08:00</authored-date>
    <message>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.</message>
    <tree>f4efa45395ce043c0756f80af92784b21e94f87a</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4a1bf73ea2c7eae787a47d6327c8d56b84468324</id>
      </parent>
    </parents>
    <author>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/5c5adb7fc877d9733187eee57d5513487de3d95b</url>
    <id>5c5adb7fc877d9733187eee57d5513487de3d95b</id>
    <committed-date>2008-02-05T23:00:32-08:00</committed-date>
    <authored-date>2008-02-05T23:00:32-08:00</authored-date>
    <message>Add url() helper, which uses Merb::Router.generate behind the scenes

Router.generate can now handle the default route Hash arguments,
and properly raises an error if you try to generate a Regexp based route.

Route.generate properly handles query string extra args.</message>
    <tree>2d79a95121bddab1b39d39e8fe26cb04dddab5df</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>33f495f7095fa0f2f494b13b8e64959494a8c551</id>
      </parent>
    </parents>
    <author>
      <name>Hampton Catlin</name>
      <email>hcatlin@greed.local</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/460780b999fdf3c975c5f617615c5cb3ab5ab923</url>
    <id>460780b999fdf3c975c5f617615c5cb3ab5ab923</id>
    <committed-date>2008-02-01T11:31:17-08:00</committed-date>
    <authored-date>2008-02-01T11:31:17-08:00</authored-date>
    <message>Repairing a little of the damage by Hater.

Fixing the tabs and spacing around the code.</message>
    <tree>a9b2ed8a09d4e7e604c898e314bb2d3b8b8940c0</tree>
    <committer>
      <name>Hampton Catlin</name>
      <email>hcatlin@greed.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>86926e633ef5f37092f9b6e7cb603813f5d8fed6</id>
      </parent>
    </parents>
    <author>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/f97a121b520d5879efaa5892de12851e65fcd17a</url>
    <id>f97a121b520d5879efaa5892de12851e65fcd17a</id>
    <committed-date>2008-01-27T00:36:54-08:00</committed-date>
    <authored-date>2008-01-27T00:36:54-08:00</authored-date>
    <message>Refactor internal params (controller_name, route_index, etc) out of Request

Dispatcher now contains most of the controller identification and class
generation code that used to be in Request.</message>
    <tree>6610a99f0cf0e856efa1e0525ffd6376129870b1</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f6ad3637d5d7b5d65c958696c4775f485e27fc28</id>
      </parent>
    </parents>
    <author>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/b7ba9037523741ccd6e78fbb2a358f987cb20711</url>
    <id>b7ba9037523741ccd6e78fbb2a358f987cb20711</id>
    <committed-date>2008-01-22T23:08:31-08:00</committed-date>
    <authored-date>2008-01-22T23:08:31-08:00</authored-date>
    <message>Router is fixed and tons of router specs</message>
    <tree>a34150bebd3ab3d9a6af9b3925907ce20d4ac517</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
</commits>
