slim 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd7e59579d815f6a4b7b73d8ca4c9718f3e4df5
-  data.tar.gz: 37b35843560936e0fdcef732edd623e34fd17039
+  metadata.gz: 6015955337b548a4b9a2771f13ef80790288d6bc
+  data.tar.gz: 83b36da94f2c3a12b2c34f30f59a104268d7fe03
 SHA512:
-  metadata.gz: 813412ac6507ed3ecc3b72c4b02be96e323fe7638afc642186155fd196e96f59ff5506c808f2ace1568ab333b5b452a5496699bdfa0a4f1b8415c0eb8c7bd725
-  data.tar.gz: 647d4ecb78fcd10d0af3ffbc713a89ce210bdfb1dc4d3dae08bfed8056f2491255cde02d559952b2472951b4eb1bf4ce69bba617e6c687e7c7690eaf4e46db9b
+  metadata.gz: fad25f84c11a4fce52b703b6466be67e2baa5ba62d692bc515f3981078df227edc188a2f14f49eb27e969352dfcbb7ae9f08f1f9ff7f2aa65544070eff6bbe54
+  data.tar.gz: 822391dff4d3328eeab7df526a476492d8ba7713f112a7623c4aa86d9283ae107b83573c27a8e50ecc4e8c736140d31733d9c4610324dd50dbfa8c0b9ed26103

data/.travis.yml

@@ -2,18 +2,22 @@ language: ruby
 
 rvm:
   - ruby-head
-  - 2.2.2
-  - 2.1.6
+  - 2.3.3
+  - 2.2.6
+  - 2.1.10
   - 2.0.0
-  - rbx-2
-  - 1.9.3
+  - rbx-3
   - jruby-head
   - jruby-19mode
 
 sudo: false
+dist: trusty
 
 script: "bundle exec rake $TASK"
 
+after_success:
+  - bundle exec codeclimate-test-reporter
+
 env:
   global:
     # travis encrypt CODECLIMATE_REPO_TOKEN=???
@@ -37,12 +41,14 @@ env:
 
 matrix:
   exclude:
-    - rvm: rbx-2
-      env: "TASK=test:rails RAILS=master"
-    - rvm: 1.9.3
+    - rvm: rbx-3
       env: "TASK=test:rails RAILS=master"
     - rvm: 2.0.0
       env: "TASK=test:rails RAILS=master"
+    - rvm: 2.3.3
+      env: "TASK=test:rails RAILS=3.1.12 TILT=1.3.4"
+    - rvm: 2.3.3
+      env: "TASK=test:rails RAILS=3.2.21 TILT=1.3.4"
   allow_failures:
     - env: "TASK=test:core_and_plugins TILT=master"
     - env: "TASK=test:rails RAILS=master"
@@ -52,4 +58,4 @@ matrix:
     - rvm: jruby-head
 
 notifications:
-  irc: "chat.freenode.net#slim-lang"
+  irc: "chat.freenode.net#slim-lang"

data/CHANGES

@@ -1,3 +1,9 @@
+3.0.8 (2017-05-06)
+
+  * Added splat_prefix configuration option for Angular2 syntax support
+  * Require Ruby >= 2.0.0
+  * Relax temple dependency
+
 3.0.7 (2016-05-22)
 
   * Add additional attributes feature to shortcuts

data/Gemfile

@@ -16,7 +16,11 @@ end
 
 if ENV['RAILS']
   # we need some smarter test logic for the different Rails versions
-  gem 'nokogiri'
+  if RUBY_VERSION >= '2.1.0'
+    gem 'nokogiri'
+  else
+    gem 'nokogiri', '~> 1.6.8'
+  end
 
   if ENV['RAILS'] == 'master'
     gem 'rails', github: 'rails/rails'

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 - 2015 Slim Team
+Copyright (c) 2010 - 2016 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

@@ -153,9 +153,9 @@ body
   | <tr><td>#{a.name}</td><td>#{a.description}</td></tr>
 ~~~
 
-### テキスト行のスペースをたどる `'`
+### スペース付きテキスト `'`
 
-シングルクォートは Slim に行をコピーしろと命じます (`|` と同様に) が,  単一行の末尾にスペースが追加されているかチェックします。
+シングルクォートは Slim に行をコピーしろと命じます (`|` と同様に) が,  末尾にスペースが追加されます。
 
 ### インライン html `<` (HTML 形式)
 
@@ -464,7 +464,7 @@ a href=="&amp;"
 
 ~~~ slim
 a data-title="help" data-content="極めて長い長い長いヘルプテキストで\
-  1つずつ1つずつその後はまたやり直して繰り返し...."
+  続けてその後はまたやり直して繰り返し...."
 ~~~
 
 #### Ruby コードを用いた属性
@@ -559,6 +559,8 @@ a class=:menu,:highlight
 div class="first second third"
 ~~~
 
+スプラット(アスタリスク)属性のプレフィックスは `splat_prefix` オプションで設定できます。デフォルト値は `'*'` です。
+
 #### 動的タグ `*`
 
 アスタリスク属性を使用することで完全に動的なタグを作ることができます。:tag をキーにもつハッシュを返すメソッドを
@@ -965,9 +967,9 @@ end
 | 真偽値 | :pretty | false | 綺麗な html インデント <b>(遅くなります!)</b> |
 | 文字列 | :indent | '  ' | インデントに使用される文字列 |
 | 真偽値 | :streaming | false (Rails では true, 無効化するにはストリーミングを参照) | ストリーミング出力の有効化, 体感的なパフォーマンスの向上 |
-| Class | :generator | Temple::Generators::ArrayBuffer/ RailsOutputBuffer | Temple コードジェネレータ (デフォルトのジェネレータは配列バッファを生成します) |
+| Class | :generator | Temple::Generators::StringBuffer/ RailsOutputBuffer | Temple コードジェネレータ (デフォルトのジェネレータは文字列バッファを生成します) |
 | 文字列 | :buffer | '_buf' (Rails では '@output_buffer') | バッファに使用される変数 |
-
+| 文字列 | :splat_prefix | '*' | スプラット(アスタリスク)属性のプレフィックス |
 
 Temple フィルタによってもっと多くのオプションがサポートされていますが一覧には載せず公式にはサポートしません。
 Slim と Temple のコードを確認しなければなりません。
@@ -1035,7 +1037,7 @@ html
 ### Rails
 
 Rails のジェネレータは [slim-rails](https://github.com/slim-template/slim-rails) によって提供されます。
-slim-rails は Rails で Slim を使用する場合に必須ではありません。Slim をインストールし Gemfile に `gem 'slim-rails'` を追加するだけです。
+slim-rails は Rails で Slim を使用する場合に必須ではありません。Slim をインストールし Gemfile に `gem 'slim'` を追加するだけです。
 後は .slim 拡張子を使えば Rails で使用できます。
 
 #### ストリーミング
@@ -1047,6 +1049,47 @@ HTTP ストリーミングは Rails がそれをサポートしているバー
 Slim::RailsTemplate.set_options streaming: false
 ~~~
 
+### Angular2
+
+Slim は Angular2 の構文に対応しています。ただし, いくつかのオプションを設定する必要があります:
+
+#### `splat_prefix` オプション
+
+このオプションはパーサにスプラット(アスタリスク)属性に使用する構文を知らせます。
+デフォルト値はアスタリスクです: `splat_prefix: '*'`
+アスタリスクは Angular2 でも構造ディレクティブとして `*ngIf` などで使われます。デフォルトの設定値は Slim と Angular2 の構文衝突の原因になります。
+
+解決方法は 2 つあります:
+
+* `splat_prefix` に 2 重アスタリスクのようなカスタム値(`splat_prefix: '**'`)を設定します。これで構造ディレクティブは期待通りに機能するはずです。スプラット(アスタリスク)属性は設定したカスタム値のプレフィックスで書かなければならないので注意してください。
+* アスタリスクではない代わりのディレクティブ構文を使う
+
+#### 属性区切り文字
+
+Angular と Slim はそれぞれの構文で括弧を使います。この場合も解決方法は 2 つ:
+* バインディングに代わりの構文を使う (`bind-...` など)
+* 属性区切り文字を波括弧に限定する
+```
+code_attr_delims: {
+ '{' => '}',
+},
+attr_list_delims: {
+ '{' => '}',
+},
+```
+
+これで次のよう書けます:
+```
+h1{ #var (bind1)="test" [bind2]="ok" [(bind3)]="works?" *ngIf="expr" *ngFor="expression" } {{it works}}
+```
+
+コンパイル結果:
+```
+<h1 #var="" (bind1)="test" [bind2]="ok" [(bind3)]="works?" *ngIf="expr" *ngFor="expression">
+  {{it works}}
+</h1>
+```
+
 ## ツール
 
 ### Slim コマンド 'slimrb'
@@ -1140,8 +1183,7 @@ Travis-CI は継続的インテグレーションテストに利用されてい
 
 Slim はすべての主要な Ruby 実装で動作します:
 
-* Ruby 1.9.3, 2.0.0, 2.1.0 および 2.2.0
-* Ruby EE
+* Ruby 2.0, 2.1, 2.2 および 2.3
 * JRuby 1.9 mode
 * Rubinius 2.0
 
@@ -1155,7 +1197,7 @@ $ git clone git://github.com/slim-template/slim
 
 魔法をかけた後 pull request を送ってください。私たちは pull request が大好きです！
 
-Ruby の 2.2.0, 2.1.0, 2.0.0 と 1.9.3 でテストをすることを覚えておいてください。
+Ruby の 2.3.0, 2.2.0, 2.1.0 と 2.0.0 でテストをすることを覚えておいてください。
 
 もしドキュメントの不足を見つけたら, README.md をアップデートして私たちを助けて下さい。Slim に割く時間がないが, 私たちが知るべきものを何か見つけた場合には issue を送ってください。
 
@@ -1226,5 +1268,6 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 * [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)
 * [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)

data/README.md

@@ -55,7 +55,7 @@ by the logic less plugin and the translator plugin which provides I18n. In logic
 ### Why use Slim?
 
 * Slim allows you to write very minimal templates which are easy to maintain and pretty much guarantees that you write well-formed HTML and XML
-* We also think that the Slim syntax is also aesthetic and makes it much more fun to write templates. Since you can use Slim as a drop-in replacement in all the major framework you can start easily.
+* The Slim syntax is aesthetic and makes it more fun to write templates. Since you can use Slim as a drop-in replacement in all the major frameworks it is easy to adopt.
 * 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.
@@ -252,7 +252,7 @@ The doctype keyword can be used to generate the complex doctypes in a very simpl
 
 XML VERSION
 
-~~~~ slim
+~~~ slim
 doctype xml
   <?xml version="1.0" encoding="utf-8" ?>
 
@@ -464,7 +464,7 @@ You can break quoted attributes with backslash `\`
 
 ~~~ slim
 a data-title="help" data-content="extremely long help text that goes on\
-  and one and one and then starts over...."
+  and on and on and then starts over...."
 ~~~
 
 #### Ruby attributes
@@ -487,7 +487,7 @@ The attribute value will be escaped by default. Use == if you want to disable es
 a href==action_path(:start)
 ~~~
 
-You can also break ruby attributes with backslash `\` or trailing `,` as describe for control sections.
+You can also break ruby attributes with backslash `\` or trailing `,` as described for control sections.
 
 #### Boolean attributes
 
@@ -559,6 +559,8 @@ This renders as:
 div class="first second third"
 ~~~
 
+Splat attributes prefix may be configured via `splat_prefix` option. Default value is `'*'`
+
 #### Dynamic tags `*`
 
 You can create completely dynamic tags using the splat attributes. Just create a method which returns a hash
@@ -965,9 +967,9 @@ There are a lot of them but the good thing is, that Slim checks the configuratio
 | Boolean | :pretty | false | Pretty HTML indenting, only block level tags are indented <b>(This is slower!)</b> |
 | String | :indent | '  ' | Indentation string |
 | Boolean | :streaming | false (true in Rails, see below how to disable it!) | Enable output streaming, improves the perceived performance |
-| Class | :generator | Temple::Generators::ArrayBuffer/ RailsOutputBuffer | Temple code generator (default generator generates array buffer) |
+| Class | :generator | Temple::Generators::StringBuffer/ RailsOutputBuffer | Temple code generator (default generator generates string buffer) |
 | String | :buffer | '_buf' ('@output_buffer' in Rails) | Variable used for buffer |
-
+| String | :splat_prefix | '*' | Prefix used for splat attributes |
 
 There are more options which are supported by the Temple filters but which are not exposed and are not officially supported. You
 have to take a look at the Slim and Temple code for that.
@@ -1035,7 +1037,7 @@ html
 ### Rails
 
 Rails generators are provided by [slim-rails](https://github.com/slim-template/slim-rails). slim-rails
-is not necessary to use Slim in Rails though. Just install Slim and add it to your Gemfile with `gem 'slim-rails'`.
+is not necessary to use Slim in Rails though. Just install Slim and add it to your Gemfile with `gem 'slim'`.
 Then just use the .slim extension and you're good to go.
 
 #### Streaming
@@ -1047,6 +1049,47 @@ performance. The rendering time in total will increase. If you want to disable i
 Slim::RailsTemplate.set_options streaming: false
 ~~~
 
+### Angular2
+
+Slim now supports Angular2 syntax. But you need to set some configuration options:
+
+#### `splat_prefix` option
+
+This option tells parser what syntax to use for splat attributes.
+Default value is asterisk: `splat_prefix: '*'`
+Asterisk is also used in Angular2 for structural directives such as `*ngIf` and others, so default configuration causes a conflict between slim and angular2 syntax.
+
+There are two ways to resolve it:
+
+* Set `splat_prefix` to any custom value, double asterisk, for example: `splat_prefix: '**'`. Now structural directives should work as expected. Remember that now splat attributes should be written with new custom prefix before them.
+* Use alternative directive syntax without asterisk.
+
+#### Attribute delimeters
+
+Angular and slim both uses brackets in their syntax. So there are also two ways:
+* Use alternative syntax for binding (`bind-...` and so on)
+* Limit attribute delimeters to curly braces only:
+```
+code_attr_delims: {
+ '{' => '}',
+},
+attr_list_delims: {
+ '{' => '}',
+},
+```
+
+Now you can use something like this:
+```
+h1{ #var (bind1)="test" [bind2]="ok" [(bind3)]="works?" *ngIf="expr" *ngFor="expression" } {{it works}}
+```
+
+Will be compiled to:
+```
+<h1 #var="" (bind1)="test" [bind2]="ok" [(bind3)]="works?" *ngIf="expr" *ngFor="expression">
+  {{it works}}
+</h1>
+```
+
 ## Tools
 
 ### Slim Command 'slimrb'
@@ -1140,8 +1183,7 @@ Travis-CI is used for continuous integration testing: <http://travis-ci.org/slim
 
 Slim is working well on all major Ruby implementations:
 
-* Ruby 1.9.3, 2.0.0, 2.1.0 and 2.2.0
-* Ruby EE
+* Ruby 2.0, 2.1, 2.2 and 2.3
 * JRuby 1.9 mode
 * Rubinius 2.0
 
@@ -1155,7 +1197,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 1.9.3, 2.0.0, 2.1.0  and 2.2.0.
+Please remember to keep the compatibility with Ruby versions 2.0.0, 2.1.0, 2.2.0 and 2.3.0.
 
 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.
 
@@ -1226,5 +1268,6 @@ Language ports/Similar languages:
 * [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)
 * [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)

data/doc/include.md

@@ -17,4 +17,4 @@ Enable the include plugin with
 
 | Type | Name | Default | Purpose |
 | ---- | ---- | ------- | ------- |
-| Boolean | :include_dirs | [Dir.pwd, '.'] | Directories where to look for the files |
+| Array | :include_dirs | [Dir.pwd, '.'] | Directories where to look for the files |

data/doc/jp/include.md

@@ -17,4 +17,4 @@
 
 | タイプ | 名前 | デフォルト値 | 目的 |
 | ------ | ---- | ------------ | ---- |
-| Boolean | :include_dirs | [Dir.pwd, '.'] | ファイルを検索するディレクトリ |
+| Array | :include_dirs | [Dir.pwd, '.'] | ファイルを検索するディレクトリ |

data/doc/smart.md

@@ -1,44 +1,60 @@
 # Smart text
 
-The easiest way to combine text and markup is to use the <a name="smarttext">smart text mode</a>.
+The <a name="smarttext">smart text plugin</a> was created to simplify the typing and combining of text and markup in Slim templates.
+Using the plugin gives you:
 
-Enable the smart text plugin with
+* More convenient ways to type text in Slim templates.
+* Smarter and more consistent HTML escaping of typed text.
+* Easier combining of the text with inline HTML tags with smart handling of whitespace on the boundaries.
 
-    require 'slim/smart'
-
-This automatically enables the `:implicit_text` option as well,
-so you can easily type text like this:
+To get started, enable the smart text plugin with
 
-    p
-      This is text.
-      This is text, too.
+    require 'slim/smart'
 
-Slim will automatically treat any line which doesn't start
+First of all, this automatically enables the `:implicit_text` option.
+When enabled, Slim will treat any line which doesn't start
 with a lowercase tag name or any of the special characters as an implicit text line.
-If the text spans several lines, simply indent them.
-
-    p
-      This is text,
-        and it spans
-        several lines.
-
-You can also mark the text explicitly with `>`,
-for example when it starts with lowercase letter or unusual character,
-or when the text spans several lines,
-or merely for aesthetic consistency,
-or if you want to use uppercase tag names
+If the text needs to span several lines, indent them as usual.
+
+This allows you to easily type text like this, without any leading indicator:
+
+    This is an implicit text.
+    This is a text
+      which spans
+      several lines.
+    This is yet another text.
+
+This works in addition to ways already available in stock Slim:
+
+    p This is an inline text.
+    p This is an inline text
+      which spans multiple lines.
+    | This is a verbatim text.
+    | This is a verbatim text
+      which spans multiple lines.
+    <p>This is in fact a verbatim text as well.</p>
+
+You can also mark the text explicitly with a leading `>`.
+This is used for example when the text starts with a lowercase letter or an unusual character,
+or merely for aesthetic consistency when it spans several lines.
+It may be also needed if you want to use uppercase tag names
 and therefore need to keep the `:implicit_text` option disabled.
 
-    p
-      > 'This is text, too.'
-    p
-      >
-        This is text
-        which spans
-        several lines.
+    > This is an explicit text.
+    > This is an explicit text
+      which spans
+      several lines.
+    > 'This is a text, too.'
+
+    > This is another way
+    > of typing text which spans
+    > several lines, if you prefer that.
 
+BTW, all these examples can be pasted to `slimrb -r slim/smart` to see how the generated output looks like.
+
+The plugin also improves upon Slim's automatic HTML escaping.
 As long as you leave the `:smart_text_escaping` enabled,
-any non-verbatim text is automatically escaped for you.
+any non-verbatim text (i.e., any implicit, explicit, and inline text) is automatically escaped for you.
 However, for your convenience, any HTML entities detected are still used verbatim.
 This way you are most likely to get what you really wanted,
 without having to worry about HTML escaping all the time.
@@ -47,8 +63,8 @@ without having to worry about HTML escaping all the time.
     footer
       Copyright &copy; #{Time.now.year}
 
-Another cool thing about smart text is that it mixes fairly well with markup.
-Smart text lines normally preserve newlines,
+Another cool thing about the plugin is that it makes text mix fairly well with markup.
+The text lines are made to preserve newlines as needed,
 so it is easy to mix them with other tags, like emphasis or links:
 
     p
@@ -57,18 +73,18 @@ so it is easy to mix them with other tags, like emphasis or links:
       > be charged now.
     p
       Check
-      a href=r(:faq) our FAQ
+      a href='/faq' our FAQ
       > for more info.
 
 (Note the use of the explicit text indicator `>` to distinguish lowercase text from tags).
 
-However, sometimes you do not want the whitespace around the inline tag.
-Fortunately smart text takes care of the most common cases for you as well.
-The leading newline is suppressed if the smart text block begins
-with a character from the `:smart_text_begin_chars` set (`,.;:!?)]}` by default).
-Similarly, trailing newline is suppressed if the smart text block ends
+However, sometimes you do not want any whitespace around the inline tag at all.
+Fortunately the plugin takes care of the most common cases for you as well.
+The newline before the tag is suppressed if the preceding line ends
 with a character from the `:smart_text_end_chars` set (`([{` by default).
-This makes it quite easy to mix normal text with links or spans like this:
+Similarly, the newline after the tag is suppressed if the following line begins
+with a character from the `:smart_text_begin_chars` set (`,.;:!?)]}` by default).
+This makes it quite easy to naturally mix normal text with links or spans like this:
 
     p
       Please proceed to
@@ -76,10 +92,10 @@ This makes it quite easy to mix normal text with links or spans like this:
       .
     p
       Status: failed (
-      a href="#1" details
+      a href="#1" see details
       ).
 
-Note that smart text is smart enough to know about tag shortcuts, too,
+Note that the plugin is smart enough to know about tag shortcuts, too,
 so it will correctly deal even with cases like this:
 
     .class
@@ -88,6 +104,7 @@ so it will correctly deal even with cases like this:
         i text
         ...
 
+And that's it.
 Of course, all this is meant only to make working with short text snippets more convenient.
 For bulk text content, you are more than welcome to use one of the builtin embedded engines,
 such as Markdown or Textile.

data/lib/slim/engine.rb

@@ -13,7 +13,7 @@ module Slim
                    format: :xhtml,
                    attr_quote: '"',
                    merge_attrs: {'class' => ' '},
-                   generator: Temple::Generators::ArrayBuffer,
+                   generator: Temple::Generators::StringBuffer,
                    default_tag: 'div'
 
     filter :Encoding

data/lib/slim/parser.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Slim
   # Parses Slim code and transforms it to a Temple expression
   # @api private
@@ -19,7 +18,8 @@ module Slim
                    shortcut: {
                      '#' => { attr: 'id' },
                      '.' => { attr: 'class' }
-                   }
+                   },
+                   splat_prefix: '*'
 
     class SyntaxError < StandardError
       attr_reader :error, :file, :line, :lineno, :column
@@ -87,7 +87,7 @@ module Slim
     # Compile string to Temple expression
     #
     # @param [String] str Slim code
-    # @return [Array] Temple expression representing the code]]
+    # @return [Array] Temple expression representing the code
     def call(str)
       result = [:multi]
       reset(str.split(/\r?\n/), [result])
@@ -414,9 +414,13 @@ module Slim
         end_re = /\A\s*#{Regexp.escape delimiter}/
       end
 
+      splat_prefix        = Regexp.escape(options[:splat_prefix])
+      splat_regexp_source = '\A\s*' << splat_prefix << '(?=[^\s]+)'
+      @splat_attrs_regexp = Regexp.new(splat_regexp_source)
+
       while true
         case @line
-        when /\A\s*\*(?=[^\s]+)/
+        when @splat_attrs_regexp
           # Splat attribute
           @line = $'
           attributes << [:slim, :splat, parse_ruby_code(delimiter)]
@@ -523,7 +527,7 @@ module Slim
       line = @orig_line.lstrip
       column = (@orig_line && @line ? @orig_line.size - @line.size : 0) + line.size - @orig_line.size
       warn %{Deprecated syntax: #{message}
-  #{options[:file]}, Line #{@lineno}, Column #{@column}
+  #{options[:file]}, Line #{@lineno}, Column #{column + 1}
     #{line}
     #{' ' * column}^
 }

data/lib/slim/smart/parser.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module Slim
   module Smart
     # @api private

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths     = %w(lib)
 
-  s.required_ruby_version = '>=1.9.2'
+  s.required_ruby_version = '>=2.0.0'
 
-  s.add_runtime_dependency('temple', ['~> 0.7.6'])
+  s.add_runtime_dependency('temple', ['>= 0.7.6', '< 0.9'])
   s.add_runtime_dependency('tilt', ['>= 1.3.3', '< 2.1'])
 end

data/test/core/helper.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 begin
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+  require 'simplecov'
+  SimpleCov.start
 rescue LoadError
 end
 

data/test/core/test_commands.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 require 'open3'
 require 'tempfile'
@@ -23,14 +22,14 @@ class TestSlimCommands < Minitest::Test
     out, err = exec_slimrb '--help'
 
     assert err.empty?
-    assert_match /Show this message/, out
+    assert_match %r{Show this message}, out
   end
 
   def test_option_version
     out, err = exec_slimrb '--version'
 
     assert err.empty?
-    assert_match /\ASlim #{Regexp.escape Slim::VERSION}$/, out
+    assert_match %r{\ASlim #{Regexp.escape Slim::VERSION}$}, out
   end
 
   def test_render
@@ -113,15 +112,15 @@ class TestSlimCommands < Minitest::Test
   def test_error
     prepare_common_test EXCEPTION_TEMPLATE, stdin_file: false do |out, err|
       assert out.empty?
-      assert_match /NotImplementedError: NotImplementedError/, err
-      assert_match /Use --trace for backtrace/, err
+      assert_match %r{NotImplementedError: NotImplementedError}, err
+      assert_match %r{Use --trace for backtrace}, err
     end
   end
 
   def test_trace_error
     prepare_common_test EXCEPTION_TEMPLATE, '--trace', stdin_file: false do |out, err|
       assert out.empty?
-      assert_match /bin\/slimrb/, err
+      assert_match %r{bin\/slimrb}, err
     end
   end
 

data/test/core/test_html_structure.rb

@@ -358,14 +358,6 @@ p < x=(1+1) > Hello
     assert_html '<p>{ foo="bar" x=(1+1) }</p><p x="2">Hello</p>', source, attr_list_delims: {'<' => '>'}, code_attr_delims: { '(' => ')' }
   end
 
-  def test_closed_tag
-    source = %q{
-closed/
-}
-
-    assert_html '<closed />', source, format: :xhtml
-  end
-
   def test_attributs_with_parens_and_spaces
     source = %q{label{ for='filter' }= hello_world}
     assert_html '<label for="filter">Hello World from @env</label>', source

data/test/core/test_parser_errors.rb

@@ -65,7 +65,7 @@ p
   img(src="img.jpg
 }
 
-assert_syntax_error "Unexpected end of file\n  (__TEMPLATE__), Line 3, Column 0\n    \n    ^\n", source
+    assert_syntax_error "Unexpected end of file\n  (__TEMPLATE__), Line 3, Column 0\n    \n    ^\n", source
   end
 
   def test_expected_closing_attribute_delimiter

data/test/core/test_slim_template.rb

@@ -47,7 +47,8 @@ class TestSlimTemplate < TestSlim
     fail unless data[0] == ?h
     template = Slim::Template.new('test.slim') { data }
     begin
-      res = template.render(Object.new, name: 'Joe', foo: 'bar')
+      template.render(Object.new, name: 'Joe', foo: 'bar')
+      fail 'should have raised an exception'
     rescue => ex
       assert_kind_of MockError, ex
       assert_backtrace(ex, 'test.slim:5')

data/test/core/test_splat_prefix_option.rb

@@ -0,0 +1,155 @@
+require 'helper'
+
+class TestSplatPrefixOption < TestSlim
+
+  def prefixes
+    ['*','**','*!','*%','*^','*$']
+  end
+
+  def options(prefix)
+    { splat_prefix: prefix }
+  end
+
+  def test_splat_without_content
+    prefixes.each do |prefix|
+      source = %Q{
+  #{prefix}hash
+  p#{prefix}hash
+  }
+
+      assert_html '<div a="The letter a" b="The letter b"></div><p a="The letter a" b="The letter b"></p>', source, options(prefix)
+    end
+  end
+
+  def test_shortcut_splat
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}hash This is my title
+}
+
+      assert_html '<div a="The letter a" b="The letter b">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat
+    prefixes.each do |prefix|
+      source = %Q{
+h1 #{prefix}hash class=[] This is my title
+}
+
+      assert_html '<h1 a="The letter a" b="The letter b">This is my title</h1>', source, options(prefix)
+    end
+  end
+
+  def test_closed_splat
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}hash /
+}
+
+      assert_html '<div a="The letter a" b="The letter b" />', source, options(prefix)
+    end
+  end
+
+  def test_splat_tag_name
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}{tag: 'h1', id: 'title'} This is my title
+}
+
+      assert_html '<h1 id="title">This is my title</h1>', source, options(prefix)
+    end
+  end
+
+
+  def test_splat_empty_tag_name
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}{tag: '', id: 'test'} This is my title
+}
+
+      assert_html '<div id="test">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_closed_splat_tag
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}hash /
+}
+
+      assert_html '<div a="The letter a" b="The letter b" />', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_id_shortcut
+    prefixes.each do |prefix|
+      source = %Q{
+#myid#{prefix}hash This is my title
+}
+
+      assert_html '<div a="The letter a" b="The letter b" id="myid">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_class_shortcut
+    prefixes.each do |prefix|
+      source = %Q{
+.myclass#{prefix}hash This is my title
+}
+
+      assert_html '<div a="The letter a" b="The letter b" class="myclass">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_id_and_class_shortcuts
+    prefixes.each do |prefix|
+      source = %Q{
+#myid.myclass#{prefix}hash This is my title
+}
+
+      assert_html '<div a="The letter a" b="The letter b" class="myclass" id="myid">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_class_merging
+    prefixes.each do |prefix|
+      source = %Q{
+#myid.myclass #{prefix}{class: [:secondclass, %w(x y z)]} #{prefix}hash This is my title
+}
+
+      assert_html '<div a="The letter a" b="The letter b" class="myclass secondclass x y z" id="myid">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_boolean_attribute
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}{disabled: true, empty1: false, nonempty: '', empty2: nil} This is my title
+}
+
+      assert_html '<div disabled="" nonempty="">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_merging_with_arrays
+    prefixes.each do |prefix|
+      source = %Q{
+#{prefix}{a: 1, b: 2} #{prefix}[[:c, 3], [:d, 4]] #{prefix}[[:e, 5], [:f, 6]] This is my title
+}
+
+      assert_html '<div a="1" b="2" c="3" d="4" e="5" f="6">This is my title</div>', source, options(prefix)
+    end
+  end
+
+  def test_splat_with_other_attributes
+    prefixes.each do |prefix|
+      source = %Q{
+h1 data-id="123" #{prefix}hash This is my title
+}
+
+      assert_html '<h1 a="The letter a" b="The letter b" data-id="123">This is my title</h1>', source, options(prefix)
+    end
+  end
+
+end

data/test/core/test_unicode.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'helper'
 
 class TestSlimUnicode < TestSlim

data/test/smart/test_smart_text.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require 'helper'
 require 'slim/smart'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +133,7 @@ files:
 - test/core/test_pretty.rb
 - test/core/test_ruby_errors.rb
 - test/core/test_slim_template.rb
+- test/core/test_splat_prefix_option.rb
 - test/core/test_tabs.rb
 - test/core/test_text_interpolation.rb
 - test/core/test_thread_options.rb
@@ -190,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="