Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 30, 2009
  1. Martin Gamsjaeger
Commits on Oct 29, 2009
  1. Martin Gamsjaeger

    [merb-core] Log more classloader behavior in verbose mode

    snusnu authored
    During application boot, the classloader stashes
    files with missing requirements to reload them
    once all files have been processed. This needs to
    be done when a not yet loaded constant is referenced
    from the class being loaded. This patch prints a
    message to the verbose log, telling which files
    had missing requirements, and where the original
    NameError happened.
Commits on Oct 28, 2009
  1. Tymon Tobolski Martin Gamsjaeger

    [merb_datamapper] Added missing messages in resource controller gener…

    teamon authored snusnu committed
    …ator
Commits on Oct 27, 2009
  1. Martin Gamsjaeger

    [merb-core] Minor docfix

    snusnu authored
  2. Martin Gamsjaeger

    [merb-gen] Create spec task when running merb-gen plugin foo

    snusnu authored
    [#1128 state:resolved]
  3. Martin Gamsjaeger
  4. Martin Gamsjaeger

    [merb-gen] Removed merb_orm :none from generated init.rb

    snusnu authored
    [#1058 state:resolved]
  5. Martin Gamsjaeger

    [merb-core] Extracted Merb.verbose_logging? method

    snusnu authored
    Dries up repeated use of rather verbose environment
    check. Also provides an easily accessible guard that
    can be used to check if really verbose debug messages
    should be emitted.
    
    [#1044 state:resolved]
  6. Martin Gamsjaeger

    [merb-cache] Decompress only once in Merb::Cache::GzipStore#fetch

    snusnu authored
    * This change misses specs mainly because the current
      merb-cache specs seem rather horrible and I couldn't
      find an easy way to spec it (The other specs use an
      ugly mix of mocking/stubbing and are pretty inconsistent
      imho. They could definitely need some refactoring!
    
    * Fixed formatting weirdness in abstract_strategy_store.rb
    
    [#1013 state:resolved]
Commits on Oct 26, 2009
  1. Tymon Tobolski Martin Gamsjaeger

    [merb-helpers] Select the correct field in select tags

    teamon authored snusnu committed
  2. Martin Gamsjaeger

    [merb-gen] Add default rspec options to spec.opts file

    snusnu authored
    This also works around an issue where rspec-1.2.9
    seems to write all spec files to the spec/spec.opts
    file in case the spec.opts file is empty.
  3. Martin Gamsjaeger
Commits on Oct 24, 2009
  1. Pavel Kunc

    [merb-core] Make CLI -i, --irb-console to take precedence over config

    pk authored
    in init.rb.
    
    This change allows you to have default adapter set in the init.rb and
    still if you want to run Merb in IRB you can do it. Currently you can't
    because setting adapter in init.rb override the config value from ARGV
    parsing.
    
    [#1262 state:resolved]
Commits on Oct 23, 2009
  1. Martin Gamsjaeger
Commits on Oct 22, 2009
  1. Jon Martin Gamsjaeger

    [merb-core] Fix potential timing attack on cookie sessions

    namelessjon authored snusnu committed
    [#1298 state: resolved ]
    
    This patch fixes a potential timing attack on the HMAC authentication
    used to verify cookie session contents by ensuring a constant time
    algorithm is used to compare the hashes.  For more information see:
    
    http://codahale.com/a-lesson-in-timing-attacks/
  2. Martin Gamsjaeger

    [merb-core] Fixed docs for Merb::Router::Behavior#to

    snusnu authored
    [#1282 state:resolved]
Commits on Oct 21, 2009
  1. Jacques Crocker Martin Gamsjaeger

    [merb-assets] Fixed external asset urls when path_prefix is set

    merbjedi authored snusnu committed
    Added checks for relative, absolute, and external
    urls for when path_prefix is set in Merb::Config.
    path_prefix should be ignored when an external url
    is requested, however it should be used when absolute
    or relative urls are passed.
    
    [#614 state:resolved]
  2. Jacques Crocker Martin Gamsjaeger

    [merb-assets] Fixing :reload option on asset helpers

    merbjedi authored snusnu committed
    Fixed :reload => false so it no longer defaults to
    Merb::Config[:reload_templates] when explicitly set.
    This was causing problems if you want to specifically
    overwrite the behavior of writing random strings
    (which can break urls, especially for external resources).
  3. Martin Gamsjaeger

    [merb-auth-slice-password] Use proper config value

    snusnu authored
    Without this change, the default password strategy
    is always activated because the wrong config key is
    used.
    
    [#1179 state:resolved]
Commits on Oct 20, 2009
  1. Martin Gamsjaeger
Commits on Oct 19, 2009
  1. Martin Gamsjaeger

    [merb-auth-more] Run shared specs for all user mixins

    snusnu authored
    * Fixed previously failing rake spec task due to
      spec order dependencies
    * Refactored specs to use a shared spec that can be
      used to test basic compliance
    * Use local merb-core and local merb-auth-more when
      running from a typical dev checkout (a git clone)
    * Added specs for sequel bcrypt mixin
    * Simplified require paths in lib and spec
Commits on Oct 17, 2009
  1. Pavel Kunc

    [merb-core] Forking class reloading fix for Ruby 1.9.x.

    pk authored
    On Ruby 1.9.x (tested on 1.9.1 and 1.9.2dev) class reloading failded to
    work. After every single save it just hanged after creating new child.
    
    This patch fixes the problem with properly closing the pipes and using
    Process.waitpid instead of Proces.detatch.
    
    Patch also rise rate at Kernel.select checks the output from the child
    which lowers system requirements for the class reloading.
  2. Jacques Crocker Pavel Kunc

    [merb-core] Setting default_cookie_domain for cookie sesisons (via Du…

    merbjedi authored pk committed
    …sty Doris)
    
    Added an explicit declaration to use Merb::Config[:default_cookie_domain] when creating the cookie session store.
    
    [#482 state:resolved]
  3. Pavel Kunc

    [merb-helpers] Spec change for the Sequel error_messages.

    pk authored
    I've dropped support for the Sequel < 2.7.0 in pk-merb_sequel. This
    change allows to expect that Model.errors is Hash.
  4. Jacques Crocker Pavel Kunc

    [merb-core] Better error handling for creating log file

    merbjedi authored pk committed
    If the log/ directory doesn't exist, we should create it (mkdir -p) so the app doesnt throw an error when trying to initialize the log file in production mode.
    
    [#1300 state:resolved]
  5. Pavel Kunc

    [merb-core] Set log level to :error for specs.

    pk authored
    This eliminate too verbose output when running specs.
  6. Jacques Crocker Pavel Kunc

    [merb-core] Refactoring redirect message handling

    merbjedi authored pk committed
    Refactoring the redirect url handling (adds messages into the query parameter) into a separate private method.
    
    [#494 state:resolved]
    [#1252 state:resolved]
  7. Jacques Crocker Pavel Kunc

    [merb-core] Fixing redirect with anchor and message (via kev)

    merbjedi authored pk committed
    When adding the message query, we need to allow for anchors within the url, otherwise the message will be ignored. Updated to use a URL object instead which handles the mixing/matching without concatenating a string. This provides protection against these edge cases.
    
    [#1252 state:resolved]
Commits on Oct 16, 2009
  1. Maxime Guilbot Martin Gamsjaeger

    [merb-core] Fixed Merb::Router#route_for for custom collection routes

    maxime authored snusnu committed
    [#1172 state:resolved]
  2. Jacques Crocker Martin Gamsjaeger

    [merb-core] Added shortcuts for sending redirect messages

    merbjedi authored snusnu committed
    Added shortcuts:
    
        redirect url, :notice => "..."
        redirect url, :error  => "..."
    
    These messages are then available via
    message[:notice] and message[:error].
    
    [#494 state:resolved]
  3. Jacques Crocker Martin Gamsjaeger

    [merb-core] Better error handling for Runner Adapter

    merbjedi authored snusnu committed
    Added a error handler for when the user tries to
    run a script (using the Merb Runner Adapter) that
    looks like a file but doesn't exist.
    
    [#1231 state:resolved]
  4. collin Martin Gamsjaeger

    [merb-auth-more] Set salt if blank?, not only if new_record?

    collin authored snusnu committed
    If for some reason you decided to reset the salt,
    
    [#1163 state:resolved]
Commits on Oct 15, 2009
  1. Martin Gamsjaeger

    [merb-helpers] Work around a bug in jquery form submit handling

    snusnu authored
    Having the id or name attribute value set to 'submit'
    causes the jQuery submit() method to fail in some cases.
    While this obviously is a jquery bug, there's no real
    need why we couldn't work around that in merb to avoid
    confusion.
  2. Martin Gamsjaeger
Commits on Oct 14, 2009
  1. Martin Gamsjaeger

    [merb-core] Fixed multipart parsing for certain files

    snusnu authored
    What was happening was that the last byte of the file
    in question was 0xFC, so when the multipart post was
    interpreted as a Unicode string in the original regex,
    the \r following the file was considered the second byte
    of the unicode character, and the regex didn't match.
    /n treats the string as ascii, and it works.
    
    [#1236 state:resolved]
Something went wrong with that request. Please try again.