From 9b94ee6550dea87086f363f290fb6bf64a86c2d4 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Thu, 14 Apr 2011 14:28:59 +0200
Subject: [PATCH] depend on Tilt 1.3

---
 lib/sinatra/base.rb | 2 +-
 sinatra.gemspec     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index 27135dbc..03801531 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -521,7 +521,7 @@ module Sinatra
     def find_template(views, name, engine)
       yield ::File.join(views, "#{name}.#{@preferred_extension}")
       Tilt.mappings.each do |ext, engines|
-        next unless ext != @preferred_extension and Array(engines).include? engine
+        next unless ext != @preferred_extension and engines.include? engine
         yield ::File.join(views, "#{name}.#{ext}")
       end
     end
diff --git a/sinatra.gemspec b/sinatra.gemspec
index 59b49886..6491384b 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -123,7 +123,7 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
   s.add_dependency 'rack', '~> 1.2'
-  s.add_dependency 'tilt', '~> 1.2', '>= 1.2.2'
+  s.add_dependency 'tilt', '~> 1.3'
   s.add_development_dependency 'shotgun', '~> 0.6'
 
   s.homepage = "http://sinatra.rubyforge.org"