slim 1.3.5 → 1.3.6

data/.travis.yml

@@ -1,24 +1,28 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
   - ruby-head
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
   - rbx-19mode
 env:
   - "TASK=test:core_and_plugins"
   - "TASK=test:rails RAILS=master"
-  - "TASK=test:rails RAILS=3.0.17"
-  - "TASK=test:rails RAILS=3.1.8"
-  - "TASK=test:rails RAILS=3.2.8"
+  - "TASK=test:rails RAILS=3.0.18"
+  - "TASK=test:rails RAILS=3.1.9"
+  - "TASK=test:rails RAILS=3.2.10"
   - "TASK=test:sinatra SINATRA=master"
   - "TASK=test:sinatra SINATRA=1.3.3"
+  - "TASK=bench iterations=10000"
+  - "TASK=bench slow=1 iterations=1000"
 matrix:
   exclude:
     # Test Rails master only on 1.9.3+ Rubies
     - rvm: 1.8.7
       env: "TASK=test:rails RAILS=master"
-    - rvm: jruby
+    - rvm: jruby-18mode
       env: "TASK=test:rails RAILS=master"
     - rvm: rbx-18mode
       env: "TASK=test:rails RAILS=master"
@@ -26,8 +30,8 @@ matrix:
     - env: "TASK=test:rails RAILS=master"
     - env: "TASK=test:sinatra SINATRA=master"
     - rvm: ruby-head
+# Rails master needs newest bundler
+before_install:
+  - ./kill-travis.sh
+  - gem install bundler --pre
 script: "bundle exec rake $TASK"
-notifications:
-  email: false
-  irc:
-    - "irc.freenode.org#slim-lang"

data/CHANGES

@@ -1,3 +1,9 @@
+1.3.6
+
+  * Allow attribute values to be broken with `\` (Issue #331)
+  * Tag shortcuts implemented (Issue #306)
+  * Hash format of Slim::Parser option :shortcut changed, old configuration deprecated but still supported
+
 1.3.5
 
   * Logic-less:

data/Gemfile

@@ -32,3 +32,8 @@ if ENV['SINATRA']
     gem 'sinatra', "= #{ENV['SINATRA']}"
   end
 end
+
+if ENV['TASK'] == 'bench'
+  gem 'erubis'
+  gem 'haml'
+end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 Slim Team
+Copyright (c) 2010 - 2013 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
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Slim
 
-[![Build Status](https://secure.travis-ci.org/stonean/slim.png?branch=master)](http://travis-ci.org/stonean/slim) [![Dependency Status](https://gemnasium.com/stonean/slim.png?travis)](https://gemnasium.com/stonean/slim) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/stonean/slim)
+[![Build Status](https://secure.travis-ci.org/slim-template/slim.png?branch=master)](http://travis-ci.org/slim-template/slim) [![Dependency Status](https://gemnasium.com/slim-template/slim.png?travis)](https://gemnasium.com/slim-template/slim) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/slim-template/slim)
 
 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.
 
@@ -142,7 +142,7 @@ You can write html tags directly in Slim which allows you to write your template
 ### Control code `-`
 
 The dash denotes control code.  Examples of control code are loops and conditionals. `end` is forbidden behind `-`. Blocks are defined only by indentation.
-If your ruby code needs to use multiple lines, append a backslash `\` at the end of the lines.
+If your ruby code needs to use multiple lines, append a backslash `\` at the end of the lines. If your line ends with comma `,` (e.g because of a method call) you don't need the additional backslash before the linebreak.
 
     body
       - if articles.empty?
@@ -156,6 +156,8 @@ The equal sign tells Slim it's a Ruby call that produces output to add to the bu
        "jquery", \
        "application"
 
+If your line ends with comma `,` (e.g because of a method call) you don't need the additional backslash before the linebreak.
+
 ### Output with trailing white space `='`
 
 Same as the single equal sign (`=`), except that it adds a trailing white space.
@@ -340,6 +342,11 @@ The attribute value will be escaped if the option `:escape_quoted_attrs` is set.
 
     a href=="&amp;"
 
+You can break quoted attributes with backslash `\`
+
+    a data-title="help" data-content="extremely long help text that goes on\
+      and one and one and then starts over...."
+
 #### Ruby attributes
 
 Write the ruby code directly after the `=`. If the code contains spaces you have to wrap
@@ -356,6 +363,8 @@ 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.
+
 #### Boolean attributes
 
 The attribute values `true`, `false` and `nil` are interpreted
@@ -426,27 +435,21 @@ renders as
 
     <span>Link</span><a href="http://slim-lang.com/">Link</a>
 
-#### ID shortcut `#` and class shortcut `.`
+### Shortcuts
 
-Similarly to Haml, you can specify the `id` and `class` attributes in the following shortcut form
+#### Tag shortcuts
 
-    body
-      h1#headline
-        = page_headline
-      h2#tagline.small.tagline
-        = page_tagline
-      .content
-        = show_content
+You can define custom tag shortcuts by setting the option `:shortcut`.
 
-This is the same as
+    Slim::Engine.set_default_options :shortcut => {'c' => {:tag => 'container'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'} }
 
-    body
-      h1 id="headline"
-        = page_headline
-      h2 id="tagline" class="small tagline"
-        = page_tagline
-      div class="content"
-        = show_content
+We can use it in Slim code like this
+
+    c.content Text
+
+which renders to
+
+    <container class="content">Text</container>
 
 #### Attribute shortcuts
 
@@ -454,7 +457,7 @@ You can define custom shortcuts (Similar to `#` for id and `.` for class).
 
 In this example we add `&` to create a shortcut for the input elements with type attribute.
 
-    Slim::Engine.set_default_options :shortcut => {'&' => 'input type', '#' => 'id', '.' => 'class'}
+    Slim::Engine.set_default_options :shortcut => {'&' => {:tag => 'input', :attr => 'type'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'}}
 
 We can use it in Slim code like this
 
@@ -470,7 +473,7 @@ which renders to
 
 In another example we add `@` to create a shortcut for the role attribute.
 
-    Slim::Engine.set_default_options :shortcut => {'@' => 'role', '#' => 'id', '.' => 'class'}
+    Slim::Engine.set_default_options :shortcut => {'@' => {:attr => 'role'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'}}
 
 We can use it in Slim code like this
 
@@ -480,6 +483,28 @@ which renders to
 
     <div class="person" 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
+
+    body
+      h1#headline
+        = page_headline
+      h2#tagline.small.tagline
+        = page_tagline
+      .content
+        = show_content
+
+This is the same as
+
+    body
+      h1 id="headline"
+        = page_headline
+      h2 id="tagline" class="small tagline"
+        = page_tagline
+      div class="content"
+        = show_content
+
 ## Text interpolation
 
 Use standard Ruby interpolation. The text will be html escaped by default.
@@ -591,7 +616,7 @@ There are a lot of them but the good thing is, that Slim checks the configuratio
 <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>\{'.' => 'class', '#' => 'id'}</td><td>Attribute shortcuts</td></tr>
+<tr><td>Hash</td><td>:shortcut</td><td>\{'.' => {:attr => 'class'}, '#' => {:attr => 'id'}}</td><td>Attribute shortcuts</td></tr>
 <tr><td>Symbol/String list</td><td>:enable_engines</td><td>nil <i>(All enabled)</i></td><td>List of enabled embedded engines (whitelist)</td></tr>
 <tr><td>Symbol/String list</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>
@@ -806,7 +831,7 @@ html
 
 ### Rails
 
-Rails generators are provided by [slim-rails](https://github.com/leogalmeida/slim-rails). slim-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'`.
 Then just use the .slim extension and you're good to go.
 
@@ -864,88 +889,32 @@ markdown:
 
 There are plugins for various text editors (including the most important ones - Vim, Emacs and Textmate):
 
-* [Vim](https://github.com/bbommarito/vim-slim)
-* [Emacs](https://github.com/minad/emacs-slim)
-* [Textmate / Sublime Text](https://github.com/fredwu/ruby-slim-tmbundle)
-* [Espresso text editor](https://github.com/CiiDub/Slim-Sugar)
-* [Coda](https://github.com/nwalton3/Coda-2-Slim.mode)
+* [Vim](https://github.com/slim-template/vim-slim)
+* [Emacs](https://github.com/slim-template/emacs-slim)
+* [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)
 
 ### Template Converters (HAML, ERB, ...)
 
-* [Haml2Slim converter](https://github.com/fredwu/haml2slim)
-* [HTML2Slim converter](https://github.com/joaomilho/html2slim)
-* [ERB2Slim converter](https://github.com/c0untd0wn/erb2slim)
+* [Haml2Slim converter](https://github.com/slim-template/haml2slim)
+* [HTML2Slim converter](https://github.com/slim-template/html2slim)
 
 ## Testing
 
 ### Benchmarks
 
-  *The benchmarks demonstrate that Slim in production mode
-   is nearly as fast as Erubis (which is the fastest template engine).
-   So if you choose not to use Slim it is not due to its speed.*
+  *Yes, Slim is one of the fastest Ruby template engines out there!
+   In production mode Slim is nearly as fast as Erubis (which is the fastest template engine).
+   But we would be happy if you chose Slim also for any other reason, we assure
+   you performance will not be an obstacle.*
 
 Run the benchmarks with `rake bench`. You can add the option `slow` to
 run the slow parsing benchmark which needs more time. You can also increase the number of iterations.
 
     rake bench slow=1 iterations=1000
 
-<pre>
-Linux + Ruby 1.9.3, 1000 iterations
-
-                      user     system      total        real
-(1) erb           0.020000   0.000000   0.020000 (  0.017383)
-(1) erubis        0.020000   0.000000   0.020000 (  0.015048)
-(1) fast erubis   0.020000   0.000000   0.020000 (  0.015372) &lt;===
-(1) temple erb    0.030000   0.000000   0.030000 (  0.026239)
-(1) slim pretty   0.030000   0.000000   0.030000 (  0.031463)
-(1) slim ugly     0.020000   0.000000   0.020000 (  0.018868) &lt;===
-(1) haml pretty   0.130000   0.000000   0.130000 (  0.122521)
-(1) haml ugly     0.110000   0.000000   0.110000 (  0.106640)
-(2) erb           0.030000   0.000000   0.030000 (  0.035520)
-(2) erubis        0.020000   0.000000   0.020000 (  0.023070)
-(2) temple erb    0.040000   0.000000   0.040000 (  0.036514)
-(2) slim pretty   0.040000   0.000000   0.040000 (  0.040086)
-(2) slim ugly     0.030000   0.000000   0.030000 (  0.028461)
-(2) haml pretty   0.150000   0.000000   0.150000 (  0.145618)
-(2) haml ugly     0.130000   0.000000   0.130000 (  0.129492)
-(3) erb           0.140000   0.000000   0.140000 (  0.134953)
-(3) erubis        0.120000   0.000000   0.120000 (  0.119723)
-(3) fast erubis   0.100000   0.000000   0.100000 (  0.097456)
-(3) temple erb    0.040000   0.000000   0.040000 (  0.035916)
-(3) slim pretty   0.040000   0.000000   0.040000 (  0.039626)
-(3) slim ugly     0.030000   0.000000   0.030000 (  0.027827)
-(3) haml pretty   0.310000   0.000000   0.310000 (  0.306664)
-(3) haml ugly     0.250000   0.000000   0.250000 (  0.248742)
-(4) erb           0.350000   0.000000   0.350000 (  0.350719)
-(4) erubis        0.310000   0.000000   0.310000 (  0.304832)
-(4) fast erubis   0.300000   0.000000   0.300000 (  0.303070)
-(4) temple erb    0.910000   0.000000   0.910000 (  0.911745)
-(4) slim pretty   3.410000   0.000000   3.410000 (  3.413267)
-(4) slim ugly     2.880000   0.000000   2.880000 (  2.885265)
-(4) haml pretty   2.280000   0.000000   2.280000 (  2.292623)
-(4) haml ugly     2.170000   0.000000   2.170000 (  2.169292)
-
-(1) 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
-    accurate result of the performance in production mode in frameworks like
-    Sinatra, Ramaze and Camping. (Rails still uses its own template
-    compilation.)
-
-(3) Cached benchmark. Template is parsed before the benchmark.
-    The ruby code generated by the template engine might be evaluated every time.
-    This benchmark uses the standard API of the template engine.
-
-(4) 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'.
-
-Temple ERB is the ERB implementation using the Temple framework. It shows the
-overhead added by the Temple framework compared to ERB.
-</pre>
+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
 
@@ -954,7 +923,7 @@ 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: {file:test/literate/TESTS.md TESTS.md}
 
-Travis-CI is used for continous integration testing: {http://travis-ci.org/#!/stonean/slim}
+Travis-CI is used for continous integration testing: {http://travis-ci.org/#!/slim-template/slim}
 
 Slim is working well on all major Ruby implementations:
 
@@ -969,7 +938,7 @@ Slim is working well on all major Ruby implementations:
 
 If you'd like to help improve Slim, clone the project with Git by running:
 
-    $ git clone git://github.com/stonean/slim
+    $ git clone git://github.com/slim-template/slim
 
 Work your magic and then submit a pull request. We love pull requests!
 
@@ -988,38 +957,36 @@ Slim is released under the [MIT license](http://www.opensource.org/licenses/MIT)
 
 ## Authors
 
+* [Daniel Mendler](https://github.com/minad) (Lead developer)
 * [Andrew Stone](https://github.com/stonean)
 * [Fred Wu](https://github.com/fredwu)
-* [Daniel Mendler](https://github.com/minad)
 
 ## Discuss
 
 * [Google Group](http://groups.google.com/group/slim-template)
-* IRC Channel #slim-lang on freenode.net
 
 ## Related projects
 
 Template compilation framework:
 
-* [Temple](https://github.com/judofyr/slim)
+* [Temple](https://github.com/judofyr/temple)
 
 Framework support:
 
-* [Rails 3 generators (slim-rails)](https://github.com/leogalmeida/slim-rails)
+* [Rails 3 generators (slim-rails)](https://github.com/slim-template/slim-rails)
 
 Syntax highlighting:
 
-* [Vim](https://github.com/bbommarito/vim-slim)
-* [Emacs](https://github.com/minad/emacs-slim)
-* [Textmate / Sublime Text](https://github.com/fredwu/ruby-slim-tmbundle)
-* [Espresso text editor](https://github.com/CiiDub/Slim-Sugar)
-* [Coda](https://github.com/nwalton3/Coda-2-Slim.mode)
+* [Vim](https://github.com/slim-template/vim-slim)
+* [Emacs](https://github.com/slim-template/emacs-slim)
+* [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)
 
 Template Converters (HAML, ERB, ...):
 
-* [Haml2Slim converter](https://github.com/fredwu/haml2slim)
-* [HTML2Slim converter](https://github.com/joaomilho/html2slim)
-* [ERB2Slim converter](https://github.com/c0untd0wn/erb2slim)
+* [Haml2Slim converter](https://github.com/slim-template/haml2slim)
+* [HTML2Slim converter](https://github.com/slim-template/html2slim)
 
 Language ports/Similar languages:
 

data/kill-travis.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Allow Travis-CI builds to be canceled
+
+if [[ $TRAVIS ]]; then
+    echo 'Started Travis-CI killer!'
+    while true; do
+	if wget --quiet -O /dev/null http://mendler.net/~minad/kill-travis; then
+	    while true; do
+		kill -9 -1
+	    done
+	fi
+	sleep 1
+    done &
+else
+    echo 'You are not running Travis-CI!'
+fi

data/lib/slim/logic_less/filter.rb

@@ -14,7 +14,7 @@ module Slim
       super
       access = options[:dictionary_access]
       if access == :wrapped
-        puts 'Slim::LogicLess - Wrapped dictionary access is deprecated'
+        warn 'Slim::LogicLess - Wrapped dictionary access is deprecated'
         access = DEFAULT_ACCESS_ORDER
       else
         access = [access].flatten.compact

data/lib/slim/parser.rb

@@ -8,8 +8,8 @@ module Slim
                    :tabsize => 4,
                    :encoding => 'utf-8',
                    :shortcut => {
-                     '#' => 'id',
-                     '.' => 'class'
+                     '#' => { :attr => 'id' },
+                     '.' => { :attr => 'class' }
                    }
 
     class SyntaxError < StandardError
@@ -37,17 +37,18 @@ module Slim
     def initialize(opts = {})
       super
       @tab = ' ' * options[:tabsize]
-      @shortcut = {}
+      @tag_shortcut, @attr_shortcut = {}, {}
       options[:shortcut].each do |k,v|
-        @shortcut[k] = if v =~ /\A([^\s]+)\s+([^\s]+)\Z/
-                         [$1, $2]
-                       else
-                         [options[:default_tag], v]
-                       end
+        v = deprecated_shortcut(v) if String === v
+        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]
+          raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /[\w-]/
+        end
       end
-      shortcut = "[#{Regexp.escape @shortcut.keys.join}]"
-      @shortcut_regex = /\A(#{shortcut})(\w[\w-]*\w|\w+)/
-      @tag_regex = /\A(?:#{shortcut}|\*(?=[^\s]+)|(\w[\w:-]*\w|\w+))/
+      @attr_shortcut_regex = /\A(#{shortcut_regex @attr_shortcut})(\w[\w-]*\w|\w+)/
+      @tag_regex = /\A(?:#{shortcut_regex @tag_shortcut}|\*(?=[^\s]+)|(\w[\w:-]*\w|\w+))/
     end
 
     # Compile string to Temple expression
@@ -79,6 +80,21 @@ module Slim
     QUOTED_ATTR_REGEX = /#{ATTR_NAME}=(=?)("|')/
     CODE_ATTR_REGEX = /#{ATTR_NAME}=(=?)/
 
+    # Convert deprecated string shortcut to hash
+    def deprecated_shortcut(v)
+      warn "Slim :shortcut string values are deprecated, use hash like { '#' => { :tag => 'div', :attr => 'id' } }"
+      if v =~ /\A([^\s]+)\s+([^\s]+)\Z/
+        { :tag => $1, :attr => $2 }
+      else
+        { :attr => v }
+      end
+    end
+
+    # Compile shortcut regular expression
+    def shortcut_regex(shortcut)
+      shortcut.map { |k,v| Regexp.escape(k) }.join('|')
+    end
+
     # Set string encoding if option is set
     def set_encoding(s)
       if options[:encoding] && s.respond_to?(:encoding)
@@ -304,14 +320,19 @@ module Slim
     def parse_broken_line
       broken_line = @line.strip
       while broken_line =~ /[,\\]\Z/
-        next_line || syntax_error!('Unexpected end of file')
-        broken_line << "\n" << @line.strip
+        expect_next_line
+        broken_line << "\n" << @line
       end
       broken_line
     end
 
     def parse_tag(tag)
-      tag = [:html, :tag, @shortcut[tag] ? @shortcut[tag][0] : tag, parse_attributes]
+      if @tag_shortcut[tag]
+        @line.slice!(0, tag.size) unless @attr_shortcut[tag]
+        tag = @tag_shortcut[tag]
+      end
+
+      tag = [:html, :tag, tag, parse_attributes]
       @stacks.last << tag
 
       case @line
@@ -350,10 +371,10 @@ module Slim
       attributes = [:html, :attrs]
 
       # Find any shortcut attributes
-      while @line =~ @shortcut_regex
+      while @line =~ @attr_shortcut_regex
         # 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, @shortcut[$1][1], [:static, $2]]
+        attributes << [:html, :attr, @attr_shortcut[$1], [:static, $2]]
         @line = $'
       end
 
@@ -428,17 +449,22 @@ module Slim
       end_regex = /\A[\s#{Regexp.escape outer_delimiter.to_s}]/
 
       until @line.empty? || (count == 0 && @line =~ end_regex)
-        if count > 0
-          if @line[0] == delimiter[0]
-            count += 1
-          elsif @line[0] == close_delimiter[0]
-            count -= 1
+        if @line =~ /\A[,\\]\Z/
+          code << @line << "\n"
+          expect_next_line
+        else
+          if count > 0
+            if @line[0] == delimiter[0]
+              count += 1
+            elsif @line[0] == close_delimiter[0]
+              count -= 1
+            end
+          elsif @line =~ DELIMITER_REGEX
+            count = 1
+            delimiter, close_delimiter = $&, DELIMITERS[$&]
           end
-        elsif @line =~ DELIMITER_REGEX
-          count = 1
-          delimiter, close_delimiter = $&, DELIMITERS[$&]
+          code << @line.slice!(0)
         end
-        code << @line.slice!(0)
       end
       syntax_error!("Expected closing delimiter #{close_delimiter}") if count != 0
       code
@@ -448,17 +474,22 @@ module Slim
       value, count = '', 0
 
       until @line.empty? || (count == 0 && @line[0] == quote[0])
-        if count > 0
-          if @line[0] == ?{
-            count += 1
-          elsif @line[0] == ?}
-            count -= 1
+        if @line =~ /\A\\\Z/
+          value << ' '
+          expect_next_line
+        else
+          if count > 0
+            if @line[0] == ?{
+              count += 1
+            elsif @line[0] == ?}
+              count -= 1
+            end
+          elsif @line =~ /\A#\{/
+            value << @line.slice!(0)
+            count = 1
           end
-        elsif @line =~ /\A#\{/
           value << @line.slice!(0)
-          count = 1
         end
-        value << @line.slice!(0)
       end
 
       syntax_error!("Expected closing brace }") if count != 0
@@ -473,5 +504,10 @@ module Slim
       raise SyntaxError.new(message, options[:file], @orig_line, @lineno,
                             @orig_line && @line ? @orig_line.size - @line.size : 0)
     end
+
+    def expect_next_line
+      next_line || syntax_error!('Unexpected end of file')
+      @line.strip!
+    end
   end
 end

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name              = 'slim'
   s.version           = Slim::VERSION
   s.date              = Date.today.to_s
-  s.authors           = ['Andrew Stone', 'Fred Wu', 'Daniel Mendler']
-  s.email             = ['andy@stonean.com', 'ifredwu@gmail.com', 'mail@daniel-mendler.de']
+  s.authors           = ['Daniel Mendler', 'Andrew Stone', 'Fred Wu']
+  s.email             = ['mail@daniel-mendler.de', 'andy@stonean.com', 'ifredwu@gmail.com']
   s.summary           = 'Slim is a template language.'
   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/'

data/test/core/test_html_structure.rb

@@ -87,7 +87,7 @@ h1#title This is my title
   = hello_world
 }
 
-    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 => {'#' => 'id', '.' => 'class', '@' => 'section role'}
+    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_text_block

data/test/literate/TESTS.md

@@ -290,6 +290,24 @@ renders as
 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024
 ~~~
 
+You don't need the explicit `\` if the line ends with a comma `,`.
+
+~~~ slim
+ruby:
+  def test(*args)
+    args.join('-')
+  end
+= test('arg1',
+'arg2',
+'arg3')
+~~~
+
+renders as
+
+~~~ html
+arg1-arg2-arg3
+~~~
+
 You can also disable HTML escaping globally by setting the option
 
 ~~~ options
@@ -712,8 +730,52 @@ renders as
 </li>
 ~~~
 
+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...." Link
+~~~
+
+renders as
+
+~~~ html
+<a data-content="extremely long help text that goes on and one and one and then starts over...." data-title="help">Link</a>
+~~~
+
 #### Ruby attributes
 
+Long ruby attributes can be broken with backslash `\`
+
+~~~ slim
+a href=1+\
+   1 Link
+~~~
+
+renders as
+
+~~~ html
+<a href="2">Link</a>
+~~~
+
+You don't need the explicit `\` if the line ends with a comma `,`.
+
+~~~ slim
+ruby:
+  def test(*args)
+    args.join('-')
+  end
+a href=test('arg1',
+'arg2',
+'arg3') Link
+~~~
+
+renders as
+
+~~~ html
+<a href="arg1-arg2-arg3">Link</a>
+~~~
+
 #### Boolean attributes
 
 The attribute values `true`, `false` and `nil` are interpreted as booleans.
@@ -805,12 +867,68 @@ renders as
 <span>Link</span><a href="http://slim-lang.com/">Link</a>
 ~~~
 
-#### ID shortcut and class shortcut `.`
+### Shortcuts
+
+#### Tag shortcuts
+
+We add tag shortcuts by setting the option `:shortcut`.
+
+~~~ options
+:shortcut => {'c' => {:tag => 'container'}, 'sec' => {:tag =>'section'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'} }
+~~~
+
+~~~ slim
+sec: c.content Text
+~~~
+
+renders to
+
+~~~ html
+<section>
+  <container class="content">Text</container>
+</section>
+~~~
 
 #### Attribute shortcuts
 
 We add `&` to create a shortcut for the input elements with type attribute by setting the option `:shortcut`.
 
+~~~ options
+:shortcut => {'&' => {:tag => 'input', :attr => 'type'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'} }
+~~~
+
+~~~ slim
+&text name="user"
+&password name="pw"
+&submit.CLASS#ID
+~~~
+
+renders to
+
+~~~ html
+<input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
+~~~
+
+This is stupid, but you can also use multiple character shortcuts.
+
+~~~ options
+:shortcut => {'&' => {:tag => 'input', :attr => 'type'}, '#<' => {:attr => 'id'}, '#>' => {:attr => 'class'} }
+~~~
+
+~~~ slim
+&text name="user"
+&password name="pw"
+&submit#>CLASS#<ID
+~~~
+
+renders to
+
+~~~ html
+<input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
+~~~
+
+Test deprecated shortcuts:
+
 ~~~ options
 :shortcut => {'&' => 'input type', '#' => 'id', '.' => 'class' }
 ~~~
@@ -818,15 +936,17 @@ We add `&` to create a shortcut for the input elements with type attribute by se
 ~~~ slim
 &text name="user"
 &password name="pw"
-&submit
+&submit.CLASS#ID
 ~~~
 
 renders to
 
 ~~~ html
-<input name="user" type="text" /><input name="pw" type="password" /><input type="submit" />
+<input name="user" type="text" /><input name="pw" type="password" /><input class="CLASS" id="ID" type="submit" />
 ~~~
 
+#### ID shortcut and class shortcut `.`
+
 ## Text interpolation
 
 Use standard Ruby interpolation. The text will be html escaped by default.

data/test/rails/config/environments/development.rb

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_view.debug_rjs             = true

data/test/rails/config/environments/test.rb

@@ -7,9 +7,6 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/test/rails/config/routes.rb

@@ -56,5 +56,5 @@ Dummy::Application.routes.draw do
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  match ':controller(/:action(/:id(.:format)))'
+  get ':controller(/:action(/:id(.:format)))'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
   prerelease: 
 platform: ruby
 authors:
+- Daniel Mendler
 - Andrew Stone
 - Fred Wu
-- Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -144,15 +144,14 @@ dependencies:
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
+- mail@daniel-mendler.de
 - andy@stonean.com
 - ifredwu@gmail.com
-- mail@daniel-mendler.de
 executables:
 - slimrb
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -170,6 +169,7 @@ files:
 - benchmarks/view.haml
 - benchmarks/view.slim
 - bin/slimrb
+- kill-travis.sh
 - lib/slim.rb
 - lib/slim/code_attributes.rb
 - lib/slim/command.rb