slim 4.1.0 → 5.0.0

data/lib/slim/embedded.rb

@@ -30,7 +30,7 @@ module Slim
   # @api private
   class OutputProtector < Filter
     def call(exp)
-      @protect, @collected, @tag = [], '', "%#{object_id.abs.to_s(36)}%"
+      @protect, @collected, @tag = [], '', object_id.abs.to_s(36)
       super(exp)
       @collected
     end
@@ -41,16 +41,16 @@ module Slim
     end
 
     def on_slim_output(escape, text, content)
-      @collected << @tag
+      @collected << "%#{@tag}%#{@protect.length}%"
       @protect << [:slim, :output, escape, text, content]
       nil
     end
 
     def unprotect(text)
       block = [:multi]
-      while text =~ /#{@tag}/
+      while text =~ /%#{@tag}%(\d+)%/
         block << [:static, $`]
-        block << @protect.shift
+        block << @protect[$1.to_i]
         text = $'
       end
       block << [:static, text]
@@ -155,7 +155,7 @@ module Slim
         text = tilt_engine.new(tilt_options.merge(
           style: options[:pretty] ? :expanded : :compressed,
           cache: false)) { text }.render
-        text.chomp!
+        text = text.chomp
         [:static, text]
       end
     end
@@ -185,6 +185,7 @@ module Slim
     # Generates a html tag and wraps another engine (specified via :engine option)
     class TagEngine < Engine
       disable_option_validator!
+      set_options attributes: {}
 
       def on_slim_embedded(engine, body, attrs)
 
@@ -213,7 +214,7 @@ module Slim
     class JavaScriptEngine < TagEngine
       disable_option_validator!
 
-      set_options tag: :script, attributes: {}
+      set_options tag: :script
 
       def on_slim_embedded(engine, body, attrs)
         super(engine, [:html, :js, body], attrs)
@@ -233,14 +234,14 @@ module Slim
     register :rdoc,       InterpolateTiltEngine
 
     # These engines are executed at compile time
-    register :coffee,     JavaScriptEngine, engine: TiltEngine
-    register :less,       TagEngine, tag: :style,  attributes: { type: 'text/css' },         engine: TiltEngine
-    register :sass,       TagEngine, :pretty, tag: :style, attributes: { type: 'text/css' }, engine: SassEngine
-    register :scss,       TagEngine, :pretty, tag: :style, attributes: { type: 'text/css' }, engine: SassEngine
+    register :coffee,     JavaScriptEngine,                engine: TiltEngine
+    register :less,       TagEngine,          tag: :style, engine: TiltEngine
+    register :sass,       TagEngine, :pretty, tag: :style, engine: SassEngine
+    register :scss,       TagEngine, :pretty, tag: :style, engine: SassEngine
 
     # Embedded javascript/css
     register :javascript, JavaScriptEngine
-    register :css,        TagEngine, tag: :style,  attributes: { type: 'text/css' }
+    register :css,        TagEngine, tag: :style
 
     # Embedded ruby code
     register :ruby,       RubyEngine

data/lib/slim/end_inserter.rb

@@ -10,8 +10,8 @@ module Slim
   #
   # @api private
   class EndInserter < Filter
-    IF_RE = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
-    ELSE_RE = /\A(else|elsif|when|rescue|ensure)\b/
+    IF_RE = /\A(if|begin|unless|else|elsif|when|in|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+    ELSE_RE = /\A(else|elsif|when|in|rescue|ensure)\b/
     END_RE = /\Aend\b/
 
     # Handle multi expression `[:multi, *exps]`

data/lib/slim/engine.rb

@@ -30,7 +30,9 @@ module Slim
     use Slim::CodeAttributes
     use(:AttributeRemover) { Temple::HTML::AttributeRemover.new(remove_empty_attrs: options[:merge_attrs].keys) }
     html :Pretty
+    filter :Ambles
     filter :Escapable
+    filter :StaticAnalyzer
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger

data/lib/slim/parser.rb

@@ -231,10 +231,6 @@ module Slim
         # We expect the line to be broken or the next line to be indented.
         @line = $'
         trailing_ws = $2.include?('>'.freeze)
-        if $2.include?('\''.freeze)
-          deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
-          trailing_ws = true
-        end
         block = [:multi]
         @stacks.last << [:static, ' '] if $2.include?('<'.freeze)
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
@@ -348,11 +344,6 @@ module Slim
       @line =~ /\A[<>']*/
       @line = $'
       trailing_ws = $&.include?('>'.freeze)
-      if $&.include?('\''.freeze)
-        deprecated_syntax 'tag\' for trailing whitespace is deprecated in favor of tag>'
-        trailing_ws = true
-      end
-
       leading_ws = $&.include?('<'.freeze)
 
       parse_attributes(attributes)
@@ -387,10 +378,6 @@ module Slim
         # Handle output code
         @line = $'
         trailing_ws2 = $2.include?('>'.freeze)
-        if $2.include?('\''.freeze)
-          deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
-          trailing_ws2 = true
-        end
         block = [:multi]
         @stacks.last.insert(-2, [:static, ' ']) if !leading_ws && $2.include?('<'.freeze)
         tag << [:slim, :output, $1 != '=', parse_broken_line, block]
@@ -530,16 +517,6 @@ module Slim
       raise
     end
 
-    def deprecated_syntax(message)
-      line = @orig_line.lstrip
-      column = (@orig_line && @line ? @orig_line.size - @line.size : 0) + line.size - @orig_line.size
-      warn %{Deprecated syntax: #{message}
-  #{options[:file]}, Line #{@lineno}, Column #{column + 1}
-    #{line}
-    #{' ' * column}^
-}
-    end
-
     def expect_next_line
       next_line || syntax_error!('Unexpected end of file')
       @line.strip!

data/lib/slim/railtie.rb

@@ -0,0 +1,17 @@
+module Slim
+  class Railtie < Rails::Railtie
+    initializer "initialize slim template handler" do
+      ActiveSupport.on_load(:action_view) do
+        Slim::RailsTemplate = Temple::Templates::Rails(Slim::Engine,
+                                                       register_as: :slim,
+                                                       # Use rails-specific generator. This is necessary
+                                                       # to support block capturing and streaming.
+                                                       generator: Temple::Generators::RailsOutputBuffer,
+                                                       # Disable the internal slim capturing.
+                                                       # Rails takes care of the capturing by itself.
+                                                       disable_capture: true,
+                                                       streaming: true)
+      end
+    end
+  end
+end

data/lib/slim/splat/builder.rb

@@ -90,8 +90,14 @@ module Slim
 
       def hyphen_attr(name, escape, value)
         if Hash === value
-          value.each do |n, v|
-            hyphen_attr("#{name}-#{n}", escape, v)
+          if @options[:hyphen_underscore_attrs] 
+            value.each do |n, v|
+              hyphen_attr("#{name}-#{n.to_s.gsub('_', '-')}", escape, v)
+            end
+          else
+            value.each do |n, v|
+              hyphen_attr("#{name}-#{n}", escape, v)
+            end
           end
         else
           attr(name, escape_html(value != true && escape, value))

data/lib/slim/splat/filter.rb

@@ -3,7 +3,8 @@ module Slim
     # @api private
     class Filter < ::Slim::Filter
       define_options :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :format, :disable_capture,
-                     hyphen_attrs: %w(data aria), use_html_safe: ''.respond_to?(:html_safe?)
+                     hyphen_attrs: %w(data aria), use_html_safe: ''.respond_to?(:html_safe?),
+                     hyphen_underscore_attrs: false
 
       def call(exp)
         @splat_options = nil

data/lib/slim/template.rb

@@ -2,18 +2,4 @@ module Slim
   # Tilt template implementation for Slim
   # @api public
   Template = Temple::Templates::Tilt(Slim::Engine, register_as: :slim)
-
-  if defined?(::ActionView)
-    # Rails template implementation for Slim
-    # @api public
-    RailsTemplate = Temple::Templates::Rails(Slim::Engine,
-                                             register_as: :slim,
-                                             # Use rails-specific generator. This is necessary
-                                             # to support block capturing and streaming.
-                                             generator: Temple::Generators::RailsOutputBuffer,
-                                             # Disable the internal slim capturing.
-                                             # Rails takes care of the capturing by itself.
-                                             disable_capture: true,
-                                             streaming: true)
-  end
 end

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '4.1.0'
+  VERSION = '5.0.0'
 end

data/lib/slim.rb

@@ -12,3 +12,4 @@ require 'slim/code_attributes'
 require 'slim/engine'
 require 'slim/template'
 require 'slim/version'
+require 'slim/railtie' if defined?(Rails::Railtie)

data/slim.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/slim/version'
 require 'date'
 
@@ -10,15 +9,15 @@ Gem::Specification.new do |s|
   s.email             = ['mail@daniel-mendler.de', 'andy@stonean.com', 'ifredwu@gmail.com']
   s.summary           = 'Slim is a template language.'
   s.description       = 'Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.'
-  s.homepage          = 'http://slim-lang.com/'
+  s.homepage          = 'http://github.com/slim-template/slim/'
   s.license           = 'MIT'
 
   s.files             = `git ls-files`.split("\n")
   s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths     = %w(lib)
 
-  s.required_ruby_version = '>=2.0.0'
+  s.required_ruby_version = '>= 2.5.0'
 
-  s.add_runtime_dependency('temple', ['>= 0.7.6', '< 0.9'])
+  s.add_runtime_dependency('temple', ['~> 0.10.0'])
   s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.1'])
 end

data/test/core/test_code_evaluation.rb

@@ -163,6 +163,7 @@ p id=(1 + 1)*5 Test it
   end
 
   def test_code_attribute_does_not_modify_argument
+    require 'ostruct'
     template = 'span class=attribute'
     model = OpenStruct.new(attribute: [:a, :b, [:c, :d]])
     output = Slim::Template.new { template }.render(model)

data/test/core/test_code_structure.rb

@@ -120,6 +120,23 @@ p
     assert_html '<p>42 is the answer</p><p>41 is the answer</p><p>42 is the answer</p><p>41 is the answer</p>', source
   end
 
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7")
+    def test_render_with_case_in
+      source = %q{
+  p
+    - case [:greet, "world"]
+    - in :greet, value if false
+      = "Goodbye #{value}"
+    - in :greet, value unless true
+      = "Top of the morning to you, #{value}"
+    - in :greet, value
+      = "Hello #{value}"
+  }
+
+      assert_html '<p>Hello world</p>', source
+    end
+  end
+
   def test_render_with_slim_comments
     source = %q{
 p Hello

data/test/core/test_commands.rb

@@ -15,9 +15,6 @@ class TestSlimCommands < Minitest::Test
   # exception raising example
   EXCEPTION_TEMPLATE = '- raise NotImplementedError'
 
-  # Temple has this feature...
-  STRING_FREEZER = RUBY_VERSION >= '2.1' ? '.freeze' : ''
-
   def test_option_help
     out, err = exec_slimrb '--help'
 
@@ -43,7 +40,7 @@ class TestSlimCommands < Minitest::Test
   def test_compile
     prepare_common_test STATIC_TEMPLATE, '--compile' do |out, err|
       assert err.empty?
-      assert_match %r{\"<p>Hello World!<\/p>\"#{STRING_FREEZER}}, out
+      assert_match %r{\"<p>Hello World!<\/p>\".freeze}, out
     end
   end
 
@@ -58,10 +55,14 @@ class TestSlimCommands < Minitest::Test
     prepare_common_test DYNAMIC_TEMPLATE, '--rails' do |out, err|
       assert err.empty?
 
-      assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;}
-      assert out.include? %Q{@output_buffer.safe_concat(("<p>Hello "#{STRING_FREEZER}));}
+      if Gem::Version.new(Temple::VERSION) >= Gem::Version.new('0.9')
+        assert out.include? %Q{@output_buffer = output_buffer || ActionView::OutputBuffer.new;}
+      else
+        assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;}
+      end
+      assert out.include? %Q{@output_buffer.safe_concat(("<p>Hello ".freeze));}
       assert out.include? %Q{@output_buffer.safe_concat(((::Temple::Utils.escape_html((name))).to_s));}
-      assert out.include? %Q{@output_buffer.safe_concat(("!</p>"#{STRING_FREEZER}));}
+      assert out.include? %Q{@output_buffer.safe_concat(("!</p>".freeze));}
     end
   end
 

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_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_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>