slim 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032ed4e8911b32aa669a7e0a6196a9955d2f2cdadbcc8432aa589039bc3a7b50
-  data.tar.gz: 94ce4618acbca850dce85c0ce3379e77a8b03ca846b84edcb25a09dfa050e848
+  metadata.gz: d9008a7eaa7a19ae0ada9b2a6789ff073a43fceaea9e24fe284ebf698fd5b02c
+  data.tar.gz: 2c79bf7dc50662e04fb711ba4a1c334265c3a5b2186a111b932a04f02ae16680
 SHA512:
-  metadata.gz: e25e4b9230e092183013063ece1dbb3233b267eb118f90e41dca7d4a2221fe4e00b1c572d6d1b5defac7b0912bba0b00ff442785c930f49f06849819d699ecb7
-  data.tar.gz: 065b7317b43379f0c7ecf85a0ce4fd398b9ecac13e3b6793de9293711776468bd24c15b2a19f029dd04a16aaf724b1210e0fab600a06a23db57f172054d7f798
+  metadata.gz: 1c4aa87d3b5a20242328258c6cfe8b436af5f92b437076bb185926764e5168959087aca53e5c0face78bde9b6670b6c4023f4893f98f58c6db97d730961ed93a
+  data.tar.gz: 178427ae03b2c8e2918c4114376a5dd3955ac20ef393d5a355ca441617a39f3b66101ff00bbb7c0c6e8b12aee338db2914c37910712c1ada5aa5814f9e3cdd79

data/.github/workflows/test.yml

@@ -16,9 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -29,23 +29,46 @@ jobs:
           SINATRA: 2.2.4
       - run: bundle install && bundle exec rake test:sinatra
         env:
-          SINATRA: 3.0.5
+          SINATRA: 3.0.6
+      - run: bundle install && bundle exec rake test:sinatra
+        if: ${{ matrix.ruby != '2.5' }}
+        env:
+          SINATRA: 3.1.0
+      - run: bundle install && bundle exec rake test:sinatra
+        if: ${{ matrix.ruby != '2.5' }}
+        env:
+          SINATRA: main
   rails:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=5.2.8"
         env:
           RAILS: 5.2.8
       - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=6.0.6"
         env:
           RAILS: 6.0.6
       - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=6.1.7"
         env:
           RAILS: 6.1.7
+      - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=7.0.7"
+        env:
+          RAILS: 7.0.8
+      - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=7.1.0"
+        env:
+          RAILS: 7.1.2
+      - run: bundle install && bundle exec rake test:rails
+        name: "rake test:rails RAILS=main"
+        env:
+          RAILS: main

data/CHANGES

@@ -1,3 +1,9 @@
+5.2.0 (2023-11-11)
+
+  * Fix logic less bug - #783
+  * Support Rails 7.1 - #936
+  * Fix splat arguments on Rails 7.1 - #942
+
 5.1.1 (2023-05-16)
 
   * Support lambda functions as shortcuts - #677 #813 #903
@@ -243,7 +249,7 @@
   * BACKWARD INCOMPATIBLE CHANGE -  Dynamic attributes which return empty value "" are not removed anymore
     (this means "" is now interpreted as true), whereas false and nil are still removed.
     This corresponds to the definition of boolean attributes in XHTML and HTML5.
-  * Deprecated option :remove_empty_attrs (TODO: Remove in 1.4.0)
+  * Deprecated option :remove_empty_attrs
   * Add option :escape_quoted_attrs to escape quoted attributes, use == if you don't want that.
     The default is false to stay backward compatible.
   * Use Temple::FilterError exception

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org/'
 
 gemspec
 
-gem 'test-unit', '~> 3.5'
 gem 'minitest', '~> 5.15'
 gem 'rake', '~> 13.0'
 gem 'kramdown', '~> 2.4'
@@ -11,12 +10,12 @@ if ENV['TEMPLE'] && ENV['TEMPLE'] != 'master'
   gem 'temple', "= #{ENV['TEMPLE']}"
 else
   # Test against temple master by default
-  gem 'temple', :github => 'judofyr/temple'
+  gem 'temple', github: 'judofyr/temple'
 end
 
 if ENV['TILT']
   if ENV['TILT'] == 'master'
-    gem 'tilt', :github => 'rtomayko/tilt'
+    gem 'tilt', github: 'jeremyevans/tilt'
   else
     gem 'tilt', "= #{ENV['TILT']}"
   end
@@ -27,7 +26,7 @@ if ENV['RAILS']
 
   # we need some smarter test logic for the different Rails versions
   if ENV['RAILS'] == 'main'
-    gem 'rails', :github => 'rails/rails', branch: 'main'
+    gem 'rails', github: 'rails/rails', branch: 'main'
   else
     gem 'rails', "= #{ENV['RAILS']}"
   end
@@ -36,9 +35,9 @@ end
 if ENV['SINATRA']
   gem 'rack-test'
 
-  if ENV['SINATRA'] == 'master'
-    gem 'sinatra', :github => 'sinatra/sinatra'
+  if ENV['SINATRA'] == 'main'
+    gem 'sinatra', github: 'sinatra/sinatra'
   else
-    gem 'sinatra', :tag => "v#{ENV['SINATRA']}"
+    gem 'sinatra', tag: "v#{ENV['SINATRA']}"
   end
 end

data/README.jp.md

@@ -32,23 +32,22 @@ Slim は 不可解にならない程度に view の構文を本質的な部品
 * ホームページ: <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: <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>
+    * 最新の Gem: <https://rubydoc.info/gems/slim/frames>
+    * GitHub main: <https://rubydoc.info/github/slim-template/slim/main/frames>
 
 ## イントロダクション
 
 ### Slim とは?
 
 Slim は __Rails5 以降__ に対応した高速, 軽量なテンプレートエンジンです。主要な Ruby の実装全てでしっかりテストされています。
-私たちは継続的インテグレーションを採用しています。(travis-ci)
+私たちは継続的インテグレーションを採用しています。(github actions)
 
 Slim の核となる構文は1つの考えによって導かれています: "この動作を行うために最低限必要なものは何か。"
 
 多くの人々の Slim への貢献によって, 彼らが使う [Haml](https://github.com/haml/haml) や [Jade](https://github.com/visionmedia/jade) の影響を受け構文の追加が行われています。 Slim の開発チームは美は見る人の目の中にあることを分っているので、こういった追加にオープンです。
 
-Slim は 構文解析/コンパイルに [Temple](https://github.com/judofyr/temple) を使い [Tilt](https://github.com/rtomayko/tilt) に組み込まれます。これにより [Sinatra](https://github.com/sinatra/sinatra) やプレーンな [Rack](https://github.com/rack/rack) とも一緒に使えます。
+Slim は 構文解析/コンパイルに [Temple](https://github.com/judofyr/temple) を使い [Tilt](https://github.com/jeremyevans/tilt) に組み込まれます。これにより [Sinatra](https://github.com/sinatra/sinatra) やプレーンな [Rack](https://github.com/rack/rack) とも一緒に使えます。
 
 Temple のアーキテクチャはとても柔軟で, モンキーパッチなしで構文解析とコンパイルのプロセスの拡張が可能です。これはロジックレスのプラグインや I18n が提供する翻訳プラグインに
 使用されます。ロジックレスモードでは HTML をビルドするために Slim の構文を使いたいが, テンプレートの中で Ruby を書きたくない場合にも Slim を使うことができます。
@@ -60,7 +59,6 @@ Temple のアーキテクチャはとても柔軟で, モンキーパッチな
 * Slim のアーキテクチャは非常に柔軟なので, 構文の拡張やプラグインを書くことができます。
 
 ___そう, Slim は速い!___ Slim は開発当初からパフォーマンスに注意して開発されてきました。
-ベンチマークはコミット毎に <http://travis-ci.org/slim-template/slim> で取られています。
 この数字が信じられませんか? それは仕方ないことです。是非 rake タスクを使って自分でベンチマークを取ってみてください!
 
 私たちの考えでは, あなたは Slim の機能と構文を使うべきです。Slim はあなたのアプリケーションのパフォーマンスに悪影響を与えないことを保証します。
@@ -843,7 +841,7 @@ body
 
 ## 埋め込みエンジン (Markdown, ...)
 
-[Tilt](https://github.com/rtomayko/tilt)のおかげで, Slim は他のテンプレートエンジンの埋め込みに見事に対応しています。
+[Tilt](https://github.com/jeremyevans/tilt)のおかげで, Slim は他のテンプレートエンジンの埋め込みに見事に対応しています。
 
 例:
 
@@ -866,8 +864,8 @@ p: markdown: Tag with **inline** markdown!
 | ruby: | なし | ショートカット | Ruby コードを埋め込むショートカット |
 | javascript: | なし | ショートカット | javascript コードを埋め込み、script タグで囲む |
 | css: | なし | ショートカット | css コードを埋め込み、style タグで囲む |
-| sass: | sass | コンパイル時 | sass コードを埋め込み、style タグで囲む |
-| scss: | sass | コンパイル時 | scss コードを埋め込み、style タグで囲む |
+| sass: | sass-embedded または sassc または sass | コンパイル時 | sass コードを埋め込み、style タグで囲む |
+| scss: | sass-embedded または sassc または sass | コンパイル時 | scss コードを埋め込み、style タグで囲む |
 | less: | less | コンパイル時 | less コードを埋め込み、style タグで囲む |
 | coffee: | coffee-script | コンパイル時 | CoffeeScript をコンパイルし、 script タグで囲む |
 | markdown: | redcarpet/rdiscount/kramdown | コンパイル時 + 展開 | Markdown をコンパイルし、テキスト中の # \{variables} を展開 |
@@ -906,7 +904,7 @@ scss class="myClass":
 ## Slim の設定
 
 Slim とその基礎となる [Temple](https://github.com/judofyr/temple) は非常に柔軟に設定可能です。
-Slim を設定する方法はコンパイル機構に少し依存します。(Rails や [Tilt](https://github.com/rtomayko/tilt))。デフォルトオプションの設定は `Slim::Engine` クラスでいつでも可能です。Rails の 環境設定ファイルで設定可能です。例えば, config/environments/developers.rb で設定したいとします:
+Slim を設定する方法はコンパイル機構に少し依存します。(Rails や [Tilt](https://github.com/jeremyevans/tilt))。デフォルトオプションの設定は `Slim::Engine` クラスでいつでも可能です。Rails の 環境設定ファイルで設定可能です。例えば, config/environments/developers.rb で設定したいとします:
 
 ### デフォルトオプション
 
@@ -1021,7 +1019,7 @@ Slim はロジックレスモードと I18n, インクルードプラグイン
 
 ### Tilt
 
-Slim は生成されたコードをコンパイルするために [Tilt](https://github.com/rtomayko/tilt) を使用します。Slim テンプレートを直接使いたい場合, Tilt インターフェイスが使用できます。
+Slim は生成されたコードをコンパイルするために [Tilt](https://github.com/jeremyevans/tilt) を使用します。Slim テンプレートを直接使いたい場合, Tilt インターフェイスが使用できます。
 
 ~~~ ruby
 Tilt.new['template.slim'].render(scope)
@@ -1186,8 +1184,6 @@ markdown:
 rake bench slow=1 iterations=1000
 ~~~
 
-私たちはコミット毎に Travis-CI でベンチマークをとっています。最新のベンチマーク結果はこちらです: <http://travis-ci.org/slim-template/slim>
-
 ### テストスイートと継続的インテグレーション
 
 Slim は minitest ベースの拡張性のあるテストスイートを提供します。テストは 'rake test' または
@@ -1195,8 +1191,6 @@ rails のインテグレーションテストの場合 'rake test:rails' で実
 
 私たちは現在 markdown ファイルで書かれ, 人間が読み書きしやすいテストを試しています: [TESTS.md](test/literate/TESTS.md)
 
-Travis-CI は継続的インテグレーションテストに利用されています: <http://travis-ci.org/slim-template/slim>
-
 Slim は主要な Ruby 実装全てで動作します:
 
 * Ruby 2.5
@@ -1232,10 +1226,6 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
-## 議論
-
-* [Google Group](http://groups.google.com/group/slim-template)
-
 ## 関連プロジェクト
 
 テンプレートのコンパイルフレームワーク:

data/README.md

@@ -32,23 +32,22 @@ A short list of the features...
 * 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: <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>
+    * Latest Gem: <https://rubydoc.info/gems/slim/frames>
+    * GitHub main: <https://rubydoc.info/github/slim-template/slim/main/frames>
 
 ## Introduction
 
 ### What is Slim?
 
 Slim is a fast, lightweight templating engine with support for __Rails 5 and later__. It has been heavily tested on all major ruby implementations. We use
-continuous integration (travis-ci).
+continuous integration (github actions).
 
 Slim's core syntax is guided by one thought: "What's the minimum required to make this work".
 
 As more people have contributed to Slim, there have been syntax additions influenced from their use of [Haml](https://github.com/haml/haml) and [Jade](https://github.com/visionmedia/jade).  The Slim team is open to these additions because we know beauty is in the eye of the beholder.
 
-Slim uses [Temple](https://github.com/judofyr/temple) for parsing/compilation and is also integrated into [Tilt](https://github.com/rtomayko/tilt), so it can be used together with [Sinatra](https://github.com/sinatra/sinatra) or plain [Rack](https://github.com/rack/rack).
+Slim uses [Temple](https://github.com/judofyr/temple) for parsing/compilation and is also integrated into [Tilt](https://github.com/jeremyevans/tilt), so it can be used together with [Sinatra](https://github.com/sinatra/sinatra) or plain [Rack](https://github.com/rack/rack).
 
 The architecture of Temple is very flexible and allows the extension of the parsing and compilation process without monkey-patching. This is used
 by the logic less plugin and the translator plugin which provides I18n. In logic-less mode you can use Slim if you like the Slim syntax to build your HTML but don't want to write Ruby in your templates.
@@ -878,7 +877,7 @@ body
 
 ## Embedded engines (Markdown, ...)
 
-Thanks to [Tilt](https://github.com/rtomayko/tilt), Slim has extensive support for embedding other template engines.
+Thanks to [Tilt](https://github.com/jeremyevans/tilt), Slim has extensive support for embedding other template engines.
 
 Examples:
 
@@ -901,8 +900,8 @@ Supported engines:
 | ruby: | none | Shortcut | Shortcut to embed ruby code |
 | javascript: | none | Shortcut | Shortcut to embed javascript code and wrap in script tag |
 | css: | none | Shortcut | Shortcut to embed css code and wrap in style tag |
-| sass: | sass | Compile time | Embed sass code and wrap in style tag |
-| scss: | sass | Compile time | Embed scss code and wrap in style tag |
+| sass: | sass-embedded or sassc or sass | Compile time | Embed sass code and wrap in style tag |
+| scss: | sass-embedded or sassc or sass | Compile time | Embed scss code and wrap in style tag |
 | less: | less | Compile time | Embed less css code and wrap in style tag |
 | coffee: | coffee-script | Compile time | Compile coffee script code and wrap in script tag |
 | markdown: | redcarpet/rdiscount/kramdown | Compile time + Interpolation | Compile markdown code and interpolate #\{variables} in text |
@@ -1056,7 +1055,7 @@ Slim currently provides plugins for logic less mode, includes and I18n. See the
 
 ### Tilt
 
-Slim uses [Tilt](https://github.com/rtomayko/tilt) to compile the generated code. If you want to use the Slim template directly, you can use the Tilt interface.
+Slim uses [Tilt](https://github.com/jeremyevans/tilt) to compile the generated code. If you want to use the Slim template directly, you can use the Tilt interface.
 
 ~~~ ruby
 Tilt.new['template.slim'].render(scope)
@@ -1222,8 +1221,6 @@ run the slow parsing benchmark which needs more time. You can also increase the
 $ rake bench slow=1 iterations=1000
 ~~~
 
-We run the benchmarks for every commit on Travis-CI. Take a look at the newest benchmarking results: <http://travis-ci.org/slim-template/slim>
-
 ### Test suite and continuous integration
 
 Slim provides an extensive test-suite based on minitest. You can run the tests
@@ -1231,8 +1228,6 @@ with 'rake test' and the rails integration tests with 'rake test:rails'.
 
 We are currently experimenting with human-readable literate tests which are written as markdown files: [TESTS.md](test/literate/TESTS.md)
 
-Travis-CI is used for continuous integration testing: <http://travis-ci.org/slim-template/slim>
-
 Slim is working well on all major Ruby implementations:
 
 * Ruby 2.5 and newer
@@ -1268,10 +1263,6 @@ If you want to support this project please visit the GitHub sponsors page.
 
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
-## Discuss
-
-* [Google Group](http://groups.google.com/group/slim-template)
-
 ## Related projects
 
 Template compilation framework:

data/Rakefile

@@ -74,7 +74,7 @@ rescue LoadError
   end
 end
 
-desc "Generate Documentation"
+desc 'Generate Documentation'
 task doc: :yard
 
 task default: 'test'

data/lib/slim/code_attributes.rb

@@ -9,7 +9,7 @@ module Slim
     # @param [Array] attrs Array of temple expressions
     # @return [Array] Compiled temple expression
     def on_html_attrs(*attrs)
-      [:multi, *attrs.map {|a| compile(a) }]
+      [:multi, *attrs.map { |a| compile(a) }]
     end
 
     # Handle attribute expression `[:html, :attr, name, value]`

data/lib/slim/command.rb

@@ -45,7 +45,7 @@ module Slim
         @options[:compile] = true
       end
 
-      opts.on('-r', '--require library', "Load library or plugin with -r slim/plugin") do |lib|
+      opts.on('-r', '--require library', 'Load library or plugin with -r slim/plugin') do |lib|
         require lib.strip
       end
 

data/lib/slim/do_inserter.rb

@@ -16,7 +16,7 @@ module Slim
     # @param [Array] content Temple expression
     # @return [Array] Compiled temple expression
     def on_slim_control(code, content)
-      code = code + ' do' unless code =~ BLOCK_REGEX || empty_exp?(content)
+      code += ' do' unless code =~ BLOCK_REGEX || empty_exp?(content)
       [:slim, :control, code, compile(content)]
     end
 
@@ -27,7 +27,7 @@ module Slim
     # @param [Array] content Temple expression
     # @return [Array] Compiled temple expression
     def on_slim_output(escape, code, content)
-      code = code + ' do' unless code =~ BLOCK_REGEX || empty_exp?(content)
+      code += ' do' unless code =~ BLOCK_REGEX || empty_exp?(content)
       [:slim, :output, escape, code, compile(content)]
     end
   end

data/lib/slim/embedded.rb

@@ -154,8 +154,8 @@ module Slim
 
       def tilt_render(tilt_engine, tilt_options, text)
         text = tilt_engine.new(tilt_options.merge(
-          style: options[:pretty] ? :expanded : :compressed,
-          cache: false)) { text }.render
+          style: options[:pretty] ? :expanded : :compressed
+        )) { text }.render
         text = text.chomp
         [:static, text]
       end
@@ -189,9 +189,8 @@ module Slim
       set_options attributes: {}
 
       def on_slim_embedded(engine, body, attrs)
-
         unless options[:attributes].empty?
-          options[:attributes].map do|k, v|
+          options[:attributes].map do |k, v|
             attrs << [:html, :attr, k, [:static, v]]
           end
         end
@@ -207,7 +206,6 @@ module Slim
 
         [:html, :tag, options[:tag], attrs, body]
       end
-
     end
 
     # Javascript wrapper engine.

data/lib/slim/logic_less/context.rb

@@ -74,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)
@@ -105,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/parser.rb

@@ -50,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"
@@ -70,9 +70,9 @@ module Slim
           @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}]/
@@ -338,7 +338,7 @@ module Slim
         syntax_error!('Illegal shortcut') unless shortcut = @attr_shortcut[$1]
 
         if shortcut.is_a?(Proc)
-          shortcut.call($2).each {|a, v| attributes << [:html, :attr, a, [:static, v]] }
+          shortcut.call($2).each { |a, v| attributes << [:html, :attr, a, [:static, v]] }
         else
           shortcut.each {|a| attributes << [:html, :attr, a, [:static, $2]] }
         end
@@ -503,9 +503,9 @@ module Slim
           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,7 +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

@@ -37,7 +37,6 @@ module Slim
         end
         block
       end
-
     end
   end
 end

data/lib/slim/smart/filter.rb

@@ -51,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

@@ -8,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
 
@@ -25,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/splat/builder.rb

@@ -4,8 +4,9 @@ module Slim
   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 = {}
@@ -18,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
 
@@ -34,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
@@ -93,7 +94,7 @@ module Slim
         if Hash === value
           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|
@@ -101,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

@@ -11,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
@@ -45,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,
@@ -86,7 +86,7 @@ module Slim
               attr
             end
         end
-        return builder, result
+        [builder, result]
       end
     end
   end

data/lib/slim/translator.rb

@@ -110,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

@@ -2,5 +2,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '5.1.1'
+  VERSION = '5.2.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 = {})

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

@@ -32,6 +32,11 @@ class SlimController < ApplicationController
     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/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

data/test/rails/test/test_slim.rb

@@ -9,6 +9,14 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1>"
   end
 
+  test "variant" do
+    get "/slim/variant"
+    assert_response :success
+    assert_template "slim/normal"
+    assert_template "layouts/application"
+    assert_equal @response.body, "<!DOCTYPE html><html><head><title>Variant</title></head><body><div class=\"content\"><h1>Hello Slim!</h1></div></body></html>"
+  end
+
   test "xml view" do
     get "/slim/xml"
     assert_response :success
@@ -86,4 +94,9 @@ class TestSlim < ActionDispatch::IntegrationTest
     get "/slim/splat"
     assert_html "<div id=\"splat\"><splat>Hello</splat></div>"
   end
+
+  test "splat with delimiter" do
+    get "/slim/splat_with_delimiter"
+    assert_html "<div class=\"cute nice\">Hello</div>"
+  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Daniel Mendler
 - Andrew Stone
 - Fred Wu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -136,6 +136,7 @@ files:
 - test/rails/app/helpers/application_helper.rb
 - test/rails/app/models/entry.rb
 - test/rails/app/views/entries/edit.html.slim
+- test/rails/app/views/layouts/application.html+testvariant.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
@@ -148,6 +149,7 @@ files:
 - test/rails/app/views/slim/normal.html.slim
 - test/rails/app/views/slim/partial.html.slim
 - test/rails/app/views/slim/splat.html.slim
+- test/rails/app/views/slim/splat_with_delimiter.slim
 - test/rails/app/views/slim/thread_options.html.slim
 - test/rails/app/views/slim/variables.html.slim
 - test/rails/app/views/slim/xml.slim
@@ -180,7 +182,7 @@ homepage: http://github.com/slim-template/slim/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Slim is a template language.
 test_files: []