slim 4.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374bad17fd98e439f41336ea3a634afd4e918708803ada3d211071e565d3ba34
-  data.tar.gz: 94a7178a4263ec906413f4f5ce921fa2ddb12423fcd6e28bbb8fbd456bc2ebb5
+  metadata.gz: 032ed4e8911b32aa669a7e0a6196a9955d2f2cdadbcc8432aa589039bc3a7b50
+  data.tar.gz: 94ce4618acbca850dce85c0ce3379e77a8b03ca846b84edcb25a09dfa050e848
 SHA512:
-  metadata.gz: 282bb0085cd7e91ddffbc4fc9af6ab82ec4478ef2090a82592bf96a395f2ad172c6af9f1010f5e0e9cee57281c487e5e2bb4b25a75e2eac0df02018bc298faf9
-  data.tar.gz: 7924d7af215643a8207b738f3f97c46f32bb990db7a103987f14b8b9558ec7de9208aaf27c65840d7caa7d60c156e56f6f876dd7ff54190da91fc436ccc75842
+  metadata.gz: e25e4b9230e092183013063ece1dbb3233b267eb118f90e41dca7d4a2221fe4e00b1c572d6d1b5defac7b0912bba0b00ff442785c930f49f06849819d699ecb7
+  data.tar.gz: 065b7317b43379f0c7ecf85a0ce4fd398b9ecac13e3b6793de9293711776468bd24c15b2a19f029dd04a16aaf724b1210e0fab600a06a23db57f172054d7f798

data/.github/workflows/test.yml

@@ -0,0 +1,51 @@
+name: test
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 15 * * 0"
+jobs:
+  basic:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install && bundle exec rake test
+      - run: bundle install && bundle exec rake test:sinatra
+        env:
+          SINATRA: 2.2.4
+      - run: bundle install && bundle exec rake test:sinatra
+        env:
+          SINATRA: 3.0.5
+  rails:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - run: bundle install && bundle exec rake test:rails
+        env:
+          RAILS: 5.2.8
+      - run: bundle install && bundle exec rake test:rails
+        env:
+          RAILS: 6.0.6
+      - run: bundle install && bundle exec rake test:rails
+        env:
+          RAILS: 6.1.7

data/.yardopts

@@ -1,4 +1,4 @@
 --markup-provider redcarpet
 --markup markdown
-- README.md CHANGES LICENSE test/literate/TESTS.md doc/logic_less.md  doc/translator.md doc/smart.md
+- README.md CHANGES LICENSE test/literate/TESTS.md doc/logic_less.md  doc/translator.md doc/smart.md doc/include.md
 

data/CHANGES

@@ -1,3 +1,28 @@
+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
+  * Support case/in #884
+  * Extract slim/railtie #850
+  * css: doesn't add type='text/css' anymore #828
+  * Remove deprecated whitespace syntax =' etc
+  * Add support for annotate_rendered_view_with_filenames #867, #878, #901
+  * Remove deprecated syntax
+  * Add option to hyphenate underscore attributes - #852
+  * Update CI/CD testing and dependencies
+  
 4.1.0 (2020-05-07)
   * Add support for Tailwind CSS - #841
   * Update dependencies and testing
@@ -120,10 +145,10 @@
        div id=('obj' + name) data={:a => 1, :b => 2} class=['alpha', 'beta']
   * Quoted attributes are escaped by default
     Old:
-       a href='http://slim-lang.com/?a=1&amp;b=2'
+       a href='http://github.com/slim-template/slim/?a=1&amp;b=2'
     New:
-       a href='http://slim-lang.com/?a=1&b=2'
-       a href=='http://slim-lang.com/?a=1&amp;b=2'
+       a href='http://github.com/slim-template/slim/?a=1&b=2'
+       a href=='http://github.com/slim-template/slim/?a=1&amp;b=2'
     You can always disable escaping completly by using :disable_escape if you don't want to write '=='.
   * Added hyphenation support for data attributes (Option :hyphen_attrs)
     Example: div data={key1_key2: 2, key1: {key3: 3}} will render as '<div data-key1-key2="2" data-key1-key3="3"></div>'
@@ -164,11 +189,11 @@
   * Deprecated :escape_quoted_attrs (done by default in 2.0)
   * Warn if quoted attributes might be double escaped in Slim 2.0.0
     Old syntax:
-       a href='http://slim-lang.com/?a=1&amp;b=2'
-       a href=='http://slim-lang.com/?a=1&amp;b=2'
+       a href='http://github.com/slim-template/slim/?a=1&amp;b=2'
+       a href=='http://github.com/slim-template/slim/?a=1&amp;b=2'
     New syntax in 2.0.0:
-       a href='http://slim-lang.com/?a=1&b=2'
-       a href=='http://slim-lang.com/?a=1&amp;b=2'
+       a href='http://github.com/slim-template/slim/?a=1&b=2'
+       a href=='http://github.com/slim-template/slim/?a=1&amp;b=2'
   * Improved pretty printing (Issue #202)
   * Renamed Slim::EmbeddedEngine to Slim::Embedded (Old constant still available until 2.0)
   * Renamed Slim::ControlStructures to Slim::Controls

data/Gemfile

@@ -2,22 +2,15 @@ source 'https://rubygems.org/'
 
 gemspec
 
-group :test do
-  gem 'sinatra'
-  gem 'rack-test'
-end
-
-group :perf do
-  gem 'benchmark-ips'
-  gem 'erubis'
-  gem 'haml'
-end
-
-if ENV['TRAVIS']
-  gem 'rails-controller-testing'
-end
-
-if  ENV['TEMPLE'] == 'master'
+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']}"
+else
+  # Test against temple master by default
   gem 'temple', :github => 'judofyr/temple'
 end
 
@@ -30,41 +23,22 @@ if ENV['TILT']
 end
 
 if ENV['RAILS']
+  gem 'rails-controller-testing'
+
   # we need some smarter test logic for the different Rails versions
-  if ENV['RAILS'] == 'master'
-    gem 'rails', :github => 'rails/rails'
+  if ENV['RAILS'] == 'main'
+    gem 'rails', :github => 'rails/rails', branch: 'main'
   else
     gem 'rails', "= #{ENV['RAILS']}"
   end
-
-  gem 'slim-rails', require: false
-end
-
-gem 'test-unit', '~> 3.3', '>= 3.3.5'
-gem 'minitest', '~> 5.14'
-
-if RUBY_ENGINE == 'rbx' && !ENV['TRAVIS']
-  gem 'psych'
 end
 
 if ENV['SINATRA']
+  gem 'rack-test'
+
   if ENV['SINATRA'] == 'master'
     gem 'sinatra', :github => 'sinatra/sinatra'
   else
     gem 'sinatra', :tag => "v#{ENV['SINATRA']}"
   end
 end
-
-gem 'rake', '~> 13.0', '>= 13.0.1'
-gem 'sassc', '~> 2.2', '>= 2.2.1'
-gem 'kramdown', '~> 2.1'
-
-if ENV['TASK'] == 'bench'
-  gem 'benchmark-ips'
-  gem 'erubis'
-  gem 'haml'
-end
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  gem 'codeclimate-test-reporter'
-end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 - 2016 Slim Team
+Copyright (c) 2010 - 2023 Slim Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.jp.md

@@ -1,7 +1,8 @@
 # Slim
 
-[![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim) [![Build Status](https://img.shields.io/travis/slim-template/slim.svg?branch=master)](http://travis-ci.org/slim-template/slim) [![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)
-[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
+[![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)
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 Slim は 不可解にならない程度に view の構文を本質的な部品まで減らすことを目指したテンプレート言語です。標準的な HTML テンプレートからどれだけのものを減らせるか、検証するところから始まりました。(<, >, 閉じタグなど) 多くの人が Slim に興味を持ったことで, 機能的で柔軟な構文に成長しました。
 
@@ -28,19 +29,19 @@ Slim は 不可解にならない程度に view の構文を本質的な部品
 
 ## リンク
 
-* ホームページ: <http://slim-lang.com>
-* ソース: <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>
 
 ## イントロダクション
 
 ### Slim とは?
 
-Slim は __Rails3 以降__ に対応した高速, 軽量なテンプレートエンジンです。主要な Ruby の実装全てでしっかりテストされています。
+Slim は __Rails5 以降__ に対応した高速, 軽量なテンプレートエンジンです。主要な Ruby の実装全てでしっかりテストされています。
 私たちは継続的インテグレーションを採用しています。(travis-ci)
 
 Slim の核となる構文は1つの考えによって導かれています: "この動作を行うために最低限必要なものは何か。"
@@ -408,7 +409,7 @@ body
 タグの後に直接属性を書きます。通常の属性記述にはダブルクォート `"` か シングルクォート `'` を使わなければなりません (引用符で囲まれた属性)。
 
 ~~~ slim
-a href="http://slim-lang.com" title='Slim のホームページ' Slim のホームページへ
+a href="https://slim-template.github.io" title='Slim のホームページ' Slim のホームページへ
 ~~~
 
 引用符で囲まれたテキストを属性として使えます。
@@ -444,7 +445,7 @@ h2 [ id = "tagline" ] = page_tagline
 例:
 
 ~~~ slim
-a href="http://slim-lang.com" title='Slim のホームページ' Slim のホームページへ
+a href="https://slim-template.github.io" title='Slim のホームページ' Slim のホームページへ
 ~~~
 
 引用符で囲まれたテキストを属性として使えます:
@@ -509,13 +510,13 @@ input type="text" disabled=nil
  class 属性はスペース区切りで結合されます。
 
 ~~~ slim
-a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
+a.menu class="highlight" href="https://slim-template.github.io/" slim-template.github.io
 ~~~
 
 レンダリング結果:
 
 ~~~ html
-<a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
+<a class="menu highlight" href="https://slim-template.github.io/">slim-template.github.io</a>
 ~~~
 
 また, `Array` を属性値として使うと、配列要素が区切り文字で結合されます。
@@ -568,7 +569,7 @@ div class="first second third"
 ~~~ slim
 ruby:
   def a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'https://slim-template.github.io/'}
   end
 - @page_current = true
 *a_unless_current リンク
@@ -579,7 +580,7 @@ ruby:
 レンダリング結果:
 
 ~~~ html
-<span>リンク</span><a href="http://slim-lang.com/">リンク</a>
+<span>リンク</span><a href="https://slim-template.github.io/">リンク</a>
 ~~~
 
 ### ショートカット
@@ -793,7 +794,7 @@ end
 そして, 次のように使用出来ます。
 
 ~~~ slim
-- links = { 'http://slim-lang.com' => '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
 ~~~
@@ -1198,9 +1199,8 @@ Travis-CI は継続的インテグレーションテストに利用されてい
 
 Slim は主要な Ruby 実装全てで動作します:
 
-* Ruby 2.0, 2.1, 2.2 および 2.3
-* JRuby 1.9 mode
-* Rubinius 2.0
+* Ruby 2.5
+* JRuby
 
 ## 貢献
 
@@ -1212,7 +1212,7 @@ $ git clone git://github.com/slim-template/slim
 
 魔法をかけた後 pull request を送ってください。私たちは pull request が大好きです！
 
-Ruby の 2.3.0, 2.2.0, 2.1.0 と 2.0.0 でテストをすることを覚えておいてください。
+Ruby の 2.5.0 でテストをすることを覚えておいてください。
 
 もしドキュメントの不足を見つけたら, README.md をアップデートして私たちを助けて下さい。Slim に割ける時間がないが, 私たちが知っておくべきことを見つけた場合には issue を送ってください。
 
@@ -1228,12 +1228,9 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 
 ## 寄付と支援
 
-このプロジェクトをサポートしたい場合, Gittip や Flattr のページを見てください。
+このプロジェクトをサポートしたい場合, GitHub sponsors のページを見てください。
 
-[![Gittip donate button](http://img.shields.io/gittip/bevry.png)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
-[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
-
-今のところ, 寄付はホスティング費用 (ドメインなど) に当てられる予定です。
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 ## 議論
 

data/README.md

@@ -1,7 +1,8 @@
 # Slim
 
-[![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim) [![Build Status](https://img.shields.io/travis/slim-template/slim.svg?branch=master)](http://travis-ci.org/slim-template/slim) [![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)
-[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
+[![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)
+[![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.
 
@@ -28,19 +29,19 @@ A short list of the features...
 
 ## Links
 
-* Homepage: <http://slim-lang.com>
-* 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
 
 ### What is Slim?
 
-Slim is a fast, lightweight templating engine with support for __Rails 3 and later__. It has been heavily tested on all major ruby implementations. We use
+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).
 
 Slim's core syntax is guided by one thought: "What's the minimum required to make this work".
@@ -59,7 +60,6 @@ by the logic less plugin and the translator plugin which provides I18n. In logic
 * The Slim architecture is very flexible and allows you to write syntax extensions and plugins.
 
 ___Yes, Slim is speedy!___ Slim was developed right from the start with performance in mind.
-Benchmarks are done for every commit at <http://travis-ci.org/slim-template/slim>.
 Don't trust the numbers? That's as it should be. Please try the benchmark rake task yourself!
 
 However in our opinion you should use Slim because of its features and syntax. We just ensure that Slim doesn't have a negative impact on the performance of your application.
@@ -153,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.
@@ -409,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://slim-lang.com" 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.
@@ -445,7 +456,7 @@ h2 [ id = "tagline" ] = page_tagline
 Example:
 
 ~~~ slim
-a href="http://slim-lang.com" 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:
@@ -510,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://slim-lang.com/" Slim-lang.com
+a.menu class="highlight" href="https://slim-template.github.io/" slim-template.github.io
 ~~~
 
 This renders as:
 
 ~~~ html
-<a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</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.
@@ -569,7 +580,7 @@ with the :tag key.
 ~~~ slim
 ruby:
   def a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'https://slim-template.github.io/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -580,7 +591,7 @@ ruby:
 This renders as:
 
 ~~~ html
-<span>Link</span><a href="http://slim-lang.com/">Link</a>
+<span>Link</span><a href="https://slim-template.github.io/">Link</a>
 ~~~
 
 ### Shortcuts
@@ -690,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
@@ -794,7 +829,7 @@ end
 and it would be used as follows
 
 ~~~ slim
-- links = { 'http://slim-lang.com' => '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
 ~~~
@@ -976,7 +1011,8 @@ There are a lot of them but the good thing is, that Slim checks the configuratio
 | Symbol | :format | :xhtml | HTML output format (Possible formats :html, :xhtml, :xml) |
 | String | :attr_quote | '"' | Character to wrap attributes in html (can be ' or ") |
 | Hash | :merge_attrs | \{'class' => ' '} | Joining character used if multiple html attributes are supplied (e.g. class="class1 class2") |
-| Array&lt;String&gt; | :hyphen_attrs | %w(data) | Attributes which will be hyphenated if a Hash is given (e.g. data={a:1,b:2} will render as data-a="1" data-b="2") |
+| Array&lt;String&gt; | :hyphen_attrs | %w(data) | Attributes which will be hyphenated if a Hash is given (e.g. data={a_foo:1,b:2} will render as data-a_foo="1" data-b="2") |
+| Boolean | :hyphen_underscore_attrs | false | Attributes that have underscores in their names will be hyphenated (e.g. data={a_foo:1,b_bar:2} will render as data-a-foo="1" data-b-bar="2") |
 | Boolean | :sort_attrs | true | Sort attributes by name |
 | Symbol | :js_wrapper | nil | Wrap javascript by :comment, :cdata or :both. You can also :guess the wrapper based on :format. |
 | Boolean | :pretty | false | Pretty HTML indenting, only block level tags are indented <b>(This is slower!)</b> |
@@ -1162,6 +1198,7 @@ There are plugins for various text editors (including the most important ones -
 * [Espresso text editor](https://github.com/slim-template/Slim-Sugar)
 * [Coda](https://github.com/slim-template/Coda-2-Slim.mode)
 * [Atom](https://github.com/slim-template/language-slim)
+* VS Code ([Official marketplace](https://marketplace.visualstudio.com/items?itemName=sianglim.slim), [Open VSX registry](https://open-vsx.org/extension/sianglim/slim))
 
 ### Template Converters (HAML, ERB, ...)
 
@@ -1198,9 +1235,8 @@ Travis-CI is used for continuous integration testing: <http://travis-ci.org/slim
 
 Slim is working well on all major Ruby implementations:
 
-* Ruby 2.0, 2.1, 2.2 and 2.3
-* JRuby 1.9 mode
-* Rubinius 2.0
+* Ruby 2.5 and newer
+* JRuby
 
 ## Contributing
 
@@ -1212,7 +1248,7 @@ $ git clone git://github.com/slim-template/slim
 
 Work your magic and then submit a pull request. We love pull requests!
 
-Please remember to keep the compatibility with Ruby versions 2.0.0, 2.1.0, 2.2.0 and 2.3.0.
+Please remember to keep the compatibility with Ruby versions 2.5 and newer.
 
 If you find the documentation lacking, help us out and update this README.md. If you don't have the time to work on Slim, but found something we should know about, please submit an issue.
 
@@ -1228,12 +1264,9 @@ Slim is released under the [MIT license](http://www.opensource.org/licenses/MIT)
 
 ## Donations and sponsoring
 
-If you want to support this project please visit the Gittip and Flattr pages.
-
-[![Gittip donate button](https://img.shields.io/gratipay/bevry.svg)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
-[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
+If you want to support this project please visit the GitHub sponsors page.
 
-Currently the donations will be used to cover the hosting costs (domain name etc).
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 ## Discuss
 
@@ -1283,8 +1316,7 @@ Language ports/Similar languages:
 * [Hamlit (High performance Haml implementation, based on Temple like Slim)](https://github.com/k0kubun/hamlit)
 * [Faml (Faster Haml implementation, also using Temple like Slim)](https://github.com/eagletmt/faml)
 * [Haml (Older engine which inspired Slim)](https://github.com/haml/haml)
-* [Jade (Similar engine for javascript)](https://github.com/visionmedia/jade)
-* [Pug (Successor of Jade, Similar engine for javascript)](https://github.com/pugjs/pug)
+* [Pug (Similar engine for javascript)](https://github.com/pugjs/pug)
 * [Sweet (Similar engine which also allows to write classes and functions)](https://github.com/joaomdmoura/sweet)
 * [Amber (Similar engine for Go)](https://github.com/eknkc/amber)
 * [Slang (Slim-inspired templating language for Crystal)](https://github.com/jeromegn/slang)

data/Rakefile

@@ -6,16 +6,9 @@ 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_and_plugins)
+task 'test' => %w(test:core test:literate test:logic_less test:translator test:smart test:include)
 
 namespace 'test' do
-  task 'core_and_plugins' => %w(core literate logic_less translator smart include)
-
   Rake::TestTask.new('core') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/core/test_*.rb']

data/doc/jp/translator.md

@@ -13,7 +13,7 @@ Gettext は文字列を英語からドイツ語に変換し, 文字列が展開
 
 次のようにレンダリングされます。
 
-    <h1>Willkommen auf slim-lang.com!</h1>
+    <h1>Willkommen auf github.com/slim-template/slim!</h1>
 
 翻訳プラグインを有効化します。
 

data/doc/logic_less.md

@@ -80,7 +80,7 @@ This will yield
 
     <tr>
       <td>Article 1</td>
-    </>
+    </tr>
     <tr>
       <td>Article 2</td>
     </tr>

data/doc/translator.md

@@ -13,7 +13,7 @@ Gettext translates the string from english to german where interpolations are re
 
 and renders as
 
-    <h1>Willkommen auf slim-lang.com!</h1>
+    <h1>Willkommen auf github.com/slim-template/slim!</h1>
 
 Enable the translator plugin with
 

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