slim 1.3.6 → 1.3.8

data/test/core/test_code_structure.rb

@@ -104,4 +104,46 @@ div
       'This is the menu'
     end
   end
+
+  def test_render_with_begin_rescue
+    source = %q{
+- begin
+  p Begin
+- rescue
+  p Rescue
+p After
+}
+
+    assert_html '<p>Begin</p><p>After</p>', source
+  end
+
+  def test_render_with_begin_rescue_exception
+    source = %q{
+- begin
+  p Begin
+  - raise 'Boom'
+  p After Boom
+- rescue => ex
+  p = ex.message
+p After
+}
+
+    assert_html '<p>Begin</p><p>Boom</p><p>After</p>', source
+  end
+
+  def test_render_with_begin_rescue_ensure
+    source = %q{
+- begin
+  p Begin
+  - raise 'Boom'
+  p After Boom
+- rescue => ex
+  p = ex.message
+- ensure
+  p Ensure
+p After
+}
+
+    assert_html '<p>Begin</p><p>Boom</p><p>Ensure</p><p>After</p>', source
+  end
 end

data/test/core/test_embedded_engines.rb

@@ -14,6 +14,57 @@ p
     assert_html "<p><b>Hello from BEFORE ERB BLOCK!</b>\nSecond Line!\ntrue</p>", source
   end
 
+  def test_wip_render_with_asciidoc
+    source = %q{
+asciidoc:
+  == Header
+  Hello from #{"AsciiDoc!"}
+
+  #{1+2}
+
+  * one
+  * two
+}
+
+    expected = <<-EOS
+<div class="sect1">
+<h2 id="_header">Header</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Hello from AsciiDoc!</p>
+</div>
+<div class="paragraph">
+<p>3</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>one</p>
+</li>
+<li>
+<p>two</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+    EOS
+    # render, then remove blank lines and unindent the remaining lines
+    output = render(source).gsub(/^ *(\n|(?=[^ ]))/, '')
+
+    assert_equal expected, output
+
+    Slim::Embedded.with_options(:asciidoc => {:compact => true, :attributes => {'sectids!' => ''}}) do
+      # render, then unindent lines
+      output = render(source).gsub(/^ *(?=[^ ])/, '')
+      assert_equal expected.gsub('<h2 id="_header">', '<h2>'), output
+    end
+
+    # render again, then remove blank lines and unindent the remaining lines
+    output = render(source).gsub(/^ *(\n|(?=[^ ]))/, '')
+    assert_equal expected, output
+  end
+
   def test_render_with_markdown
     source = %q{
 markdown:
@@ -90,6 +141,34 @@ javascript:
     assert_html %q|<script type="text/javascript">$(function() { alert('hello'); });</script>|, source
   end
 
+  def test_render_with_javascript_with_explicit_html_comment
+    Slim::Engine.with_options(:js_wrapper => :comment) do
+      source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
+      assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
+    end
+  end
+
+  def test_render_with_javascript_with_explicit_cdata_comment
+    Slim::Engine.with_options(:js_wrapper => :cdata) do
+      source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
+      assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
+    end
+  end
+
+  def test_render_with_javascript_with_format_xhtml_comment
+    Slim::Engine.with_options(:js_wrapper => :guess, :format => :xhtml) do
+      source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
+      assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
+    end
+  end
+
+  def test_render_with_javascript_with_format_html_comment
+    Slim::Engine.with_options(:js_wrapper => :guess, :format => :html) do
+      source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
+      assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
+    end
+  end
+
   def test_render_with_ruby
     source = %q{
 ruby:

data/test/core/test_html_attributes.rb

@@ -52,6 +52,20 @@ p id=(false ? 'notshown' : 'shown') = output_number
     assert_html '<div id="alpha-beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '-' }
   end
 
+  def test_id_attribute_merging3
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_html '<div id="alpha_beta">Test it</div>', source, :merge_attrs => {'class' => ' ', 'id' => '_' }
+  end
+
+  def test_id_attribute_merging4
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_html '<div id="alpha-beta">Test it</div>', source, :merge_attrs => {'class' => ' ', 'id' => '-' }
+  end
+
   def test_boolean_attribute_false
     source = %{
 - cond=false
@@ -143,7 +157,7 @@ h1 *hash This is my title
 
   def test_closed_splat_tag
     source = %q{
-*hash / This is my title
+*hash /
 }
 
     assert_html '<div a="The letter a" b="The letter b"/>', source
@@ -231,4 +245,12 @@ p(id="marvin" class=nil nonempty=("".to_s) data-info="Illudium Q-36")= output_nu
 
     assert_html '<p data-info="Illudium Q-36" id="marvin" nonempty="">1337</p>', source
   end
+
+  def test_double_escape_warning
+    source = %q{
+a href='http://slim-lang.com?a=1&amp;b=2'
+}
+
+    assert_html '<a href="http://slim-lang.com?a=1&amp;b=2"></a>', source
+  end
 end

data/test/core/test_parser_errors.rb

@@ -149,4 +149,12 @@ html: body:/comment
 }
     assert_syntax_error "Expected tag\n  (__TEMPLATE__), Line 2, Column 11\n    html: body:/comment\n               ^\n", source
   end
+
+  def test_unexpected_text_after_closed
+    source = %{
+img / text
+}
+
+    assert_syntax_error "Unexpected text after closed tag\n  (__TEMPLATE__), Line 2, Column 6\n    img / text\n          ^\n", source
+  end
 end

data/test/core/test_pretty.rb

@@ -41,7 +41,9 @@ html
     result = %q{<!DOCTYPE html>
 <html>
   <head>
-    <title>Hello World!</title>
+    <title>
+      Hello World!
+    </title>
     <!--Meta tags
     with long explanatory
     multiline comment-->
@@ -52,24 +54,51 @@ html
     <!--Javascripts-->
     <script src="jquery.js"></script>
     <script src="jquery.ui.js"></script>
-    <!--[if lt IE 9]><script src="old-ie1.js"></script>
-    <script src="old-ie2.js"></script><![endif]-->
+    <!--[if lt IE 9]>
+    <script src="old-ie1.js"></script>
+    <script src="old-ie2.js"></script>
+    <![endif]-->
     <style type="text/css">
       body {
         background-color: red;
       }
-      </style>
+    </style>
   </head>
   <body>
     <div id="container">
-      <p>Hello
-        World!</p>
-      <p>dynamic text with
-        newline</p>
+      <p>
+        Hello
+        World!
+      </p>
+      <p>
+        dynamic text with
+        newline
+      </p>
     </div>
   </body>
 </html>}
 
     assert_html result, source
   end
+
+  def test_partials
+    body = %q{body
+  == render content}
+
+    content = %q{div
+  | content}
+
+    source = %q{html
+  == render body, :scope => self, :locals => { :content => content }}
+
+    result = %q{<html>
+  <body>
+    <div>
+      content
+    </div>
+  </body>
+</html>}
+
+    assert_html result, source, :scope => self, :locals => {:body => body, :content => content }
+  end
 end

data/test/core/test_ruby_errors.rb

@@ -161,7 +161,9 @@ p
   - test = 123
     = "Hello from within a block! "
 }
-    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+    # FIXME: Tilt add stupid end;end;end at the end, this leads to wrong line numbers
+    # See also #342
+    assert_ruby_syntax_error "(__TEMPLATE__):7", source
   end
 
   def test_invalid_nested_output
@@ -170,7 +172,9 @@ p
   = "Hello Ruby!"
     = "Hello from within a block! "
 }
-    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+    # FIXME: Tilt add stupid end;end;end at the end, this leads to wrong line numbers
+    # See also #342
+    assert_ruby_syntax_error "(__TEMPLATE__):7", source
   end
 
   def test_invalid_embedded_engine

data/test/core/test_tabs.rb

@@ -0,0 +1,169 @@
+require 'helper'
+
+class TestSlimTabs < TestSlim
+
+  def teardown
+    Slim::Engine.set_default_options :tabsize => 4
+  end
+
+  def test_single_tab1_expansion
+
+    Slim::Engine.set_default_options :tabsize => 1
+
+    source = %Q{
+|
+\t0
+ \t1
+  \t2
+   \t3
+    \t4
+     \t5
+      \t6
+       \t7
+        \t8
+}
+
+    result = %q{
+0
+ 1
+  2
+   3
+    4
+     5
+      6
+       7
+        8
+}.strip
+
+    assert_html result, source
+  end
+
+  def test_single_tab4_expansion
+
+    Slim::Engine.set_default_options :tabsize => 4
+
+    source = %Q{
+|
+\t0
+ \t1
+  \t2
+   \t3
+    \t4
+     \t5
+      \t6
+       \t7
+        \t8
+}
+
+    result = %q{
+0
+1
+2
+3
+    4
+    5
+    6
+    7
+        8
+}.strip
+
+    assert_html result, source
+  end
+
+  def test_multi_tab1_expansion
+
+    Slim::Engine.set_default_options :tabsize => 1
+
+    source = %Q{
+|
+\t0
+ \t\t1
+ \t \t2
+ \t  \t3
+ \t   \t4
+  \t\t1
+  \t \t2
+  \t  \t3
+  \t   \t4
+   \t\t1
+   \t \t2
+   \t  \t3
+   \t   \t4
+    \t\t1
+    \t \t2
+    \t  \t3
+    \t   \t4
+}
+
+    result = %q{
+0
+  1
+   2
+    3
+     4
+   1
+    2
+     3
+      4
+    1
+     2
+      3
+       4
+     1
+      2
+       3
+        4
+}.strip
+
+    assert_html result, source
+  end
+
+  def test_multi_tab4_expansion
+
+    Slim::Engine.set_default_options :tabsize => 4
+
+    source = %Q{
+|
+\t0
+ \t\t1
+ \t \t2
+ \t  \t3
+ \t   \t4
+  \t\t1
+  \t \t2
+  \t  \t3
+  \t   \t4
+   \t\t1
+   \t \t2
+   \t  \t3
+   \t   \t4
+    \t\t1
+    \t \t2
+    \t  \t3
+    \t   \t4
+}
+
+    result = %q{
+0
+    1
+    2
+    3
+    4
+    1
+    2
+    3
+    4
+    1
+    2
+    3
+    4
+        1
+        2
+        3
+        4
+}.strip
+
+    assert_html result, source
+  end
+
+end