slim 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d3292109076e4e06bc239e5f78b6d53b198a34
-  data.tar.gz: 0c1e6219507af63490d7de910b2e7e4a478013a5
+  metadata.gz: fdd7e59579d815f6a4b7b73d8ca4c9718f3e4df5
+  data.tar.gz: 37b35843560936e0fdcef732edd623e34fd17039
 SHA512:
-  metadata.gz: 711c54460e79e5191c8662e7c2764cf5b4a019cf65324c9e0ce59c547319903a04803b89ede833a354a80d87a6e2be50bc479a5689b1908acb4bf359b190e734
-  data.tar.gz: 13357a0c0ca79b446e29f7f9096a6964a97c0422bdb62f8826ad63ff551dc315633c82dc769d6864c255ae0c41d76e17fc8391d0578dafba64de87f03aca3888
+  metadata.gz: 813412ac6507ed3ecc3b72c4b02be96e323fe7638afc642186155fd196e96f59ff5506c808f2ace1568ab333b5b452a5496699bdfa0a4f1b8415c0eb8c7bd725
+  data.tar.gz: 647d4ecb78fcd10d0af3ffbc713a89ce210bdfb1dc4d3dae08bfed8056f2491255cde02d559952b2472951b4eb1bf4ce69bba617e6c687e7c7690eaf4e46db9b

data/CHANGES

@@ -1,3 +1,8 @@
+3.0.7 (2016-05-22)
+
+  * Add additional attributes feature to shortcuts
+  * Freeze string literals
+
 3.0.6 (2015-06-05)
 
   * Fix warnings #625

data/README.jp.md

@@ -1,6 +1,6 @@
 # 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) [![Dependency Status](https://img.shields.io/gemnasium/slim-template/slim.svg?travis)](https://gemnasium.com/slim-template/slim) [![Code Climate](https://img.shields.io/codeclimate/github/slim-template/slim.svg)](https://codeclimate.com/github/slim-template/slim) [![Gittip donate button](https://img.shields.io/gratipay/bevry.svg)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
+[![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) [![Dependency Status](https://img.shields.io/gemnasium/slim-template/slim.svg?travis)](https://gemnasium.com/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) [![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")
 
 Slim は 不可解にならないように view の構文を本質的な部品まで減らすことを目指したテンプレート言語です。標準的な HTML テンプレートからどれだけのものが削除できるか確かめるところから始まりました。(<, >, 閉じタグなど) 多くの人が Slim に興味を持ったことで, 機能性は発展し, 柔軟な構文をもたらしました。
@@ -238,7 +238,7 @@ html コメントにはスラッシュの直後にエクスクラメーション
     p もっといいブラウザを使ってください。
 ~~~
 
-レンダリング結果
+レンダリング結果:
 
 ~~~ html
 <!--[if IE]><p>もっといいブラウザを使ってください。</p><![endif]-->
@@ -246,9 +246,9 @@ html コメントにはスラッシュの直後にエクスクラメーション
 
 ## HTML タグ
 
-### ドキュメントタイプタグ
+# <!DOCTYPE> 宣言
 
-ドキュメントタイプタグはとても簡単な方法で複雑なドキュメントタイプを生成するために使われる特別なタグです。
+doctype はとても簡単な方法で複雑なドキュメントタイプを生成するために使われる特別なキーワードです。
 
 XML 宣言
 
@@ -513,7 +513,7 @@ input type="text" disabled=nil
 a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
 ~~~
 
-レンダリング結果
+レンダリング結果:
 
 ~~~ html
 <a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
@@ -534,7 +534,7 @@ a class=:menu,:highlight
 .card*{'data-url'=>place_path(place), 'data-id'=>place.id} = place.name
 ~~~
 
-レンダリング結果
+レンダリング結果:
 
 ~~~ html
 <div class="card" data-id="1234" data-url="/place/1234">Slim の家</div>
@@ -575,7 +575,7 @@ ruby:
 *a_unless_current リンク
 ~~~
 
-レンダリング結果
+レンダリング結果:
 
 ~~~ html
 <span>リンク</span><a href="http://slim-lang.com/">リンク</a>
@@ -585,7 +585,7 @@ ruby:
 
 #### タグショートカット
 
-`:shortcut` オプションを設定することで独自のタグショートカットを定義できます。
+`:shortcut` オプションを設定することで独自のタグショートカットを定義できます。Rails アプリケーションでは, `config/initializers/slim.rb` のようにイニシャライザに定義します。Sinatra アプリでは, `require 'slim'` が書かれた下であればどこにでも設定を定義することができます。
 
 ~~~ ruby
 Slim::Engine.set_options shortcut: {'c' => {tag: 'container'}, '#' => {attr: 'id'}, '.' => {attr: 'class'} }
@@ -665,6 +665,29 @@ Slim の中で次のように使用し
 <div class="person" role="admin" data-role="admin">Daniel</div>
 ~~~
 
+次のように追加の属性固定値を設定することもできます。
+
+~~~ ruby
+Slim::Engine.set_options shortcut: {'^' => {tag: 'script', attr: 'data-binding',
+  additional_attrs: { type: "text/javascript" }}}
+~~~
+
+このように使用します。
+
+~~~ slim
+^products
+  == @products.to_json
+~~~
+
+レンダリング結果です。
+
+~~~ html
+<script data-binding="products" type="text/javascript">
+[{"name": "product1", "price": "$100"},
+ {"name": "prodcut2", "price": "$200"}]
+</script>
+~~~
+
 #### ID ショートカット `#` と class ショートカット `.`
 
 `id` と `class` の属性を次のショートカットで指定できます。
@@ -754,7 +777,7 @@ end
 = captured_content
 ~~~
 
-別の興味深いユースケースは、enumerableを使いそれぞれの要素をキャプチャすることです。ヘルパは、このようになります。
+別の興味深いユースケースは, enumerableを使いそれぞれの要素をキャプチャすることです。ヘルパは, このようになります。
 
 ~~~ ruby
 module Capture
@@ -766,7 +789,7 @@ module Capture
 end
 ~~~
 
-そして、次のように使用出来ます。
+そして, 次のように使用出来ます。
 
 ~~~ slim
 - links = { 'http://slim-lang.com' => 'The Slim Template Language' }
@@ -774,7 +797,7 @@ end
   a href=url = text
 ~~~
 
-その後は、`link_list`はキャプチャしたコンテンツを含みます。
+その後は, `link_list`はキャプチャしたコンテンツを含みます。
 
 ###　インクルードヘルパ
 
@@ -1080,6 +1103,7 @@ markdown:
 * [Textmate / Sublime Text](https://github.com/slim-template/ruby-slim.tmbundle)
 * [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)
 
 ### テンプレート変換 (HAML, ERB, ...)
 
@@ -1181,6 +1205,7 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 静的コード解析:
 
 * [Slim-Lint](https://github.com/sds/slim-lint)
+* [SublimeLinter-slim-lint](https://github.com/elstgav/SublimeLinter-slim-lint)
 
 テンプレート変換 (HAML, ERB, ...):
 

data/README.md

@@ -1,6 +1,6 @@
 # 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) [![Dependency Status](https://img.shields.io/gemnasium/slim-template/slim.svg?travis)](https://gemnasium.com/slim-template/slim) [![Code Climate](https://img.shields.io/codeclimate/github/slim-template/slim.svg)](https://codeclimate.com/github/slim-template/slim) [![Gittip donate button](https://img.shields.io/gratipay/bevry.svg)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
+[![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) [![Dependency Status](https://img.shields.io/gemnasium/slim-template/slim.svg?travis)](https://gemnasium.com/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) [![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")
 
 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.
@@ -189,7 +189,7 @@ body
 
 ### Output `=`
 
-The equal sign tells Slim it's a Ruby call that produces output to add to the buffer. If your ruby code needs to use multiple lines, append a backslash `\` at the end of the lines, for example:
+The equals sign tells Slim it's a Ruby call that produces output to add to the buffer. If your ruby code needs to use multiple lines, append a backslash `\` at the end of the lines. For example:
 
 ~~~ slim
 = javascript_include_tag \
@@ -199,15 +199,15 @@ The equal sign tells Slim it's a Ruby call that produces output to add to the bu
 
 If your line ends with comma `,` (e.g because of a method call) you don't need the additional backslash before the linebreak. For trailing or leading whitespace the modifiers `>` and `<` are supported.
 
-* Output with trailing white space `=>`. Same as the single equal sign (`=`), except that it adds a trailing white space.
-* Output with leading white space `=<`. Same as the single equal sign (`=`), except that it adds a leading white space.
+* Output with trailing white space `=>`. Same as the single equals sign (`=`), except that it adds a trailing white space.
+* Output with leading white space `=<`. Same as the single equals sign (`=`), except that it adds a leading white space.
 
 ### Output without HTML escaping `==`
 
-Same as the single equal sign (`=`), but does not go through the `escape_html` method. For trailing or leading whitespace the modifiers `>` and `<` are supported.
+Same as the single equals sign (`=`), but does not go through the `escape_html` method. For trailing or leading whitespace the modifiers `>` and `<` are supported.
 
-* Output without HTML escaping and trailing white space `==>`. Same as the double equal sign (`==`), except that it adds a trailing white space.
-* Output without HTML escaping and leading white space `==<`. Same as the double equal sign (`==`), except that it adds a leading white space.
+* Output without HTML escaping and trailing white space `==>`. Same as the double equals sign (`==`), except that it adds a trailing white space.
+* Output without HTML escaping and leading white space `==<`. Same as the double equals sign (`==`), except that it adds a leading white space.
 
 ### Code comment `/`
 
@@ -238,7 +238,7 @@ Use the forward slash immediately followed by an exclamation mark for html comme
     p Get a better browser.
 ~~~
 
-renders as
+This renders as:
 
 ~~~ html
 <!--[if IE]><p>Get a better browser.</p><![endif]-->
@@ -246,9 +246,9 @@ renders as
 
 ## HTML tags
 
-### Doctype tag
+### <!DOCTYPE> declaration
 
-The doctype tag is a special tag which can be used to generate the complex doctypes in a very simple way.
+The doctype keyword can be used to generate the complex doctypes in a very simple manner.
 
 XML VERSION
 
@@ -513,7 +513,7 @@ this is done for class attributes with the white space as delimiter.
 a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
 ~~~
 
-This renders as
+This renders as:
 
 ~~~ html
 <a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
@@ -528,13 +528,13 @@ a class=:menu,:highlight
 
 #### Splat attributes `*`
 
-The splat shortcut allows you turn a hash in to attribute/value pairs
+The splat shortcut allows you to turn a hash into attribute/value pairs.
 
 ~~~ slim
 .card*{'data-url'=>place_path(place), 'data-id'=>place.id} = place.name
 ~~~
 
-renders as
+This renders as:
 
 ~~~ html
 <div class="card" data-id="1234" data-url="/place/1234">Slim's house</div>
@@ -553,7 +553,7 @@ The hash attributes which support attribute merging (see Slim option `:merge_att
 .first *{class: [:second, :third]} Text
 ~~~
 
-renders as
+This renders as:
 
 ~~~ html
 div class="first second third"
@@ -575,7 +575,7 @@ ruby:
 *a_unless_current Link
 ~~~
 
-renders as
+This renders as:
 
 ~~~ html
 <span>Link</span><a href="http://slim-lang.com/">Link</a>
@@ -585,7 +585,7 @@ renders as
 
 #### Tag shortcuts
 
-You can define custom tag shortcuts by setting the option `:shortcut`.
+You can define custom tag shortcuts by setting the option `:shortcut`. In Rails apps, you need to put this code for your shortcuts into an initializer like `config/initializers/slim.rb`. In Sinatra, you simply add the same configuration anywhere below the line where you `require 'slim'`.
 
 ~~~ ruby
 Slim::Engine.set_options shortcut: {'c' => {tag: 'container'}, '#' => {attr: 'id'}, '.' => {attr: 'class'} }
@@ -647,7 +647,7 @@ which renders to
 <div class="person" role="admin">Daniel</div>
 ~~~
 
-You can also set multiple attributes at once using one shortcut.
+You can also set multiple attributes with same value at once using one shortcut.
 
 ~~~ ruby
 Slim::Engine.set_options shortcut: {'@' => {attr: %w(data-role role)}}
@@ -665,6 +665,29 @@ which renders to
 <div class="person" role="admin" data-role="admin">Daniel</div>
 ~~~
 
+You can also set additional fixed value attributes to a shortcut.
+
+~~~ ruby
+Slim::Engine.set_options shortcut: {'^' => {tag: 'script', attr: 'data-binding',
+  additional_attrs: { type: "text/javascript" }}}
+~~~
+
+Then
+
+~~~ slim
+^products
+  == @products.to_json
+~~~
+
+which renders to
+
+~~~ html
+<script data-binding="products" type="text/javascript">
+[{"name": "product1", "price": "$100"},
+ {"name": "prodcut2", "price": "$200"}]
+</script>
+~~~
+
 #### ID shortcut `#` and class shortcut `.`
 
 You can specify the `id` and `class` attributes in the following shortcut form
@@ -818,7 +841,7 @@ body
 
 ## Embedded engines (Markdown, ...)
 
-Thanks to [Tilt](https://github.com/rtomayko/tilt), Slim has impressive support for embedding other template engines.
+Thanks to [Tilt](https://github.com/rtomayko/tilt), Slim has extensive support for embedding other template engines.
 
 Examples:
 
@@ -842,7 +865,7 @@ Supported engines:
 | 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 | Embedd scss code and wrap in style tag |
+| scss: | sass | Compile time | Embed scss code and wrap in style tag |
 | less: | less | Compile time | Embed less css code and wrap in style tag |
 | styl: | styl | Compile time | Embed stylus css code and wrap in style tag |
 | coffee: | coffee-script | Compile time | Compile coffee script code and wrap in script tag |
@@ -1080,6 +1103,7 @@ There are plugins for various text editors (including the most important ones -
 * [Textmate / Sublime Text](https://github.com/slim-template/ruby-slim.tmbundle)
 * [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)
 
 ### Template Converters (HAML, ERB, ...)
 
@@ -1181,6 +1205,7 @@ Syntax highlighting:
 Static code analysis:
 
 * [Slim-Lint](https://github.com/sds/slim-lint)
+* [SublimeLinter-slim-lint](https://github.com/elstgav/SublimeLinter-slim-lint)
 
 Template Converters (HAML, ERB, ...):
 

data/benchmarks/run-benchmarks.rb

@@ -13,7 +13,7 @@ require 'haml'
 
 class SlimBenchmarks
   def initialize(slow)
-    @benches    = []
+    @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')
@@ -25,8 +25,8 @@ class SlimBenchmarks
   end
 
   def init_compiled_benches
-    haml_pretty = Haml::Engine.new(@haml_code, format: :html5)
-    haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
+    haml_pretty = Haml::Engine.new(@haml_code, format: :html5, escape_attrs: false)
+    haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true, escape_attrs: false)
 
     context  = Context.new
 
@@ -41,14 +41,14 @@ class SlimBenchmarks
       def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
     }
 
-    bench('(1) erb')         { context.run_erb }
-    bench('(1) erubis')      { context.run_erubis }
-    bench('(1) fast erubis') { context.run_fast_erubis }
-    bench('(1) temple erb')  { context.run_temple_erb }
-    bench('(1) slim pretty') { context.run_slim_pretty }
-    bench('(1) slim ugly')   { context.run_slim_ugly }
-    bench('(1) haml pretty') { context.run_haml_pretty }
-    bench('(1) haml ugly')   { context.run_haml_ugly }
+    bench(:compiled, 'erb')         { context.run_erb }
+    bench(:compiled, 'erubis')      { context.run_erubis }
+    bench(:compiled, 'fast erubis') { context.run_fast_erubis }
+    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 pretty') { context.run_haml_pretty }
+    bench(:compiled, 'haml ugly')   { context.run_haml_ugly }
   end
 
   def init_tilt_benches
@@ -62,47 +62,54 @@ class SlimBenchmarks
 
     context  = Context.new
 
-    bench('(2) erb')         { tilt_erb.render(context) }
-    bench('(2) erubis')      { tilt_erubis.render(context) }
-    bench('(2) temple erb')  { tilt_temple_erb.render(context) }
-    bench('(2) slim pretty') { tilt_slim_pretty.render(context) }
-    bench('(2) slim ugly')   { tilt_slim_ugly.render(context) }
-    bench('(2) haml pretty') { tilt_haml_pretty.render(context) }
-    bench('(2) haml ugly')   { tilt_haml_ugly.render(context) }
+    bench(:tilt, 'erb')         { tilt_erb.render(context) }
+    bench(:tilt, 'erubis')      { tilt_erubis.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 pretty') { tilt_haml_pretty.render(context) }
+    bench(:tilt, 'haml ugly')   { tilt_haml_ugly.render(context) }
   end
 
   def init_parsing_benches
     context  = Context.new
     context_binding = context.instance_eval { binding }
 
-    bench('(3) erb')         { ERB.new(@erb_code).result(context_binding) }
-    bench('(3) erubis')      { Erubis::Eruby.new(@erb_code).result(context_binding) }
-    bench('(3) fast erubis') { Erubis::FastEruby.new(@erb_code).result(context_binding) }
-    bench('(3) temple erb')  { Temple::ERB::Template.new { @erb_code }.render(context) }
-    bench('(3) slim pretty') { Slim::Template.new(pretty: true) { @slim_code }.render(context) }
-    bench('(3) slim ugly')   { Slim::Template.new { @slim_code }.render(context) }
-    bench('(3) haml pretty') { Haml::Engine.new(@haml_code, format: :html5).render(context) }
-    bench('(3) haml ugly')   { Haml::Engine.new(@haml_code, format: :html5, ugly: true).render(context) }
+    bench(:parsing, 'erb')         { ERB.new(@erb_code).result(context_binding) }
+    bench(:parsing, 'erubis')      { Erubis::Eruby.new(@erb_code).result(context_binding) }
+    bench(:parsing, 'fast erubis') { Erubis::FastEruby.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 pretty') { Haml::Engine.new(@haml_code, format: :html5).render(context) }
+    bench(:parsing, 'haml ugly')   { Haml::Engine.new(@haml_code, format: :html5, ugly: true).render(context) }
   end
 
   def run
-    Benchmark.ips do |x|
-      @benches.each do |name, block|
-        x.report(name.to_s, &block)
+    @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 "
-(1) Compiled benchmark. Template is parsed before the benchmark and
+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.
 
-(2) Compiled Tilt benchmark. Template is compiled with Tilt, which gives a more
+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.)
 
-(3) Parsing benchmark. Template is parsed every time.
+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'.
 
@@ -111,8 +118,8 @@ overhead added by the Temple framework compared to ERB.
 "
   end
 
-  def bench(name, &block)
-    @benches.push([name, block])
+  def bench(group, name, &block)
+    @benches[group].push([name, block])
   end
 end
 

data/doc/logic_less.md

@@ -55,7 +55,7 @@ The dictionary object is accessed in the order given by the `:dictionary_access`
 
 If all the above fails, Slim will try to resolve the title reference in the same order against the parent object. In this example, the parent would be the dictionary object you are rendering the template against.
 
-As you might have guessed, the article reference goes through the same steps against the dictionary. Instance variables are not allowed in the view code, but Slim will find and use them. Essentially, you're just using dropping the @ prefix in your template. Parameterized method calls are not allowed.
+As you might have guessed, the article reference goes through the same steps against the dictionary. Instance variables are not allowed in the view code, but Slim will find and use them. Essentially, you're just dropping the @ prefix in your template. Parameterized method calls are not allowed.
 
 
 ## Strings

data/lib/slim/end_inserter.rb

@@ -10,7 +10,7 @@ module Slim
   #
   # @api private
   class EndInserter < Filter
-    IF_RE = /\A(if|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+    IF_RE = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
     ELSE_RE = /\A(else|elsif|when|rescue|ensure)\b/
     END_RE = /\Aend\b/
 

data/lib/slim/engine.rb

@@ -34,8 +34,6 @@ module Slim
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger
-    use :Generator do
-      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].options.valid_key?(k) })
-    end
+    use(:Generator) { options[:generator] }
   end
 end

data/lib/slim/parser.rb

@@ -55,13 +55,18 @@ module Slim
         @tab_re = "\t"
         @tab = ' '
       end
-      @tag_shortcut, @attr_shortcut = {}, {}
+      @tag_shortcut, @attr_shortcut, @additional_attrs = {}, {}, {}
       options[:shortcut].each do |k,v|
-        raise ArgumentError, 'Shortcut requires :tag and/or :attr' unless (v[:attr] || v[:tag]) && (v.keys - [:attr, :tag]).empty?
+        raise ArgumentError, 'Shortcut requires :tag and/or :attr' unless (v[:attr] || v[:tag]) && (v.keys - [:attr, :tag, :additional_attrs]).empty?
         @tag_shortcut[k] = v[:tag] || options[:default_tag]
+        if v.include?(:attr) || v.include?(:additional_attrs)
+          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
-          raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /(\p{Word}|-)/
+        end
+        if v.include?(:additional_attrs)
+          @additional_attrs[k] = v[:additional_attrs]
         end
       end
       keys = Regexp.union @attr_shortcut.keys.sort_by {|k| -k.size }
@@ -221,13 +226,13 @@ module Slim
         # Found an output block.
         # We expect the line to be broken or the next line to be indented.
         @line = $'
-        trailing_ws = $2.include?('>')
-        if $2.include?('\'')
+        trailing_ws = $2.include?('>'.freeze)
+        if $2.include?('\''.freeze)
           deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
           trailing_ws = true
         end
         block = [:multi]
-        @stacks.last << [:static, ' '] if $2.include?('<')
+        @stacks.last << [:static, ' '] if $2.include?('<'.freeze)
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] if trailing_ws
         @stacks << block
@@ -326,18 +331,23 @@ module Slim
         # 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 additional_attr_pairs = @additional_attrs[$1]
+          additional_attr_pairs.each do |k,v|
+            attributes << [:html, :attr, k.to_s, [:static, v]]
+          end
+        end
         @line = $'
       end
 
       @line =~ /\A[<>']*/
       @line = $'
-      trailing_ws = $&.include?('>')
-      if $&.include?('\'')
+      trailing_ws = $&.include?('>'.freeze)
+      if $&.include?('\''.freeze)
         deprecated_syntax 'tag\' for trailing whitespace is deprecated in favor of tag>'
         trailing_ws = true
       end
 
-      leading_ws = $&.include?('<')
+      leading_ws = $&.include?('<'.freeze)
 
       parse_attributes(attributes)
 
@@ -366,13 +376,13 @@ module Slim
       when /\A\s*=(=?)(['<>]*)/
         # Handle output code
         @line = $'
-        trailing_ws2 = $2.include?('>')
-        if $2.include?('\'')
+        trailing_ws2 = $2.include?('>'.freeze)
+        if $2.include?('\''.freeze)
           deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
           trailing_ws2 = true
         end
         block = [:multi]
-        @stacks.last.insert(-2, [:static, ' ']) if !leading_ws && $2.include?('<')
+        @stacks.last.insert(-2, [:static, ' ']) if !leading_ws && $2.include?('<'.freeze)
         tag << [:slim, :output, $1 != '=', parse_broken_line, block]
         @stacks.last << [:static, ' '] if !trailing_ws && trailing_ws2
         @stacks << block

data/lib/slim/smart/escaper.rb

@@ -24,7 +24,7 @@ module Slim
         block = [:multi]
         until string.empty?
           case string
-          when /\A&(\w+|#x[0-9a-f]+|#\d+);/i
+          when /\A&([a-z][a-z0-9]*|#x[0-9a-f]+|#\d+);/i
             # Entity.
             block << [:escape, false, [:static, $&]]
             string = $'

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=1.9.2'
 
-  s.add_runtime_dependency('temple', ['~> 0.7.3'])
+  s.add_runtime_dependency('temple', ['~> 0.7.6'])
   s.add_runtime_dependency('tilt', ['>= 1.3.3', '< 2.1'])
 end

data/test/core/test_code_structure.rb

@@ -13,6 +13,24 @@ div
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
+  def test_render_with_begin
+    source = %q{
+- if true
+  - begin
+    p A
+- if true
+  - begin
+    p B
+- if true
+  - begin
+    p C
+  - rescue
+    p D
+}
+
+    assert_html '<p>A</p><p>B</p><p>C</p>', source
+  end
+
   def test_render_with_consecutive_conditionals
     source = %q{
 div

data/test/core/test_html_structure.rb

@@ -99,6 +99,22 @@ h1#title This is my title
     assert_html '<div class="hello world" id="notice" role="test">Hello World from @env</div><section role="abc">Hello World from @env</section>', source, shortcut: {'#' => {attr: 'id'}, '.' => {attr: 'class'}, '@' => {tag: 'section', attr: 'role'}}
   end
 
+  def test_render_with_custom_array_shortcut
+    source = %q{
+#user@.admin Daniel
+}
+    assert_html '<div class="admin" id="user" role="admin">Daniel</div>', source, shortcut: {'#' => {attr: 'id'}, '.' => {attr: 'class'}, '@' => {attr: 'role'}, '@.' => {attr: ['class', 'role']}}
+  end
+
+  def test_render_with_custom_shortcut_and_additional_attrs
+    source = %q{
+^items
+  == "[{'title':'item0'},{'title':'item1'},{'title':'item2'},{'title':'item3'},{'title':'item4'}]"
+}
+    assert_html '<script data-binding="items" type="application/json">[{\'title\':\'item0\'},{\'title\':\'item1\'},{\'title\':\'item2\'},{\'title\':\'item3\'},{\'title\':\'item4\'}]</script>',
+                source, shortcut: {'^' => {tag: 'script', attr: 'data-binding', additional_attrs: { type: "application/json" }}}
+  end
+
   def test_render_with_text_block
     source = %q{
 p

data/test/smart/test_smart_text.rb

@@ -99,14 +99,14 @@ p
   > Escaped <&>.
   Protected &amp; &lt; &gt; &copy; &Aacute;.
   Protected &#0129; &#x00ff;.
-  Escaped &#xx; &#1f; &;.
+  Escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{Not escaped <&>.<p>Escaped &lt;&amp;&gt;.</p><p>Escaped &lt;&amp;&gt;.
 Escaped &lt;&amp;&gt;.
 Protected &amp; &lt; &gt; &copy; &Aacute;.
 Protected &#0129; &#x00ff;.
-Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+Escaped &amp;#xx; &amp;#1f; &amp;9; &amp;_; &amp;;.</p>}
 
     assert_html result, source
   end
@@ -121,14 +121,14 @@ p
   > Not escaped <&>.
   Not escaped &amp; &lt; &gt; &copy; &Aacute;.
   Not escaped &#0129; &#x00ff;.
-  Not escaped &#xx; &#1f; &;.
+  Not escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{<p>Not escaped <&>.</p>Not escaped <&>.<p>Not escaped <&>.
 Not escaped <&>.
 Not escaped &amp; &lt; &gt; &copy; &Aacute;.
 Not escaped &#0129; &#x00ff;.
-Not escaped &#xx; &#1f; &;.</p>}
+Not escaped &#xx; &#1f; &9; &_; &;.</p>}
 
       assert_html result, source
     end
@@ -139,13 +139,13 @@ Not escaped &#xx; &#1f; &;.</p>}
 p Escaped <&>.
   Protected &amp; &lt; &gt; &copy; &Aacute;.
   Protected &#0129; &#x00ff;.
-  Escaped &#xx; &#1f; &;.
+  Escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{<p>Escaped &lt;&amp;&gt;.
 Protected &amp; &lt; &gt; &copy; &Aacute;.
 Protected &#0129; &#x00ff;.
-Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+Escaped &amp;#xx; &amp;#1f; &amp;9; &amp;_; &amp;;.</p>}
 
     assert_html result, source
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -203,4 +203,3 @@ signing_key:
 specification_version: 4
 summary: Slim is a template language.
 test_files: []
-has_rdoc: