Commits on Mar 11, 2010
  1. mention pass blocks in CHANGES

    Blake Mizerany committed Mar 11, 2010
Commits on Dec 14, 2009
  1. passing a block to #pass will not 404, but eval the block

    This is huge for writing extensions that install routes.
    The developer can set the block to do default behaviour
    if the app that registered the extension has not, or does
    not want to, customize the route.
      # MyFooExt
      def self.registered(app)
        app.get "/foo" do
          pass do
            "You hit foo!"
    At this point, as the user of MyFooExt, I can let the default
    behaviour happen or override:
      # MySinatraApp
      require 'sinatra/my_foo_ext'
      class MySinatraApp < Sinatra::Base
        register MyFooExt
        get "/foo" do
          # MyFooExt has done do_foo_things
          "All foo things done"
    Blake Mizerany committed Dec 10, 2009
Commits on Dec 13, 2009
  1. Typo in README

    rtomayko committed Dec 13, 2009
  2. Upgrade Tilt to 0.4

    rtomayko committed Dec 13, 2009
Commits on Dec 11, 2009
Commits on Dec 7, 2009
  1. quick refactoring of #error

    Blake Mizerany committed Dec 7, 2009
Commits on Nov 28, 2009
  1. Update docs with arg name change committed with rtomayko Nov 28, 2009
Commits on Nov 23, 2009
Commits on Nov 11, 2009
  1. Adds after filters

    Originally by jschementi (
    Updated for Sinatra 1.0 by rtomayko
    jschementi committed with rtomayko Dec 22, 2008
Commits on Nov 5, 2009
  1. Update Tilt to 1fdc1bf

    sr committed Nov 5, 2009
Commits on Oct 17, 2009
  1. Update README re. mime_type

    sr committed Oct 17, 2009
  2. Get rid of Default

    TODO: clean the options^Wsettings test
    sr committed Oct 14, 2009
  3. ERubis support in to sinatra. With tests!

    Signed-off-by: Simon Rozet <>
    dylanegan committed with sr Oct 12, 2009
  4. allow non-bundled tilt to be loaded

    Tries to require 'tilt' before falling back on the
    bundled version - 'sinatra/tilt'. This should result
    in any tilt on the $LOAD_PATH overriding the bundled
    rtomayko committed Oct 17, 2009
Commits on Oct 12, 2009
  1. Add #mime_type to the delagator

    sr committed with rtomayko Oct 4, 2009
  2. Remove #mime in main.rb

    sr committed with rtomayko Oct 4, 2009
  3. Adds a #settings method which #options is alised to.

    I propose options be renamed "settings" - the nomenclature is perhaps more
    set & settings vs set & options
    defunkt committed with rtomayko Oct 11, 2009
  4. Updated gemspec and fixed rake install error

    When running rake install I would get this error:
    $ rake install
    (in .../sinatra)
    updated sinatra.gemspec
    rake aborted!
    Don't know how to build task 'test/render_backtrace_test.rb'
    kematzy committed with rtomayko Oct 8, 2009
Commits on Oct 4, 2009
  1. added rake task for rcov

    Homer Simpson committed with rtomayko Sep 25, 2009
  2. Stop disabling sessions in test environement

    Manually `disable :sessions` if you want to manually pass in
    the `rack.session` env key in your tests.
    sr committed Oct 3, 2009
Commits on Oct 3, 2009
  1. Remove backtrace test

    sr committed Oct 3, 2009
  2. Bundle tilt

    sr committed Oct 3, 2009
  3. Use Tilt for templating

    This fixes a whole slew of issues with templates and adds some
    new features:
     * Template files are read from disk once
     * Template compilation is cached. For instance, ERB templates are
       converted to Ruby once leaving only the eval for subsequent
       renders. HAML templates use a single engine instance.
     * Backtraces from file templates have the templates file and line
     * Backtraces from in-file templates have correct file/line numbers :)
    rtomayko committed with sr Jun 7, 2009
  4. Fix use_in_file_templates! with jRuby on Windows

    It's actually a workaround for a jRuby issue.
    Signed-off-by: Simon Rozet <>
    undees committed with sr Oct 3, 2009
  5. Apply filters after checking for static files. From #278 by Chris.

    Signed-off-by: Simon Rozet <>
    dylanegan committed with sr Aug 25, 2009
Commits on Sep 22, 2009
  1. Fixed jumbled sentence in lib/sinatra/showexceptions.rb

    Signed-off-by: Simon Rozet <>
    dannytatom committed with sr Sep 22, 2009