hamlet 0.2.1 → 0.3.0

data/test/slim/test_code_evaluation.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestSlimCodeEvaluation < TestSlim
   def test_render_with_call_to_set_attributes
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world
+<p id="#{id_helper}" class="hello world">= hello_world
 }
 
     assert_html '<p class="hello world" id="notice">Hello World from @env</p>', source
@@ -11,7 +11,7 @@ p id="#{id_helper}" class="hello world" = hello_world
 
   def test_render_with_call_to_set_custom_attributes
     source = %q{
-p data-id="#{id_helper}" data-class="hello world"
+<p data-id="#{id_helper}" data-class>="hello world"
   = hello_world
 }
 
@@ -20,7 +20,7 @@ p data-id="#{id_helper}" data-class="hello world"
 
   def test_render_with_call_to_set_attributes_and_call_to_set_content
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world
+<p id="#{id_helper}" class="hello world">= hello_world
 }
 
     assert_html '<p class="hello world" id="notice">Hello World from @env</p>', source
@@ -28,7 +28,7 @@ p id="#{id_helper}" class="hello world" = hello_world
 
   def test_render_with_parameterized_call_to_set_attributes_and_call_to_set_content
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world("Hello Ruby!")
+<p id="#{id_helper}" class="hello world">= hello_world("Hello Ruby!")
 }
 
     assert_html '<p class="hello world" id="notice">Hello Ruby!</p>', source
@@ -36,7 +36,7 @@ p id="#{id_helper}" class="hello world" = hello_world("Hello Ruby!")
 
   def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
+<p id="#{id_helper}" class="hello world">= hello_world "Hello Ruby!"
 }
 
     assert_html '<p class="hello world" id="notice">Hello Ruby!</p>', source
@@ -44,7 +44,7 @@ p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
 
   def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content_2
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!", :dummy => "value"
+<p id="#{id_helper}" class="hello world">= hello_world "Hello Ruby!", :dummy => "value"
 }
 
     assert_html '<p class="hello world" id="notice">Hello Ruby!dummy value</p>', source
@@ -52,7 +52,7 @@ p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!", :dummy => "
 
   def test_hash_call_in_attribute
     source = %q{
-p id="#{hash[:a]}" Test it
+<p id="#{hash[:a]}">Test it
 }
 
     assert_html '<p id="The letter a">Test it</p>', source
@@ -60,7 +60,7 @@ p id="#{hash[:a]}" Test it
 
   def test_instance_variable_in_attribute_without_quotes
     source = %q{
-p id=@var
+<p id=#{@var}>
 }
 
     assert_html '<p id="instance"></p>', source
@@ -68,7 +68,7 @@ p id=@var
 
   def test_method_call_in_attribute_without_quotes
     source = %q{
-form action=action_path(:page, :save) method='post'
+<form action=#{action_path(:page, :save)} method='post'
 }
 
     assert_html '<form action="&#47;action-page-save" method="post"></form>', source
@@ -76,7 +76,7 @@ form action=action_path(:page, :save) method='post'
 
   def test_ruby_attribute_with_unbalanced_delimiters
     source = %q{
-div crazy=action_path('[') id="crazy_delimiters"
+<div crazy=#{action_path('[')} id="crazy_delimiters">
 }
 
     assert_html '<div crazy="&#47;action-[" id="crazy_delimiters"></div>', source
@@ -84,7 +84,7 @@ div crazy=action_path('[') id="crazy_delimiters"
 
   def test_method_call_in_delimited_attribute_without_quotes
     source = %q{
-form(action=action_path(:page, :save) method='post')
+<form action=#{action_path(:page, :save)} method='post'>
 }
 
     assert_html '<form action="&#47;action-page-save" method="post"></form>', source
@@ -92,7 +92,7 @@ form(action=action_path(:page, :save) method='post')
 
   def test_method_call_in_delimited_attribute_without_quotes2
     source = %q{
-form(method='post' action=action_path(:page, :save))
+<form method='post' action=#{action_path(:page, :save)}>
 }
 
     assert_html '<form action="&#47;action-page-save" method="post"></form>', source
@@ -100,7 +100,7 @@ form(method='post' action=action_path(:page, :save))
 
   def test_bypassing_escape_in_attribute
     source = %q{
-form action==action_path(:page, :save) method='post'
+<form action==#{action_path(:page, :save)} method='post'>
 }
 
     assert_html '<form action="/action-page-save" method="post"></form>', source
@@ -108,7 +108,7 @@ form action==action_path(:page, :save) method='post'
 
   def test_hash_call_in_attribute_without_quotes
     source = %q{
-p id=hash[:a] Test it
+<p id=#{hash[:a]}>Test it
 }
 
     assert_html '<p id="The letter a">Test it</p>', source
@@ -116,7 +116,7 @@ p id=hash[:a] Test it
 
   def test_hash_call_in_delimited_attribute
     source = %q{
-p(id=hash[:a]) Test it
+<p id=#{hash[:a]}> Test it
 }
 
     assert_html '<p id="The letter a">Test it</p>', source
@@ -124,7 +124,7 @@ p(id=hash[:a]) Test it
 
   def test_hash_call_in_attribute_with_ruby_evaluation
     source = %q{
-p id={hash[:a] + hash[:a]} Test it
+<p id=#{hash[:a] + hash[:a]}>Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -132,7 +132,7 @@ p id={hash[:a] + hash[:a]} Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation
     source = %q{
-p(id=(hash[:a] + hash[:a])) Test it
+<p id=#{hash[:a] + hash[:a]}> Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -140,7 +140,7 @@ p(id=(hash[:a] + hash[:a])) Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_2
     source = %q{
-p[id=(hash[:a] + hash[:a])] Test it
+<p id=#{hash[:a] + hash[:a]}> Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -148,7 +148,7 @@ p[id=(hash[:a] + hash[:a])] Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_3
     source = %q{
-p(id=[hash[:a] + hash[:a]]) Test it
+<p id=#{hash[:a] + hash[:a]}>Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -156,7 +156,7 @@ p(id=[hash[:a] + hash[:a]]) Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_4
     source = %q{
-p(id=[hash[:a] + hash[:a]] class=[hash[:a]]) Test it
+<p id=#{hash[:a] + hash[:a]} class=#{hash[:a]}>Test it
 }
 
     assert_html '<p class="The letter a" id="The letter aThe letter a">Test it</p>', source
@@ -164,7 +164,7 @@ p(id=[hash[:a] + hash[:a]] class=[hash[:a]]) Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_5
     source = %q{
-p(id=hash[:a] class=[hash[:a]]) Test it
+<p id=#{hash[:a]} class=#{hash[:a]}>Test it
 }
 
     assert_html '<p class="The letter a" id="The letter a">Test it</p>', source
@@ -172,7 +172,7 @@ p(id=hash[:a] class=[hash[:a]]) Test it
 
   def test_computation_in_attribute
     source = %q{
-p id=(1 + 1)*5 Test it
+<p id=#{(1 + 1)*5}>Test it
 }
 
     assert_html '<p id="10">Test it</p>', source
@@ -180,7 +180,7 @@ p id=(1 + 1)*5 Test it
 
   def test_number_type_interpolation
     source = %q{
-p = output_number
+<p>= output_number
 }
 
     assert_html '<p>1337</p>', source
@@ -188,7 +188,7 @@ p = output_number
 
   def test_ternary_operation_in_attribute
     source = %q{
-p id="#{(false ? 'notshown' : 'shown')}" = output_number
+<p id="#{(false ? 'notshown' : 'shown')}">= output_number
 }
 
     assert_html '<p id="shown">1337</p>', source
@@ -196,35 +196,35 @@ p id="#{(false ? 'notshown' : 'shown')}" = output_number
 
   def test_class_attribute_merging
     source = %{
-.alpha class="beta" Test it
+<.alpha class="beta">Test it
 }
     assert_html '<div class="alpha beta">Test it</div>', source
   end
 
   def test_class_attribute_merging_with_nil
     source = %{
-.alpha class="beta" class=nil class="gamma" Test it
+<.alpha class="beta" class=nil class="gamma">Test it
 }
     assert_html '<div class="alpha beta gamma">Test it</div>', source
   end
 
   def test_id_attribute_merging
     source = %{
-#alpha id="beta" Test it
+<#alpha id="beta">Test it
 }
     assert_html '<div id="alpha_beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '_' }
   end
 
   def test_id_attribute_merging2
     source = %{
-#alpha id="beta" Test it
+<#alpha id="beta">Test it
 }
     assert_html '<div id="alpha-beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '-' }
   end
 
   def test_boolean_attribute_false
     source = %{
-option selected=false Text
+<option selected=false>Text
 }
 
     assert_html '<option>Text</option>', source
@@ -232,7 +232,7 @@ option selected=false Text
 
   def test_boolean_attribute_true
     source = %{
-option selected=true Text
+<option selected=true>Text
 }
 
     assert_html '<option selected="selected">Text</option>', source
@@ -240,7 +240,7 @@ option selected=true Text
 
   def test_boolean_attribute_dynamic
     source = %{
-option selected=method_which_returns_true Text
+<option selected=#{method_which_returns_true}>Text
 }
 
     assert_html '<option selected="selected">Text</option>', source
@@ -248,7 +248,7 @@ option selected=method_which_returns_true Text
 
   def test_boolean_attribute_nil
     source = %{
-option selected=nil Text
+<option selected=#{nil}>Text
 }
 
     assert_html '<option>Text</option>', source
@@ -256,7 +256,7 @@ option selected=nil Text
 
   def test_boolean_attribute_string2
     source = %{
-option selected="selected" Text
+<option selected="selected">Text
 }
 
     assert_html '<option selected="selected">Text</option>', source
@@ -264,8 +264,8 @@ option selected="selected" Text
 
   def test_boolean_attribute_shortcut
     source = %{
-option(class="clazz" selected) Text
-option(selected class="clazz") Text
+<option class="clazz" selected>Text
+<option selected class="clazz">Text
 }
 
     assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
@@ -273,7 +273,7 @@ option(selected class="clazz") Text
 
   def test_array_attribute
     source = %{
-.alpha class="beta" class=[:gamma, nil, :delta, [true, false]]
+<.alpha class="beta" class=#{[:gamma, nil, :delta, [true, false]]}
 }
 
     assert_html '<div class="alpha beta gamma delta true false"></div>', source

data/test/slim/test_code_output.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestSlimCodeOutput < TestSlim
   def test_render_with_call
     source = %q{
-p
+<p
   = hello_world
 }
 
@@ -12,16 +12,17 @@ p
 
   def test_render_with_trailing_whitespace
     source = %q{
-p
+<p
   =' hello_world
 }
 
     assert_html '<p>Hello World from @env </p>', source
   end
 
+=begin
   def test_render_with_trailing_whitespace_after_tag
     source = %q{
-p=' hello_world
+<p>=' hello_world
 }
 
     assert_html '<p>Hello World from @env</p> ', source
@@ -29,7 +30,7 @@ p=' hello_world
 
   def test_no_escape_render_with_trailing_whitespace
     source = %q{
-p
+<p
   ==' hello_world
 }
 
@@ -43,10 +44,11 @@ p==' hello_world
 
     assert_html '<p>Hello World from @env</p> ', source
   end
+=end
 
   def test_render_with_conditional_call
     source = %q{
-p
+<p
   = hello_world if true
 }
 
@@ -55,7 +57,7 @@ p
 
   def test_render_with_parameterized_call
     source = %q{
-p
+<p
   = hello_world("Hello Ruby!")
 }
 
@@ -64,7 +66,7 @@ p
 
   def test_render_with_spaced_parameterized_call
     source = %q{
-p
+<p
   = hello_world "Hello Ruby!"
 }
 
@@ -73,7 +75,7 @@ p
 
   def test_render_with_spaced_parameterized_call_2
     source = %q{
-p
+<p
   = hello_world "Hello Ruby!", :dummy => "value"
 }
 
@@ -82,8 +84,8 @@ p
 
   def test_render_with_call_and_inline_text
     source = %q{
-h1 This is my title
-p
+<h1>This is my title
+<p
   = hello_world
 }
 
@@ -92,7 +94,7 @@ p
 
   def test_render_with_attribute_starts_with_keyword
     source = %q{
-p = hello_world in_keyword
+<p>= hello_world in_keyword
 }
 
     assert_html '<p>starts with keyword</p>', source
@@ -100,7 +102,7 @@ p = hello_world in_keyword
 
   def test_hash_call
     source = %q{
-p = hash[:a]
+<p>= hash[:a]
 }
 
     assert_html '<p>The letter a</p>', source
@@ -108,8 +110,8 @@ p = hash[:a]
 
   def test_tag_output_without_space
     source = %q{
-p= hello_world
-p=hello_world
+<p>= hello_world
+<p>=hello_world
 }
 
     assert_html '<p>Hello World from @env</p><p>Hello World from @env</p>', source
@@ -117,8 +119,8 @@ p=hello_world
 
   def test_class_output_without_space
     source = %q{
-.test=hello_world
-#test==hello_world
+<.test>=hello_world
+<#test>==hello_world
 }
 
     assert_html '<div class="test">Hello World from @env</div><div id="test">Hello World from @env</div>', source
@@ -126,8 +128,8 @@ p=hello_world
 
   def test_attribute_output_without_space
     source = %q{
-p id="test"=hello_world
-p(id="test")==hello_world
+<p id="test">=hello_world
+<p id="test">==hello_world
 }
 
     assert_html '<p id="test">Hello World from @env</p><p id="test">Hello World from @env</p>', source
@@ -136,7 +138,7 @@ p(id="test")==hello_world
   def test_render_with_backslash_end
 # Keep trailing spaces!
     source = %q{
-p = \  
+<p>= \  
 "Hello" + \  
 " Ruby!"
 - variable = 1 + \
@@ -151,7 +153,7 @@ p = \
 
   def test_render_with_no_trailing_character
     source = %q{
-p
+<p>
   = hello_world}
 
     assert_html '<p>Hello World from @env</p>', source

data/test/slim/test_code_structure.rb

@@ -3,11 +3,11 @@ require 'helper'
 class TestSlimCodeStructure < TestSlim
   def test_render_with_conditional
     source = %q{
-div
+<div
   - if show_first?
-      p The first paragraph
+      <p>The first paragraph
   - else
-      p The second paragraph
+      <p>The second paragraph
 }
 
     assert_html '<div><p>The second paragraph</p></div>', source
@@ -15,11 +15,11 @@ div
 
   def test_render_with_consecutive_conditionals
     source = %q{
-div
+<div>
   - if show_first? true
-      p The first paragraph
+      <p>The first paragraph
   - if show_first? true
-      p The second paragraph
+      <p>The second paragraph
 }
 
     assert_html '<div><p>The first paragraph</p><p>The second paragraph</p></div>', source
@@ -27,11 +27,11 @@ div
 
   def test_render_with_parameterized_conditional
     source = %q{
-div
+<div
   - if show_first? false
-      p The first paragraph
+      <p>The first paragraph
   - else
-      p The second paragraph
+      <p>The second paragraph
 }
 
     assert_html '<div><p>The second paragraph</p></div>', source
@@ -39,9 +39,9 @@ div
 
   def test_render_with_conditional_and_following_nonconditonal
     source = %q{
-div
+<div
   - if true
-      p The first paragraph
+      <p>The first paragraph
   - var = 42
   = var
 }
@@ -51,7 +51,7 @@ div
 
   def test_render_with_inline_condition
     source = %q{
-p = hello_world if true
+<p>= hello_world if true
 }
 
     assert_html '<p>Hello World from @env</p>', source
@@ -59,13 +59,13 @@ p = hello_world if true
 
   def test_render_with_case
     source = %q{
-p
+<p>
   - case 42
   - when 41
-    | 1
+    1
   - when 42
-    | 42
-  |  is the answer
+    42
+  > is the answer
 }
 
     assert_html '<p>42 is the answer</p>', source
@@ -73,10 +73,10 @@ p
 
   def test_render_with_slim_comments
     source = %q{
-p Hello
-/ This is a comment
-  Another comment
-p World
+<p>Hello
+# This is a comment
+# Another comment
+<p>World
 }
 
     assert_html '<p>Hello</p><p>World</p>', source
@@ -84,7 +84,7 @@ p World
 
   def test_render_with_yield
     source = %q{
-div
+<div
   == yield :menu
 }