Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Feb 22, 2010
  1. @sr
  2. @sr

    Doc for content_type :foo

    sr committed
  3. @sr

    Doc for error(500) { }

    sr committed
  4. @sr

    More 'halt' doc

    sr committed
  5. @sr

    Update sass example re. options

    sr committed
  6. @sr

    Update README re. mime_type

    sr committed

Commits on Dec 26, 2009
  1. @sr

    Deprecate use_in_file_templates!

    sr committed
    Use enable :inline_templates instead
Commits on Jun 8, 2009
  1. @sr @rtomayko

    Add a note about Sinatra::Base to the README

    sr committed with rtomayko
    Edited-By: Ryan Tomayko <>
Commits on May 21, 2009
  1. @scottj97 @rtomayko

    fix inaccurate comment in README

    scottj97 committed with rtomayko
Commits on May 18, 2009
  1. @rtomayko
Commits on May 12, 2009
  1. @rtomayko

    fix unclosed <tt> in README

    Mathew Cucuzella committed with rtomayko
Commits on Apr 25, 2009
  1. @bmizerany

    closes #9779 Auto-require haml/erb/builder/sass

    bmizerany committed
    this is causing thread-saftey issues.
Commits on Mar 27, 2009
  1. @kematzy @rtomayko

    Merge app-level haml/sass options with call options [#184]

    kematzy committed with rtomayko
    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.
Commits on Mar 25, 2009
  1. @cypher @rtomayko

    Note on passing template symbols vs. strings in README

    cypher committed with rtomayko
    The README is very ambiguous about the difference between passing a
    symbol and a string to a template rendering method. This adds a note
    that explains the difference.
  2. @rtomayko
Commits on Mar 3, 2009
  1. @rtomayko
Commits on Mar 2, 2009
  1. @cypher @rtomayko

    Fix test_with_rack_env example in README

    cypher committed with rtomayko
    First, there was a missing quote, and second :agent is more
    clear than HTTP_USER_AGENT.
  2. @rtomayko
  3. @rtomayko
Commits on Feb 20, 2009
  1. @Aupajo @rtomayko

    Fixed broken link in README.

    Aupajo committed with rtomayko
  2. @vangberg @rtomayko
Commits on Feb 16, 2009
  1. @bmizerany
Commits on Jan 31, 2009
  1. @bdimcheff @rtomayko
Commits on Jan 24, 2009
  1. @rtomayko
  2. @rtomayko
Commits on Jan 19, 2009
  1. @Syd @rtomayko
Commits on Jan 18, 2009
  1. @bmizerany
  2. @bmizerany

    In-file-templates are automaticly loaded for you.

    bmizerany committed
    Sinatra will now load you in-file-templates from the file
    that required sinatra.
    If you need to use in-file-templates outside this you will need
    to explicitly call use_in_file_templates! in that file.
Commits on Jan 15, 2009
  1. @karmi @rtomayko
Commits on Jan 14, 2009
  1. @dylanegan @rtomayko

    Bacon support

    dylanegan committed with rtomayko
  2. @rtomayko

    Test framework refactoring

    rtomayko committed
    * Adds test/helper.rb and moves mock_app and other code specific
      to testing the framework out of Sinatra::Test.
    * Do not require test/unit. The sinatra/test/unit,
      sinatra/test/spec, and sinatra/test/rspec files can be used to
      choose the framework.
    * Add Sinatra::TestHarness, which should act similar to the
      Rack::Session proposal here:
    * Update the README with information on using the different test
Commits on Jan 13, 2009
  1. @cypher @rtomayko

    README and CHANGES tweaks for 0.9.0 release (#63)

    cypher committed with rtomayko
    * Add support for regex routes to README
    * Use $LOAD_PATH instead of $:
    * EventContext is no longer present
    * Misc cleanup from rtomayko
Commits on Jan 10, 2009
  1. @bmizerany
  2. @djanowski @bmizerany
Commits on Dec 21, 2008
  1. @rtomayko

    I knew I shoulda taken that left turn at Hoboken

    rtomayko committed
    This is a fairly large reworking of Sinatra's innards. Although
    most of the internal implementation has been modified, it
    provides the same basic feature set and is meant to be compatible
    with Sinatra 0.3.2.
    * The Event and EventContext classes have been removed. Sinatra
      applications are now defined within the class context of a
      Sinatra::Base subclass; each request is processed within a new
    * Sinatra::Base can be used as a base class for multiple
      Rack applications within a single process and can be used as
      Rack middleware.
    * The routing and result type processing implementation has been
      simplified and enhanced a bit. There's a new route conditions
      system for things like :agent/:host matching and a request
      level #pass method has been added to allow an event handler to
      exit immediately, passing control to the next matching route.
    * Regular expressions may now be used in route patterns. Captures
      are available as an array from "params[:captures]".
    * The #body helper method now takes a block. The block is not
      evaluated until an attempt is made to read the body.
    * Options are now dynamically generated class attributes on the
      Sinatra::Base subclass (instead of OpenStruct); options are
      inherited by subclasses and may be overridden up the
      inheritance hierarchy. The Base.set manages all option related
    * The application file (app_file) detection heuristics are bit
      more sane now. This fixes some bugs with reloading and
      public/views directory detection. All thin / passenger issues
      of these type should be better now.
    * Error mappings are now split into to distinct layers: exception
      mappings and custom error pages. Exception mappings are registered
      with 'error(Exception)' and are run only when the app raises an
      exception. Custom error pages are registered with error(status_code)
      and are run any time the response has the status code specified.
      It's also possible to register an error page for a range of status
      codes: 'error(500..599)'.
    * The spec and unit testing extensions have been modified to take
      advantage of the ability to have multiple Sinatra applications.
      The Sinatra::Test module must be included within the TestCase
      in order to take advantage of these methods (unless the
      'sinatra/compat' library has been required).
    * Rebuilt specs from scratch for better coverage and
      organization. Sinatra 3.2 unit tests have been retained
      under ./compat to ensure a baseline level of compatibility with
      previous versions; use the 'rake compat' task to run these.
    A large number of existing Sinatra idioms have been deprecated but
    continue to be supported through the 'sinatra/compat' library.
    * The "set_option" and "set_options" methods have been deprecated
      due to redundancy; use "set".
    * The "env" option (Sinatra::Base.env) has been renamed to "environment"
      and deprecated because it's too easy to confuse with the request-level
      Rack environment Hash (Sinatra::Base#env).
    * The request level "stop" method has been renamed "halt" and
      deprecated. This is for consistency with `throw :halt`.
    * The request level "entity_tag" method has been renamed "etag" and
      deprecated. Both versions were previously supported.
    * The request level "headers" method has been deprecated. Use
      response['Header-Name'] to access and modify response headers.
    * Sinatra.application is deprecated. Use Sinatra::Application instead.
    * Setting Sinatra.application = nil to reset an application is
      deprecated. You shouldn't have to reset objects anymore.
    * The Sinatra.default_options Hash is deprecated. Modifying this object now
      results in "set(key, value)" invocations on the Sinatra::Base
    * The "body.to_result" convention has been deprecated.
    * The ServerError exception has been deprecated. Any Exception is now
      considered a ServerError.
Something went wrong with that request. Please try again.