Merge pull request #1558 from jkowens/fix-1172

Lookup Tilt class for template engine without loading files
sinatra · Oct 26, 2019 · 80f8d3b · 80f8d3b
2 parents f515356 + 909551e
commit 80f8d3b
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/sinatra-contrib/lib/sinatra/respond_with.rb b/sinatra-contrib/lib/sinatra/respond_with.rb
@@ -169,15 +169,14 @@ def template_for(name, exts)
         settings.template_engines[:all].each do |engine|
           exts.each { |ext| possible << [engine, "#{name}.#{ext}"] }
         end
+
         exts.each do |ext|
           settings.template_engines[ext].each { |e| possible << [e, name] }
         end
+
         possible.each do |engine, template|
-          begin
-            klass = Tilt[engine]
-          rescue LoadError
-            next
-          end
+          klass = Tilt.default_mapping.template_map[engine.to_s] ||
+            Tilt.lazy_map[engine.to_s].fetch(0, [])[0]
 
           find_template(settings.views, template, klass) do |file|
             next unless File.exist? file