Permalink
Switch branches/tags
Commits on May 27, 2008
  1. Check routing matches for emptiness more precisely since Merb::Router…

    yrashk committed May 27, 2008
    ….match definitely allows [nil, non-empty-hash] result
Commits on May 26, 2008
  1. Fixing bug in the rspec route matcher.

    benburkert committed May 26, 2008
    * Fixed typo in RouteToMatcher.
    * Added the ParameterMatcher's actual and expected parameters to the failure message.
  2. Merge branch 'master' of git@github.com:wycats/merb-core

    wycats committed May 26, 2008
    * 'master' of git@github.com:wycats/merb-core:
      Added Merb::Template.template_extensions as a semi-public method for getting known template extensions
      Prevent anonymous controller classes from making a Helper module
      We've Been Dup'd! - fixed nasty bug concerning class inheritable attrs
      Added Object.full_const_set
Commits on May 25, 2008
  1. Added Merb::Template.template_extensions as a semi-public method for …

    fabien committed May 25, 2008
    …getting known template extensions
Commits on May 24, 2008
  1. Added Object.full_const_set

    fabien committed May 24, 2008
Commits on May 23, 2008
  1. Add helper for full_uri

    wycats committed May 23, 2008
Commits on May 22, 2008
  1. Fixed documentation examples for dispatch spec helpers

    hosh committed with michaelklishin May 22, 2008
    Examples given for dispatch_to, dispatch_multipart_to, dispatch_with_basic_authentication_to, request have been fixed.
    
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  2. Only do the rubygems hack if it's needed and deal with cases where pe…

    wycats committed May 22, 2008
    …ople are using the Gem cache library without using the commands.
Commits on May 21, 2008
  1. Updated docs on Merb#merge_env

    Cory ODaniel committed with Ezra Zygmuntowicz May 16, 2008
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
  2. Merb Personalized Environments; Completed Merb#merge_env method, now …

    Cory ODaniel committed with Ezra Zygmuntowicz May 16, 2008
    …accepts boolean parameter to optionally use the merged environments database connection
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
  3. fix typo in spec

    Ezra Zygmuntowicz committed May 21, 2008
Commits on May 19, 2008
  1. Check to see if the session responds to :data

    wzph committed with michaelklishin May 18, 2008
    This is a follow-up patch to
    http://merb.lighthouseapp.com/projects/7433/tickets/180-exception-in-dispatch-exceptions-html-erb
    
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  2. make nice for windows - remove app level loading (is handled in rakef…

    jackdempsey committed with wycats May 19, 2008
    …ile in merb-more now
Commits on May 18, 2008
  1. Typos

    wycats committed May 18, 2008
  2. YARD conversion of rubygems.rb

    wycats committed May 18, 2008
  3. YARD conversion of object.rb

    wycats committed May 18, 2008
  4. YARD conversion of mash.rb

    wycats committed May 18, 2008
  5. YARD conversion of kernel.rb

    wycats committed May 18, 2008
  6. YARD conversion for hash.rb

    wycats committed May 18, 2008
  7. Convert class.rb over to YARD.

    wycats committed May 18, 2008
  8. Merge branch 'master' of git@github.com:wycats/merb-core

    wycats committed May 18, 2008
    * 'master' of git@github.com:wycats/merb-core: (26 commits)
      Patch for missing inner_content method bug in HasTag
      Correct lable and line number in Router#compile
      Make merb.show_routes show named routes a bit more verbose.
      Make merb.show_routes a bit more verbose.
      Use single symbol instead of Array for ORM/test framework generator scopes.
      Add links to source at GitHub to boot diagram
      Merb core boot diagram is done and prettified
      Add support for a :session_cookie_domain config option to allow for setting the session cookie's domain.
      Add more advanced nested routes examples to Merb::Router::Behavior#match documentation.
      Add a bunch of pretty advanced spec examples for nested matches in routes.
      Code clean-up behavior.rb
      Created Documentation for new #match functionality
      Changes to behavior.rb to allow for :controller, :actions and :params options to be passed in
      Implemented Merb::Router::Behavior#match! that is a shortcut for match(...).to({}).
      Improve Merb boot diagram.
      Make each subsequent call to use_orm just replace effect of previos.
      Remove WIP spec for Merb::Router::Behavior#redirect.
      fix typo in request_spec.rb
      Needs to raise here since if the generator scope has more than one ORM the geneartors will not work.
      Log instead of raising when dependencies mechanism this ORM required twice.
      ...
Commits on May 17, 2008
  1. Patch for missing inner_content method bug in HasTag

    mholub committed with michaelklishin May 17, 2008
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>