radiant 0.9.1 → 1.0.0.rc1

data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_1.rhtml → erb/_av_partial_1.erb}

@@ -6,7 +6,7 @@
       <li>
         <strong>Partial:</strong>
         <% @nesting = 5 %>
-        <%= render :partial => 'haml/rhtml/av_partial_2' %>
+        <%= render :partial => 'haml/erb/av_partial_2' %>
     <% end %>
   </ul>
 </div>

data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_2.rhtml → erb/_av_partial_2.erb}

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

data/vendor/plugins/haml/test/haml/{rhtml/action_view.rhtml → erb/action_view.erb}

@@ -11,7 +11,7 @@
       It's only used for benchmarking.
     </h1>
     <div class="crazy_partials">
-      <%= render :partial => 'haml/rhtml/av_partial_1' %>
+      <%= render :partial => 'haml/erb/av_partial_1' %>
     </div>
     <!-- You're In my house now! -->
     <div class='header'>

data/vendor/plugins/haml/test/haml/helper_test.rb

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require 'haml/template'
 
 class ActionView::Base
   def nested_tag
     content_tag(:span) {content_tag(:div) {"something"}}
   end
+
+  def wacky_form
+    form_tag("/foo") {"bar"}
+  end
 end
 
 module Haml::Helpers
@@ -119,7 +122,7 @@ HAML
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="foo" method="post">
+<form #{rails_form_attr}action="foo" method="post">#{rails_form_opener}
   <p>bar</p>
   <strong>baz</strong>
 </form>
@@ -166,9 +169,10 @@ HAML
 
   def test_content_tag_error_wrapping
     def @base.protect_against_forgery?; false; end
+    error_class = Haml::Util.ap_geq_3? ? "field_with_errors" : "fieldWithErrors"
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="" method="post">
-  <div class="fieldWithErrors"><label for="post_error_field">Error field</label></div>
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
+  <div class="#{error_class}"><label for="post_error_field">Error field</label></div>
 </form>
 HTML
 #{rails_block_helper_char} form_for #{form_for_calling_convention('post')}, :url => '' do |f|
@@ -176,6 +180,67 @@ HTML
 HAML
   end
 
+  def test_form_tag_in_helper_with_string_block
+    def @base.protect_against_forgery?; false; end
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form #{rails_form_attr}action="/foo" method="post">#{rails_form_opener}bar</form>
+HTML
+#{rails_block_helper_char} wacky_form
+HAML
+  end
+
+  def test_haml_tag_name_attribute_with_id
+    assert_equal("<p id='some_id'></p>\n", render("- haml_tag 'p#some_id'"))
+  end
+
+  def test_haml_tag_name_attribute_with_colon_id
+    assert_equal("<p id='some:id'></p>\n", render("- haml_tag 'p#some:id'"))
+  end
+
+  def test_haml_tag_without_name_but_with_id
+    assert_equal("<div id='some_id'></div>\n", render("- haml_tag '#some_id'"))
+  end
+
+  def test_haml_tag_without_name_but_with_class
+    assert_equal("<div class='foo'></div>\n", render("- haml_tag '.foo'"))
+  end
+
+  def test_haml_tag_without_name_but_with_colon_class
+    assert_equal("<div class='foo:bar'></div>\n", render("- haml_tag '.foo:bar'"))
+  end
+
+  def test_haml_tag_name_with_id_and_class
+    assert_equal("<p class='foo' id='some_id'></p>\n", render("- haml_tag 'p#some_id.foo'"))
+  end
+
+  def test_haml_tag_name_with_class
+    assert_equal("<p class='foo'></p>\n", render("- haml_tag 'p.foo'"))
+  end
+
+  def test_haml_tag_name_with_class_and_id
+    assert_equal("<p class='foo' id='some_id'></p>\n", render("- haml_tag 'p.foo#some_id'"))
+  end
+
+  def test_haml_tag_name_with_id_and_multiple_classes
+    assert_equal("<p class='foo bar' id='some_id'></p>\n", render("- haml_tag 'p#some_id.foo.bar'"))
+  end
+
+  def test_haml_tag_name_with_multiple_classes_and_id
+    assert_equal("<p class='foo bar' id='some_id'></p>\n", render("- haml_tag 'p.foo.bar#some_id'"))
+  end
+
+  def test_haml_tag_name_and_attribute_classes_merging
+    assert_equal("<p class='foo bar' id='some_id'></p>\n", render("- haml_tag 'p#some_id.foo', :class => 'bar'"))
+  end
+
+  def test_haml_tag_name_and_attribute_classes_merging
+    assert_equal("<p class='bar foo'></p>\n", render("- haml_tag 'p.foo', :class => 'bar'"))
+  end
+
+  def test_haml_tag_name_merges_id_and_attribute_id
+    assert_equal("<p id='foo_bar'></p>\n", render("- haml_tag 'p#foo', :id => 'bar'"))
+  end
+
   def test_haml_tag_attribute_html_escaping
     assert_equal("<p id='foo&amp;bar'>baz</p>\n", render("%p{:id => 'foo&bar'} baz", :escape_html => true))
   end
@@ -184,6 +249,21 @@ HAML
     assert_equal("<br class='foo' />\n", render("- haml_tag :br, :class => 'foo'"))
   end
 
+  def test_haml_tag_with_class_array
+    assert_equal("<p class='a b'>foo</p>\n", render("- haml_tag :p, 'foo', :class => %w[a b]"))
+    assert_equal("<p class='a b c d'>foo</p>\n", render("- haml_tag 'p.c.d', 'foo', :class => %w[a b]"))
+  end
+
+  def test_haml_tag_with_id_array
+    assert_equal("<p id='a_b'>foo</p>\n", render("- haml_tag :p, 'foo', :id => %w[a b]"))
+    assert_equal("<p id='c_a_b'>foo</p>\n", render("- haml_tag 'p#c', 'foo', :id => %w[a b]"))
+  end
+
+  def test_haml_tag_with_data_hash
+    assert_equal("<p data-baz='data-baz' data-foo='bar'>foo</p>\n",
+      render("- haml_tag :p, 'foo', :data => {:foo => 'bar', :baz => true}"))
+  end
+
   def test_haml_tag_non_autoclosed_tags_arent_closed
     assert_equal("<p></p>\n", render("- haml_tag :p"))
   end
@@ -208,6 +288,42 @@ HAML
     assert_raise(Haml::Error) { render("= haml_tag :p") }
   end
 
+  def test_haml_tag_with_multiline_string
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  foo
+  bar
+  baz
+</p>
+HTML
+- haml_tag :p, "foo\\nbar\\nbaz"
+HAML
+  end
+
+  def test_haml_concat_with_multiline_string
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  foo
+  bar
+  baz
+</p>
+HTML
+%p
+  - haml_concat "foo\\nbar\\nbaz"
+HAML
+  end
+
+  def test_haml_tag_with_ugly
+    assert_equal(<<HTML, render(<<HAML, :ugly => true))
+<p>
+<strong>Hi!</strong>
+</p>
+HTML
+- haml_tag :p do
+  - haml_tag :strong, "Hi!"
+HAML
+  end
+
   def test_is_haml
     assert(!ActionView::Base.new.is_haml?)
     assert_equal("true\n", render("= is_haml?"))
@@ -225,7 +341,8 @@ HAML
   end
 
   def test_indented_capture
-    assert_equal("  \n  Foo\n  ", @base.render(:inline => "  <% res = capture do %>\n  Foo\n  <% end %><%= res %>"))
+    prior = Haml::Util.ap_geq_3? ? "" : "  \n"
+    assert_equal("#{prior}  Foo\n  ", @base.render(:inline => "  <% res = capture do %>\n  Foo\n  <% end %><%= res %>"))
   end
 
   def test_capture_deals_properly_with_collections
@@ -291,14 +408,14 @@ MESSAGE
     render("%p foo\n= haml_concat 'foo'\n%p bar")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 2, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 2, e.backtrace[1].scan(/:(\d+)/).first.first.to_i
   end
 
   def test_error_return_line_in_helper
     render("- something_that_uses_haml_concat")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 13, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 16, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
   end
 
   class ActsLikeTag

data/vendor/plugins/haml/test/haml/html2haml/erb_tests.rb

@@ -0,0 +1,426 @@
+module ErbTests
+  def test_erb
+    assert_equal '- foo = bar', render_erb('<% foo = bar %>')
+    assert_equal '- foo = bar', render_erb('<% foo = bar -%>')
+    assert_equal '= h @item.title', render_erb('<%=h @item.title %>')
+    assert_equal '= h @item.title', render_erb('<%=h @item.title -%>')
+  end
+
+  def test_inline_erb
+    assert_equal("%p= foo", render_erb("<p><%= foo %></p>"))
+  end
+
+  def test_non_inline_erb
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p>
+  <%= foo %>
+</p>
+HTML
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p>
+  <%= foo %></p>
+HTML
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p><%= foo %>
+</p>
+HTML
+  end
+
+  def test_erb_in_cdata
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+:cdata
+  Foo \#{bar} baz
+HAML
+<![CDATA[Foo <%= bar %> baz]]>
+HTML
+  end
+
+  def test_erb_in_script
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+:javascript
+  function foo() {
+    return \#{foo.to_json};
+  }
+HAML
+<script type="text/javascript">
+  function foo() {
+    return <%= foo.to_json %>;
+  }
+</script>
+HTML
+  end
+
+  def test_erb_in_style
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+:css
+  foo {
+      bar: \#{"baz"};
+  }
+HAML
+<style type="text/css">
+    foo {
+        bar: <%= "baz" %>;
+    }
+</style>
+HTML
+  end
+
+  def test_erb_in_line
+    assert_equal 'foo bar #{baz}', render_erb('foo bar <%= baz %>')
+    assert_equal 'foo bar #{baz}! Bang.', render_erb('foo bar <%= baz %>! Bang.')
+  end
+
+  def test_erb_multi_in_line
+    assert_equal('foo bar #{baz}! Bang #{bop}.',
+      render_erb('foo bar <%= baz %>! Bang <%= bop %>.'))
+    assert_equal('foo bar #{baz}#{bop}!',
+      render_erb('foo bar <%= baz %><%= bop %>!'))
+  end
+
+  def test_erb_with_html_special_chars
+    assert_equal '= 3 < 5 ? "OK" : "Your computer is b0rken"',
+      render_erb('<%= 3 < 5 ? "OK" : "Your computer is b0rken" %>')
+  end
+
+  def test_erb_in_class_attribute
+    assert_equal "%div{:class => dyna_class} I have a dynamic attribute",
+      render_erb('<div class="<%= dyna_class %>">I have a dynamic attribute</div>')
+  end
+
+  def test_erb_in_id_attribute
+    assert_equal "%div{:id => dyna_id} I have a dynamic attribute",
+      render_erb('<div id="<%= dyna_id %>">I have a dynamic attribute</div>')
+  end
+
+  def test_erb_in_attribute_results_in_string_interpolation
+    assert_equal('%div{:id => "item_#{i}"} Ruby string interpolation FTW',
+      render_erb('<div id="item_<%= i %>">Ruby string interpolation FTW</div>'))
+  end
+
+  def test_erb_in_attribute_with_trailing_content
+    assert_equal('%div{:class => "#{12}!"} Bang!',
+      render_erb('<div class="<%= 12 %>!">Bang!</div>'))
+  end
+
+  def test_erb_in_html_escaped_attribute
+    assert_equal '%div{:class => "foo"} Bang!',
+      render_erb('<div class="<%= "foo" %>">Bang!</div>')
+  end
+
+  def test_erb_in_attribute_to_multiple_interpolations
+    assert_equal('%div{:class => "#{12} + #{13}"} Math is super',
+      render_erb('<div class="<%= 12 %> + <%= 13 %>">Math is super</div>'))
+  end
+
+  def test_whitespace_eating_erb_tags
+    assert_equal '- form_for', render_erb('<%- form_for -%>')
+  end
+
+  def test_interpolation_in_erb
+    assert_equal('= "Foo #{bar} baz"', render_erb('<%= "Foo #{bar} baz" %>'))
+  end
+
+  def test_interpolation_in_erb_attrs
+    assert_equal('%p{:foo => "#{bar} baz"}',
+      render_erb('<p foo="<%= "#{bar} baz" %>"></p>'))
+  end
+
+  def test_multiline_erb_silent_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  - foo
+  - bar
+  - baz
+  %p foo
+HAML
+<div class="blah">
+  <%
+    foo
+    bar
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_erb_loud_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +            |
+      bar.baz.bang + |
+    baz              |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+      bar.baz.bang +
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_weirdly_indented_multiline_erb_loud_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+  bar.baz.bang +
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_two_multiline_erb_loud_scripts
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  -#
+  = foo.bar do |
+      bang     |
+    end        |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+    bar.baz.bang +
+    baz
+  %>
+  <%= foo.bar do
+        bang
+      end %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_then_single_line_erb_loud_scripts
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  = foo.bar
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+    bar.baz.bang +
+    baz
+  %>
+  <%= foo.bar %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_erb_but_really_single_line
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  ### Block Parsing
+
+  def test_block_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  %p bar
+HAML
+<% foo do %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_args
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do |a, b, c|
+  %p bar
+HAML
+<% foo do |a, b, c| %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_equals
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+= foo do
+  %p bar
+HAML
+<%= foo do %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_modified_end
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  blah
+- end.bip
+HAML
+<% foo do %>
+  blah
+<% end.bip %>
+ERB
+  end
+
+  def test_block_parsing_with_modified_end_with_block
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  blah
+- end.bip do
+  brang
+HAML
+<% foo do %>
+  blah
+<% end.bip do %>
+  brang
+<% end %>
+ERB
+  end
+
+  def test_multiline_block_opener
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo bar
+- baz bang
+- biddle do
+  foo
+HAML
+<% foo bar
+  baz bang
+  biddle do %>
+    foo
+<% end %>
+ERB
+  end
+
+  def test_if_elsif_else_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- if foo
+  %p bar
+- elsif bar.foo("zip")
+  #bang baz
+- else
+  %strong bibble
+HAML
+<% if foo %>
+  <p>bar</p>
+<% elsif bar.foo("zip") %>
+  <div id="bang">baz</div>
+<% else %>
+  <strong>bibble</strong>
+<% end %>
+ERB
+  end
+
+  def test_case_when_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- case foo.bar
+- when "bip"
+  %p bip
+- when "bop"
+  %p BOP
+- when bizzle.bang.boop.blip
+  %em BIZZLE BANG BOOP BLIP
+HAML
+<% case foo.bar %>
+<% when "bip" %>
+  <p>bip</p>
+<% when "bop" %>
+  <p>BOP</p>
+<% when bizzle.bang.boop.blip %>
+  <em>BIZZLE BANG BOOP BLIP</em>
+<% end %>
+ERB
+
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- case foo.bar
+- when "bip"
+  %p bip
+- when "bop"
+  %p BOP
+- when bizzle.bang.boop.blip
+  %em BIZZLE BANG BOOP BLIP
+HAML
+<% case foo.bar
+   when "bip" %>
+  <p>bip</p>
+<% when "bop" %>
+  <p>BOP</p>
+<% when bizzle.bang.boop.blip %>
+  <em>BIZZLE BANG BOOP BLIP</em>
+<% end %>
+ERB
+  end
+
+  def test_begin_rescue_ensure
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- begin
+  %p a
+- rescue FooException => e
+  %p b
+- ensure
+  %p c
+HAML
+<% begin %>
+  <p>a</p>
+<% rescue FooException => e %>
+  <p>b</p>
+<% ensure %>
+  <p>c</p>
+<% end %>
+ERB
+  end
+
+  # Regression
+
+  def test_tag_inside_block
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+%table
+  - foo.each do
+    %tr
+HAML
+<table>
+  <% foo.each do %>
+    <tr></tr>
+  <% end %>
+</table>
+ERB
+  end
+end