examples/template.rb in goliath-0.9.4 vs examples/template.rb in goliath-1.0.0.beta.1

@@ -9,34 +9,41 @@
 #
 # The templating is based on, but not as fancy-pants as, Sinatra's. Notably,
 # your template's extension must match the engine (foo.markdown, not foo.md)
 
 require 'tilt'
-# use bluecloth as default markdown renderer
-require 'bluecloth'
-Tilt.register 'markdown', Tilt::BlueClothTemplate
-require 'yajl/json_gem'
 
+if RUBY_PLATFORM != 'java'
+  require 'yajl/json_gem'
+  require 'bluecloth' # use bluecloth as default markdown renderer
+  Tilt.register 'markdown', Tilt::BlueClothTemplate
+else
+  require 'maruku'
+  Tilt.register 'markdown', Tilt::MarukuTemplate
+end
+
 require 'goliath'
 require 'goliath/rack/templates'
 require 'goliath/plugins/latency'
 
 class Template < Goliath::API
   include Goliath::Rack::Templates      # render templated files from ./views
 
   use(Rack::Static,                     # render static files from ./public
-            :root => Goliath::Application.app_path("public"),
-            :urls => ["/favicon.ico", '/stylesheets', '/javascripts', '/images'])
+      :root => Goliath::Application.app_path("public"),
+      :urls => ["/favicon.ico", '/stylesheets', '/javascripts', '/images'])
 
   plugin Goliath::Plugin::Latency       # ask eventmachine reactor to track its latency
 
   def recent_latency
     Goliath::Plugin::Latency.recent_latency
   end
 
   def response(env)
     case env['PATH_INFO']
-    when '/'         then [200, {}, haml(:root)]
+    # TODO(dj2): change /root -> / when rack > 1.4.0 is released
+    when '/root'         then [200, {}, haml(:root)]
+    when '/haml_str' then [200, {}, haml("%h1 Header")]
     when '/debug'    then [200, {}, haml(:debug)]
     when '/oops'     then [200, {}, haml(:no_such_template)] # will 500
     when '/joke'     then
       [200, {}, markdown(:joke, :locals => {:title => "HERE IS A JOKE"})]
     when '/erb_me'   then