use any Tilt-supported view engine for dashboards, including Haml

Author: apeckham

lib/dashing.rb

@@ -50,8 +50,12 @@ def protected!
 
 get '/:dashboard' do
   protected!
-  if File.exist? File.join(settings.views, "#{params[:dashboard]}.erb")
-    erb params[:dashboard].to_sym
+  view_engine = Tilt.mappings.keys.find do |ext|
+    File.exist? File.join(settings.views, "#{params[:dashboard]}.#{ext}")
+  end
+
+  if view_engine
+    render view_engine.to_sym, params[:dashboard].to_sym
   else
     halt 404
   end
@@ -107,7 +111,7 @@ 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

test/app_test.rb

@@ -58,14 +58,42 @@ def test_redirect_to_first_dashboard
     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"'
     end
   end
-  
+
+  begin
+    require 'haml'
+    def test_get_haml
+      with_generated_project do |dir|
+        File.write(File.join(dir, "dashboards/hamltest.haml"), <<-HAML)
+.gridster
+  %ul
+    %li{data: {col: 1, row: 1, sizex: 1, sizey: 1}}
+      %div{data: {view: "Clock"}}
+      %i.icon-time.icon-background
+HAML
+        get '/hamltest'
+        assert_equal 200, last_response.status
+        assert_include last_response.body, "class='gridster'"
+      end
+    end
+  rescue LoadError
+  end
+
   def test_get_nonexistent_dashboard
     with_generated_project do
       get '/nodashboard'
@@ -88,7 +116,7 @@ def with_generated_project
 
       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