haml 1.7.2 → 1.8.0

data/test/haml/helper_test.rb

@@ -13,7 +13,6 @@ class HelperTest < Test::Unit::TestCase
   include Haml::Helpers
   
   def setup
-    ActionView::Base.register_template_handler("haml", Haml::Template)
     @base = ActionView::Base.new
     @base.controller = ActionController::Base.new
   end
@@ -51,7 +50,8 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_tabs
-    assert_equal(render("foo\n- tab_up\nbar\n- tab_down\nbaz"), "foo\n  bar\nbaz\n")
+    assert_equal("foo\n  bar\nbaz\n", render("foo\n- tab_up\nbar\n- tab_down\nbaz"))
+    assert_equal("          <p>tabbed</p>\n", render("- buffer.tabulation=5\n%p tabbed"))
   end
   
   def test_helpers_dont_leak
@@ -77,8 +77,10 @@ class HelperTest < Test::Unit::TestCase
   def test_action_view_included
     assert(Haml::Helpers.action_view?)
   end
-    
+  
   def test_form_tag
+    # This is usually provided by ActionController::Base.
+    def @base.protect_against_forgery?; false; end
     result = render("- form_tag 'foo' do\n  %p bar\n  %strong baz", :action_view)
     should_be = "<form action=\"foo\" method=\"post\">\n  <p>bar</p>\n  <strong>baz</strong>\n</form>\n"
     assert_equal(should_be, result)
@@ -119,5 +121,31 @@ class HelperTest < Test::Unit::TestCase
 
     assert_equal("1\n\n2\n\n3\n\n", render("- trc([1, 2, 3]) do |i|\n  = i.inspect"))
   end
+
+  def test_find_and_preserve_with_block
+    assert_equal("<pre>&#x000A;  Foo&#x000A;  Bar&#x000A;</pre>\nFoo\nBar\n",
+                 render("= find_and_preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
+  end
+
+  def test_preserve_with_block
+    assert_equal("<pre>&#x000A;  Foo&#x000A;  Bar&#x000A;</pre>&#x000A;Foo&#x000A;Bar&#x000A;\n",
+                 render("= preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
+  end
+
+  def test_init_haml_helpers
+    context = Object.new
+    class << context
+      include Haml::Helpers
+    end
+    context.init_haml_helpers
+
+    result = context.capture_haml do
+      context.open :p, :attr => "val" do
+        context.puts "Blah"
+      end
+    end
+
+    assert_equal("<p attr='val'>\n  Blah\n</p>\n", result)
+  end
 end
 

data/test/haml/html2haml_test.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/haml'
+require 'haml/html'
+
+class Html2HamlTest < Test::Unit::TestCase
+
+  def test_empty_render_should_remain_empty
+    assert_equal '', render('')
+  end
+
+  def test_id_and_class_should_be_removed_from_hash
+    assert_equal '%span#foo.bar', render('<span id="foo" class="bar"> </span>')
+  end
+
+  def test_no_tag_name_for_div_if_class_or_id_is_present
+    assert_equal '#foo', render('<div id="foo"> </div>')
+    assert_equal '.foo', render('<div class="foo"> </div>')
+  end
+
+  def test_multiple_class_names
+    assert_equal '.foo.bar.baz', render('<div class=" foo  bar  baz "> </div>')
+  end
+
+  def test_should_have_pretty_attributes
+    assert_equal_attributes('%input{ :type => "text", :name => "login" }/',
+                            render('<input type="text" name="login" />'))
+    assert_equal_attributes('%meta{ "http-equiv" => "Content-Type", :content => "text/html" }/',
+                            render('<meta http-equiv="Content-Type" content="text/html" />'))
+    assert_equal_attributes('%div{ "xml:lang" => "hr" }/',
+                            render('<div xml:lang="hr" />'))
+  end
+
+  def test_sqml_comment
+    assert_equal "/\n  IE sucks", render('<!-- IE sucks -->')
+  end
+
+  def test_rhtml
+    assert_equal '- foo = bar', render_rhtml('<% foo = bar %>')
+    assert_equal '- foo = bar', render_rhtml('<% foo = bar -%>')
+    assert_equal '= h @item.title', render_rhtml('<%=h @item.title %>')
+    assert_equal '= h @item.title', render_rhtml('<%=h @item.title -%>')
+  end
+
+  protected
+
+    def render(text, options = {})
+      Haml::HTML.new(text, options).render.rstrip
+    end
+
+    def render_rhtml(text)
+      render(text, :rhtml => true)
+    end
+
+    def assert_equal_attributes(expected, result)
+      assert_equal *[expected, result].map { |s| s.gsub!(/\{ (.+) \}/, ''); $1.split(', ').sort }
+      assert_equal expected, result
+    end
+end

data/test/haml/markaby/standard.mab

@@ -0,0 +1,52 @@
+self << '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+html(:xmlns=>'http://www.w3.org/1999/xhtml', 'xml:lang'=>'en-US') do
+  head do
+    title "Hampton Catlin Is Totally Awesome"
+    meta("http-equiv" => "Content-Type", :content => "text/html; charset=utf-8")
+  end
+  body do
+    # You're In my house now!
+    div :class => "header" do
+      self << %|Yes, ladies and gentileman. He is just that egotistical.
+      Fantastic! This should be multi-line output
+      The question is if this would translate! Ahah!|
+      self << 1 + 9 + 8 + 2 #numbers should work and this should be ignored
+    end
+    div(:id => "body") { self << "Quotes should be loved! Just like people!"}
+    120.times do |number|
+      number
+    end
+    self << "Wow.|"
+    p do
+      self << "Holy cow        " + 
+        "multiline       " +       
+        "tags!           " + 
+        "A pipe (|) even!"   
+      self << [1, 2, 3].collect { |n| "PipesIgnored|" }
+      self << [1, 2, 3].collect { |n|     
+          n.to_s                    
+        }.join("|")                
+    end
+    div(:class => "silent") do
+      foo = String.new
+      foo << "this"
+      foo << " shouldn't"
+      foo << " evaluate"
+      self << foo + " but now it should!"
+      # Woah crap a comment!
+    end
+    # That was a line that shouldn't close everything.
+    ul(:class => "really cool") do
+      ('a'..'f').each do |a|
+        li a
+      end
+    end
+    div((@should_eval = "with this text"), :id => "combo", :class => "of_divs_with_underscore")
+    [ 104, 101, 108, 108, 111 ].map do |byte|
+      byte.chr
+    end
+    div(:class => "footer") do
+      strong("This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works", :class => "shout")
+    end
+  end
+end

data/test/haml/results/eval_suppressed.xhtml

@@ -1,4 +1,7 @@
-<p></p>
+<p>
+</p>
+<p>
+</p>
 <h1>Me!</h1>
 <div id='foo'>
   <p id='bar'>All</p>

data/test/haml/results/helpers.xhtml

@@ -45,15 +45,23 @@
 click
 <a href='thing'>here</a>.
 <p>baz</p>
-                  <p>boom</p>
+                    <p>boom</p>
 foo
 <p>
-  <form action="hello/world" method="post">
+  <form action="" method="post">
 </p>
-<form action="heeheeaform" method="post">
+<form action="" method="post">
   <div><input name="commit" type="submit" value="save" /></div>
+  <p>
+    @foo =
+    value one
+  </p>
+  <p>
+    @foo =
+    value three
+  </p>
 </form>
-<form action="article_url" method="post">
+<form action="" method="post">
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:
@@ -82,3 +90,6 @@ foo
     </td>
   </tr>
 </table>
+<hr />
+<div>
+</div>

data/test/haml/results/just_stuff.xhtml

@@ -10,6 +10,13 @@
 Embedded? false!
 Embedded? true!
 Embedded? true!
+Embedded? twice! true!
+Embedded? one af"t"er another!
+<p>Embedded? false!</p>
+<p>Embedded? true!</p>
+<p>Embedded? true!</p>
+<p>Embedded? twice! true!</p>
+<p>Embedded? one af"t"er another!</p>
 <div class='render'><em>wow!</em></div>
 stuff followed by whitespace
 <strong>block with whitespace</strong>
@@ -29,7 +36,8 @@ stuff followed by whitespace
   <strong>there can even be sub-tags!</strong>
   Or script!
 -->
-<p>class attribute shouldn't appear!</p>
+<p class=''>class attribute should appear!</p>
+<p>this attribute shouldn't appear</p>
 <!--[if lte IE6]> conditional comment! <![endif]-->
 <!--[if gte IE7]> 
   <p>Block conditional comment</p>

data/test/haml/results/standard.xhtml

@@ -6,7 +6,6 @@
   </head>
   <body>
     <!-- You're In my house now! -->
-foo
     <div class='header'>
       Yes, ladies and gentileman. He is just that egotistical.
       Fantastic! This should be multi-line output

data/test/haml/rhtml/_av_partial_1.rhtml

@@ -0,0 +1,12 @@
+<h2>This is a pretty complicated partial</h2>
+<div class="partial">
+  <p>It has several nested partials,</p>
+  <ul>
+    <% 5.times do %>
+      <li>
+        <strong>Partial:</strong>
+        <% @nesting = 5 %>
+        <%= render :partial => 'haml/rhtml/av_partial_2' %>
+    <% end %>
+  </ul>
+</div>

data/test/haml/rhtml/_av_partial_2.rhtml

@@ -0,0 +1,8 @@
+<% @nesting -= 1 %>
+<div class="partial" level="<%= @nesting %>">
+  <h3>This is a crazy deep-nested partial.</h3>
+  <p>Nesting level <%= @nesting %></p>
+  <% if @nesting > 0 %>
+    <%= render :partial => 'haml/rhtml/av_partial_2' %>
+  <% end %>
+</div>

data/test/haml/rhtml/action_view.rhtml

@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US'>
+  <head>
+    <title>Hampton Catlin Is Totally Awesome</title>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
+  </head>
+  <body>
+    <h1>
+      This is very much like the standard template,
+      except that it has some ActionView-specific stuff.
+      It's only used for benchmarking.
+    </h1>
+    <div class="crazy_partials">
+      <%= render :partial => 'haml/rhtml/av_partial_1' %>
+    </div>
+    <!-- You're In my house now! -->
+    <div class='header'>
+      Yes, ladies and gentileman. He is just that egotistical.
+      Fantastic! This should be multi-line output
+      The question is if this would translate! Ahah!
+      <%= 1 + 9 + 8 + 2 %>
+      <%# numbers should work and this should be ignored %>
+    </div>
+    <% 120.times do |number| -%>
+      <%= number %>
+    <% end -%>
+    <div id='body'><%= " Quotes should be loved! Just like people!" %></div>
+    Wow.
+    <p>
+      <%= "Holy cow        " +
+          "multiline       " +
+          "tags!           " +
+          "A pipe (|) even!"  %>
+      <%= [1, 2, 3].collect { |n| "PipesIgnored|" } %>
+      <%= [1, 2, 3].collect { |n|
+          n.to_s
+        }.join("|") %>
+    </p>
+    <div class='silent'>
+      <% foo = String.new
+         foo << "this"
+         foo << " shouldn't"
+         foo << " evaluate" %>
+      <%= foo + "but now it should!" %>
+      <%# Woah crap a comment! %>
+    </div>
+    <ul class='really cool'>
+      <% ('a'..'f').each do |a|%>
+      <li><%= a %>
+      <% end %>
+    <div class='of_divs_with_underscore' id='combo'><%= @should_eval = "with this text" %></div>
+    <%= [ 104, 101, 108, 108, 111 ].map do |byte|
+      byte.chr
+    end %>
+    <div class='footer'>
+      <strong class='shout'>
+        <%= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid.\n" + 
+"        So, I'm just making it *really* long. God, I hope this works" %>
+      </strong>
+    </div>
+  </body>
+</html>

data/test/haml/rhtml/standard.rhtml

@@ -6,7 +6,6 @@
   </head>
   <body>
     <!-- You're In my house now! -->
-    <% concat("Foo", Proc.new {}) %>
     <div class='header'>
       Yes, ladies and gentileman. He is just that egotistical.
       Fantastic! This should be multi-line output

data/test/haml/template_test.rb

@@ -2,9 +2,7 @@
 
 require 'test/unit'
 require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
+require 'action_pack'
 
 require File.dirname(__FILE__) + '/../../lib/haml'
 require 'haml/template'
@@ -27,9 +25,13 @@ class TemplateTest < Test::Unit::TestCase
     filters }
 
   def setup
-    ActionView::Base.register_template_handler("haml", Haml::Template)
     Haml::Template.options = { :filters => { 'test'=>TestFilter } }
     @base = ActionView::Base.new(File.dirname(__FILE__) + "/templates/", {'article' => Article.new, 'foo' => 'value one'})
+    @base.send(:evaluate_assigns)
+
+    # This is used by form_for.
+    # It's usually provided by ActionController::Base.
+    def @base.protect_against_forgery?; false; end
   end
 
   def render(text)
@@ -42,18 +44,22 @@ class TemplateTest < Test::Unit::TestCase
     @result
   end
 
-  def assert_renders_correctly(name)
+  def assert_renders_correctly(name, &render_method)
+    render_method ||= proc { |name| @base.render(name) }
     test = Proc.new do |rendered|
       load_result(name).split("\n").zip(rendered.split("\n")).each_with_index do |pair, line|
         message = "template: #{name}\nline:     #{line}"
         assert_equal(pair.first, pair.last, message)
       end
     end
-    test.call(@base.render(name))
-
-    # If eval's suppressed, the partial won't render anyway :p.
-    unless Haml::Template.options[:suppress_eval]
-      test.call(@base.render(:file => "partialize", :locals => { :name => name }))
+    begin
+      test.call(render_method[name])
+    rescue ActionView::TemplateError => e
+      if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
+        puts "\nCouldn't require #{$2}; skipping a test."
+      else
+        raise e
+      end
     end
   end
 
@@ -67,6 +73,27 @@ class TemplateTest < Test::Unit::TestCase
     end
   end
 
+  def test_templates_should_render_correctly_with_render_proc
+    @@templates.each do |template|
+      assert_renders_correctly(template) do |name|
+        engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :filters => { 'test'=>TestFilter })
+        engine.render_proc(@base).call
+      end
+    end
+  end
+
+  def test_templates_should_render_correctly_with_def_method
+    @@templates.each do |template|
+      assert_renders_correctly(template) do |name|
+        method = "render_haml_" + name.gsub(/[^a-zA-Z0-9]/, '_')
+
+        engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :filters => { 'test'=>TestFilter })
+        engine.def_method(@base, method)
+        @base.send(method)
+      end
+    end
+  end
+
   def test_action_view_templates_render_correctly
     @base.instance_variable_set("@content_for_layout", 'Lorem ipsum dolor sit amet')
     assert_renders_correctly 'content_for_layout'
@@ -116,18 +143,11 @@ class TemplateTest < Test::Unit::TestCase
   end
 
   def test_exceptions_should_work_correctly
-    begin
-      Haml::Template.new(@base).render(File.dirname(__FILE__) + '/templates/breakage.haml')
-    rescue Exception => e
-      assert_equal("./test/haml/templates/breakage.haml:4", e.backtrace[0])
-    else
-      assert false
-    end
-
     begin
       render("- raise 'oops!'")
     rescue Exception => e
-      assert_equal("(haml):1", e.backtrace[0])
+      assert_equal("oops!", e.message)
+      assert_match(/^\(haml\):1/, e.backtrace[0])
     else
       assert false
     end
@@ -147,9 +167,9 @@ END
     begin
       render(template.chomp)
     rescue Exception => e
-      assert_equal("(haml):5", e.backtrace[0])
+      assert_match(/^\(haml\):5/, e.backtrace[0])
     else
       assert false
     end
-  end
+  end  
 end