Skip to content
Commits on Feb 17, 2011
  1. @rkh

    make sure we check every alternative extension registered for a templ…

    rkh committed Feb 17, 2011
    …ate engine, fixes #179.
    
    Conflicts:
    
    	test/templates_test.rb
  2. @rkh
  3. @rkh

    fix for weird last_modified behavior, and duplicative work

    elij committed with rkh Feb 8, 2011
    fix for issue #180
    The api should be passed an object that supports .to_time. If it happens
    to be something else, make a best effort to convert it to a time object (such
    as if a string is passed in -- which happens in a few of the tests).
    
    Failing conversion, the rescue stanza will result in an http 200
    response, which should be a 'safe' thing to do.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
  4. @rossabaker @rkh

    Run all "literally matches" tests, and fix the failing one for '$'.

    rossabaker committed with rkh Jan 23, 2011
    The "literally matches" tests in routing_test.rb differed only by punctuation in the name, so only one of them was actually running.  Renaming them exposed a failing test.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Commits on Jan 16, 2011
  1. @rkh
Commits on Dec 25, 2010
  1. @rkh
  2. @rkh
  3. @rkh

    depend on Tilt 1.2

    rkh committed Dec 25, 2010
    Conflicts:
    
    	test/markaby_test.rb
  4. @rkh

    fix tests for rdoc 3.0

    rkh committed Dec 23, 2010
  5. @rkh

    add test for locals passed to haml

    rkh committed Dec 16, 2010
  6. @rkh

    Routes can use unicode characters without causing an encoding excepti…

    rkh committed Dec 15, 2010
    …on on
    
    Ruby 1.9.
    
    Fixes #81.
Commits on Dec 14, 2010
  1. @rkh

    Set encoding for inline templates correctly.

    rkh committed Dec 13, 2010
    * 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.
  2. @rkh

    In send_file: Do not override Content-Type if already set and no expl…

    rkh committed Dec 8, 2010
    …icit type
    
    is given.
    
    Fixes #130.
  3. @rkh

    If file extension is unknown, send_file will always fall back to appl…

    rkh committed Nov 26, 2010
    …ication/octet-stream rather than complaining. Fixes #127.
  4. @rkh

    Make nested layout usage independed of the outer template's :layout v…

    rkh committed Nov 11, 2010
    …alue. Allows using partials in layouts.
Commits on Nov 4, 2010
  1. @rkh
Commits on Oct 30, 2010
  1. @rkh
Commits on Oct 26, 2010
  1. @rkh
Commits on Oct 21, 2010
  1. @rkh
Commits on Oct 19, 2010
  1. @krekoten @rkh

    Rename test_valid_range to assert_valid_range

    krekoten committed with rkh Oct 19, 2010
    MiniTets treats all /test.*/ methods as test examples.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
  2. @rkh
Commits on Oct 17, 2010
  1. @snej @rkh

    Re-implement byte-range support for static files.

    snej committed with rkh Oct 17, 2010
    Correct handling of "Range:" request header. Replaces buggy implementation (480b1e8, 44ab090) that was recently backed out.
    Fixes #93.
    
    NOTE: Does not yet support multiple ranges (e.g. "bytes=1-10,20-30") because that requires sending a multipart response, which is more complex than I want to get into now.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
  2. @rkh
Commits on Oct 12, 2010
  1. @rkh

    Only run error handlers if show_excetions is set to :after_handler, n…

    rkh committed Oct 12, 2010
    …ot when it is set to true.
Commits on Oct 11, 2010
  1. @pangel @rkh

    Bugfix. show_exceptions used to override app-specified exceptions (er…

    pangel committed with rkh Oct 11, 2010
    …ror do ... end blocks).
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Commits on Oct 10, 2010
  1. @rkh

    Add nokogiri helper method. Tilt supports Nokogiri for quite some tim…

    rkh committed Oct 10, 2010
    …e now, but it was not as easy to use as builder, and not documented. Tests and documentation included.
  2. @jphastings @rkh

    send_file now copes with 'Range: bytes=100-400,500-600' headers

    jphastings committed with rkh Oct 10, 2010
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Commits on Oct 9, 2010
  1. @rkh

    Merge branch 'smart-templates'

    rkh committed Oct 9, 2010
  2. @rkh
  3. @gnandretta @rkh

    changes the date comparison in last_modified

    gnandretta committed with rkh Oct 6, 2010
    last_modified was halting only when the 'If-Modified-Since' header date
    was equal to the time specified. Now, it halts when is equal or later
    than the time specified.
    
    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Commits on Sep 27, 2010
  1. @rkh

    Sets default content type according to template engine used instead o…

    rkh committed Sep 19, 2010
    …f just text/html.
    
    It does so by including a Mixin into the the returned string offering a content_type method. Therefore all of the following examples produce the expected results:
    
        # text/html
        get('/') do
          haml :index
        end
    
        # text/css
        get('/') do
          sass :index
        end
    
        # text/css
        get('/') do
          haml :index
          sass :index
        end
    
        # text/html
        get('/') do
          haml '= sass :index'
        end
    
    It also allows setting the default content type for a template engine:
    
        set :builder, :content_type => :html
    
    Tests and README adjustments (all languages) included.
  2. @rkh

    Skip implicit layouts for nested templates.

    rkh committed Sep 19, 2010
    That way the following will produce valid HTML:
    
    @@ layout
    !!!
    = yield
    
    @@ content
    %html
      %head= haml :head
      %body= haml :body
    
    That way using render methods for partials is a lot easier.
    Tests included.
Commits on Sep 19, 2010
  1. @rkh
Commits on Sep 16, 2010
  1. @rkh
Commits on Sep 12, 2010
  1. @rkh

    Skip rdiscount tests on JRuby.

    rkh committed Sep 12, 2010
Something went wrong with that request. Please try again.