Permalink
Commits on Apr 26, 2010
Commits on Apr 24, 2010
Commits on Apr 11, 2010
Commits on Apr 8, 2010
  1. [merb-gen] Core, Flat and Very Flat apps to work without Bundler

    pk committed Apr 8, 2010
    Explicit require of gems needed to boot the fresh generated application
    without Bundler stanzas and Bundler required in the runtime.
Commits on Apr 7, 2010
Commits on Apr 6, 2010
  1. [merb-gen] Removing bundler stanza from generated apps.

    pk committed Apr 4, 2010
    With removing Bundler integration from the merb-core we need to sync the
    generated apps as well.
  2. [merb-core] Removing dependency on Bundler and implicit loading of deps.

    pk committed Apr 2, 2010
    I've removed dependency on Bundler so it won't get bundled/installed
    when you install merb-core. It's useless to bundle Bundler.
    
    Also I've removed dependencies loading from the bootloader because it
    cause problems and tight Merb to Bundler exclusively. You can now use
    Merb with or without Bundler.
    
    The ./bin/merb, Rakefile and spec_helper.rb has the Bundler setup in
    place which setups the whole bundle environment. If you explicitly
    require all your gems you should not need any changes to your code.
    
    If for some reason you don't explicitly require your dependencies - some
    gems might not do that - than you can either add these requires at the
    top of the init.rb or you can simply add there Bundler.require to
    require all gems using bundler.
    
    This change allows you to create list of requires to require your gems
    explicitly so you can influence order in which gems are loaded. Which is
    not possible now with the Bundler.
    
    [#1322 state:resolved]
Commits on Apr 2, 2010
  1. [merb-core] Removing Allison RDoc template and using the default

    pk committed Mar 26, 2010
    Darkfish.
    
    [#1313 state:resolved]
  2. [merb-core] Fixed double unescaping of Merb::Request#message.

    genki authored and pk committed Jan 30, 2009
    [#1125 state:resolved]
    [#1253 state:resolved]
Commits on Mar 25, 2010
  1. [merb-core] Fix bug in header setting in mongrel

    namelessjon committed Mar 25, 2010
    Mongrel was assuming cookies (and other headers, potentially) were being
    sent as an array, not as a joined string.
    
    Reported by Sean Kellogg.
Commits on Mar 24, 2010
Commits on Mar 23, 2010
  1. [merb-gen] Use Rack's ContentLength middleware

    namelessjon committed Mar 23, 2010
    Rack's implementation is more robust and correctly handles a few edge
    cases merb's missed.
  2. [merb-core] Use Rack's ContentLength middleware

    namelessjon committed Mar 23, 2010
    Rack's implementation is more robust and correctly handles a few edge
    cases merb's missed.  Make Merb::Rack::ContentLength an alias of
    Rack::ContentLength, so we don't immediately break a bunch of apps.
    
    [#1321 state:resolved]
  3. [merb-core] Don't set Content-Length in mongrel

    namelessjon committed Mar 23, 2010
    This is better handled outside the process handle, using e.g.
    Rack::ContentLength.
    
    [#1320 state:resolved]
Commits on Mar 20, 2010
  1. [all] Dumping version 1.1.0

    pk committed Mar 20, 2010
  2. [merb-core] Avoid bloating mongrels

    Wesley Beary authored and pk committed Oct 5, 2009
    Push body to mongrel as you get it, rather than buffering the whole
    thing.
    
    [#1310 state:resolved]
  3. [merb-core] Fixing mutex settings to the Dispatcher.

    pk committed Mar 16, 2010
    [#1174 state:resolved]
  4. [merb-helpers] Allow select helper to accept numeric values in :selected

    pk committed Mar 16, 2010
    This patch allows to use numeric values in :selected option of select
    form helper.
    
    So you can now do:
    select(:name => :foo, :collection => [['A',1]], :selected => 1)
    
    Instead previously neccesary:
    select(:name => :foo, :collection => [['A',1]], :selected => 1.to_s)
    
    Works with the :selected => [1,2,...] as well.
    
    [#1212 state:resolved]
  5. [merb-core] Adding possibility to set status code in redirect.

    pk committed Mar 17, 2010
    [#524 status:resolved]
  6. [merb-core] Fixing multipart parsing for identical param names

    pk committed Mar 16, 2010
    When posting multipart form with fields having the same name, fields was
    only having value of the first occurence. This makes problems for
    checkbox helper which add hidden before the checkbox to handle on/off
    states of the checkbox.
    
    This patch prevents multipart parser to parse files 2x which cause
    problems but allows parsing non-files multiple times to fix the problem.
    
    [#1304 state:resolved]
  7. [merb-core] Fix Erubis bug causing problems with <%== %>

    namelessjon authored and pk committed Mar 17, 2010
    When you used <%== %> to have escaping for HTML you got exception. This
    patch fixes behaviour so it's now possible to use <%= %> and <%== %>.
    
    [#1040 state:resolved]
  8. [merb-gen] Correctly handle HEAD requests in apps

    namelessjon authored and pk committed Mar 19, 2010
    Mix the Rack::Head middleware into the default stack to ensure we don't
    send a body on HEAD requests.  Also, add the Content-Length middleware,
    so we correctly report the size of the body.
    
    [#1068 state:resolved]
  9. [merb-core] Correctly handle HEAD requests

    namelessjon authored and pk committed Mar 19, 2010
    Mix the Rack::Head middleware into the default stack to ensure we don't
    send a body on HEAD requests.  Also, add the Content-Length middleware,
    so we correctly report the size of the body.
  10. [merb-core] Prevent an edge case of overwriting sessions

    merbjedi authored and pk committed Oct 17, 2009
    When generating a new session, check to see if that session uuid already exists. If so regenerate. Added a constant GENERATE_MAX_TRIES which determines how many times we try before giving up.
    
    [#1258 state:resolved]
  11. [merb-core] Fixed load_classes_with_requirements so it loads all classes

    pk committed Mar 20, 2010
    [#1234 state:resolved]
  12. [merb-core] Load & require all dependencies before the init files.

    pk committed Mar 20, 2010
    Because we currently can't have dependencies inside the configuration
    files but only in the Gemfile. We can load init file after all the
    dependencies.
    
    This allows to use any gems inside the init file or in flat and
    very-flat applications.
    
    [#1307 state:resolved]
  13. [merb-assets] Moving :asset_timestamp to the Plugin config.

    pk committed Mar 20, 2010
    It should be local to Merb::Plugin.config[:asset_helpers] not in the
    global configuration.
  14. [merb-assets] Allow assets to have timestamp in the query string.

    pk committed Mar 20, 2010
    Allow assets to have timestamp query parameter. This allows using long
    expire on assets while allowing easy refresh when you update site.
    
    You can use Merb::Plugins.config[:assets_timestamp] or new :timestamp
    option for image_tag, js_include_tag and css_include_tag.
    
    Valid values for the timestamp is either true/false or value which will
    be used as the timestamp.
    
    [#859 state:resolved]