Merge pull request #1580 from k0kubun/hamlit-support

Support capture and content_for with Hamlit

sinatra-contrib/Gemfile

@@ -16,8 +16,10 @@ group :development, :test do
   end
 
   platform :jruby, :ruby do
-    gem 'slim', '2.1.0'
+    gem 'hamlit'
+    gem 'hamlit-block', '>= 0.7.1'
     gem 'liquid', '~> 2.6.x'
+    gem 'slim'
   end
 
   platform :ruby do

sinatra-contrib/lib/sinatra/capture.rb

@@ -86,7 +86,7 @@ module Capture
 
     def capture(*args, &block)
       return block[*args] if ruby?
-      if haml?
+      if haml? && Tilt[:haml] == Tilt::HamlTemplate
         buffer = Haml::Buffer.new(nil, Haml::Options.new.for_buffer)
         with_haml_buffer(buffer) { capture_haml(*args, &block) }
       else

sinatra-contrib/lib/sinatra/content_for.rb

@@ -174,7 +174,7 @@ def clear_content_for(key)
     # for <tt>:head</tt>.
     def yield_content(key, *args, &block)
       if block_given? && !content_for?(key)
-        haml? ? capture_haml(*args, &block) : yield(*args)
+        (haml? && Tilt[:haml] == Tilt::HamlTemplate) ? capture_haml(*args, &block) : yield(*args)
       else
         content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
         content.join.tap do |c|

sinatra-contrib/lib/sinatra/respond_with.rb

@@ -240,8 +240,8 @@ def self.engines
         :css  => [:less,  :sass, :scss],
         :xml  => [:builder, :nokogiri],
         :js   => [:coffee],
-        :html => [:erb, :erubi, :erubis, :haml, :slim, :liquid, :radius, :mab,
-          :markdown, :textile, :rdoc],
+        :html => [:erb, :erubi, :erubis, :haml, :halmit, :slim, :liquid, :radius,
+          :mab, :markdown, :textile, :rdoc],
         :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
           [:mab] - [:find_template, :markaby]),
         :json => [:yajl],

sinatra-contrib/spec/capture_spec.rb

@@ -23,6 +23,9 @@ def render(engine, template)
     if engine == :erubi || engine == :erubis
       lang = :erb
     end
+    if engine == :hamlit
+      lang = :haml
+    end
     require "#{engine}"
 
     it "captures content" do
@@ -35,6 +38,7 @@ def render(engine, template)
   end
 
   describe('haml')   { it_behaves_like "a template language", :haml   }
+  describe('hamlit') { it_behaves_like "a template language", :hamlit }
   describe('slim')   { it_behaves_like "a template language", :slim   }
   describe('erubi')  { it_behaves_like "a template language", :erubi  }
   describe('erubis') { it_behaves_like "a template language", :erubis }

sinatra-contrib/spec/content_for/different_key.hamlit

@@ -0,0 +1,2 @@
+- content_for :bar do
+  bar

sinatra-contrib/spec/content_for/footer.hamlit

@@ -0,0 +1,2 @@
+- if content_for? :foo
+  != yield_content :foo

sinatra-contrib/spec/content_for/layout.hamlit

@@ -0,0 +1 @@
+= yield_content :foo

sinatra-contrib/spec/content_for/multiple_blocks.hamlit

@@ -0,0 +1,8 @@
+- content_for :foo do
+  foo
+- content_for :foo do
+  bar
+- content_for :baz do
+  WON'T RENDER ME
+- content_for :foo do
+  baz

sinatra-contrib/spec/content_for/multiple_yields.hamlit

@@ -0,0 +1,3 @@
+= yield_content :foo
+= yield_content :foo
+= yield_content :foo

sinatra-contrib/spec/content_for/parameter_value.hamlit

@@ -0,0 +1 @@
+- content_for :foo, 'foo'

sinatra-contrib/spec/content_for/passes_values.hamlit

@@ -0,0 +1 @@
+!= yield_content :foo, 1, 2

sinatra-contrib/spec/content_for/same_key.hamlit

@@ -0,0 +1,2 @@
+- content_for :foo do
+  foo

sinatra-contrib/spec/content_for/takes_values.hamlit

@@ -0,0 +1,3 @@
+- content_for :foo do |a, b|
+  %i= a
+  =b

sinatra-contrib/spec/content_for/yield_block.hamlit

@@ -0,0 +1,2 @@
+!= yield_content :foo  do
+  baz

sinatra-contrib/spec/content_for_spec.rb

@@ -9,6 +9,8 @@
   end
 
   Tilt.prefer Tilt::ERBTemplate
+  require 'hamlit/block'
+  Tilt.register Tilt::HamlTemplate, :haml
 
   extend Forwardable
   def_delegators :subject, :content_for, :clear_content_for, :yield_content
@@ -89,7 +91,7 @@ def render(engine, template)
   end
 
   # TODO: liquid radius markaby builder nokogiri
-  engines = %w[erb erubi erubis haml slim]
+  engines = %w[erb erubi erubis haml hamlit slim]
 
   engines.each do |inner|
     describe inner.capitalize do