Permalink
Commits on Dec 25, 2010
  1. 1.2.0.a release

    rkh committed Dec 25, 2010
  2. propagate default_encoding to Tilt

    rkh committed Dec 25, 2010
Commits on Dec 24, 2010
  1. depend on Tilt 1.2

    rkh committed Dec 24, 2010
Commits on Dec 23, 2010
  1. Switch from Hanna to YARD.

    * hanna has broken dependencies all the time
    * we have a .yardopts file already for rubydoc.info
    * just compare the rake tasks
    * README has a TOC
    
    This would also allow using YARD's doc tagging system at some point in the
    future. Rakefile is still usable even if YARD is not installed.
    rkh committed Dec 23, 2010
  2. fix tests for rdoc 3.0

    rkh committed Dec 23, 2010
  3. Tilt::CompileSite is deprecated, no longer use it.

    Warning: This means current master will render slower with Tilt 1.1. Please use Tilt master or wait for the next Tilt release.
    We will not release Sinatra 1.2.0 before Tilt 1.2 is released and this patch will not be part of Sinatra 1.1.1.
    
    This patch does not change Sinatra's behavior in any way.
    rkh committed Dec 23, 2010
Commits on Dec 20, 2010
  1. update REAMDE.es.rdoc

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    Gabriel Andretta committed with rkh Dec 20, 2010
  2. Updated README.ru.rdoc to reflect latest changes

    * filter conditions;
    * inline markaby;
    * OPTIONS request type.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    vast committed with rkh Dec 20, 2010
Commits on Dec 16, 2010
  1. add test for locals passed to haml

    rkh committed Dec 16, 2010
Commits on Dec 15, 2010
  1. remove whitespaces

    rkh committed Dec 15, 2010
  2. remove some semicolons

    rkh committed Dec 15, 2010
  3. Updated README.rdoc to reflect added OPTIONS request type.

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    jammur committed with rkh Nov 29, 2010
  4. Added support for OPTIONS request type.

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    jammur committed with rkh Nov 29, 2010
  5. Routes can use unicode characters without causing an encoding excepti…

    …on on
    
    Ruby 1.9.
    
    Fixes #81.
    rkh committed Dec 15, 2010
  6. send_file now takes :last_modified option

    fixes #131
    rkh committed Dec 15, 2010
Commits on Dec 14, 2010
  1. Merge branch 'filter-conditions'

    rkh committed Dec 14, 2010
  2. Add layout_engine option to #render.

    This will render an erb file with a haml layout:
    
        get('/') { erb :index, :layout_engine => :haml }
    
    Whereas this will cause all markdown templates to be rendered with an erb
    layout (unless, of course, `:layout_engine` is set explicitly):
    
        set :markdown, :layout_engine => :erb
    
    Fixes #110.
    rkh committed Dec 14, 2010
  3. bump version

    (this is not a release)
    rkh committed Dec 14, 2010
  4. typo

    rkh committed Dec 14, 2010
  5. Update CHANGES.

    rkh committed Dec 14, 2010
Commits on Dec 13, 2010
  1. When reading inline templates, don't set encoding

    for each line, but only once for the complete
    file.
    rkh committed Dec 13, 2010
  2. When reading line templates, scan the first two

    lines for magic comments, instead of just the
    first. Also, scan for 'coding:' rather than
    'encoding'.
    rkh committed Dec 13, 2010
  3. When reading inline templates, make sure to use

    binary encoding, avoiding to raise an exception
    for unknown byte sequences.
    rkh committed Dec 13, 2010
  4. Set encoding for inline templates correctly.

    * If Ruby version is not encoding aware, do nothing
    * If file contains a magic comment in the first line, use that encoding
    * Otherwise use settings.default_encoding
    
    Allows one to use unicode characters without having to escape them and deploy
    on Linux systems, like Heroku, on 1.9.2 (on OSX encodings always default to
    UTF-8, which makes it hard to spot this issue before deployment).
    
    Fixes #136.
    rkh committed Dec 13, 2010
  5. Reset LANG and LC_CTYPE before running tests (thus avoiding that ever…

    …ything defaults to UTF-8 on OSX).
    rkh committed Dec 13, 2010
Commits on Dec 8, 2010
  1. In send_file: Do not override Content-Type if already set and no expl…

    …icit type
    
    is given.
    
    Fixes #130.
    rkh committed Dec 8, 2010
  2. Don't rescue Errno::ENOENT in render

    All Errno::ENOENT exceptions raised during layout (not template) rendering
    where caught assuming this would indicate that there is no layout file.
    However, if the Errno::ENOENT was raised inside the layout (say, from a
    missing partial), that exceptions was rescued, too.
    
    With this patch, it will not only not raise an error if the template is
    missing, it will just raise an exception if the layout is missing and the
    layout option hasn't been set explicitely. That way, unexpected behavior can
    more easily be traced back to missing templates.
    
    Fixes #135.
    rkh committed Dec 8, 2010
Commits on Dec 2, 2010
  1. Some spellchecking in README.de.rdoc

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    Alexander Klink committed with rkh Dec 2, 2010
Commits on Nov 26, 2010
  1. If file extension is unknown, send_file will always fall back to appl…

    …ication/octet-stream rather than complaining. Fixes #127.
    rkh committed Nov 26, 2010
Commits on Nov 21, 2010
Commits on Nov 18, 2010
  1. Add note to Portugese tanslation.

    Note says:
    
      "Important Note: This document is just a translation of the
        English version and might not be up to date."
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    lucianosousa committed with rkh Nov 18, 2010