2 files changed, 54 insertions, 9 deletions

diff --git a/lib/dashing.rb b/lib/dashing.rb
index 952b614..04921fe 100644
--- a/lib/dashing.rb
+++ b/lib/dashing.rb
@@ -50,17 +50,20 @@ end
 
 get '/:dashboard' do
   protected!
-  if File.exist? File.join(settings.views, "#{params[:dashboard]}.erb")
-    erb params[:dashboard].to_sym
-  else
-    halt 404
+  tilt_html_engines.each do |suffix, _|
+    file = File.join(settings.views, "#{params[:dashboard]}.#{suffix}")
+    return render(suffix.to_sym, params[:dashboard].to_sym) if File.exist? file
   end
+
+  halt 404
 end
 
 get '/views/:widget?.html' do
   protected!
-  widget = params[:widget]
-  send_file File.join(settings.root, 'widgets', widget, "#{widget}.html")
+  tilt_html_engines.each do |suffix, engines|
+    file = File.join(settings.root, "widgets", params[:widget], "#{params[:widget]}.#{suffix}")
+    return engines.first.new(file).render if File.exist? file
+  end
 end
 
 post '/widgets/:id' do
@@ -107,11 +110,18 @@ def latest_events
 end
 
 def first_dashboard
-  files = Dir[File.join(settings.views, '*.erb')].collect { |f| f.match(/(\w*).erb/)[1] }
+  files = Dir[File.join(settings.views, '*')].collect { |f| File.basename(f, '.*') }
   files -= ['layout']
   files.first
 end
 
+def tilt_html_engines
+  Tilt.mappings.select do |_, engines|
+    default_mime_type = engines.first.default_mime_type
+    default_mime_type.nil? || default_mime_type == 'text/html'
+  end
+end
+
 Dir[File.join(settings.root, 'lib', '**', '*.rb')].each {|file| require file }
 {}.to_json # Forces your json codec to initialize (in the event that it is lazily loaded). Does this before job threads start.
 
diff --git a/test/app_test.rb b/test/app_test.rb
index f6fa537..97aad3a 100644
--- a/test/app_test.rb
+++ b/test/app_test.rb
@@ -58,14 +58,49 @@ class AppTest < Dashing::Test
     end
   end
 
+  def test_redirect_to_first_dashboard_without_erb
+    with_generated_project do |dir|
+      FileUtils.touch(File.join(dir, "dashboards/htmltest.html"))
+      get '/'
+      assert_equal 302, last_response.status
+      assert_equal 'http://example.org/htmltest', last_response.location
+    end
+  end
+
   def test_get_dashboard
     with_generated_project do
       get '/sampletv'
       assert_equal 200, last_response.status
       assert_include last_response.body, 'class="gridster"'
+      assert_include last_response.body, "DOCTYPE"
     end
   end
-  
+
+  begin
+    require 'haml'
+
+    def test_get_haml_dashboard
+      with_generated_project do |dir|
+        File.write(File.join(dir, 'dashboards/hamltest.haml'), '.gridster')
+        get '/hamltest'
+        assert_equal 200, last_response.status
+        assert_include last_response.body, "class='gridster'"
+      end
+    end
+
+    def test_get_haml_widget
+      with_generated_project do |dir|
+        File.write(File.join(dir, 'widgets/clock/clock.haml'), '%h1 haml')
+        File.unlink(File.join(dir, 'widgets/clock/clock.html'))
+        get '/views/clock.html'
+        assert_equal 200, last_response.status
+        assert_include last_response.body, '<h1>haml</h1>'
+      end
+    end
+  rescue LoadError
+    puts "[skipping haml tests because haml isn't installed]"
+  end
+
   def test_get_nonexistent_dashboard
     with_generated_project do
       get '/nodashboard'
@@ -88,7 +123,7 @@ class AppTest < Dashing::Test
 
       Sinatra::Application.settings.views = File.join(dir, 'new_project/dashboards')
       Sinatra::Application.settings.root = File.join(dir, 'new_project')
-      yield
+      yield Sinatra::Application.settings.root
     end
   end