slim 5.1.0 → 5.2.0

data/lib/slim/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Base class for Temple filters used in Slim
   #

data/lib/slim/grammar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Slim expression grammar
   # @api private

data/lib/slim/include.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'slim'
 
 module Slim

data/lib/slim/interpolation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Perform interpolation of #{var_name} in the
   # expressions `[:slim, :interpolate, string]`.

data/lib/slim/logic_less/context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   class LogicLess
     # @api private
@@ -16,7 +17,7 @@ module Slim
             yield
           else
             new_scope do
-              dict.inject('') do |result, d|
+              dict.inject(''.dup) do |result, d|
                 scope.dict = d
                 result << yield
               end
@@ -73,7 +74,7 @@ module Slim
               return @dict.instance_variable_get(var_name).call(&block) if instance_variable?(var_name)
             end
           end
-          @parent.lambda(name) if @parent
+          @parent.lambda(name, &block) if @parent
         end
 
         def [](name)
@@ -104,11 +105,9 @@ module Slim
         end
 
         def instance_variable?(name)
-          begin
-            @dict.instance_variable_defined?(name)
-          rescue NameError
-            false
-          end
+          @dict.instance_variable_defined?(name)
+        rescue NameError
+          false
         end
       end
 

data/lib/slim/logic_less/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Handle logic less mode
   # This filter can be activated with the option "logic_less"

data/lib/slim/logic_less.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'slim'
 require 'slim/logic_less/filter'
 require 'slim/logic_less/context'

data/lib/slim/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Parses Slim code and transforms it to a Temple expression
   # @api private
@@ -49,7 +50,7 @@ module Slim
       @code_attr_delims = options[:code_attr_delims]
       tabsize = options[:tabsize]
       if tabsize > 1
-        @tab_re = /\G((?: {#{tabsize}})*) {0,#{tabsize-1}}\t/
+        @tab_re = /\G((?: {#{tabsize}})*) {0,#{tabsize - 1}}\t/
         @tab = '\1' + ' ' * tabsize
       else
         @tab_re = "\t"
@@ -63,15 +64,15 @@ module Slim
           raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /(\p{Word}|-)/
         end
         if v.include?(:attr)
-          @attr_shortcut[k] = [v[:attr]].flatten
+          @attr_shortcut[k] = v[:attr].is_a?(Proc) ? v[:attr] : [v[:attr]].flatten
         end
         if v.include?(:additional_attrs)
           @additional_attrs[k] = v[:additional_attrs]
         end
       end
-      keys = Regexp.union @attr_shortcut.keys.sort_by {|k| -k.size }
+      keys = Regexp.union @attr_shortcut.keys.sort_by { |k| -k.size }
       @attr_shortcut_re = /\A(#{keys}+)((?:\p{Word}|-|\/\d+|:(\w|-)+)*)/
-      keys = Regexp.union @tag_shortcut.keys.sort_by {|k| -k.size }
+      keys = Regexp.union @tag_shortcut.keys.sort_by { |k| -k.size }
       @tag_re = /\A(?:#{keys}|\*(?=[^\s]+)|(\p{Word}(?:\p{Word}|:|-)*\p{Word}|\p{Word}+))/
       keys = Regexp.escape @code_attr_delims.keys.join
       @code_attr_delims_re = /\A[#{keys}]/
@@ -84,7 +85,7 @@ module Slim
       @code_attr_re = /#{@attr_name}\s*=(=?)\s*/
 
       splat_prefix = Regexp.escape(options[:splat_prefix])
-      splat_regexp_source = '\A\s*' << splat_prefix << '(?=[^\s]+)'
+      splat_regexp_source = '\A\s*' + splat_prefix + '(?=[^\s]+)'
       @splat_attrs_regexp = Regexp.new(splat_regexp_source)
     end
 
@@ -335,7 +336,13 @@ module Slim
         # The class/id attribute is :static instead of :slim :interpolate,
         # because we don't want text interpolation in .class or #id shortcut
         syntax_error!('Illegal shortcut') unless shortcut = @attr_shortcut[$1]
-        shortcut.each {|a| attributes << [:html, :attr, a, [:static, $2]] }
+
+        if shortcut.is_a?(Proc)
+          shortcut.call($2).each { |a, v| attributes << [:html, :attr, a, [:static, v]] }
+        else
+          shortcut.each {|a| attributes << [:html, :attr, a, [:static, $2]] }
+        end
+
         if additional_attr_pairs = @additional_attrs[$1]
           additional_attr_pairs.each do |k,v|
             attributes << [:html, :attr, k.to_s, [:static, v]]
@@ -461,7 +468,7 @@ module Slim
     end
 
     def parse_ruby_code(outer_delimiter)
-      code, count, delimiter, close_delimiter = '', 0, nil, nil
+      code, count, delimiter, close_delimiter = ''.dup, 0, nil, nil
 
       # Attribute ends with space or attribute delimiter
       end_re = /\A[\s#{Regexp.escape outer_delimiter.to_s}]/
@@ -489,16 +496,16 @@ module Slim
     end
 
     def parse_quoted_attribute(quote)
-      value, count = '', 0
+      value, count = ''.dup, 0
 
       until count == 0 && @line[0] == quote[0]
         if @line =~ /\A(\\)?\Z/
           value << ($1 ? ' ' : "\n")
           expect_next_line
         else
-          if @line[0] == ?{
+          if @line[0] == '{'
             count += 1
-          elsif @line[0] == ?}
+          elsif @line[0] == '}'
             count -= 1
           end
           value << @line.slice!(0)

data/lib/slim/railtie.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Slim
   class Railtie < ::Rails::Railtie
-    initializer "initialize slim template handler" do
+    initializer 'initialize slim template handler' do
       ActiveSupport.on_load(:action_view) do
         Slim::RailsTemplate = Temple::Templates::Rails(Slim::Engine,
                                                        register_as: :slim,

data/lib/slim/smart/escaper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Smart
     # Perform smart entity escaping in the
@@ -36,7 +37,6 @@ module Slim
         end
         block
       end
-
     end
   end
 end

data/lib/slim/smart/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Smart
     # Perform newline processing in the
@@ -50,13 +51,13 @@ module Slim
         # so we don't have to worry about that at all.
         block = [:multi]
         prev = nil
-        last_exp = exps.reject{ |exp| exp.first == :newline }.last unless @active && @append
+        last_exp = exps.reject { |exp| exp.first == :newline }.last unless @active && @append
         exps.each do |exp|
           @append = exp.equal?(last_exp)
           if @active
             @prepend = false if prev
           else
-            @prepend = prev && ( prev.first != :slim || prev[1] != :text )
+            @prepend = prev && (prev.first != :slim || prev[1] != :text)
           end
           block << compile(exp)
           prev = exp unless exp.first == :newline

data/lib/slim/smart/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Smart
     # @api private
@@ -7,9 +8,9 @@ module Slim
       def initialize(opts = {})
         super
         word_re = options[:implicit_text] ? '[_a-z0-9]' : '\p{Word}'
-        attr_keys = Regexp.union(@attr_shortcut.keys.sort_by {|k| -k.size } )
+        attr_keys = Regexp.union(@attr_shortcut.keys.sort_by { |k| -k.size })
         @attr_shortcut_re = /\A(#{attr_keys}+)((?:\p{Word}|-)*)/
-        tag_keys = Regexp.union((@tag_shortcut.keys - @attr_shortcut.keys).sort_by {|k| -k.size } )
+        tag_keys = Regexp.union((@tag_shortcut.keys - @attr_shortcut.keys).sort_by { |k| -k.size })
         @tag_re = /\A(?:#{attr_keys}(?=-*\p{Word})|#{tag_keys}|\*(?=[^\s]+)|(#{word_re}(?:#{word_re}|:|-)*#{word_re}|#{word_re}+))/
       end
 
@@ -24,7 +25,7 @@ module Slim
           end
           # Found implicit smart text block.
           if line = @lines.first
-            indent = ( line =~ /\A\s*\Z/ ? @indents.last + 1 : get_indent(line) )
+            indent = (line =~ /\A\s*\Z/ ? @indents.last + 1 : get_indent(line))
           end
           @stacks.last << [:slim, :text, :implicit, parse_text_block(@line, indent)]
         end

data/lib/slim/smart.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'slim'
 require 'slim/smart/filter'
 require 'slim/smart/escaper'

data/lib/slim/splat/builder.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
 module Slim
   class InvalidAttributeNameError < StandardError; end
   module Splat
     # @api private
     class Builder
-     # https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-     INVALID_ATTRIBUTE_NAME_REGEX = /[ \0"'>\/=]/
+      # https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+      INVALID_ATTRIBUTE_NAME_REGEX = /[ \0"'>\/=]/
+
       def initialize(options)
         @options = options
         @attrs = {}
@@ -17,7 +19,7 @@ module Slim
         elsif @options[:hyphen_attrs].include?(name) && Hash === value
           hyphen_attr(name, escape, value)
         elsif value != false && value != nil
-          attr(name, escape_html(value != true && escape, value))
+          attr(name, escape_html(escape, value))
         end
       end
 
@@ -33,7 +35,7 @@ module Slim
         end
         if @attrs[name]
           if delim = @options[:merge_attrs][name]
-            @attrs[name] += delim + value.to_s
+            @attrs[name] = @attrs[name].to_s + delim + value.to_s
           else
             raise("Multiple #{name} attributes specified")
           end
@@ -90,9 +92,9 @@ module Slim
 
       def hyphen_attr(name, escape, value)
         if Hash === value
-          if @options[:hyphen_underscore_attrs] 
+          if @options[:hyphen_underscore_attrs]
             value.each do |n, v|
-              hyphen_attr("#{name}-#{n.to_s.gsub('_', '-')}", escape, v)
+              hyphen_attr("#{name}-#{n.to_s.tr('_', '-')}", escape, v)
             end
           else
             value.each do |n, v|
@@ -100,12 +102,12 @@ module Slim
             end
           end
         else
-          attr(name, escape_html(value != true && escape, value))
+          attr(name, escape_html(escape, value))
         end
       end
 
       def escape_html(escape, value)
-        return value unless escape
+        return value if !escape || value == true
         @options[:use_html_safe] ? Temple::Utils.escape_html_safe(value) : Temple::Utils.escape_html(value)
       end
     end

data/lib/slim/splat/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Splat
     # @api private
@@ -10,7 +11,7 @@ module Slim
         @splat_options = nil
         exp = compile(exp)
         if @splat_options
-          opts = options.to_hash.reject {|k,v| !Filter.options.valid_key?(k) }.inspect
+          opts = options.to_hash.reject { |k, v| !Filter.options.valid_key?(k) }.inspect
           [:multi, [:code, "#{@splat_options} = #{opts}"], exp]
         else
           exp
@@ -44,7 +45,7 @@ module Slim
       # @param [Array] attrs Array of temple expressions
       # @return [Array] Compiled temple expression
       def on_html_attrs(*attrs)
-        if attrs.any? {|attr| splat?(attr) }
+        if attrs.any? { |attr| splat?(attr) }
           builder, block = make_builder(attrs)
           [:multi,
            block,
@@ -85,7 +86,7 @@ module Slim
               attr
             end
         end
-        return builder, result
+        [builder, result]
       end
     end
   end

data/lib/slim/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # Tilt template implementation for Slim
   # @api public

data/lib/slim/translator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'slim'
 
 module Slim
@@ -62,7 +63,7 @@ module Slim
       end
 
       def call(exp)
-        @text, @captures = '', []
+        @text, @captures = ''.dup, []
         result = compile(exp)
 
         text = @translate.call(@text)
@@ -89,7 +90,7 @@ module Slim
       define_options :tr_fn
 
       def call(exp)
-        @captures_count, @captures_var, @text = 0, unique_name, ''
+        @captures_count, @captures_var, @text = 0, unique_name, ''.dup
 
         result = compile(exp)
 
@@ -109,7 +110,7 @@ module Slim
       def on_slim_output(escape, code, content)
         @captures_count += 1
         @text << "%#{@captures_count}"
-        [:capture, "#{@captures_var}[#{@captures_count-1}]", [:slim, :output, escape, code, content]]
+        [:capture, "#{@captures_var}[#{@captures_count - 1}]", [:slim, :output, escape, code, content]]
       end
     end
   end

data/lib/slim/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Slim
   # Slim version string
   # @api public
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/lib/slim.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple'
 require 'slim/parser'
 require 'slim/filter'

data/slim.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5.0'
 
   s.add_runtime_dependency('temple', ['~> 0.10.0'])
-  s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.2'])
+  s.add_runtime_dependency('tilt', ['>= 2.1.0'])
 end

data/test/core/helper.rb

@@ -62,16 +62,8 @@ class TestSlim < Minitest::Test
   end
 
   def assert_backtrace(ex, from)
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-      # HACK: Rubinius stack trace sometimes has one entry more
-      if ex.backtrace[0] !~ /^#{Regexp.escape from}/
-        ex.backtrace[1] =~ /([^\s]+:\d+)/
-        assert_equal from, $1
-      end
-    else
-      ex.backtrace[0] =~ /([^\s]+:\d+)/
-      assert_equal from, $1
-    end
+    ex.backtrace[0] =~ /([^\s]+:\d+)/
+    assert_equal from, $1
   end
 
   def assert_ruby_syntax_error(from, source, options = {})
@@ -121,7 +113,7 @@ class Env
   end
 
   def hello_world(text = "Hello World from @env", opts = {})
-    text << opts.to_a * " " if opts.any?
+    text = text + (opts.to_a * " ") if opts.any?
     if block_given?
       "#{text} #{yield} #{text}"
     else

data/test/core/test_commands.rb

@@ -73,23 +73,19 @@ class TestSlimCommands < Minitest::Test
     end
   end
 
-  # We cannot run these two on Travis, because we can't install libyaml.
-  # See https://github.com/slim-template/slim/issues/576
-  if ENV['TRAVIS'] && RUBY_ENGINE != 'rbx'
-    def test_locals_json
-      data = '{"name":"from slim"}'
-      prepare_common_test DYNAMIC_TEMPLATE, '--locals', data do |out, err|
-        assert err.empty?
-        assert_equal "<p>Hello from slim!</p>\n", out
-      end
+  def test_locals_json
+    data = '{"name":"from slim"}'
+    prepare_common_test DYNAMIC_TEMPLATE, '--locals', data do |out, err|
+      assert err.empty?
+      assert_equal "<p>Hello from slim!</p>\n", out
     end
+  end
 
-    def test_locals_yaml
-      data = "name: from slim"
-      prepare_common_test DYNAMIC_TEMPLATE, '--locals', data do |out, err|
-        assert err.empty?
-        assert_equal "<p>Hello from slim!</p>\n", out
-      end
+  def test_locals_yaml
+    data = "name: from slim"
+    prepare_common_test DYNAMIC_TEMPLATE, '--locals', data do |out, err|
+      assert err.empty?
+      assert_equal "<p>Hello from slim!</p>\n", out
     end
   end
 

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

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/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,7 +63,7 @@ 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"
       else

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,7 +5,7 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 #require 'active_record/railtie'
 #require 'action_mailer/railtie'
-require 'sprockets/railtie'
+#require 'sprockets/railtie'
 require 'slim'
 
 module Dummy