haml 1.8.0 → 2.0.3

data/test/haml/template_test.rb

@@ -1,32 +1,40 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require 'rubygems'
-require 'action_pack'
-
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
 require File.dirname(__FILE__) + '/mocks/article'
 
-class TestFilter
-  def initialize(text)
-    @text = text
-  end
+module Haml::Filters::Test
+  include Haml::Filters::Base
 
-  def render
+  def render(text)
     "TESTING HAHAHAHA!"
   end
 end
 
+module Haml::Helpers
+  def test_partial(name, locals = {})
+    Haml::Engine.new(File.read(File.join(TemplateTest::TEMPLATE_PATH, "_#{name}.haml"))).render(self, locals)
+  end
+end
+
 class TemplateTest < Test::Unit::TestCase
-  @@templates = %w{       very_basic        standard    helpers
+  TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
+  TEMPLATES = %w{         very_basic        standard    helpers
     whitespace_handling   original_engine   list        helpful
     silent_script         tag_parsing       just_stuff  partials
-    filters }
+    filters               nuke_outer_whitespace         nuke_inner_whitespace }
 
   def setup
-    Haml::Template.options = { :filters => { 'test'=>TestFilter } }
-    @base = ActionView::Base.new(File.dirname(__FILE__) + "/templates/", {'article' => Article.new, 'foo' => 'value one'})
+    vars = { 'article' => Article.new, 'foo' => 'value one' }
+    
+    unless ActionView::Base.instance_methods.include? 'finder'
+      @base = ActionView::Base.new(TEMPLATE_PATH, vars)
+    else
+      # Rails 2.1.0
+      @base = ActionView::Base.new([], vars)
+      @base.finder.append_view_path(TEMPLATE_PATH)
+    end
+    
     @base.send(:evaluate_assigns)
 
     # This is used by form_for.
@@ -46,20 +54,16 @@ class TemplateTest < Test::Unit::TestCase
 
   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
+
+    load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|
+      message = "template: #{name}\nline:     #{line}"
+      assert_equal(pair.first, pair.last, message)
     end
-    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
+  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
 
@@ -67,30 +71,24 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal('', render(''))
   end
 
-  def test_templates_should_render_correctly
-    @@templates.each do |template|
+  TEMPLATES.each do |template|
+    define_method "test_template_should_render_correctly [template: #{template}] " do
       assert_renders_correctly template
     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
+    assert_renders_correctly("standard") do |name|
+      engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
+      engine.render_proc(@base).call
     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
+    assert_renders_correctly("standard") do |name|
+      engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
+      engine.def_method(@base, "render_standard")
+      @base.render_standard
     end
   end
 
@@ -122,19 +120,6 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal("2\n", render("= 1+1"))
   end
 
-  def test_rhtml_still_renders
-    # Make sure it renders normally
-    res = @base.render("../rhtml/standard")
-    assert !(res.nil? || res.empty?)
-
-    # Register Haml stuff in @base...
-    @base.render("standard") 
-
-    # Does it still render?
-    res = @base.render("../rhtml/standard")
-    assert !(res.nil? || res.empty?)
-  end
-
   def test_haml_options
     Haml::Template.options = { :suppress_eval => true }
     assert_equal({ :suppress_eval => true }, Haml::Template.options)

data/test/haml/templates/_partial.haml

@@ -2,6 +2,7 @@
   @foo = 
   = @foo
 - @foo = 'value three'
+== Toplevel? #{haml_buffer.toplevel?}
 %p
   @foo = 
   = @foo

data/test/haml/templates/filters.haml

@@ -1,9 +1,10 @@
 %style
+  - width = 5 + 17
   :sass
     p
       :border
         :style dotted
-        :width 10px
+        :width #{width}px
         :color #ff00ff
     h1
       :font-weight normal
@@ -14,20 +15,11 @@
   Not
   Print
 
-:redcloth
-  Foo
-  ===
-
-      This is preformatted!
-      Look at that!
-      Wowie-zowie!
-
-  *boldilicious!*
-
-:textile
-  h1. Yeah
-
-  _pretty much the same as above_
+%p
+  :javascript
+    function newline(str) {
+      return "\n" + str;
+    }
 
 :plain
   This
@@ -35,11 +27,31 @@
       Plain
         Text
           %strong right?
+   \#{not interpolated}
+   \\#{1 + 2}
+   \\\#{also not}
+   \\
 
-:erb
-  <% 10.times do |c| %>
-    <%= (c+97).chr %>
-  <% end %>
+- last = "noitalo"
+%p
+  %pre
+    :preserve
+      This pre is pretty deeply
+            nested.
+         Does #{"interp" + last.reverse} work?
+    :preserve
+        This one is, too.
+      Nested, that is.
+
+- num = 10
+%ul
+  :erb
+    <% num.times do |c| %>
+      <li><%= (c+97).chr %></li>
+    <% end %>
+    <% res = 178 %>
+
+.res= res
 
 :markdown
   *  Foo
@@ -48,6 +60,12 @@
 
 = "Text!"
 
+- var = "Hello"
 :ruby
-  puts "Hello, World!"
-  puts "How are you doing today?"
+  printf "%s, World!\n", var
+  print "How are you doing today?\n"
+
+:escaped
+  <div class="foo">
+    <p>I think &mdash; or do I?</p>
+  </div>

data/test/haml/templates/helpers.haml

@@ -31,10 +31,10 @@ click
 = succeed '.' do
   %a{:href=>"thing"} here
 %p baz
-- buffer.tabulation = 10
+- haml_buffer.tabulation = 10
 %p boom
 - concat "foo\n"
-- buffer.tabulation = 0
+- haml_buffer.tabulation = 0
 - def url_for(*stuff); stuff.join(' '); end
 -# The form URLs must be empty
 -# because of a weird bug that causes url_for to misbehave.
@@ -43,7 +43,7 @@ click
 - form_tag '' do
   %div= submit_tag 'save'
   - @foo = 'value one'
-  = render :partial => './partial'
+  = test_partial 'partial'
 - form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title
@@ -58,12 +58,12 @@ click
   - puts "boom"
   baz
   - puts "boom, again"
-- open :table do
-  - open :tr do
-    - open :td, {:class => 'cell'} do
-      - open :strong, "strong!"
+- haml_tag :table do
+  - haml_tag :tr do
+    - haml_tag :td, {:class => 'cell'} do
+      - haml_tag :strong, "strong!"
       - puts "data"
-    - open :td do
+    - haml_tag :td do
       - puts "more_data"
-- open :hr
-- open :div, ''
+- haml_tag :hr
+- haml_tag :div, ''

data/test/haml/templates/just_stuff.haml

@@ -19,7 +19,6 @@
 %p== Embedded? #{embedded}!
 %p== Embedded? #{"twice! #{true}"}!
 %p== Embedded? #{"one"} af"t"er #{"another"}!
-.render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"
   
 - if true
@@ -31,7 +30,6 @@
   \%p foo
   \yee\ha
 / Short comment
-/ This is a really long comment look how long it is it should be on a line of its own don't you think?
 /
   This is a block comment
   cool, huh?
@@ -75,4 +73,11 @@
 %p.qux{:class => 'quux'}[@article] Blump
 == #{"Woah inner quotes"}
 %p.dynamic_quote{:quotes => "single '", :dyn => 1 + 2}
-%p.dynamic_atomic{:dyn => 1 + 2}/
+%p.dynamic_self_closing{:dyn => 1 + 2}/
+%body
+  :plain
+    hello
+  %div
+
+    %img
+

data/test/haml/templates/nuke_inner_whitespace.haml

@@ -0,0 +1,32 @@
+%p
+  %q< Foo
+%p
+  %q{:a => 1 + 1}< Foo
+%p
+  %q<= "Foo\nBar"
+%p
+  %q{:a => 1 + 1}<= "Foo\nBar"
+%p
+  %q<
+    Foo
+    Bar
+%p
+  %q{:a => 1 + 1}<
+    Foo
+    Bar
+%p
+  %q<
+    %div
+      Foo
+      Bar
+%p
+  %q{:a => 1 + 1}<
+    %div
+      Foo
+      Bar
+
+-# Regression test
+%p
+  %q<= "foo"
+  %q{:a => 1 + 1}
+    bar

data/test/haml/templates/nuke_outer_whitespace.haml

@@ -0,0 +1,144 @@
+%p
+  %p
+    %q>
+      Foo
+%p
+  %p
+    %q{:a => 1 + 1}>
+      Foo
+%p
+  %p
+    %q> Foo
+%p
+  %p
+    %q{:a => 1 + 1}> Foo
+%p
+  %p
+    %q>
+      = "Foo"
+%p
+  %p
+    %q{:a => 1 + 1}>
+      = "Foo"
+%p
+  %p
+    %q>= "Foo"
+%p
+  %p
+    %q{:a => 1 + 1}>= "Foo"
+%p
+  %p
+    %q>
+      = "Foo\nBar"
+%p
+  %p
+    %q{:a => 1 + 1}>
+      = "Foo\nBar"
+%p
+  %p
+    %q>= "Foo\nBar"
+%p
+  %p
+    %q{:a => 1 + 1}>= "Foo\nBar"
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q> Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}> Foo
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      = "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      = "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>= "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>= "Foo"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>
+      = "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>
+      = "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q>= "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    - tab_up
+    foo
+    %q{:a => 1 + 1}>= "Foo\nBar"
+    bar
+    - tab_down
+%p
+  %p
+    %q>
+%p
+  %p
+    %q>/
+%p
+  %p
+    %q{:a => 1 + 1}>
+%p
+  %p
+    %q{:a => 1 + 1}>/

data/test/haml/templates/partials.haml

@@ -6,7 +6,7 @@
 %p
   @foo = 
   = @foo
-= render :file => "_partial.haml"
+= test_partial "partial"
 %p
   @foo = 
   = @foo

data/test/haml/templates/tag_parsing.haml

@@ -19,6 +19,3 @@
   .foo16 e
   .123 f
   .foo2u g
-%div.broken
-  %foo<{ :a => :b }
-  .foo>{ :c => :d }

data/test/haml/templates/whitespace_handling.haml

@@ -1,9 +1,9 @@
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  #flattened~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  ~ test_partial "text_area", :value => "Oneline"
+  ~ test_partial "text_area", :value => "Two\nlines"
+  #flattened~ test_partial "text_area", :value => "Two\nlines"
 .hithere
   ~ "Foo bar"
   ~ "<pre>foo bar</pre>"
@@ -15,11 +15,11 @@
   ~ ['a', 'b', 'c'].map do |a|
     - "<textarea>\n#{a}\n</textarea>"
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Oneline" })
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
-  #flattened= find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  = find_and_preserve test_partial("text_area", :value => "Oneline")
+  = find_and_preserve test_partial("text_area", :value => "Two\nlines")
+  #flattened= find_and_preserve test_partial("text_area", :value => "Two\nlines")
 .hithere
   = find_and_preserve("Foo bar")
   = find_and_preserve("<pre>foo bar</pre>")