Commits on Oct 7, 2008
  1. Bump up versions

    michaelklishin committed Oct 6, 2008
  2. Tell merb-gen merb_full app generator about htaccess since it isn't p…

    ivey committed Oct 7, 2008
    …icked up by default
Commits on Oct 6, 2008
  1. support local assignment preambles in haml and builder templates

    dcolthorp committed with Ezra Zygmuntowicz Oct 5, 2008
    Signed-off-by: Ezra Zygmuntowicz <>
Commits on Oct 5, 2008
  1. Added a Generators file to merb-mailer

    Carl Lerche committed Oct 5, 2008
    Templater and merb-gen require a Generators file in the root of any
    gem that provides generation templates.
  2. Add support for custom cache key in fragment caching.

    RichGuk committed with benburkert Sep 29, 2008
    (cherry picked from commit 14db4f4)
  3. Start moving merb-helpers fixtures towards a real app.

    michaelklishin committed Oct 5, 2008
    Using real small app gives us some nice possibilities:
    * It lets us figure out how well view matchers work.
    * It lets us use real models instead of fake objects.
    * It lets us easily add use cases from reports.
    * It lets us reveal issues with -helpers related to changes in ORMs.
    * It provides a lot of examples of how people test views =>
      we can copy them over to documentation as examples.
    Please consider never using fake objects in helper specs.
  4. Bunch of improvements to merb-gen.

    michaelklishin committed Oct 5, 2008
    * Add merb.thor to flat and very flat apps.
    * Move Rakefile and merb.thor to common templates directory.
    * Do not force RSpec down test_unit users' throat.
    * Annotate generators code.
  5. Generate controller spec for resource no matter what ORM is used (we …

    michaelklishin committed Oct 5, 2008
    …do not have specific templates yet).
  6. Added some specs

    fabien committed Oct 5, 2008
  7. Updated generator templates to include the correct output method of e…

    RichGuk committed with michaelklishin Oct 3, 2008
    Signed-off-by: Michael S. Klishin <>