slim 1.3.9 → 2.0.0

data/test/core/test_html_attributes.rb

@@ -41,25 +41,11 @@ p id=(false ? 'notshown' : 'shown') = output_number
   def test_id_attribute_merging
     source = %{
 #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
-}
-    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
+  def test_id_attribute_merging2
     source = %{
 #alpha id="beta" Test it
 }
@@ -122,6 +108,14 @@ option(selected class="clazz") Text
     assert_html '<div class="alpha beta gamma delta true false"></div><div class="alpha beta gamma"></div>', source
   end
 
+  def test_hyphenated_attribute
+    source = %{
+.alpha data={:a => 'alpha', :b => 'beta', :c_d => 'gamma', :c => {:e => 'epsilon'}}
+}
+
+    assert_html '<div class="alpha" data-a="alpha" data-b="beta" data-c-d="gamma" data-c-e="epsilon"></div>', source
+  end
+
   def test_shortcut_splat
     source = %q{
 *hash This is my title
@@ -132,12 +126,20 @@ option(selected class="clazz") Text
 
   def test_splat
     source = %q{
-h1 *hash This is my title
+h1 *hash class=[] This is my title
 }
 
     assert_html '<h1 a="The letter a" b="The letter b">This is my title</h1>', source
   end
 
+  def test_closed_splat
+    source = %q{
+*hash /
+}
+
+    assert_html '<div a="The letter a" b="The letter b" />', source
+  end
+
   def test_splat_tag_name
     source = %q{
 *{:tag => 'h1', :id => 'title'} This is my title
@@ -160,7 +162,7 @@ h1 *hash This is my title
 *hash /
 }
 
-    assert_html '<div a="The letter a" b="The letter b"/>', source
+    assert_html '<div a="The letter a" b="The letter b" />', source
   end
 
   def test_splat_with_id_shortcut
@@ -245,12 +247,4 @@ 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_html_escaping.rb

@@ -43,8 +43,16 @@ p class="#{x}" test #{content}
 p id="&" class=="&"
 }
 
-    assert_html '<p class="&amp;" id="&"></p>', source
-    assert_html '<p class="&amp;" id="&amp;"></p>', source, :escape_quoted_attrs => true
+    assert_html '<p class="&amp;" id="&amp;"></p>', source
+  end
+
+  def test_html_quoted_attr_escape_with_interpolation
+    source = %q{
+p id="&#{'"'}" class=="&amp;#{'"'}"
+p id="&#{{'"'}}" class=="&amp;#{{'"'}}"
+}
+
+    assert_html '<p class="&amp;&quot;" id="&amp;&quot;"></p><p class="&amp;"" id="&amp;""></p>', source
   end
 
   def test_html_ruby_attr_escape

data/test/core/test_html_structure.rb

@@ -358,7 +358,7 @@ p<id="marvin"
 class="martian"
  data-info="Illudium Q-36"> = output_number
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
     end
@@ -370,7 +370,7 @@ p<id="marvin"
   class="martian"
  data-info="Illudium Q-36"> THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -383,7 +383,7 @@ p<id="marvin"
 data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -396,7 +396,7 @@ p<id=id_helper
   data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
     end
@@ -410,7 +410,7 @@ p<id=id_helper
   span.emphasis THE
   |  space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
     end
@@ -423,7 +423,7 @@ li< id="myid"
 data-info="myinfo">
   a href="link" My Link
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
     end

data/test/core/test_parser_errors.rb

@@ -109,7 +109,7 @@ p
   img{src= }
 }
 
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3, Column 10\n    img{src= }\n            ^\n", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3, Column 11\n    img{src= }\n             ^\n", source
   end
 
   def test_invalid_empty_attribute2

data/test/core/test_ruby_errors.rb

@@ -161,9 +161,7 @@ p
   - test = 123
     = "Hello from within a block! "
 }
-    # 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
+    assert_ruby_syntax_error "(__TEMPLATE__):3", source
   end
 
   def test_invalid_nested_output
@@ -172,9 +170,7 @@ p
   = "Hello Ruby!"
     = "Hello from within a block! "
 }
-    # 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
+    assert_ruby_syntax_error "(__TEMPLATE__):3", source
   end
 
   def test_invalid_embedded_engine

data/test/core/test_thread_options.rb

@@ -5,14 +5,14 @@ class TestSlimThreadOptions < TestSlim
     source = %q{p.test}
 
     assert_html '<p class="test"></p>', source
-    assert_html "<p class='test'></p>", source, :attr_wrapper => "'"
+    assert_html "<p class='test'></p>", source, :attr_quote => "'"
 
-    Slim::Engine.with_options(:attr_wrapper => "'") do
+    Slim::Engine.with_options(:attr_quote => "'") do
       assert_html "<p class='test'></p>", source
-      assert_html '<p class="test"></p>', source, :attr_wrapper => '"'
+      assert_html '<p class="test"></p>', source, :attr_quote => '"'
     end
 
     assert_html '<p class="test"></p>', source
-    assert_html "<p class='test'></p>", source, :attr_wrapper => "'"
+    assert_html "<p class='test'></p>", source, :attr_quote => "'"
   end
 end

data/test/core/test_unicode.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+if ''.respond_to?(:encoding)
+  require 'helper'
+
+  class TestSlimUnicode < TestSlim
+    def test_unicode_tags
+      source = "Статья года"
+      result = "<Статья>года</Статья>"
+      assert_html result, source
+    end
+
+    def test_unicode_attrs
+      source = "Статья года=123 content"
+      result = "<Статья года=\"123\">content</Статья>"
+      assert_html result, source
+    end
+  end
+end

data/test/literate/TESTS.md

@@ -260,6 +260,74 @@ renders as
 Hello, World!
 ~~~
 
+You can also write loops like this
+
+~~~ slim
+- items = [{:name => 'table', :price => 10}, {:name => 'chair', :price => 5}]
+table#items
+  - for item in items do
+    tr
+      td.name = item[:name]
+      td.price = item[:price]
+~~~
+
+which renders as
+
+~~~ html
+<table id="items">
+  <tr>
+    <td class="name">
+      table
+    </td>
+    <td class="price">
+      10
+    </td>
+  </tr>
+  <tr>
+    <td class="name">
+      chair
+    </td>
+    <td class="price">
+      5
+    </td>
+  </tr>
+</table>
+~~~
+
+The `do` keyword can be omitted.
+
+~~~ slim
+- items = [{:name => 'table', :price => 10}, {:name => 'chair', :price => 5}]
+table#items
+  - for item in items
+    tr
+      td.name = item[:name]
+      td.price = item[:price]
+~~~
+
+which renders as
+
+~~~ html
+<table id="items">
+  <tr>
+    <td class="name">
+      table
+    </td>
+    <td class="price">
+      10
+    </td>
+  </tr>
+  <tr>
+    <td class="name">
+      chair
+    </td>
+    <td class="price">
+      5
+    </td>
+  </tr>
+</table>
+~~~
+
 ### Output `=`
 
 The equal sign `=` produces dynamic output.
@@ -334,9 +402,19 @@ renders as
 <script>evil();</script>
 ~~~
 
-### Output with trailing white space `='`
+The equal sign with modifier `=>` produces dynamic output with a trailing white space.
 
-The equal sign with apostrophe `='` produces dynamic output with a trailing white space.
+~~~ slim
+=> 7*7
+~~~
+
+renders as
+
+~~~ html
+49 
+~~~
+
+The legacy syntax `='` is also supported.
 
 ~~~ slim
 =' 7*7
@@ -348,6 +426,30 @@ renders as
 49 
 ~~~
 
+The equal sign with modifier `=<` produces dynamic output with a leading white space.
+
+~~~ slim
+=< 7*7
+~~~
+
+renders as
+
+~~~ html
+ 49
+~~~
+
+The equal sign with modifiers `=<>` produces dynamic output with a leading and trailing white space.
+
+~~~ slim
+=<> 7*7
+~~~
+
+renders as
+
+~~~ html
+ 49 
+~~~
+
 ### Output without HTML escaping `==`
 
 The double equal sign `==` produces dynamic output without HTML escaping.
@@ -380,10 +482,19 @@ renders as
 <script>evil();</script>
 ~~~
 
-### Output without HTML escaping and trailing ws `=='`
+The double equal sign with modifier `==>` produces dynamic output without HTML escaping and trailing white space.
+
+~~~ slim
+==> '<script>evil();</script>'
+~~~
+
+renders as
 
+~~~ html
+<script>evil();</script> 
+~~~
 
-The double equal sign with apostrophe `=='` produces dynamic output without HTML escaping and trailing white space.
+The legacy syntax `=='` is also supported.
 
 ~~~ slim
 ==' '<script>evil();</script>'
@@ -590,6 +701,64 @@ renders as
 <img src="image.png" />
 ~~~
 
+### Trailing and leading whitespace
+
+You can force a trailing whitespace behind a tag by adding `>`. The legacy syntax with `'` is also supported.
+
+~~~ slim
+a#closed> class="test" /
+a#closed> class="test"/
+a> href='url1' Link1
+a' href='url2' Link2
+~~~
+
+renders as
+
+~~~ html
+<a class="test" id="closed" /> <a class="test" id="closed" /> <a href="url1">Link1</a> <a href="url2">Link2</a> 
+~~~
+
+If you combine > and =' only one trailing whitespace is added.
+
+~~~ slim
+a> =' 'Text1'
+a =' 'Text2'
+a> = 'Text3'
+a>= 'Text4'
+~~~
+
+renders as
+
+~~~ html
+<a>Text1</a> <a>Text2</a> <a>Text3</a> <a>Text4</a> 
+~~~
+
+You can force a leading whitespace before a tag by adding `<`.
+
+~~~ slim
+a#closed< class="test" /
+a#closed< class="test"/
+a< href='url1' Link1
+a< href='url2' Link2
+~~~
+
+~~~ html
+ <a class="test" id="closed" /> <a class="test" id="closed" /> <a href="url1">Link1</a> <a href="url2">Link2</a>
+~~~
+
+You can also combine both.
+
+~~~ slim
+a#closed<> class="test" /
+a#closed>< class="test"/
+a<> href='url1' Link1
+a<> href='url2' Link2
+~~~
+
+~~~ html
+ <a class="test" id="closed" />  <a class="test" id="closed" />  <a href="url1">Link1</a>  <a href="url2">Link2</a> 
+~~~
+
 ### Inline tags
 
 Sometimes you may want to be a little more compact and inline the tags.
@@ -695,6 +864,24 @@ renders as
 <dl itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress"></dl>
 ~~~
 
+You may use spaces around the wrappers and assignments:
+
+~~~ slim
+h1 id = "logo" Logo
+h2 [ id = "tagline" ] Tagline
+~~~
+
+renders as
+
+~~~ html
+<h1 id="logo">
+  Logo
+</h1>
+<h2 id="tagline">
+  Tagline
+</h2>
+~~~
+
 #### Quoted attributes
 
 You can use single or double quotes for simple text attributes.
@@ -722,13 +909,7 @@ renders as
 <a href="http://slim-lang.com">Goto the slim-lang.com</a>
 ~~~
 
-The attribute value will be escaped if the option
-
-~~~ options
-:escape_quoted_attrs => true
-~~~
-
-is set. Use == if you want to disable escaping in the attribute.
+The attribute value will be escaped by default. Use == if you want to disable escaping in the attribute.
 
 ~~~ slim
 li
@@ -833,7 +1014,7 @@ renders as
 
 #### Attribute merging
 
-You can configure attributes to be merged if multiple are given (See option `:attr_delimiter`). In the default configuration
+You can configure attributes to be merged if multiple are given (See option `:merge_attrs`). In the default configuration
 this is done for class attributes with the white space as delimiter.
 
 ~~~ slim
@@ -945,24 +1126,6 @@ renders to
 <input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
 ~~~
 
-Test deprecated shortcuts:
-
-~~~ options
-:shortcut => {'&' => 'input type', '#' => 'id', '.' => 'class' }
-~~~
-
-~~~ slim
-&text name="user"
-&password name="pw"
-&submit.CLASS#ID
-~~~
-
-renders to
-
-~~~ html
-<input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
-~~~
-
 #### ID shortcut and class shortcut `.`
 
 ## Text interpolation
@@ -987,7 +1150,3 @@ renders as
 ## Configuring Slim
 
 ## Plugins
-
-### Logic less mode
-
-### Translator