slim 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a9425fd0b4b76c20a920f76d2d5de37e0f411c
-  data.tar.gz: 627435a655daa4b54f1ed18baf5a58302f1d5fc1
+  metadata.gz: 89b79547893a3fcfe80dc8f1a77b5e7eb94fb69e
+  data.tar.gz: 68744041f28214f56c5c12559db00e9edb4cc3d0
 SHA512:
-  metadata.gz: 522bfc01a26bc8ce325599b25cd85de310c97d5d40b3cc5fb84b8b1f3fae592bb1ea0ed2a6738156082d65e77ee1afec9ce5d08ab34fb9d5d27fe86290b36160
-  data.tar.gz: 2e784025e8bc003385e120990660e449d0950acee036219ca73dc289c932b39876d782cd13f8972a91f85ed41439ed99ca3b8222f2eff7cde8fe65a128485202
+  metadata.gz: 124098d00c5f8aec79387b13ea46f04df1c7b158d2aa8d27d858e6e62ed9b7814bbfdf08fd474a8d7b62e61df5a23454e10ee188997506352dd6980fa6517954
+  data.tar.gz: 392e37c3702ba5b2c84a9c6b763be82083d06cabad6155da9bcc9e4a5b4cffa612ad76d91654cd4451b024d5842fd1b8066a077d70ea756eecd81f606dfce1c7

data/.travis.yml

@@ -12,11 +12,12 @@ env:
   - "TASK=test:core_and_plugins TILT=master"
   - "TASK=test:core_and_plugins TILT=1.3.4"
   - "TASK=test:core_and_plugins TILT=1.4.1"
+  - "TASK=test:core_and_plugins TILT=2.0.0.beta1"
   - "TASK=test:rails RAILS=master"
   - "TASK=test:rails RAILS=3.0.20"
   - "TASK=test:rails RAILS=3.1.12"
   - "TASK=test:rails RAILS=3.2.13"
-  - "TASK=test:rails RAILS=4.0.0.rc1"
+  - "TASK=test:rails RAILS=4.0.0"
   - "TASK=test:sinatra SINATRA=master"
   - "TASK=test:sinatra SINATRA=1.3.6"
   - "TASK=test:sinatra SINATRA=1.4.2"
@@ -32,11 +33,11 @@ matrix:
     - rvm: rbx-18mode
       env: "TASK=test:rails RAILS=master"
     - rvm: 1.8.7
-      env: "TASK=test:rails RAILS=4.0.0.rc1"
+      env: "TASK=test:rails RAILS=4.0.0"
     - rvm: jruby-18mode
-      env: "TASK=test:rails RAILS=4.0.0.rc1"
+      env: "TASK=test:rails RAILS=4.0.0"
     - rvm: rbx-18mode
-      env: "TASK=test:rails RAILS=4.0.0.rc1"
+      env: "TASK=test:rails RAILS=4.0.0"
   allow_failures:
     - env: "TASK=test:core_and_plugins TILT=master"
     - env: "TASK=test:rails RAILS=master"

data/.yardopts

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

data/CHANGES

@@ -1,3 +1,12 @@
+2.0.1
+
+  * Support multiple attributes per shortcut (See issue #415)
+  * Add support for org-ruby embedded engine
+  * Render true boolean attributes with empty value
+  * Support case-when statements
+  * Fix issue #431
+  * Also escape ' to '
+
 2.0.0
 
   * IMPORTANT: Backward incompatible syntax change: '{...}' and '[...]' are not

data/Gemfile

@@ -39,6 +39,7 @@ gem 'kramdown'
 gem 'creole'
 gem 'builder'
 gem 'asciidoctor'
+gem 'org-ruby'
 gem 'minitest', '~> 4.7.4'
 
 if ENV['TASK'] == 'bench'

data/README.md

@@ -50,7 +50,7 @@ as good as possible.
 ### What is Slim?
 
 Slim is a fast, lightweight templating engine with support for __Rails 3 and 4__. It has been heavily tested on all major ruby implementations. We use
-continous integration (travis-ci).
+continuous integration (travis-ci).
 
 Slim's core syntax is guided by one thought: "What's the minimum required to make this work".
 
@@ -417,7 +417,7 @@ You can also break ruby attributes with backslash `\` or trailing `,` as describ
 #### Boolean attributes
 
 The attribute values `true`, `false` and `nil` are interpreted
-as booleans. If you use the attribut wrapper you can omit the attribute assigment
+as booleans. If you use the attribute wrapper you can omit the attribute assigment.
 
     input type="text" disabled="disabled"
     input type="text" disabled=true
@@ -532,6 +532,18 @@ which renders to
 
     <div class="person" role="admin">Daniel</div>
 
+You can also set multiple attributes at once using one shortcut.
+
+    Slim::Engine.set_default_options :shortcut => {'@' => {:attr => %w(data-role role)}}
+
+We can use it in Slim code like this
+
+    .person@admin = person.name
+
+which renders to
+
+    <div class="person" role="admin" data-role="admin">Daniel</div>
+
 #### ID shortcut `#` and class shortcut `.`
 
 Similarly to Haml, you can specify the `id` and `class` attributes in the following shortcut form
@@ -610,28 +622,25 @@ Examples:
 
 Supported engines:
 
-<table>
-<thead style="font-weight:bold"><tr><td>Filter</td><td>Required gems</td><td>Type</td><td>Description</td></tr></thead>
-<tbody>
-<tr><td>ruby:</td><td>none</td><td>Shortcut</td><td>Shortcut to embed ruby code</td></tr>
-<tr><td>javascript:</td><td>none</td><td>Shortcut</td><td>Shortcut to embed javascript code and wrap in script tag</td></tr>
-<tr><td>css:</td><td>none</td><td>Shortcut</td><td>Shortcut to embed css code and wrap in style tag</td></tr>
-<tr><td>sass:</td><td>sass</td><td>Compile time</td><td>Embed sass code and wrap in style tag</td></tr>
-<tr><td>scss:</td><td>sass</td><td>Compile time</td><td>Embedd scss code and wrap in style tag</td></tr>
-<tr><td>less:</td><td>less</td><td>Compile time</td><td>Embed less css code and wrap in style tag</td></tr>
-<tr><td>styl:</td><td>styl</td><td>Compile time</td><td>Embed stylus css code and wrap in style tag</td></tr>
-<tr><td>coffee:</td><td>coffee-script</td><td>Compile time</td><td>Compile coffee script code and wrap in script tag</td></tr>
-<tr><td>asciidoc:</td><td>asciidoctor</td><td>Compile time + Interpolation</td><td>Compile AsciiDoc code and interpolate #\{variables} in text</td></tr>
-<tr><td>markdown:</td><td>redcarpet/rdiscount/kramdown</td><td>Compile time + Interpolation</td><td>Compile markdown code and interpolate #\{variables} in text</td></tr>
-<tr><td>textile:</td><td>redcloth</td><td>Compile time + Interpolation</td><td>Compile textile code and interpolate #\{variables} in text</td></tr>
-<tr><td>creole:</td><td>creole</td><td>Compile time + Interpolation</td><td>Compile creole code and interpolate #\{variables} in text</td></tr>
-<tr><td>wiki:, mediawiki:</td><td>wikicloth</td><td>Compile time + Interpolation</td><td>Compile wiki code and interpolate #\{variables} in text</td></tr>
-<tr><td>rdoc:</td><td>rdoc</td><td>Compile time + Interpolation</td><td>Compile rdoc code and interpolate #\{variables} in text</td></tr>
-<tr><td>builder:</td><td>builder</td><td>Precompiled</td><td>Embed builder code</td></tr>
-<tr><td>nokogiri:</td><td>nokogiri</td><td>Precompiled</td><td>Embed nokogiri builder code</td></tr>
-<tr><td>erb:</td><td>none</td><td>Precompiled</td><td>Embed erb code</td></tr>
-</tbody>
-</table>
+| Filter | Required gems | Type | Description |
+| ------ | ------------- | ---- | ----------- |
+| 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 | Embedd 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 |
+| asciidoc: | asciidoctor | Compile time + Interpolation | Compile AsciiDoc code and interpolate #\{variables} in text |
+| markdown: | redcarpet/rdiscount/kramdown | Compile time + Interpolation | Compile markdown code and interpolate #\{variables} in text |
+| textile: | redcloth | Compile time + Interpolation | Compile textile code and interpolate #\{variables} in text |
+| creole: | creole | Compile time + Interpolation | Compile creole code and interpolate #\{variables} in text |
+| wiki:, mediawiki: | wikicloth | Compile time + Interpolation | Compile wiki code and interpolate #\{variables} in text |
+| rdoc: | rdoc | Compile time + Interpolation | Compile rdoc code and interpolate #\{variables} in text |
+| builder: | builder | Precompiled | Embed builder code |
+| nokogiri: | nokogiri | Precompiled | Embed nokogiri builder code |
+| erb: | none | Precompiled | Embed erb code |
 
 The embedded engines can be configured in Slim by setting the options directly on the `Slim::Embedded` filter. Example:
 
@@ -686,32 +695,31 @@ You have to be aware that the compiled engine code and the options are cached pe
 The following options are exposed by the `Slim::Engine` and can be set with `Slim::Engine.set_default_options`.
 There are a lot of them but the good thing is, that Slim checks the configuration keys and reports an error if you try to use an invalid configuration key.
 
-<table>
-<thead style="font-weight:bold"><tr><td>Type</td><td>Name</td><td>Default</td><td>Purpose</td></tr></thead>
-<tbody>
-<tr><td>String</td><td>:file</td><td>nil</td><td>Name of parsed file, set automatically by Slim::Template</td></tr>
-<tr><td>Integer</td><td>:tabsize</td><td>4</td><td>Number of white spaces per tab (used by the parser)</td></tr>
-<tr><td>String</td><td>:encoding</td><td>"utf-8"</td><td>Set encoding of template</td></tr>
-<tr><td>String</td><td>:default_tag</td><td>"div"</td><td>Default tag to be used if tag name is omitted</td></tr>
-<tr><td>Hash</td><td>:shortcut</td><td>\{'.' => {:attr => 'class'}, '#' => {:attr => 'id'}}</td><td>Attribute shortcuts</td></tr>
-<tr><td>Array&lt;Symbol,String&gt;</td><td>:enable_engines</td><td>nil <i>(All enabled)</i></td><td>List of enabled embedded engines (whitelist)</td></tr>
-<tr><td>Array&lt;Symbol,String&gt;</td><td>:disable_engines</td><td>nil <i>(None disabled)</i></td><td>List of disabled embedded engines (blacklist)</td></tr>
-<tr><td>Boolean</td><td>:disable_capture</td><td>false (true in Rails)</td><td>Disable capturing in blocks (blocks write to the default buffer </td></tr>
-<tr><td>Boolean</td><td>:disable_escape</td><td>false</td><td>Disable automatic escaping of strings</td></tr>
-<tr><td>Boolean</td><td>:use_html_safe</td><td>false (true in Rails)</td><td>Use String#html_safe? from ActiveSupport (Works together with :disable_escape)</td></tr>
-<tr><td>Symbol</td><td>:format</td><td>:xhtml</td><td>HTML output format (Possible formats :xhtml, :html4, :html5, :html)</td></tr>
-<tr><td>String</td><td>:attr_quote</td><td>'"'</td><td>Character to wrap attributes in html (can be ' or ")</td></tr>
-<tr><td>Hash</td><td>:merge_attrs</td><td>\{'class' => ' '}</td><td>Joining character used if multiple html attributes are supplied (e.g. class="class1 class2")</td></tr>
-<tr><td>Array&lt;String&gt;</td><td>:hyphen_attrs</td><td>%w(data)</td><td>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")</td></tr>
-<tr><td>Boolean</td><td>:sort_attrs</td><td>true</td><td>Sort attributes by name</td></tr>
-<tr><td>Symbol</td><td>:js_wrapper</td><td>nil</td><td>Wrap javascript by :comment, :cdata or :both. You can also :guess the wrapper based on :format.</td></tr>
-<tr><td>Boolean</td><td>:pretty</td><td>false</td><td>Pretty HTML indenting, only block level tags are indented <b>(This is slower!)</b></td></tr>
-<tr><td>String</td><td>:indent</td><td>'  '</td><td>Indentation string</td></tr>
-<tr><td>Boolean</td><td>:streaming</td><td>false (true in Rails > 3.1)</td><td>Enable output streaming</td></tr>
-<tr><td>Class</td><td>:generator</td><td>Temple::Generators::ArrayBuffer/RailsOutputBuffer</td><td>Temple code generator (default generator generates array buffer)</td></tr>
-<tr><td>String</td><td>:buffer</td><td>'_buf' ('@output_buffer' in Rails)</td><td>Variable used for buffer</td></tr>
-</tbody>
-</table>
+
+| Type | Name | Default | Purpose |
+| ---- | ---- | ------- | ------- |
+| String | :file | nil | Name of parsed file, set automatically by Slim::Template |
+| Integer | :tabsize | 4 | Number of white spaces per tab (used by the parser) |
+| String | :encoding | "utf-8" | Set encoding of template |
+| String | :default_tag | "div" | Default tag to be used if tag name is omitted |
+| Hash | :shortcut | \{'.' => {:attr => 'class'}, '#' => {:attr => 'id'}} | Attribute shortcuts |
+| Array&lt;Symbol,String&gt; | :enable_engines | nil <i>(All enabled)</i> | List of enabled embedded engines (whitelist) |
+| Array&lt;Symbol,String&gt; | :disable_engines | nil <i>(None disabled)</i> | List of disabled embedded engines (blacklist) |
+| Boolean | :disable_capture | false (true in Rails) | Disable capturing in blocks (blocks write to the default buffer  |
+| Boolean | :disable_escape | false | Disable automatic escaping of strings |
+| Boolean | :use_html_safe | false (true in Rails) | Use String#html_safe? from ActiveSupport (Works together with :disable_escape) |
+| Symbol | :format | :xhtml | HTML output format (Possible formats :xhtml, :html4, :html5, :html) |
+| 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") |
+| 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> |
+| String | :indent | '  ' | Indentation string |
+| Boolean | :streaming | false (true in Rails > 3.1) | Enable output streaming |
+| Class | :generator | Temple::Generators::ArrayBuffer/ RailsOutputBuffer | Temple code generator (default generator generates array buffer) |
+| String | :buffer | '_buf' ('@output_buffer' in Rails) | Variable used for buffer |
+
 
 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.
@@ -857,17 +865,18 @@ run the slow parsing benchmark which needs more time. You can also increase the
 
 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 continous integration
+### Test suite and continuous integration
 
 Slim provides an extensive test-suite based on minitest. You can run the tests
 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 continous integration testing: <http://travis-ci.org/#!/slim-template/slim>
+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.0.0
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
@@ -883,9 +892,9 @@ If you'd like to help improve Slim, clone the project with Git by running:
 
 Work your magic and then submit a pull request. We love pull requests!
 
-Please remember to test against Ruby versions 1.9.2 and 1.8.7.
+Please remember to test against Ruby versions 2.0.0, 1.9.3 and 1.8.7.
 
-If you find the documentation lacking (and you probably will), 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.
+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.
 
 ## License
 
@@ -934,3 +943,4 @@ Language ports/Similar languages:
 * [Emblem.js (Javascript, similar to Slim)](https://github.com/machty/emblem.js)
 * [Haml (Older engine which inspired Slim)](https://github.com/haml/haml)
 * [Jade (Similar engine for javascript)](https://github.com/visionmedia/jade)
+* [Sweet (Similar engine which also allows to write classes and functions)](https://github.com/joaomdmoura/sweet)

data/Rakefile

@@ -48,6 +48,7 @@ namespace 'test' do
   end
 
   begin
+    require 'rubygems'
     require 'sinatra'
     spec = Gem::Specification.find_by_name('sinatra')
     Rake::TestTask.new('sinatra') do |t|

data/doc/logic_less.md

@@ -130,11 +130,8 @@ and activate logic less mode per render call in your application
 
 ## Options
 
-<table>
-<thead style="font-weight:bold"><tr><td>Type</td><td>Name</td><td>Default</td><td>Purpose</td></tr></thead>
-<tbody>
-<tr><td>Boolean</td><td>:logic_less</td><td>true</td><td>Enable logic less mode (Enabled if 'slim/logic_less' is required)</td></tr>
-<tr><td>String</td><td>:dictionary</td><td>"self"</td><td>Dictionary where variables are looked up</td></tr>
-<tr><td>Symbol/Array&lt;Symbol&gt;</td><td>:dictionary_access</td><td>[:symbol, :string, :method, :instance_variable]</td><td>Dictionary access order (:symbol, :string, :method, :instance_variable)</td></tr>
-</tbody>
-</table>
+| Type | Name | Default | Purpose |
+| ---- | ---- | ------- | ------- |
+| Boolean | :logic_less | true | Enable logic less mode (Enabled if 'slim/logic_less' is required) |
+| String | :dictionary | "self" | Dictionary where variables are looked up |
+| Symbol/Array&lt;Symbol&gt; | :dictionary_access | [:symbol, :string, :method, :instance_variable] | Dictionary access order (:symbol, :string, :method, :instance_variable) |

data/doc/translator.md

@@ -21,11 +21,8 @@ Enable the translator plugin with
 
 # Options
 
-<table>
-<thead style="font-weight:bold"><tr><td>Type</td><td>Name</td><td>Default</td><td>Purpose</td></tr></thead>
-<tbody>
-<tr><td>Boolean</td><td>:tr</td><td>true</td><td>Enable translator (Enabled if 'slim/translator' is required)</td></tr>
-<tr><td>Symbol</td><td>:tr_mode</td><td>:dynamic</td><td>When to translate: :static = at compile time, :dynamic = at runtime</td></tr>
-<tr><td>String</td><td>:tr_fn</td><td>Depending on installed translation library</td><td>Translation function, could be '_' for gettext</td></tr>
-</tbody>
-</table>
+| Type | Name | Default | Purpose |
+| ---- | ---- | ------- | ------- |
+| Boolean | :tr | true | Enable translator (Enabled if 'slim/translator' is required) |
+| Symbol | :tr_mode | :dynamic | When to translate: :static = at compile time, :dynamic = at runtime |
+| String | :tr_fn | Depending on installed translation library | Translation function, could be '_' for gettext |

data/lib/slim/code_attributes.rb

@@ -11,7 +11,7 @@ module Slim
       [:multi, *attrs.map {|a| compile(a) }]
     end
 
-    # Handle attribute expression `[:html, :attr, escape, code]`
+    # Handle attribute expression `[:html, :attr, name, value]`
     #
     # @param [String] name Attribute name
     # @param [Array] value Value expression
@@ -22,7 +22,7 @@ module Slim
         escape, code = value[2], value[3]
         case code
         when 'true'
-          [:html, :attr, name, [:static, name]]
+          [:html, :attr, name, [:multi]]
         when 'false', 'nil'
           [:multi]
         else
@@ -30,7 +30,7 @@ module Slim
           [:multi,
            [:code, "#{tmp} = #{code}"],
            [:case, tmp,
-            ['true', [:html, :attr, name, [:static, name]]],
+            ['true', [:html, :attr, name, [:multi]]],
             ['false, nil', [:multi]],
             [:else, [:html, :attr, name, [:escape, escape, [:dynamic, tmp]]]]]]
         end

data/lib/slim/command.rb

@@ -65,7 +65,7 @@ module Slim
 
       opts.on('-o', '--option [NAME=CODE]', String, 'Set slim option') do |str|
         parts = str.split('=', 2)
-        Engine.default_options[parts.first.to_sym] = eval(parts.last)
+        Engine.default_options[parts.first.gsub(/\A:/, '').to_sym] = eval(parts.last)
       end
 
       opts.on_tail('-h', '--help', 'Show this message') do

data/lib/slim/do_inserter.rb

@@ -7,7 +7,7 @@ module Slim
   #
   # @api private
   class DoInserter < Filter
-    BLOCK_REGEX = /(\A(if|unless|else|elsif|when|begin|rescue|ensure)\b)|do\s*(\|[^\|]*\|\s*)?\Z/
+    BLOCK_REGEX = /(\A(if|unless|else|elsif|when|begin|rescue|ensure|case)\b)|do\s*(\|[^\|]*\|\s*)?\Z/
 
     # Handle control expression `[:slim, :control, code, content]`
     #

data/lib/slim/embedded.rb

@@ -248,6 +248,7 @@ module Slim
     register :creole,     InterpolateTiltEngine
     register :wiki,       InterpolateTiltEngine
     register :mediawiki,  InterpolateTiltEngine
+    register :org,        InterpolateTiltEngine
 
     # These engines are executed at compile time
     register :coffee,     JavaScriptEngine, :engine => StaticTiltEngine

data/lib/slim/engine.rb

@@ -9,7 +9,6 @@ module Slim
                    :sort_attrs => true,
                    :attr_quote => '"',
                    :merge_attrs => {'class' => ' '},
-                   :encoding => 'utf-8',
                    :generator => Temple::Generators::ArrayBuffer,
                    :default_tag => 'div'
 

data/lib/slim/parser.rb

@@ -48,12 +48,14 @@ module Slim
         raise ArgumentError, 'Shortcut requires :tag and/or :attr' unless (v[:attr] || v[:tag]) && (v.keys - [:attr, :tag]).empty?
         @tag_shortcut[k] = v[:tag] || options[:default_tag]
         if v.include?(:attr)
-          @attr_shortcut[k] = v[:attr]
+          @attr_shortcut[k] = [v[:attr]].flatten
           raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /(#{WORD_RE}|-)/
         end
       end
-      @attr_shortcut_re = /\A(#{Regexp.union @attr_shortcut.keys})(#{WORD_RE}(?:#{WORD_RE}|-)*#{WORD_RE}|#{WORD_RE}+)/
-      @tag_re = /\A(?:#{Regexp.union @tag_shortcut.keys}|\*(?=[^\s]+)|(#{WORD_RE}(?:#{WORD_RE}|:|-)*#{WORD_RE}|#{WORD_RE}+))/
+      keys = Regexp.union @attr_shortcut.keys.sort_by {|k| -k.size }
+      @attr_shortcut_re = /\A(#{keys}+)(#{WORD_RE}(?:#{WORD_RE}|-)*#{WORD_RE}|#{WORD_RE}+)/
+      keys = Regexp.union @tag_shortcut.keys.sort_by {|k| -k.size }
+      @tag_re = /\A(?:#{keys}|\*(?=[^\s]+)|(#{WORD_RE}(?:#{WORD_RE}|:|-)*#{WORD_RE}|#{WORD_RE}+))/
     end
 
     # Compile string to Temple expression
@@ -302,7 +304,8 @@ module Slim
       while @line =~ @attr_shortcut_re
         # The class/id attribute is :static instead of :slim :interpolate,
         # because we don't want text interpolation in .class or #id shortcut
-        attributes << [:html, :attr, @attr_shortcut[$1], [:static, $2]]
+        syntax_error!('Illegal shortcut') unless shortcut = @attr_shortcut[$1]
+        shortcut.each {|a| attributes << [:html, :attr, a, [:static, $2]] }
         @line = $'
       end
 

data/lib/slim/splat/builder.rb

@@ -20,7 +20,7 @@ module Slim
             return
           when true
             # Boolean true attribute
-            value = name
+            value = ''
           else
             value = value.to_s
           end

data/lib/slim/splat/filter.rb

@@ -24,16 +24,15 @@ module Slim
       # @param [Array] content Temple expression
       # @return [Array] Compiled temple expression
       def on_html_tag(name, attrs, content = nil)
-        if name != '*'
-          super
-        elsif content
-          builder, block = make_builder(attrs[2..-1])
+        return super if name != '*'
+        builder, block = make_builder(attrs[2..-1])
+        if content
           [:multi,
            block,
-           [:slim, :output, false, "#{builder}.build_tag do",
+           [:slim, :output, false,
+            "#{builder}.build_tag #{empty_exp?(content) ? '{}' : 'do'}",
             compile(content)]]
         else
-          builder, block = make_builder(attrs[2..-1])
           [:multi,
            block,
            [:dynamic, "#{builder}.build_tag"]]

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -12,11 +12,12 @@ Gem::Specification.new do |s|
   s.description       = 'Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.'
   s.homepage          = 'http://slim-lang.com/'
   s.rubyforge_project = s.name
+  s.license           = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = %w(lib)
+  s.files             = `git ls-files`.split("\n")
+  s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths     = %w(lib)
 
-  s.add_runtime_dependency('temple', ['~> 0.6.5'])
-  s.add_runtime_dependency('tilt', ['~> 1.3', '>= 1.3.3'])
+  s.add_runtime_dependency('temple', ['~> 0.6.6'])
+  s.add_runtime_dependency('tilt', ['>= 1.3.3', '< 2.1'])
 end

data/test/core/helper.rb

@@ -59,11 +59,11 @@ class TestSlim < MiniTest::Unit::TestCase
     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] =~ /^(.*?:\d+):/
+        ex.backtrace[1] =~ /([^\s]+:\d+):/
         assert_equal from, $1
       end
     else
-      ex.backtrace[0] =~ /^(.*?:\d+):/
+      ex.backtrace[0] =~ /([^\s]+:\d+):/
       assert_equal from, $1
     end
   end
@@ -72,7 +72,7 @@ class TestSlim < MiniTest::Unit::TestCase
     render(source, options)
     raise 'Ruby syntax error expected'
   rescue SyntaxError => ex
-    ex.message =~ /^(.*?:\d+):/
+    ex.message =~ /([^\s]+:\d+):/
     assert_equal from, $1
   end
 

data/test/core/test_code_escaping.rb

@@ -17,6 +17,14 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
     assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;/strong&gt;.</p>", source
   end
 
+  def test_render_without_html_safe2
+    source = %q{
+p = "<strong>Hello World\\n, meet 'Slim'</strong>."
+}
+
+    assert_html "<p>&lt;strong&gt;Hello World\n, meet &#39;Slim&#39;&lt;/strong&gt;.</p>", source
+  end
+
   def test_render_with_html_safe_false
     source = %q{
 p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
@@ -37,6 +45,27 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>.".html_safe
     end
   end
 
+  # splat ignores html_safe? for now
+  def test_render_splat_with_html_safe_true
+    source = %q{
+p *{ :title => '&'.html_safe }
+}
+
+    with_html_safe do
+      assert_html "<p title=\"&amp;\"></p>", source, :use_html_safe => true
+    end
+  end
+
+  def test_render_attribute_with_html_safe_true
+    source = %q{
+p title=('&'.html_safe)
+}
+
+    with_html_safe do
+      assert_html "<p title=\"&\"></p>", source, :use_html_safe => true
+    end
+  end
+
   def test_render_with_disable_escape_false
     source = %q{
 = "<p>Hello</p>"

data/test/core/test_code_structure.rb

@@ -74,13 +74,32 @@ p = hello_world if true
 p
   - case 42
   - when 41
-    | 1
+    | 41
+  - when 42
+    | 42
+  |  is the answer
+p
+  - case 41
+  - when 41
+    | 41
+  - when 42
+    | 42
+  |  is the answer
+p
+  - case 42 when 41
+    | 41
+  - when 42
+    | 42
+  |  is the answer
+p
+  - case 41 when 41
+    | 41
   - when 42
     | 42
   |  is the answer
 }
 
-    assert_html '<p>42 is the answer</p>', source
+    assert_html '<p>42 is the answer</p><p>41 is the answer</p><p>42 is the answer</p><p>41 is the answer</p>', source
   end
 
   def test_render_with_slim_comments

data/test/core/test_embedded_engines.rb

@@ -68,6 +68,18 @@ creole:
     assert_html "<h1>head1</h1><h2>head2</h2>", source
   end
 
+  def test_render_with_org
+    # HACK: org-ruby registers itself in Tilt
+    require 'org-ruby'
+
+    source = %q{
+org:
+  * point1
+  * point2
+}
+    assert_html "<h1>point1</h1>\n<h1>point2</h1>\n", source
+  end
+
   def test_render_with_builder
     source = %q{
 builder:
@@ -112,7 +124,7 @@ p Hi
 javascript:   
   $(function() { #{func} });
 }
-    assert_html %q|<script type="text/javascript">$(function() { alert('hello'); });</script>|, source
+    assert_html %q|<script type="text/javascript">$(function() { alert(&#39;hello&#39;); });</script>|, source
   end
 
   def test_render_with_javascript_with_explicit_html_comment

data/test/core/test_html_attributes.rb

@@ -69,7 +69,7 @@ option selected=true Text
 option selected=cond Text2
 }
 
-    assert_html '<option selected="selected">Text</option><option selected="selected">Text2</option>', source
+    assert_html '<option selected="">Text</option><option selected="">Text2</option>', source
   end
 
   def test_boolean_attribute_nil
@@ -96,7 +96,7 @@ option(class="clazz" selected) Text
 option(selected class="clazz") Text
 }
 
-    assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
+    assert_html '<option class="clazz" selected="">Text</option><option class="clazz" selected="">Text</option>', source
   end
 
   def test_array_attribute_merging
@@ -116,6 +116,15 @@ option(selected class="clazz") Text
     assert_html '<div class="alpha" data-a="alpha" data-b="beta" data-c-d="gamma" data-c-e="epsilon"></div>', source
   end
 
+  def test_splat_without_content
+    source = %q{
+*hash
+p*hash
+}
+
+    assert_html '<div a="The letter a" b="The letter b"></div><p a="The letter a" b="The letter b"></p>', source
+  end
+
   def test_shortcut_splat
     source = %q{
 *hash This is my title
@@ -202,7 +211,7 @@ h1 *hash class=[] This is my title
 *{:disabled => true, :empty1 => false, :nonempty => '', :empty2 => nil} This is my title
 }
 
-    assert_html '<div disabled="disabled" nonempty="">This is my title</div>', source
+    assert_html '<div disabled="" nonempty="">This is my title</div>', source
   end
 
   def test_splat_merging_with_arrays

data/test/core/test_parser_errors.rb

@@ -157,4 +157,18 @@ img / text
 
     assert_syntax_error "Unexpected text after closed tag\n  (__TEMPLATE__), Line 2, Column 6\n    img / text\n          ^\n", source
   end
+
+  def test_illegal_shortcuts
+    source = %{
+.#test
+}
+
+    assert_syntax_error "Illegal shortcut\n  (__TEMPLATE__), Line 2, Column 0\n    .#test\n    ^\n", source
+
+    source = %{
+div.#test
+}
+
+    assert_syntax_error "Illegal shortcut\n  (__TEMPLATE__), Line 2, Column 3\n    div.#test\n       ^\n", source
+  end
 end

data/test/literate/TESTS.md

@@ -861,7 +861,7 @@ dl(
 renders as
 
 ~~~ html
-<dl itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress"></dl>
+<dl itemprop="address" itemscope="" itemtype="http://schema.org/PostalAddress"></dl>
 ~~~
 
 You may use spaces around the wrappers and assignments:
@@ -993,7 +993,7 @@ input(type="text" disabled)
 renders as
 
 ~~~ html
-<input disabled="" type="text" /><input disabled="disabled" type="text" /><input disabled="disabled" type="text" /><input disabled="disabled" type="text" /><input disabled="disabled" type="text" />
+<input disabled="" type="text" /><input disabled="" type="text" /><input disabled="disabled" type="text" /><input disabled="" type="text" /><input disabled="" type="text" />
 ~~~
 
 ~~~ slim
@@ -1126,6 +1126,42 @@ renders to
 <input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
 ~~~
 
+You can also set multiple attributes per shortcut.
+
+~~~ options
+:shortcut => {'.' => {:attr => %w(id class)} }
+~~~
+
+~~~ slim
+.test
+~~~
+
+renders to
+
+~~~ html
+<div class="test" id="test"></div>
+~~~
+
+Shortcuts can also have multiple characters.
+
+~~~ options
+:shortcut => {'.' => {:attr => 'class'}, '#' => {:attr => 'id'}, '.#' => {:attr => %w(class id)} }
+~~~
+
+~~~ slim
+.#test
+.test
+#test
+~~~
+
+renders to
+
+~~~ html
+<div class="test" id="test"></div>
+<div class="test"></div>
+<div id="test"></div>
+~~~
+
 #### ID shortcut and class shortcut `.`
 
 ## Text interpolation

data/test/logic_less/test_logic_less.rb

@@ -242,7 +242,7 @@ p
    input checked=selected = name
 }
 
-    assert_html '<p><input checked="checked">Joe</input><input>Jack</input></p>', source, :scope => Scope.new, :dictionary => '@hash'
+    assert_html '<p><input checked="">Joe</input><input>Jack</input></p>', source, :scope => Scope.new, :dictionary => '@hash'
   end
 
   def test_sections

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -18,34 +18,34 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -159,7 +159,8 @@ files:
 - test/rails/test/test_slim.rb
 - test/translator/test_translator.rb
 homepage: http://slim-lang.com/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []