Commits on Apr 26, 2009
  1. Try to run compat tests with Rake::TestTask

    This should make the compat specs run under integrity
    installs at Heroku.
    sr committed with rtomayko Apr 20, 2009
  2. Deprecate Sinatra::Test

    sr committed with rtomayko Mar 28, 2009
Commits on Apr 25, 2009
  1. Use Rack 1.0's built in nested params

    Our implementation is retained but is not used when Rack 1.0
    is detected. We should remove Base#nested_params as soon as we
    make Rack 1.0 a requirement.
    reinh committed with rtomayko Apr 9, 2009
  2. Pass the class to configure blocks

    This allows for the following idiom in top-level apps:
      configure do |app|
        set :foo, app.root + '/foo'
    tj committed with rtomayko Mar 31, 2009
  3. template backtraces ftw [#198] [#51]

    S. Brent Faulkner committed with rtomayko Apr 6, 2009
  4. closes #9779 Auto-require haml/erb/builder/sass

    this is causing thread-saftey issues.
    bmizerany committed Apr 25, 2009
Commits on Apr 20, 2009
  1. Better handling of in file templates

    `__END__` in the middle of lines should not be recognized as the end of
    the ruby script. Ruby only accepts the line just contain `__END__`.
    Beginning/tailing whitespaces are not allowed.
    Signed-off-by: Simon Rozet <>
    Yoji Shidara committed with rtomayko Apr 17, 2009
  2. Fixed an uncought exception when run on the Google App Engine infrast…

    Signed-off-by: Simon Rozet <>
    Samuel Goebert committed with rtomayko Apr 9, 2009
  3. refactor caller_files

    - supports external modification of ignores list (e.g. to include polyglot)
    - provides additional caller_locations method to include line numbers (e.g. for render backtraces)
    S. Brent Faulkner committed with rtomayko Apr 5, 2009
Commits on Apr 19, 2009
  1. Update copyright years

    sr committed Apr 19, 2009
  2. Code alignment

    sr committed Apr 13, 2009
Commits on Mar 31, 2009
  1. Added Base#route_eval for hooking into route execution

    Tiny yet potentially useful abstraction, allowing developers to tap
    into a route proc before it has been executed.
    tj committed with rtomayko Mar 26, 2009
  2. Clean up options tests

    sr committed with rtomayko Mar 26, 2009
  3. Use contest instead of test/spec/mini

    See <> for more info. The
    contest.rb file is included under the test/ directory.
    sr committed with rtomayko Mar 26, 2009
  4. Run normal and compat specs with default rake task

    The previous behavior was to run only the main test suite, which led
    to missed compat issues. You can get the old behavior by running
    "rake test" explicitly.
    rtomayko committed Mar 31, 2009
  5. Sane template options [#191]

    * The options hash now takes the :views, :layout, and :locals
      options but also any template-specific options. The generic
      options are removed before calling the template specific render
    * The haml ":options" and ":haml" options are deprecated. These
      should be merged in directly with the options hash.
    * The sass ":sass" option is deprecated. Merge directly with the
      options hash instead.
    * All template engines have an app-level option named the same as
      their engine (erb, haml, sass, etc.). This must be a hash and is
      merged with the options passed to the render method.
    * The :views_directory option is deprecated; renamed :views.
    rtomayko committed Mar 27, 2009
  6. Make sass option support backwards-compatible

    S. Brent Faulkner committed with rtomayko Mar 31, 2009
Commits on Mar 27, 2009
  1. Merge app-level haml/sass options with call options [#184]

    Ensures globally set Haml/Sass configurations can be overridden on
    an individual call basis, while retaining the global values.
    Renamed the #haml() :options key to :haml_options for
    clarity and consistency with the #sass method.
    kematzy committed with rtomayko Mar 15, 2009
Commits on Mar 26, 2009