slim 4.1.0 → 5.2.1

data/test/core/test_embedded_engines.rb

@@ -11,24 +11,26 @@ markdown:
 
   #{1+2}
 
+  [#{1}](#{"#2"})
+
   * one
   * two
 }
     if ::Tilt['md'].name =~ /Redcarpet/
       # redcarpet
-      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n", source
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<p><a href=\"#2\">1</a></p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n", source
     elsif ::Tilt['md'].name =~ /RDiscount/
       # rdiscount
-      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n\n", source
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<p><a href=\"#2\">1</a></p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n\n", source
     else
       # kramdown, :auto_ids by default
-      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<p><a href=\"#2\">1</a></p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
 
       Slim::Embedded.with_options(markdown: {auto_ids: false}) do
-        assert_html "<h1>Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+        assert_html "<h1>Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<p><a href=\"#2\">1</a></p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
       end
 
-      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<p><a href=\"#2\">1</a></p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
     end
   end
 
@@ -37,7 +39,7 @@ markdown:
 css:
   h1 { color: blue }
 }
-  assert_html "<style type=\"text/css\">h1 { color: blue }</style>", source
+  assert_html "<style>h1 { color: blue }</style>", source
   end
 
   def test_render_with_css_empty_attributes
@@ -45,7 +47,7 @@ css:
 css []:
   h1 { color: blue }
 }
-  assert_html "<style type=\"text/css\">h1 { color: blue }</style>", source
+  assert_html "<style>h1 { color: blue }</style>", source
   end
 
   def test_render_with_css_attribute
@@ -53,7 +55,7 @@ css []:
 css scoped = "true":
   h1 { color: blue }
 }
-  assert_html "<style scoped=\"true\" type=\"text/css\">h1 { color: blue }</style>", source
+  assert_html "<style scoped=\"true\">h1 { color: blue }</style>", source
   end
 
   def test_render_with_css_multiple_attributes
@@ -61,7 +63,7 @@ css scoped = "true":
 css class="myClass" scoped = "true" :
   h1 { color: blue }
 }
-  assert_html "<style class=\"myClass\" scoped=\"true\" type=\"text/css\">h1 { color: blue }</style>", source
+  assert_html "<style class=\"myClass\" scoped=\"true\">h1 { color: blue }</style>", source
   end
 
   def test_render_with_javascript
@@ -163,13 +165,15 @@ ruby:
     assert_html "foobar\n", source
   end
 
+# TODO: Reactivate sass tests
+if false
   def test_render_with_scss
     source = %q{
 scss:
   $color: #f00;
   body { color: $color; }
 }
-    assert_html "<style type=\"text/css\">body{color:red}</style>", source
+    assert_html "<style>body{color:red}</style>", source
   end
 
   def test_render_with_scss_attribute
@@ -178,7 +182,7 @@ scss [class="myClass"]:
   $color: #f00;
   body { color: $color; }
 }
-    assert_html "<style class=\"myClass\" type=\"text/css\">body{color:red}</style>", source
+    assert_html "<style class=\"myClass\">body{color:red}</style>", source
   end
 
   def test_render_with_sass
@@ -188,7 +192,7 @@ sass:
   body
     color: $color
 }
-    assert_html "<style type=\"text/css\">body{color:red}</style>", source
+    assert_html "<style>body{color:red}</style>", source
   end
 
   def test_render_with_sass_attribute
@@ -198,9 +202,9 @@ sass [class="myClass"]:
   body
     color: $color
 }
-    assert_html "<style class=\"myClass\" type=\"text/css\">body{color:red}</style>", source
+    assert_html "<style class=\"myClass\">body{color:red}</style>", source
   end
-
+end
 
   def test_disabled_embedded_engine
     source = %{

data/test/core/test_encoding.rb

@@ -8,10 +8,10 @@ class TestSlimEncoding < TestSlim
   end
 
   def test_binary
-    source = "| \xFF\xFF"
+    source = "| \xFF\xFF".dup
     source.force_encoding(Encoding::BINARY)
 
-    result = "\xFF\xFF"
+    result = "\xFF\xFF".dup
     result.force_encoding(Encoding::BINARY)
 
     out = render(source, default_encoding: 'binary')

data/test/core/test_erb_converter.rb

@@ -21,9 +21,8 @@ html
     /[if lt IE 9]
       script src="old-ie1.js"
       script src="old-ie2.js"
-    sass:
-      body
-        background-color: red
+    css:
+      body { background-color: red; }
   body
     #container
       p Hello
@@ -51,9 +50,8 @@ multiline comment-->
 </script><!--[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>
+</script><![endif]--><style>
+body { background-color: red; }</style>
 </head><body>
 <div id="container">
 <p>Hello

data/test/core/test_html_attributes.rb

@@ -116,6 +116,14 @@ option(selected class="clazz") Text
     assert_html '<div class="alpha" data-a="alpha" data-b="beta" data-c-e="epsilon" data-c_d="gamma"></div>', source
   end
 
+  def test_hyphenated_underscore_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, hyphen_underscore_attrs: true 
+  end
+
   def test_splat_without_content
     source = %q{
 *hash

data/test/core/test_html_structure.rb

@@ -115,6 +115,54 @@ h1#title This is my title
                 source, shortcut: {'^' => {tag: 'script', attr: 'data-binding', additional_attrs: { type: "application/json" }}}
   end
 
+  def test_render_with_custom_lambda_shortcut
+    begin
+      Slim::Parser.options[:shortcut]['~'] = {attr: ->(v) {{class: "styled-#{v}", id: "id-#{v}"}}}
+      source = %q{
+~foo Hello
+}
+      assert_html '<div class="styled-foo" id="id-foo">Hello</div>', source
+    ensure
+      Slim::Parser.options[:shortcut].delete('~')
+    end
+  end
+
+  def test_render_with_custom_lambda_shortcut_and_multiple_values
+    begin
+      Slim::Parser.options[:shortcut]['~'] = {attr: ->(v) {{class: "styled-#{v}"}}}
+      source = %q{
+~foo~bar Hello
+}
+      assert_html '<div class="styled-foo styled-bar">Hello</div>', source
+    ensure
+      Slim::Parser.options[:shortcut].delete('~')
+    end
+  end
+
+  def test_render_with_custom_lambda_shortcut_and_existing_class
+    begin
+      Slim::Parser.options[:shortcut]['~'] = {attr: ->(v) {{class: "styled-#{v}"}}}
+      source = %q{
+~foo.baz Hello
+}
+      assert_html '<div class="styled-foo baz">Hello</div>', source
+    ensure
+      Slim::Parser.options[:shortcut].delete('~')
+    end
+  end
+
+  def test_render_with_existing_class_and_custom_lambda_shortcut
+    begin
+      Slim::Parser.options[:shortcut]['~'] = {attr: ->(v) {{class: "styled-#{v}"}}}
+      source = %q{
+.baz~foo Hello
+}
+      assert_html '<div class="baz styled-foo">Hello</div>', source
+    ensure
+      Slim::Parser.options[:shortcut].delete('~')
+    end
+  end
+
   def test_render_with_text_block
     source = %q{
 p
@@ -311,6 +359,12 @@ p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
+  # Regression test for bug #796
+  def test_square_brackets_around_attributes_multiline_with_tabs
+    source = "div\n\tp[\n\t\tclass=\"martian\"\n\t]\n\tp Next line"
+    assert_html '<div><p class="martian"></p><p>Next line</p></div>', source
+  end
+
   def test_parens_around_attributes_with_equal_sign_snug_to_right_paren
     source = %q{
 p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number

data/test/core/test_pretty.rb

@@ -29,9 +29,8 @@ html
     /[if lt IE 9]
       script src="old-ie1.js"
       script src="old-ie2.js"
-    sass:
-      body
-        background-color: red
+    css:
+      body { background-color: red; }
   body
     #container
       p Hello
@@ -56,10 +55,8 @@ html
     <script src="old-ie1.js"></script>
     <script src="old-ie2.js"></script>
     <![endif]-->
-    <style type="text/css">
-      body {
-        background-color: red;
-      }
+    <style>
+      body { background-color: red; }
     </style>
   </head>
   <body>

data/test/core/test_ruby_errors.rb

@@ -106,6 +106,25 @@ ruby:
     assert_ruby_error NameError,"(__TEMPLATE__):4", source
   end
 
+  def test_embedded_ruby3
+    source = %q{
+h1 before
+ruby:
+  a = 1
+
+h1 between
+ruby:
+  b = a + 1
+
+  unknown_ruby_method
+
+  c = 3
+h1 third
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):10", source
+  end
+
   def test_embedded_markdown
     source = %q{
 markdown:

data/test/literate/TESTS.md

@@ -27,6 +27,22 @@ renders as
 Text block
 ~~~
 
+You can add leading or trailing white space with the `<` and `>` markers:
+
+~~~ slim
+|< Text with leading whitespace.
+|  Text with leading whitespace.
+|> Text with trailing whitespace.
+|<> Text with both leading and trailing whitespace.
+~~~
+
+renders as
+
+~~~ html
+ Text with leading whitespace. Text with leading whitespace.Text with trailing whitespace.  Text with both leading and trailing whitespace. 
+~~~
+
+
 Multiple lines can be indented beneath the first text line.
 
 ~~~ slim
@@ -77,6 +93,30 @@ Text
 lines
 ~~~
 
+~~~ slim
+|><
+
+   Text
+    block
+
+     with
+
+    multiple
+   lines
+~~~
+
+renders as
+
+~~~ html
+ Text
+ block
+
+  with
+
+ multiple
+lines 
+~~~
+
 You can nest text blocks beneath tags.
 
 ~~~ slim
@@ -95,13 +135,23 @@ renders as
 You can embed html code in the text which is not escaped.
 
 ~~~ slim
-| <a href="http://slim-lang.com">slim-lang.com</a>
+| <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
+renders as
+
+~~~ html
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
+~~~ slim
+|<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 ### Text with trailing white space `'`
@@ -122,13 +172,13 @@ This is especially useful if you use tags behind a text block.
 
 ~~~ slim
 ' Link to
-a href="http://slim-lang.com" slim-lang.com
+a href="http://github.com/slim-template/slim" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-Link to <a href="http://slim-lang.com">slim-lang.com</a>
+Link to <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 Multiple lines can be indented beneath the first text line.
@@ -186,13 +236,13 @@ lines
 HTML can be written directly.
 
 ~~~ slim
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 HTML tags allow nested blocks inside.
@@ -800,31 +850,31 @@ If a delimiter makes the syntax more readable for you, you can use the character
 
 ~~~ slim
 li
-  a(href="http://slim-lang.com" class="important") Link
+  a(href="http://github.com/slim-template/slim" class="important") Link
 li
-  a[href="http://slim-lang.com" class="important"] Link
+  a[href="http://github.com/slim-template/slim" class="important"] Link
 li
-  a{href="http://slim-lang.com" class="important"} Link
+  a{href="http://github.com/slim-template/slim" class="important"} Link
 ~~~
 
 renders as
 
 ~~~ html
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 ~~~
 
 If you wrap the attributes, you can spread them across multiple lines:
 
 ~~~ slim
-a(href="http://slim-lang.com"
+a(href="http://github.com/slim-template/slim"
 
      class="important") Link
 ~~~
@@ -832,7 +882,7 @@ a(href="http://slim-lang.com"
 renders as
 
 ~~~ html
-<a class="important" href="http://slim-lang.com">Link</a>
+<a class="important" href="http://github.com/slim-template/slim">Link</a>
 ~~~
 
 ~~~ slim
@@ -872,19 +922,19 @@ renders as
 You can use single or double quotes for simple text attributes.
 
 ~~~ slim
-a href="http://slim-lang.com" title='Slim Homepage' Goto the Slim homepage
+a href="http://github.com/slim-template/slim" title='Slim Homepage' Goto the Slim homepage
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com" title="Slim Homepage">Goto the Slim homepage</a>
+<a href="http://github.com/slim-template/slim" title="Slim Homepage">Goto the Slim homepage</a>
 ~~~
 
 You can use text interpolation in the quoted attributes:
 
 ~~~ slim
-- url='slim-lang.com'
+- url='github.com/slim-template/slim'
 a href="http://#{url}" Goto the #{url}
 a href="{"test"}" Test of quoted text in braces
 ~~~
@@ -892,7 +942,7 @@ a href="{"test"}" Test of quoted text in braces
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">Goto the slim-lang.com</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
+<a href="http://github.com/slim-template/slim">Goto the github.com/slim-template/slim</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
 ~~~
 
 The attribute value will be escaped by default. Use == if you want to disable escaping in the attribute.
@@ -1040,13 +1090,13 @@ You can configure attributes to be merged if multiple are given (See option `:me
 this is done for class attributes with the white space as delimiter.
 
 ~~~ slim
-a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
+a.menu class="highlight" href="http://github.com/slim-template/slim/" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-<a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
+<a class="menu highlight" href="http://github.com/slim-template/slim/">github.com/slim-template/slim</a>
 ~~~
 
 You can also use an `Array` as attribute value and the array elements will be merged using the delimiter.
@@ -1074,7 +1124,7 @@ with the :tag key.
 ~~~ slim
 ruby:
   def self.a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://github.com/slim-template/slim/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -1085,7 +1135,7 @@ ruby:
 renders as
 
 ~~~ html
-<span>Link</span><a href="http://slim-lang.com/">Link</a>
+<span>Link</span><a href="http://github.com/slim-template/slim/">Link</a>
 ~~~
 
 ### Shortcuts

data/test/literate/helper.rb

@@ -8,7 +8,7 @@ Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, grammar: Slim::Gra
 Slim::Engine.before :Pretty, Temple::Filters::Validator
 Slim::Engine.set_options tr: false, logic_less: false
 
-class MiniTest::Spec
+class Minitest::Spec
   def render(source, options = {}, &block)
     Slim::Template.new(options) { source }.render(self, &block)
   end

data/test/literate/run.rb

@@ -63,11 +63,11 @@ class LiterateTest < Temple::Engine
     def on_html(code)
       raise Temple::FilterError, 'Html block must be preceded by slim block' unless @in_testcase
       @in_testcase = false
-      result =  "  html = #{code.inspect}\n"
+      result =  "  html = #{code.inspect}\n".dup
       if @opts.empty?
-        result << "  render(slim).must_equal html\nend\n"
+        result << "  _(render(slim)).must_equal html\nend\n"
       else
-        result << "  options = #{@opts.inspect}\n  render(slim, options).must_equal html\nend\n"
+        result << "  options = #{@opts.inspect}\n  _(render(slim, options)).must_equal html\nend\n"
       end
     end
 

data/test/logic_less/test_logic_less.rb

@@ -312,4 +312,19 @@ div
       'This is the menu'
     end
   end
+
+  def test_render_parent_lambda
+    source = %q{
+- list
+  == fn
+    p = string
+}
+
+    assert_html '<fn><p>str</p></fn><fn><p>str</p></fn><fn><p>str</p></fn>',
+                source, scope: {
+                  fn: ->(&block) { "<fn>#{block.call}</fn>" },
+                  list: [ "item1", "item2", "item3" ],
+                  string: "str"
+                }
+  end
 end

data/test/rails/app/controllers/slim_controller.rb

@@ -26,11 +26,17 @@ class SlimController < ApplicationController
   end
 
   def thread_options
-    Slim::Engine.with_options(shortcut: {'@' => { attr: params[:attr] }}) do
+    default_shortcut = {'#' => {attr: 'id'}, '.' => {attr: 'class'} }
+    Slim::Engine.with_options(shortcut: default_shortcut.merge({'@' => { attr: params[:attr] }})) do
       render
     end
   end
 
+  def variant
+    request.variant = :testvariant
+    render :normal
+  end
+
   def content_for
     @hello = "Hello Slim!"
   end

data/test/rails/app/views/layouts/application.html+testvariant.slim

@@ -0,0 +1,10 @@
+doctype html
+
+html
+  head
+    title Variant
+    = csrf_meta_tag
+
+  body
+    = yield :page_heading
+    .content= yield

data/test/rails/app/views/slim/attributes.html.slim

@@ -0,0 +1,3 @@
+/ Exercises Temple `:capture` handling (used here for preparing HTML attributes) with the
+/ Rails-specific Temple generators
+.static class="#{['a', 'b'].join('-')}"

data/test/rails/app/views/slim/splat_with_delimiter.slim

@@ -0,0 +1 @@
+.cute *{class: "nice"} Hello

data/test/rails/config/application.rb

@@ -5,10 +5,8 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 #require 'active_record/railtie'
 #require 'action_mailer/railtie'
-require 'sprockets/railtie'
-
+#require 'sprockets/railtie'
 require 'slim'
-require 'slim-rails/register_engine'
 
 module Dummy
   class Application < Rails::Application
@@ -42,20 +40,5 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-
-    # From slim-rails fix for "ActionView::Template::Error: Unknown line indicator"
-    # https://github.com/slim-template/slim-rails/blob/991589ea5648e5e896781e68912bc51beaf4102a/lib/slim-rails/register_engine.rb
-    if config.respond_to?(:assets)
-      config.assets.configure do |env|
-        if env.respond_to?(:register_transformer) && Sprockets::VERSION.to_i > 3
-          env.register_mime_type 'text/slim', extensions: ['.slim', '.slim.html']
-          env.register_transformer 'text/slim', 'text/html', Slim::Rails::RegisterEngine::Transformer
-        elsif env.respond_to?(:register_engine)
-          args = ['.slim', Slim::Template]
-          args << { silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
-          env.register_engine(*args)
-        end
-      end
-    end
   end
 end