slim 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89b79547893a3fcfe80dc8f1a77b5e7eb94fb69e
-  data.tar.gz: 68744041f28214f56c5c12559db00e9edb4cc3d0
+  metadata.gz: e8b90e64b7eb12f2d3c66b7f1141a757d7314df8
+  data.tar.gz: e695b95196c24065d593af6dbc2da8d122b6b0e1
 SHA512:
-  metadata.gz: 124098d00c5f8aec79387b13ea46f04df1c7b158d2aa8d27d858e6e62ed9b7814bbfdf08fd474a8d7b62e61df5a23454e10ee188997506352dd6980fa6517954
-  data.tar.gz: 392e37c3702ba5b2c84a9c6b763be82083d06cabad6155da9bcc9e4a5b4cffa612ad76d91654cd4451b024d5842fd1b8066a077d70ea756eecd81f606dfce1c7
+  metadata.gz: 43864aaeb0b17561f3a742be6a2324213be8aefa19ee751f7ded2fef9018effb46bc095a8f756af696eb2c835fb3035df33bbb254781e1ebcd52ac36aef20df4
+  data.tar.gz: 5e9ca23904c3c810069605133d41e3770ab6b4349e926328b219c7b3ecf5da99b4a850a38064913082e8d2d4df2bf59e7016c790ae91f717b59e3af3f7a45a25

data/.travis.yml

@@ -46,6 +46,5 @@ matrix:
     - rvm: ruby-head
 # Rails master needs newest bundler
 before_install:
-  - ./kill-travis.sh
   - gem update bundler
 script: "bundle exec rake $TASK"

data/CHANGES

@@ -1,3 +1,7 @@
+2.0.2
+
+  * Add option :attr_delims
+
 2.0.1
 
   * Support multiple attributes per shortcut (See issue #415)

data/README.md

@@ -1,6 +1,7 @@
 # Slim
 
-[![Gem Version](https://badge.fury.io/rb/slim.png)](http://rubygems.org/gems/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/github/slim-template/slim.png)](https://codeclimate.com/github/slim-template/slim)
+[![Gem Version](https://badge.fury.io/rb/slim.png)](http://rubygems.org/gems/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/github/slim-template/slim.png)](https://codeclimate.com/github/slim-template/slim) [![Gittip donate button](http://img.shields.io/gittip/bevry.png)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
+[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
 
 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.
 
@@ -32,19 +33,6 @@ A short list of the features...
     * Latest Gem: <http://rubydoc.info/gems/slim/frames>
     * GitHub master: <http://rubydoc.info/github/slim-template/slim/master/frames>
 
-## Upgrade to version 2.0
-
-If you are already using Slim 1.x and want to upgrade to the newest version 2.0, you should at first
-upgrade to at least Slim 1.3.8 which will emit warnings for deprecated features. This way you can easily
-see if your application is already Slim 2.0 compliant!
-
-Slim 2.0 removes deprecated features from the 1.3 series and cleans up some minor
-inconsistencies in the syntax (Attribute wrapper and quoted attribute escaping).
-Of course it also includes new features and bugfixes. See the CHANGES for details.
-
-In general don't be afraid of upgrading! We try to be backward compatible and follow [semantic versions](http://semver.org/)
-as good as possible.
-
 ## Introduction
 
 ### What is Slim?
@@ -69,7 +57,7 @@ There is also some development in logic-less engines (e.g. [Mustache](https://gi
 
 Slim was born to bring a minimalist syntax approach with speed. If people chose not to use Slim, it would not be because of speed.
 
-___Yes, Slim is speedy!___ Benchmarks are done for every commit at <http://travis-ci.org/#!/slim-template/slim>.
+___Yes, Slim is speedy!___ Benchmarks are done for every commit at <http://travis-ci.org/slim-template/slim>.
 Don't trust the numbers? That's as it should be. Please try the benchmark rake task yourself!
 
 ### How to start?
@@ -98,7 +86,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
         h1 Markup examples
 
         #content
-          p This example shows you how a basic Slim file looks like.
+          p This example shows you how a basic Slim file looks.
 
         == yield
 
@@ -362,6 +350,7 @@ You can use text interpolation in the quoted attributes.
 
 If a delimiter makes the syntax more readable for you,
 you can use the characters `{...}`, `(...)`, `[...]` to wrap the attributes.
+You can configure these symbols (See option `:attr_delims`).
 
     body
       h1(id="logo") = page_logo
@@ -572,8 +561,15 @@ If you use Slim you might want to extend your template with some helpers. Assume
 
 ~~~ruby
 module Helpers
-  def headline
-    "<h1>#{yield}</h1>"
+  def headline(&block)
+    if defined?(::Rails)
+      # In Rails we have to use capture!
+      "<h1>#{capture(&block)}</h1>"
+    else
+      # If we are using Slim without a framework (Plain Tilt),
+      # this works directly.
+      "<h1>#{yield}</h1>"
+    end
   end
 end
 ~~~
@@ -703,6 +699,7 @@ There are a lot of them but the good thing is, that Slim checks the configuratio
 | 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 |
+| Hash | :attr_delims | \{'(' => ')', '[' => ']', '{' => '}'} | Attribute delimiters |
 | 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  |
@@ -745,7 +742,7 @@ It is also possible to set options for superclasses like `Temple::Engine`. But t
 Slim currently provides plugins for logic less mode and I18n. See the plugin documentation.
 
 * [Logic less mode](doc/logic_less.md)
-* [Translator/I18ne](doc/translator.md)
+* [Translator/I18n](doc/translator.md)
 
 ## Framework support
 
@@ -863,7 +860,7 @@ run the slow parsing benchmark which needs more time. You can also increase the
 
     rake bench slow=1 iterations=1000
 
-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>
+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 continuous integration
 
@@ -872,14 +869,11 @@ 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 continuous 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
+* Ruby 1.8.7, 1.9.3 and 2.0.0
 * Ruby EE
 * JRuby
 * Rubinius 2.0
@@ -892,7 +886,7 @@ 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 2.0.0, 1.9.3 and 1.8.7.
+Please remember to keep the compatibility with Ruby versions 1.8.7, 1.9.3 and 2.0.0.
 
 If you find the documentation lacking, help us out and update this README.md. If you don't have the time to work on Slim, but found something we should know about, please submit an issue.
 
@@ -906,6 +900,15 @@ Slim is released under the [MIT license](http://www.opensource.org/licenses/MIT)
 * [Andrew Stone](https://github.com/stonean)
 * [Fred Wu](https://github.com/fredwu)
 
+## Donations and sponsoring
+
+If you want to support this project please visit the Gittip and Flattr pages.
+
+[![Gittip donate button](http://img.shields.io/gittip/bevry.png)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
+[![Flattr donate button](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](https://flattr.com/submit/auto?user_id=min4d&url=http%3A%2F%2Fslim-lang.org%2F "Donate monthly to this project using Flattr")
+
+Currently the donations will be used to cover the hosting costs (domain name etc).
+
 ## Discuss
 
 * [Google Group](http://groups.google.com/group/slim-template)

data/lib/slim/engine.rb

@@ -14,7 +14,7 @@ module Slim
 
     filter :Encoding, :encoding
     filter :RemoveBOM
-    use Slim::Parser, :file, :tabsize, :shortcut, :default_tag
+    use Slim::Parser, :file, :tabsize, :shortcut, :default_tag, :attr_delims
     use Slim::Embedded, :enable_engines, :disable_engines, :pretty
     use Slim::Interpolation
     use Slim::Splat::Filter, :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :hyphen_attrs

data/lib/slim/parser.rb

@@ -9,6 +9,11 @@ module Slim
                    :shortcut => {
                      '#' => { :attr => 'id' },
                      '.' => { :attr => 'class' }
+                   },
+                   :attr_delims => {
+                     '(' => ')',
+                     '[' => ']',
+                     '{' => '}',
                    }
 
     class SyntaxError < StandardError
@@ -56,6 +61,9 @@ module Slim
       @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}+))/
+      keys = Regexp.escape options[:attr_delims].keys.join
+      @delim_re = /\A[#{keys}]/
+      @attr_delim_re = /\A\s*([#{keys}])/
     end
 
     # Compile string to Temple expression
@@ -74,15 +82,7 @@ module Slim
 
     protected
 
-    DELIMS = {
-      '(' => ')',
-      '[' => ']',
-      '{' => '}',
-    }.freeze
-
     WORD_RE = ''.respond_to?(:encoding) ? '\p{Word}' : '\w'
-    DELIM_RE = /\A[#{Regexp.escape DELIMS.keys.join}]/
-    ATTR_DELIM_RE = /\A\s*([#{Regexp.escape DELIMS.keys.join}])/
     ATTR_NAME = "\\A\\s*(#{WORD_RE}(?:#{WORD_RE}|:|-)*)"
     QUOTED_ATTR_RE = /#{ATTR_NAME}\s*=(=?)\s*("|')/
     CODE_ATTR_RE = /#{ATTR_NAME}\s*=(=?)\s*/
@@ -361,8 +361,8 @@ module Slim
     def parse_attributes(attributes)
       # Check to see if there is a delimiter right after the tag name
       delimiter = nil
-      if @line =~ ATTR_DELIM_RE
-        delimiter = DELIMS[$1]
+      if @line =~ @attr_delim_re
+        delimiter = options[:attr_delims][$1]
         @line = $'
       end
 
@@ -433,9 +433,9 @@ module Slim
             elsif @line[0] == close_delimiter[0]
               count -= 1
             end
-          elsif @line =~ DELIM_RE
+          elsif @line =~ @delim_re
             count = 1
-            delimiter, close_delimiter = $&, DELIMS[$&]
+            delimiter, close_delimiter = $&, options[:attr_delims][$&]
           end
           code << @line.slice!(0)
         end

data/lib/slim/version.rb

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

data/test/core/test_html_structure.rb

@@ -283,6 +283,26 @@ p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
+  def test_default_attr_delims_option
+    source = %q{
+p<id="marvin" class="martian" data-info="Illudium Q-36">= output_number
+}
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
+    end
+  end
+
+  def test_custom_attr_delims_option
+    source = %q{
+p { foo="bar" }
+}
+
+    assert_html '<p foo="bar"></p>', source
+    assert_html '<p foo="bar"></p>', source, :attr_delims => {'{' => '}'}
+    assert_html '<p>{ foo="bar" }</p>', source, :attr_delims => {'(' => ')', '[' => ']'}
+  end
+
   def test_closed_tag
     source = %q{
 closed/
@@ -358,7 +378,7 @@ p<id="marvin"
 class="martian"
  data-info="Illudium Q-36"> = output_number
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
     end
@@ -370,7 +390,7 @@ p<id="marvin"
   class="martian"
  data-info="Illudium Q-36"> THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -383,7 +403,7 @@ p<id="marvin"
 data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -396,7 +416,7 @@ p<id=id_helper
   data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
     end
@@ -410,7 +430,7 @@ p<id=id_helper
   span.emphasis THE
   |  space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
     end
@@ -423,7 +443,7 @@ li< id="myid"
 data-info="myinfo">
   a href="link" My Link
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.default_options[:attr_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
     end

data/test/core/test_pretty.rb

@@ -41,10 +41,7 @@ html
     result = %q{<!DOCTYPE html>
 <html>
   <head>
-    <title>
-      Hello World!
-    </title>
-    <!--Meta tags
+    <title>Hello World!</title><!--Meta tags
     with long explanatory
     multiline comment-->
     <meta content="template language" name="description" />

data/test/literate/TESTS.md

@@ -213,11 +213,7 @@ HTML tags allow nested blocks inside.
 renders as
 
 ~~~ html
-<html><head>
-<title>
-  Example
-</title>
-</head>
+<html><head><title>Example</title></head>
 <body>
   yes
 </body>

data/test/rails/app/controllers/slim_controller.rb

@@ -34,4 +34,7 @@ class SlimController < ApplicationController
   def content_for
     @hello = "Hello Slim!"
   end
+
+  def helper
+  end
 end

data/test/rails/app/helpers/application_helper.rb

@@ -1,2 +1,5 @@
 module ApplicationHelper
+  def headline(&block)
+    "<h1>#{capture(&block)}</h1>".html_safe
+  end
 end

data/test/rails/app/views/slim/helper.html.slim

@@ -0,0 +1,4 @@
+p
+  = headline do
+    ' Hello
+    = 'User'

data/test/rails/test/test_slim.rb

@@ -17,6 +17,14 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1>"
   end
 
+  test "helper" do
+    get "slim/helper"
+    assert_response :success
+    assert_template "slim/helper"
+    assert_template "layouts/application"
+    assert_html "<p><h1>Hello User</h1></p>"
+  end
+
   test "normal erb view" do
     get "slim/erb"
     assert_html "<h1>Hello Erb!</h1>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -76,7 +76,6 @@ files:
 - bin/slimrb
 - doc/logic_less.md
 - doc/translator.md
-- kill-travis.sh
 - lib/slim.rb
 - lib/slim/code_attributes.rb
 - lib/slim/command.rb
@@ -135,6 +134,7 @@ files:
 - test/rails/app/views/slim/content_for.html.slim
 - test/rails/app/views/slim/erb.html.erb
 - test/rails/app/views/slim/form_for.html.slim
+- test/rails/app/views/slim/helper.html.slim
 - test/rails/app/views/slim/integers.html.slim
 - test/rails/app/views/slim/no_layout.html.slim
 - test/rails/app/views/slim/normal.html.slim
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Slim is a template language.

data/kill-travis.sh

@@ -1,16 +0,0 @@
-#!/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