haml 3.2.0.alpha.10 → 3.2.0.alpha.13

data/test/{haml/html2haml_test.rb → html2haml_test.rb}

@@ -1,9 +1,8 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/html2haml/erb_tests'
+require 'test_helper'
+require 'html2haml/erb_tests'
 require 'haml/html'
 
-class Html2HamlTest < Test::Unit::TestCase
+class Html2HamlTest < MiniTest::Unit::TestCase
   def test_empty_render_should_remain_empty
     assert_equal '', render('')
   end
@@ -41,6 +40,13 @@ class Html2HamlTest < Test::Unit::TestCase
       render('<meta http-equiv="Content-Type" content="text/html" />'))
   end
 
+  def test_should_have_html_style_attributes
+    assert_equal('%input(name="login" type="text")/',
+      render('<input type="text" name="login" />', :html_style_attributes => true))
+    assert_equal('%meta(content="text/html" http-equiv="Content-Type")/',
+      render('<meta http-equiv="Content-Type" content="text/html" />', :html_style_attributes => true))
+  end
+
   def test_class_with_dot_and_hash
     assert_equal('%div{:class => "foo.bar"}', render("<div class='foo.bar'></div>"))
     assert_equal('%div{:class => "foo#bar"}', render("<div class='foo#bar'></div>"))
@@ -295,7 +301,7 @@ HTML
 
   # Encodings
 
-  unless Haml::Util.ruby1_8?
+  unless RUBY_VERSION < "1.9"
     def test_encoding_error
       render("foo\nbar\nb\xFEaz".force_encoding("utf-8"))
       assert(false, "Expected exception")

data/test/{haml/results → results}/silent_script.xhtml

@@ -50,7 +50,7 @@
     <li>z</li>
   </ul>
   <h1>I can catch errors!</h1>
-  Oh no! "undefined method `silly' for String:Class" happened!
+  Oh no! "foo" happened!
   <p>
     "false" is:
     false

data/test/{haml/results → results}/whitespace_handling.xhtml

@@ -1,28 +1,26 @@
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-    <textarea>Oneline</textarea>
-  </div>
-  <textarea>BLAH
-  </textarea>
+  <textarea>Oneline</textarea>
+</div>
+<textarea>BLAH
+</textarea>
   <div class='text_area_test_area'>
-    <textarea>Two&#x000A;lines</textarea>
-  </div>
-  <textarea>BLAH
-  </textarea>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH
+</textarea>
   <div class='text_area_test_area'>
-    <textarea>Oneline</textarea>
-  </div>
-  <textarea>BLAH</textarea>
+  <textarea>Oneline</textarea>
+</div>
+<textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-    <textarea>Two&#x000A;lines</textarea>
-  </div>
-  <textarea>BLAH</textarea>
-  <div id='flattened'>
-    <div class='text_area_test_area'>
-      <textarea>Two&#x000A;lines</textarea>
-    </div>
-    <textarea>BLAH</textarea>
-  </div>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH</textarea>
+  <div id='flattened'><div class='text_area_test_area'>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH</textarea></div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -30,42 +28,40 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-    foo
-    bar
-  </p>
+        foo
+        bar
+      </p>
 </div>
 <div class='foo'>
   13
-    <textarea>
-  a
-  </textarea>
+        <textarea>
+      a
+      </textarea>
 <textarea>&#x000A;a</textarea>
 </div>
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-    <textarea>Oneline</textarea>
-  </div>
-  <textarea>BLAH
-  </textarea>
+  <textarea>Oneline</textarea>
+</div>
+<textarea>BLAH
+</textarea>
   <div class='text_area_test_area'>
-    <textarea>Two&#x000A;lines</textarea>
-  </div>
-  <textarea>BLAH
-  </textarea>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH
+</textarea>
   <div class='text_area_test_area'>
-    <textarea>Oneline</textarea>
-  </div>
-  <textarea>BLAH</textarea>
+  <textarea>Oneline</textarea>
+</div>
+<textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-    <textarea>Two&#x000A;lines</textarea>
-  </div>
-  <textarea>BLAH</textarea>
-  <div id='flattened'>
-    <div class='text_area_test_area'>
-      <textarea>Two&#x000A;lines</textarea>
-    </div>
-    <textarea>BLAH</textarea>
-  </div>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH</textarea>
+  <div id='flattened'><div class='text_area_test_area'>
+  <textarea>Two&#x000A;lines</textarea>
+</div>
+<textarea>BLAH</textarea></div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -73,9 +69,9 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-    foo
-    bar
-  </p>
+            foo
+            bar
+          </p>
   <pre>                                                 ___&#x000A;                                              ,o88888&#x000A;                                           ,o8888888'&#x000A;                     ,:o:o:oooo.        ,8O88Pd8888"&#x000A;                 ,.::.::o:ooooOoOoO. ,oO8O8Pd888'"&#x000A;               ,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"&#x000A;              , ..:.::o:ooOoOOOO8OOOOo.FdO8O8"&#x000A;             , ..:.::o:ooOoOO8O888O8O,COCOO"&#x000A;            , . ..:.::o:ooOoOOOO8OOOOCOCO"&#x000A;             . ..:.::o:ooOoOoOO8O8OCCCC"o&#x000A;                . ..:.::o:ooooOoCoCCC"o:o&#x000A;                . ..:.::o:o:,cooooCo"oo:o:&#x000A;             `   . . ..:.:cocoooo"'o:o:::'&#x000A;             .`   . ..::ccccoc"'o:o:o:::'&#x000A;            :.:.    ,c:cccc"':.:.:.:.:.'&#x000A;          ..:.:"'`::::c:"'..:.:.:.:.:.'  http://www.chris.com/ASCII/&#x000A;        ...:.'.:.::::"'    . . . . .'&#x000A;       .. . ....:."' `   .  . . ''&#x000A;     . . . ...."'&#x000A;     .. . ."'     -hrr-&#x000A;    .&#x000A;&#x000A;&#x000A;                                              It's a planet!&#x000A;%strong This shouldn't be bold!</pre>
   <strong>This should!</strong>
   <textarea>      ___           ___           ___           ___ &#x000A;     /\__\         /\  \         /\__\         /\__\&#x000A;    /:/  /        /::\  \       /::|  |       /:/  /&#x000A;   /:/__/        /:/\:\  \     /:|:|  |      /:/  / &#x000A;  /::\  \ ___   /::\~\:\  \   /:/|:|__|__   /:/  /  &#x000A; /:/\:\  /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/   &#x000A; \/__\:\/:/  / \/__\:\/:/  / \/__/~~/:/  / \:\  \   &#x000A;      \::/  /       \::/  /        /:/  /   \:\  \  &#x000A;      /:/  /        /:/  /        /:/  /     \:\  \ &#x000A;     /:/  /        /:/  /        /:/  /       \:\__\&#x000A;     \/__/         \/__/         \/__/         \/__/&#x000A;     &#x000A;     Many&#x000A;                   thanks&#x000A;           to&#x000A;                                http://www.network-science.de/ascii/
@@ -86,4 +82,4 @@
 </div>
 <pre>       __     ______        __               ______&#x000A;.----.|  |--.|__    |.----.|  |--..--------.|  __  |&#x000A;|  __||     ||__    ||  __||    < |        ||  __  |&#x000A;|____||__|__||______||____||__|__||__|__|__||______|</pre>
 <pre>foo
-bar</pre>
+bar</pre>

data/test/{haml/template_test.rb → template_test.rb}

@@ -1,7 +1,5 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
-require 'sass/plugin'
-require File.dirname(__FILE__) + '/mocks/article'
+require 'test_helper'
+require 'mocks/article'
 
 require 'action_pack/version'
 
@@ -30,7 +28,7 @@ class DummyController
   def initialize
     @logger = Egocentic.new
   end
-    
+
   def self.controller_path
     ''
   end
@@ -40,12 +38,12 @@ class DummyController
   end
 end
 
-class TemplateTest < Test::Unit::TestCase
+class TemplateTest < MiniTest::Unit::TestCase
   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               nuke_outer_whitespace         nuke_inner_whitespace
+  TEMPLATES = %w{          very_basic        standard    helpers
+    whitespace_handling    original_engine   list        helpful
+    silent_script          tag_parsing       just_stuff  partials
+    nuke_outer_whitespace  nuke_inner_whitespace
     render_layout }
   # partial layouts were introduced in 2.0.0
   TEMPLATES << 'partial_layout' unless ActionPack::VERSION::MAJOR < 2
@@ -54,27 +52,13 @@ class TemplateTest < Test::Unit::TestCase
     @base = create_base
 
     # filters template uses :sass
-    Sass::Plugin.options.update(:line_comments => true, :style => :compact)
+    # Sass::Plugin.options.update(:line_comments => true, :style => :compact)
   end
 
   def create_base
     vars = { 'article' => Article.new, 'foo' => 'value one' }
-    
-    unless Haml::Util.has?(:instance_method, ActionView::Base, :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
-    
-    if Haml::Util.has?(:private_method, base, :evaluate_assigns)
-      # Rails < 3.0
-      base.send(:evaluate_assigns)
-    elsif Haml::Util.has?(:private_method, base, :_evaluate_assigns_and_ivars)
-      # Rails 2.2
-      base.send(:_evaluate_assigns_and_ivars)
-    end
+
+    base = ActionView::Base.new(TEMPLATE_PATH, vars)
 
     # This is needed by RJS in (at least) Rails 3
     base.instance_variable_set('@template', base)
@@ -109,9 +93,9 @@ class TemplateTest < Test::Unit::TestCase
     Haml::Template.options[:escape_html] = false
     if ActionPack::VERSION::MAJOR < 2 ||
         (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
-      render_method ||= proc { |name| @base.render(name) }
+      render_method ||= proc { |n| @base.render(n) }
     else
-      render_method ||= proc { |name| @base.render(:file => name) }
+      render_method ||= proc { |n| @base.render(:file => n) }
     end
 
     load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|
@@ -144,7 +128,7 @@ class TemplateTest < Test::Unit::TestCase
       engine.render_proc(@base).call
     end
   end
-  
+
   def test_templates_should_render_correctly_with_def_method
     assert_renders_correctly("standard") do |name|
       engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
@@ -193,26 +177,6 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal("2\n", render("= 1+1"))
   end
 
-  unless Haml::Util.ap_geq_3?
-    def test_form_for_error_return
-      assert_raise(Haml::Error) { render(<<HAML) }
-= form_for :article, @article, :url => '' do |f|
-  Title:
-  = f.text_field :title
-  Body:
-  = f.text_field :body
-HAML
-    end
-
-    def test_form_tag_error_return
-      assert_raise(Haml::Error) { render(<<HAML) }
-= form_tag '' do
-  Title:
-  Body:
-HAML
-    end
-  end
-
   def test_haml_options
     old_options = Haml::Template.options.dup
     Haml::Template.options[:suppress_eval] = true
@@ -224,7 +188,6 @@ HAML
   end
 
   def test_with_output_buffer_with_ugly
-    return unless Haml::Util.has?(:instance_method, ActionView::Base, :with_output_buffer)
     assert_equal(<<HTML, render(<<HAML, :ugly => true))
 <p>
 foo
@@ -275,38 +238,16 @@ END
     end
   end
 
-  if defined?(ActionView::OutputBuffer) &&
-      Haml::Util.has?(:instance_method, ActionView::OutputBuffer, :append_if_string=)
-    def test_av_block_deprecation_warning
-      assert_warning(/^DEPRECATION WARNING: - style block helpers are deprecated\. Please use =\./) do
-        assert_equal <<HTML, render(<<HAML, :action_view)
-<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
-  Title:
-  <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-  Body:
-  <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-</form>
-HTML
-- form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
-  Title:
-  = f.text_field :title
-  Body:
-  = f.text_field :body
-HAML
-      end
-    end
-  end
-
   if ActionPack::VERSION::MAJOR >= 3
     # Rails 3's #label helper can take a block.
     def test_form_builder_label_with_block
       assert_equal(<<HTML, render(<<HAML, :action_view))
-<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
+<form accept-charset="UTF-8" action="" method="post">#{rails_form_opener}
   <label for="article_title">Block content
   </label>
 </form>
 HTML
-#{rails_block_helper_char} form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
+= form_for @article, :as => :article, :html => {:class => nil, :id => nil}, :url => '' do |f|
   = f.label :title do
     Block content
 HAML
@@ -379,10 +320,8 @@ HAML
       assert_equal("Foo & Bar", render('- concat(Haml::Util.html_safe("Foo & Bar"))', :action_view))
     end
 
-    if Haml::Util.has?(:instance_method, ActionView::Helpers::TextHelper, :safe_concat)
-      def test_xss_protection_with_safe_concat
-        assert_equal("Foo & Bar", render('- safe_concat "Foo & Bar"', :action_view))
-      end
+    def test_xss_protection_with_safe_concat
+      assert_equal("Foo & Bar", render('- safe_concat "Foo & Bar"', :action_view))
     end
 
     ## Regression
@@ -403,14 +342,14 @@ HAML
 
     def test_xss_protection_with_form_for
       assert_equal(<<HTML, render(<<HAML, :action_view))
-<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
+<form accept-charset="UTF-8" action="" method="post">#{rails_form_opener}
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 HTML
-#{rails_block_helper_char} form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
+= form_for @article, :as => :article, :html => {:class => nil, :id => nil}, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:

data/test/{haml/templates → templates}/_av_partial_1.haml

@@ -6,4 +6,4 @@
       %li
         %strong Partial:
         - @nesting = 5
-        = render :partial => 'haml/templates/av_partial_2'
+        = render :partial => 'templates/av_partial_2'

data/test/{haml/templates → templates}/_av_partial_1_ugly.haml

@@ -6,4 +6,4 @@
       %li
         %strong Partial:
         - @nesting = 5
-        = render :partial => 'haml/templates/av_partial_2_ugly'
+        = render :partial => 'templates/av_partial_2_ugly'

data/test/{haml/templates → templates}/_av_partial_2.haml

@@ -2,4 +2,4 @@
 .partial{:level => @nesting}
   %h3 This is a crazy deep-nested partial.
   %p== Nesting level #{@nesting}
-  = render :partial => 'haml/templates/av_partial_2' if @nesting > 0
+  = render :partial => 'templates/av_partial_2' if @nesting > 0

data/test/{haml/templates → templates}/_av_partial_2_ugly.haml

@@ -2,4 +2,4 @@
 .partial{:level => @nesting}
   %h3 This is a crazy deep-nested partial.
   %p== Nesting level #{@nesting}
-  = render :partial => 'haml/templates/av_partial_2_ugly' if @nesting > 0
+  = render :partial => 'templates/av_partial_2_ugly' if @nesting > 0

data/test/{haml/templates → templates}/action_view.haml

@@ -8,7 +8,7 @@
       This is very much like the standard template,
       except that it has some ActionView-specific stuff.
       It's only used for benchmarking.
-    .crazy_partials= render :partial => 'haml/templates/av_partial_1'
+    .crazy_partials= render :partial => 'templates/av_partial_1'
     / You're In my house now!
     .header
       Yes, ladies and gentileman. He is just that egotistical.