slim 5.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a9cb2acf2b4cdc15e88f19f4b83e7b4ac35ef2bcfe3cce9faff694cd08a761
-  data.tar.gz: 4f097cd7b0c48768b8be27c1d3983826bbdb0dd370b4e617667a6c2b5da7b05e
+  metadata.gz: 032ed4e8911b32aa669a7e0a6196a9955d2f2cdadbcc8432aa589039bc3a7b50
+  data.tar.gz: 94ce4618acbca850dce85c0ce3379e77a8b03ca846b84edcb25a09dfa050e848
 SHA512:
-  metadata.gz: 2eedadac31b851ef0c1d5552c5f199a36ff11cb4a6b6ac8c80b0c0725e81404327b1edc2d43c01033dcb47d5eefbb7145d989ac3619aa635cd9903d390998d2c
-  data.tar.gz: 71ea954ab4041ee8b02f39e056c4954d0ed814b8eaf9e368a48d5a639a314825717996e263bdab0c414c63143a0fe8de1aed29d3ce68c37ebc6a591e1829750e
+  metadata.gz: e25e4b9230e092183013063ece1dbb3233b267eb118f90e41dca7d4a2221fe4e00b1c572d6d1b5defac7b0912bba0b00ff442785c930f49f06849819d699ecb7
+  data.tar.gz: 065b7317b43379f0c7ecf85a0ce4fd398b9ecac13e3b6793de9293711776468bd24c15b2a19f029dd04a16aaf724b1210e0fab600a06a23db57f172054d7f798

data/.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
       - synchronize
       - reopened
   schedule:
-    - cron: "00 15 * * *"
+    - cron: "0 15 * * 0"
 jobs:
   basic:
     runs-on: ubuntu-latest

data/CHANGES

@@ -1,3 +1,16 @@
+5.1.1 (2023-05-16)
+
+  * Support lambda functions as shortcuts - #677 #813 #903
+  * Support --enable-frozen-string-literal - #851
+
+5.1.0 (2023-03-06)
+
+  * Allow whitespace markers for verbatim text: `|<`, `|>`, and `|<>` - #912
+  * Do not swallow single quote after output line indicator - #911
+  * Support Tilt 2.1.0 - #910
+  * Fix Railtie load error - #904
+  * Fix attribute parsing with square brackets - #796
+
 5.0.0 (2023-01-23)
 
   * Fix markdown interpolation #773

data/Gemfile

@@ -2,11 +2,10 @@ source 'https://rubygems.org/'
 
 gemspec
 
-group :perf do
-  gem 'benchmark-ips'
-  gem 'erubi'
-  gem 'haml'
-end
+gem 'test-unit', '~> 3.5'
+gem 'minitest', '~> 5.15'
+gem 'rake', '~> 13.0'
+gem 'kramdown', '~> 2.4'
 
 if ENV['TEMPLE'] && ENV['TEMPLE'] != 'master'
   gem 'temple', "= #{ENV['TEMPLE']}"
@@ -34,11 +33,6 @@ if ENV['RAILS']
   end
 end
 
-gem 'test-unit', '~> 3.5'
-gem 'minitest', '~> 5.15'
-gem 'rake', '~> 13.0'
-gem 'kramdown', '~> 2.4'
-
 if ENV['SINATRA']
   gem 'rack-test'
 
@@ -48,13 +42,3 @@ if ENV['SINATRA']
     gem 'sinatra', :tag => "v#{ENV['SINATRA']}"
   end
 end
-
-if ENV['TASK'] == 'bench'
-  gem 'benchmark-ips'
-  gem 'erubi'
-  gem 'haml'
-end
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  gem 'codeclimate-test-reporter'
-end

data/README.jp.md

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim)
 ![Build Status](https://github.com/slim-template/slim/actions/workflows/test.yml/badge.svg)
-[![Code Climate](https://codeclimate.com/github/slim-template/slim/badges/gpa.svg)](https://codeclimate.com/github/slim-template/slim)
-[![Test Coverage](https://codeclimate.com/github/slim-template/slim/badges/coverage.svg)](https://codeclimate.com/github/slim-template/slim/coverage)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 Slim は 不可解にならない程度に view の構文を本質的な部品まで減らすことを目指したテンプレート言語です。標準的な HTML テンプレートからどれだけのものを減らせるか、検証するところから始まりました。(<, >, 閉じタグなど) 多くの人が Slim に興味を持ったことで, 機能的で柔軟な構文に成長しました。
@@ -31,13 +29,13 @@ Slim は 不可解にならない程度に view の構文を本質的な部品
 
 ## リンク
 
-* ホームページ: <http://github.com/slim-template/slim>
-* ソース: <http://github.com/slim-template/slim>
-* バグ:   <http://github.com/slim-template/slim/issues>
-* リスト:   <http://groups.google.com/group/slim-template>
+* ホームページ: <https://slim-template.github.io>
+* ソース: <https://github.com/slim-template/slim>
+* バグ:   <https://github.com/slim-template/slim/issues>
+* リスト:   <https://groups.google.com/group/slim-template>
 * API ドキュメント:
-    * 最新の Gem: <http://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
-    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
+    * 最新の Gem: <https://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
+    * GitHub master: <https://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
 
 ## イントロダクション
 
@@ -411,7 +409,7 @@ body
 タグの後に直接属性を書きます。通常の属性記述にはダブルクォート `"` か シングルクォート `'` を使わなければなりません (引用符で囲まれた属性)。
 
 ~~~ slim
-a href="http://github.com/slim-template/slim" title='Slim のホームページ' Slim のホームページへ
+a href="https://slim-template.github.io" title='Slim のホームページ' Slim のホームページへ
 ~~~
 
 引用符で囲まれたテキストを属性として使えます。
@@ -447,7 +445,7 @@ h2 [ id = "tagline" ] = page_tagline
 例:
 
 ~~~ slim
-a href="http://github.com/slim-template/slim" title='Slim のホームページ' Slim のホームページへ
+a href="https://slim-template.github.io" title='Slim のホームページ' Slim のホームページへ
 ~~~
 
 引用符で囲まれたテキストを属性として使えます:
@@ -512,13 +510,13 @@ input type="text" disabled=nil
  class 属性はスペース区切りで結合されます。
 
 ~~~ slim
-a.menu class="highlight" href="http://github.com/slim-template/slim/" github.com/slim-template/slim
+a.menu class="highlight" href="https://slim-template.github.io/" slim-template.github.io
 ~~~
 
 レンダリング結果:
 
 ~~~ html
-<a class="menu highlight" href="http://github.com/slim-template/slim/">github.com/slim-template/slim</a>
+<a class="menu highlight" href="https://slim-template.github.io/">slim-template.github.io</a>
 ~~~
 
 また, `Array` を属性値として使うと、配列要素が区切り文字で結合されます。
@@ -571,7 +569,7 @@ div class="first second third"
 ~~~ slim
 ruby:
   def a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://github.com/slim-template/slim/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'https://slim-template.github.io/'}
   end
 - @page_current = true
 *a_unless_current リンク
@@ -582,7 +580,7 @@ ruby:
 レンダリング結果:
 
 ~~~ html
-<span>リンク</span><a href="http://github.com/slim-template/slim/">リンク</a>
+<span>リンク</span><a href="https://slim-template.github.io/">リンク</a>
 ~~~
 
 ### ショートカット
@@ -796,7 +794,7 @@ end
 そして, 次のように使用出来ます。
 
 ~~~ slim
-- links = { 'http://github.com/slim-template/slim' => 'The Slim Template Language' }
+- links = { 'https://slim-template.github.io' => 'The Slim Template Language' }
 = capture link_list=:link_list, links do |url, text|
   a href=url = text
 ~~~

data/README.md

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim)
 ![Build Status](https://github.com/slim-template/slim/actions/workflows/test.yml/badge.svg)
-[![Code Climate](https://codeclimate.com/github/slim-template/slim/badges/gpa.svg)](https://codeclimate.com/github/slim-template/slim)
-[![Test Coverage](https://codeclimate.com/github/slim-template/slim/badges/coverage.svg)](https://codeclimate.com/github/slim-template/slim/coverage)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 Slim is a template language whose goal is to reduce the view syntax to the essential parts without becoming cryptic. It started as an exercise to see how much could be removed from a standard html template (<, >, closing tags, etc...). As more people took an interest in Slim, the functionality grew and so did the flexibility of the syntax.
@@ -31,13 +29,13 @@ A short list of the features...
 
 ## Links
 
-* Homepage: <http://github.com/slim-template/slim>
-* Source: <http://github.com/slim-template/slim>
-* Bugs:   <http://github.com/slim-template/slim/issues>
-* List:   <http://groups.google.com/group/slim-template>
+* Homepage: <https://slim-template.github.io>
+* Source: <https://github.com/slim-template/slim>
+* Bugs:   <https://github.com/slim-template/slim/issues>
+* List:   <https://groups.google.com/group/slim-template>
 * API documentation:
-    * Latest Gem: <http://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
-    * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
+    * Latest Gem: <https://rubydoc.info/gems/slim/frames> <https://www.omniref.com/ruby/gems/slim>
+    * GitHub master: <https://rubydoc.info/github/slim-template/slim/master/frames> <https://www.omniref.com/github/slim-template/slim>
 
 ## Introduction
 
@@ -155,6 +153,17 @@ You can also embed html in the text line
   | <tr><td>#{a.name}</td><td>#{a.description}</td></tr>
 ~~~
 
+#### Verbatim text with leading and/or trailing white space `|<` `|>` `|<>`
+
+You can add white space around verbatim text in the same way as for `=` output:
+~~~ slim
+| This line will not have any extra white space.
+|  This line will have a leading space, but it is difficult to see.
+|< This line will have a leading white space.
+|> This line will have a trailing white space.
+|<> This line will have both leading and trailing white space.
+~~~
+
 ### Verbatim text with trailing white space `'`
 
 The single quote tells Slim to copy the line (similar to `|`), but makes sure that a single trailing white space is appended.
@@ -411,7 +420,7 @@ body
 You write attributes directly after the tag. For normal text attributes you must use double `"` or single quotes `'` (Quoted attributes).
 
 ~~~ slim
-a href="http://github.com/slim-template/slim" title='Slim Homepage' Goto the Slim homepage
+a href="https://slim-template.github.io" title='Slim Homepage' Goto the Slim homepage
 ~~~
 
 You can use text interpolation in the quoted attributes.
@@ -447,7 +456,7 @@ h2 [ id = "tagline" ] = page_tagline
 Example:
 
 ~~~ slim
-a href="http://github.com/slim-template/slim" title='Slim Homepage' Goto the Slim homepage
+a href="https://slim-template.github.io" title='Slim Homepage' Goto the Slim homepage
 ~~~
 
 You can use text interpolation in the quoted attributes:
@@ -512,13 +521,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://github.com/slim-template/slim/" github.com/slim-template/slim
+a.menu class="highlight" href="https://slim-template.github.io/" slim-template.github.io
 ~~~
 
 This renders as:
 
 ~~~ html
-<a class="menu highlight" href="http://github.com/slim-template/slim/">github.com/slim-template/slim</a>
+<a class="menu highlight" href="https://slim-template.github.io/">slim-template.github.io</a>
 ~~~
 
 You can also use an `Array` as attribute value and the array elements will be merged using the delimiter.
@@ -571,7 +580,7 @@ with the :tag key.
 ~~~ slim
 ruby:
   def a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://github.com/slim-template/slim/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'https://slim-template.github.io/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -582,7 +591,7 @@ ruby:
 This renders as:
 
 ~~~ html
-<span>Link</span><a href="http://github.com/slim-template/slim/">Link</a>
+<span>Link</span><a href="https://slim-template.github.io/">Link</a>
 ~~~
 
 ### Shortcuts
@@ -692,6 +701,30 @@ which renders to
 </script>
 ~~~
 
+#### Lambda shortcuts
+
+You can define custom shortcuts using lambdas.
+
+In this example we add `~` to create a shortcut with a special processing (adding a prefix) for the class attribute.
+
+~~~ ruby
+Slim::Engine.set_options shortcut: {'~' => {attr: ->(v) {{class: "styled-#{v}"}}}}
+~~~
+
+We can use it in Slim code like this
+
+~~~ slim
+h1~title Hello
+~text~question.paragraph How are you?
+~~~
+
+which renders to
+
+~~~ html
+<h1 class="styled-title">Hello</h1>
+<div class="styled-text styled-question paragraph">How are you?</div>
+~~~
+
 #### ID shortcut `#` and class shortcut `.`
 
 You can specify the `id` and `class` attributes in the following shortcut form
@@ -796,7 +829,7 @@ end
 and it would be used as follows
 
 ~~~ slim
-- links = { 'http://github.com/slim-template/slim' => 'The Slim Template Language' }
+- links = { 'https://slim-template.github.io' => 'The Slim Template Language' }
 = capture link_list=:link_list, links do |url, text|
   a href=url = text
 ~~~

data/Rakefile

@@ -6,11 +6,6 @@ end
 
 require 'rake/testtask'
 
-desc 'Run Slim benchmarks! (default parameters slow=false)'
-task :bench, :slow do
-  ruby('benchmarks/run-benchmarks.rb')
-end
-
 task 'test' => %w(test:core test:literate test:logic_less test:translator test:smart test:include)
 
 namespace 'test' do

data/lib/slim/code_attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # @api private
   class CodeAttributes < Filter

data/lib/slim/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'slim'
 require 'optparse'
 
@@ -63,13 +64,6 @@ module Slim
             eval(locals)
           else
             require 'yaml'
-            if RUBY_ENGINE == 'rbx'
-              begin
-                require 'psych'
-              rescue LoadError
-                $stderr.puts 'Please install psych gem as Rubunius ships with an old YAML engine.'
-              end
-            end
             YAML.load(locals)
           end
       end

data/lib/slim/controls.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # @api private
   class Controls < Filter

data/lib/slim/do_inserter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # In Slim you don't need the do keyword sometimes. This
   # filter adds the missing keyword.

data/lib/slim/embedded.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module Slim
   # @api private
   class TextCollector < Filter
     def call(exp)
-      @collected = ''
+      @collected = ''.dup
       super(exp)
       @collected
     end
@@ -30,7 +31,7 @@ module Slim
   # @api private
   class OutputProtector < Filter
     def call(exp)
-      @protect, @collected, @tag = [], '', object_id.abs.to_s(36)
+      @protect, @collected, @tag = [], ''.dup, object_id.abs.to_s(36)
       super(exp)
       @collected
     end

data/lib/slim/end_inserter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   # In Slim you don't need to close any blocks:
   #

data/lib/slim/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The Slim module contains all Slim related classes (e.g. Engine, Parser).
 # Plugins might also reside within the Slim module (e.g. Include, Smart).
 # @api public

data/lib/slim/erb_converter.rb

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

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

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
@@ -63,7 +64,7 @@ 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]
@@ -79,12 +80,12 @@ module Slim
       @attr_list_delims_re = /\A\s*([#{keys}])/
       @embedded_re = /\A(#{Regexp.union(Embedded.engines.keys.map(&:to_s))})(?:\s*(?:(.*)))?:(\s*)/
       keys = Regexp.escape ('"\'></='.split(//) + @attr_list_delims.flatten + @code_attr_delims.flatten).uniq.join
-      @attr_name = "\\A\\s*([^\0\s#{keys}]+)"
+      @attr_name = "\\A\\s*([^\\0\\s#{keys}]+)"
       @quoted_attr_re = /#{@attr_name}\s*=(=?)\s*("|')/
       @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
 
@@ -209,10 +210,12 @@ module Slim
       when /\A\//
         # Slim comment
         parse_comment_block
-      when /\A([\|'])( ?)/
+      when /\A([\|'])([<>]{1,2}(?: |\z)| ?)/
         # Found verbatim text block.
-        trailing_ws = $1 == "'"
-        @stacks.last << [:slim, :text, :verbatim, parse_text_block($', @indents.last + $2.size + 1)]
+        leading_ws = $2.include?('<'.freeze)
+        trailing_ws = ($1 == "'") || $2.include?('>'.freeze)
+        @stacks.last << [:static, ' '] if leading_ws
+        @stacks.last << [:slim, :text, :verbatim, parse_text_block($', @indents.last + $2.count(' ') + 1)]
         @stacks.last << [:static, ' '] if trailing_ws
       when /\A</
         # Inline html
@@ -226,13 +229,14 @@ module Slim
         block = [:multi]
         @stacks.last << [:slim, :control, parse_broken_line, block]
         @stacks << block
-      when /\A=(=?)(['<>]*)/
+      when /\A=(=?)([<>]*)/
         # Found an output block.
         # We expect the line to be broken or the next line to be indented.
         @line = $'
+        leading_ws = $2.include?('<'.freeze)
         trailing_ws = $2.include?('>'.freeze)
         block = [:multi]
-        @stacks.last << [:static, ' '] if $2.include?('<'.freeze)
+        @stacks.last << [:static, ' '] if leading_ws
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] if trailing_ws
         @stacks << block
@@ -332,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]]
@@ -458,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}]/
@@ -486,7 +496,7 @@ 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/

data/lib/slim/railtie.rb

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

data/lib/slim/smart/escaper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Smart
     # Perform smart entity escaping in the

data/lib/slim/smart/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   module Smart
     # Perform newline processing in the

data/lib/slim/smart/parser.rb

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

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,3 +1,4 @@
+# frozen_string_literal: true
 module Slim
   class InvalidAttributeNameError < StandardError; end
   module Splat
@@ -90,7 +91,7 @@ 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)
             end

data/lib/slim/splat/filter.rb

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

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)
 

data/lib/slim/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Slim
   # Slim version string
   # @api public
-  VERSION = '5.0.0'
+  VERSION = '5.1.1'
 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.1'])
+  s.add_runtime_dependency('tilt', ['>= 2.1.0'])
 end

data/test/core/helper.rb

@@ -121,7 +121,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_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
@@ -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/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
@@ -104,6 +144,16 @@ renders as
 <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://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
 ### Text with trailing white space `'`
 
 A text blocks with trailing white space starts with the `'` as line indicator.

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/rails/app/controllers/slim_controller.rb

@@ -26,7 +26,8 @@ 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

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/test/test_slim.rb

@@ -77,6 +77,11 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_xpath '//input[@id="entry_name" and @name="entry[name]" and @type="text"]'
   end
 
+  test "attributes" do
+    get "/slim/attributes"
+    assert_html "<div class=\"static a-b\"></div>"
+  end
+
   test "splat" do
     get "/slim/splat"
     assert_html "<div id=\"splat\"><splat>Hello</splat></div>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -32,20 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -66,14 +60,6 @@ files:
 - README.jp.md
 - README.md
 - Rakefile
-- benchmarks/context.rb
-- benchmarks/profile-parser.rb
-- benchmarks/profile-render.rb
-- benchmarks/run-benchmarks.rb
-- benchmarks/run-diffbench.rb
-- benchmarks/view.erb
-- benchmarks/view.haml
-- benchmarks/view.slim
 - bin/slimrb
 - doc/include.md
 - doc/jp/include.md
@@ -152,6 +138,7 @@ files:
 - test/rails/app/views/entries/edit.html.slim
 - test/rails/app/views/layouts/application.html.slim
 - test/rails/app/views/slim/_partial.html.slim
+- test/rails/app/views/slim/attributes.html.slim
 - test/rails/app/views/slim/content_for.html.slim
 - test/rails/app/views/slim/erb.html.erb
 - test/rails/app/views/slim/form_for.html.slim

data/benchmarks/context.rb

@@ -1,11 +0,0 @@
-class Context
-  def header
-    'Colors'
-  end
-
-  def item
-    [ { name: 'red',   current: true,  url: '#red'   },
-      { name: 'green', current: false, url: '#green' },
-      { name: 'blue',  current: false, url: '#blue'  } ]
-  end
-end

data/benchmarks/profile-parser.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-
-1000.times { engine.call(content) }

data/benchmarks/profile-render.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-slim = Slim::Template.new { content }
-context = Context.new
-
-10000.times { slim.render(context) }

data/benchmarks/run-benchmarks.rb

@@ -1,115 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-require 'benchmark/ips'
-require 'tilt'
-require 'erubi'
-require 'erb'
-require 'haml'
-
-class SlimBenchmarks
-  def initialize(slow)
-    @benches   = Hash.new { |h, k| h[k] = [] }
-
-    @erb_code  = File.read(File.dirname(__FILE__) + '/view.erb')
-    @haml_code = File.read(File.dirname(__FILE__) + '/view.haml')
-    @slim_code = File.read(File.dirname(__FILE__) + '/view.slim')
-
-    init_compiled_benches
-    init_tilt_benches
-    init_parsing_benches if slow
-  end
-
-  def init_compiled_benches
-    context  = Context.new
-
-    context.instance_eval %{
-      def run_erb; #{ERB.new(@erb_code).src}; end
-      def run_erubi; #{Erubi::Engine.new(@erb_code).src}; end
-      def run_temple_erb; #{Temple::ERB::Engine.new.call @erb_code}; end
-      def run_slim_pretty; #{Slim::Engine.new(pretty: true).call @slim_code}; end
-      def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
-      def run_haml; #{Haml::Engine.new.call @haml_code}; end
-    }
-
-    bench(:compiled, 'erb')         { context.run_erb }
-    bench(:compiled, 'erubi')       { context.run_erubi }
-    bench(:compiled, 'temple erb')  { context.run_temple_erb }
-    bench(:compiled, 'slim pretty') { context.run_slim_pretty }
-    bench(:compiled, 'slim ugly')   { context.run_slim_ugly }
-    bench(:compiled, 'haml')        { context.run_haml }
-  end
-
-  def init_tilt_benches
-    tilt_erb         = Tilt::ERBTemplate.new { @erb_code }
-    tilt_erubi       = Tilt::ErubiTemplate.new { @erb_code }
-    tilt_temple_erb  = Temple::ERB::Template.new { @erb_code }
-    tilt_haml        = Tilt::HamlTemplate.new(format: :html5) { @haml_code }
-    tilt_slim_pretty = Slim::Template.new(pretty: true) { @slim_code }
-    tilt_slim_ugly   = Slim::Template.new { @slim_code }
-
-    context  = Context.new
-
-    bench(:tilt, 'erb')         { tilt_erb.render(context) }
-    bench(:tilt, 'erubi')       { tilt_erubi.render(context) }
-    bench(:tilt, 'temple erb')  { tilt_temple_erb.render(context) }
-    bench(:tilt, 'slim pretty') { tilt_slim_pretty.render(context) }
-    bench(:tilt, 'slim ugly')   { tilt_slim_ugly.render(context) }
-    bench(:tilt, 'haml')        { tilt_haml.render(context) }
-  end
-
-  def init_parsing_benches
-    context  = Context.new
-    context_binding = context.instance_eval { binding }
-
-    bench(:parsing, 'erb')         { ERB.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'erubi')       { Erubi::Engine.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'temple erb')  { Temple::ERB::Template.new { @erb_code }.render(context) }
-    bench(:parsing, 'slim pretty') { Slim::Template.new(pretty: true) { @slim_code }.render(context) }
-    bench(:parsing, 'slim ugly')   { Slim::Template.new { @slim_code }.render(context) }
-    bench(:parsing, 'haml')        { Haml::Engine.new(@haml_code, format: :html5).render(context) }
-  end
-
-  def run
-    @benches.each do |group_name, group_benches|
-      puts "Running #{group_name} benchmarks:"
-
-      Benchmark.ips do |x|
-        group_benches.each do |name, block|
-          x.report("#{group_name} #{name}", &block)
-        end
-
-        x.compare!
-      end
-    end
-
-    puts "
-Compiled benchmark: Template is parsed before the benchmark and
-    generated ruby code is compiled into a method.
-    This is the fastest evaluation strategy because it benchmarks
-    pure execution speed of the generated ruby code.
-
-Compiled Tilt benchmark: Template is compiled with Tilt, which gives a more
-    accurate result of the performance in production mode in frameworks like
-    Sinatra, Ramaze and Camping. (Rails still uses its own template
-    compilation.)
-
-Parsing benchmark: Template is parsed every time.
-    This is not the recommended way to use the template engine
-    and Slim is not optimized for it. Activate this benchmark with 'rake bench slow=1'.
-
-Temple ERB is the ERB implementation using the Temple framework. It shows the
-overhead added by the Temple framework compared to ERB.
-"
-  end
-
-  def bench(group, name, &block)
-    @benches[group].push([name, block])
-  end
-end
-
-SlimBenchmarks.new(ENV['slow']).run

data/benchmarks/run-diffbench.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-require 'diffbench'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-template = Slim::Template.new { content }
-context = Context.new
-
-DiffBench.bm do
-  report("Parse") do
-    2000.times { engine.call(content) }
-  end
-  report("Render") do
-    100000.times { template.render(context) }
-  end
-end

data/benchmarks/view.erb

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-
-<html lang="en">
-  <head>
-    <title>Simple Benchmark</title>
-    <meta charset="utf-8">
-    <meta name="description" content="This is an example of a meta description.">
-  </head>
-  <body>
-    <h1><%= header %></h1>
-    <% unless item.empty? %>
-      <ul>
-      <% for i in item %>
-        <% if i[:current] %>
-          <li><strong><%= i[:name] %></strong></li>
-        <% else %>
-          <li><a href="<%= i[:url] %>"><%= i[:name] %></a></li>
-        <% end %>
-      <% end %>
-      </ul>
-    <% else %>
-      <p>The list is empty.</p>
-    <% end %>
-  </body>
-</html>

data/benchmarks/view.haml

@@ -1,20 +0,0 @@
-!!! html
-
-%html{ lang: "en" }
-  %head
-    %title Simple Benchmark
-    %meta{ charset: "utf-8" }
-    %meta{ name: "description", content: "This is an example of a meta description." }
-  %body
-    %h1= header
-    - unless item.empty?
-      %ul
-        - for i in item
-          - if i[:current]
-            %li
-              %strong= i[:name]
-          - else
-            %li
-              %a{:href => i[:url]}= i[:name]
-    - else
-      %p The list is empty.

data/benchmarks/view.slim

@@ -1,19 +0,0 @@
-doctype html
-html lang="en"
-  head
-    title Simple Benchmark
-    meta charset="utf-8"
-    meta name="description" content="This is an example of a meta description."
-  body
-    h1 == header
-    - unless item.empty?
-      ul
-        - for i in item
-          - if i[:current]
-            li
-              strong == i[:name]
-          - else
-            li
-              a href==i[:url] == i[:name]
-    - else
-      p The list is empty.