slim 3.0.3 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3526425b78d5829bd231ac9a41146c6044b093d3
-  data.tar.gz: fe4ab15abda376d89008704a2956e2c5e7050f99
+  metadata.gz: 62d3292109076e4e06bc239e5f78b6d53b198a34
+  data.tar.gz: 0c1e6219507af63490d7de910b2e7e4a478013a5
 SHA512:
-  metadata.gz: fa521d0745c0b0a404c512fc22a9dd69643efcfec0827e500ef6b5ad183ef9fdda8a163550ece9ae9d2d7ecbddd3ac32fa13a0edcfdaf824bd4076950c9eb6d4
-  data.tar.gz: caacf25c2529313fbf6aad2de36e6f5186de76b873819d214f39d982d3e91da7105f1d46ddf144e852f25a53f040ac20c3d8a45ea60c1abcba1967bfd3955b4a
+  metadata.gz: 711c54460e79e5191c8662e7c2764cf5b4a019cf65324c9e0ce59c547319903a04803b89ede833a354a80d87a6e2be50bc479a5689b1908acb4bf359b190e734
+  data.tar.gz: 13357a0c0ca79b446e29f7f9096a6964a97c0422bdb62f8826ad63ff551dc315633c82dc769d6864c255ae0c41d76e17fc8391d0578dafba64de87f03aca3888

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 
 rvm:
   - ruby-head
-  - 2.2.0
-  - 2.1.5
+  - 2.2.2
+  - 2.1.6
   - 2.0.0
   - rbx-2
   - 1.9.3
@@ -15,21 +15,25 @@ sudo: false
 script: "bundle exec rake $TASK"
 
 env:
-  - "TASK=test:core_and_plugins TILT=master"
-  - "TASK=test:core_and_plugins TILT=1.3.7"
-  - "TASK=test:core_and_plugins TILT=1.4.1"
-  - "TASK=test:core_and_plugins TILT=2.0.1"
-  - "TASK=test:rails RAILS=master"
-  - "TASK=test:rails RAILS=3.1.12 TILT=1.3.4"
-  - "TASK=test:rails RAILS=3.2.21 TILT=1.3.4"
-  - "TASK=test:rails RAILS=4.0.12"
-  - "TASK=test:rails RAILS=4.1.8"
-  - "TASK=test:rails RAILS=4.2.0"
-  - "TASK=test:sinatra SINATRA=master"
-  - "TASK=test:sinatra SINATRA=1.3.6"
-  - "TASK=test:sinatra SINATRA=1.4.5"
-  - "TASK=bench"
-  - "TASK=bench slow=1"
+  global:
+    # travis encrypt CODECLIMATE_REPO_TOKEN=???
+    - secure: "a7sD9iwPJJn3Fj+mn62GAmy/PEguh3elrilsp1KS+WfDiCiIKD8Q5KG2Jv67DGcQAGI3dPWeh7+ZhZ/W7nEipwWUBmSvGYVeoF63y8j6mNRLeekqspj94l47hXyFePj9bCadY1b1/xY4lE1pMEU8eA8AOUHUqCSuH+Kk/MuvyLM="
+  matrix:
+    - "TASK=test:core_and_plugins TILT=master"
+    - "TASK=test:core_and_plugins TILT=1.3.7"
+    - "TASK=test:core_and_plugins TILT=1.4.1"
+    - "TASK=test:core_and_plugins TILT=2.0.1"
+    - "TASK=test:rails RAILS=master"
+    - "TASK=test:rails RAILS=3.1.12 TILT=1.3.4"
+    - "TASK=test:rails RAILS=3.2.21 TILT=1.3.4"
+    - "TASK=test:rails RAILS=4.0.13"
+    - "TASK=test:rails RAILS=4.1.10"
+    - "TASK=test:rails RAILS=4.2.1"
+    - "TASK=test:sinatra SINATRA=master"
+    - "TASK=test:sinatra SINATRA=1.3.6"
+    - "TASK=test:sinatra SINATRA=1.4.6"
+    - "TASK=bench"
+    - "TASK=bench slow=1"
 
 matrix:
   exclude:
@@ -46,5 +50,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-19mode
     - rvm: jruby-head
-    - rvm: rbx-2
-      env: "TASK=test:rails RAILS=4.1.8"
+
+notifications:
+  irc: "chat.freenode.net#slim-lang"

data/CHANGES

@@ -1,18 +1,28 @@
-3.0.3
+3.0.6 (2015-06-05)
+
+  * Fix warnings #625
+
+3.0.4 (2015-06-02)
+
+  * javascript: doesn't add type='text/javascript' anymore
+  * slimrb: --require added
+  * Fix #624
+
+3.0.3 (2015-03-06)
 
   * Fix #392, capturing for splat attributes didn't work correctly under Rails
 
-3.0.2
+3.0.2 (2015-02-02)
 
   * slimrb: Add option --locals
   * Fix issues in the test suite (#576), thanks @dmke!
 
-3.0.1
+3.0.1 (2014-12-22)
 
   * Allow more special characters in html attribute names (See https://html.spec.whatwg.org/multipage/syntax.html#attributes-2), #567
   * Fix: Code attributes mutate their argument (#571)
 
-3.0.0
+3.0.0 (2014-12-07)
 
   * Drop 1.8.7 support
   * Deprecate default_options in favor of options
@@ -20,7 +30,7 @@
   * Deprecate `='`, `=='` and `tag'` syntax for trailing whitespace. Use `=<` etc. instead.
   * slimrb: Remove deprecated plugin options -l and -t
 
-2.1.0
+2.1.0 (2014-10-15)
 
   * Parser: Require pairwise braces in quoted attributes
   * Parser: add :attr_list_delims and :code_attr_delims
@@ -43,7 +53,7 @@
   * Fix rails error reporting #587 (Manipulate stacktrace)
   * Splat: handle html_safe
 
-2.0.3
+2.0.3 (2014-07-04)
 
   * slimrb: Don't update HTML output on exceptions
   * Allow dashes at the beginning of class names (#474)
@@ -52,11 +62,11 @@
   * Fix #485: missing end for empty `if` control blocks
   * Fix #510: double dash in class name
 
-2.0.2
+2.0.2 (2013-10-27)
 
   * Add option :attr_delims
 
-2.0.1
+2.0.1 (2013-07-31)
 
   * Support multiple attributes per shortcut (See issue #415)
   * Add support for org-ruby embedded engine
@@ -65,7 +75,7 @@
   * Fix issue #431
   * Also escape ' to &#39;
 
-2.0.0
+2.0.0 (2013-05-27)
 
   * IMPORTANT: Backward incompatible syntax change: '{...}' and '[...]' are not
     allowed as ruby attribute wrappers anymore. Use parentheses '(...)'
@@ -100,11 +110,11 @@
   * Add syntax for trailing or leading whitespace after tag, e.g. input>, input<
   * Add syntax for trailing or leading whitespace after output, e.g. =>, =<
 
-1.3.8
+1.3.8 (2013-04-11)
 
   * Disable some superflous deprecation warnings
 
-1.3.7
+1.3.7 (2013-04-10)
 
   * Fixed issue #374, rescue and ensure blocks
   * Fixed issue #333 (Throw syntax error if you write text after closed tag)
@@ -132,25 +142,25 @@
   * Support for wrapping javascript in HTML comments or CDATA (Issue #340)
   * Asciidoc embedded engine added
 
-1.3.6
+1.3.6 (2013-01-06)
 
   * 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
+1.3.5 (2012-12-19)
 
   * Logic-less:
     - Rewrote logic-less mode (Issue #326, #327)
     - Logic-less mode supports lambdas
     - Option :dictionary_access made more powerful, value :wrapped deprecated
 
-1.3.4
+1.3.4 (2012-11-15)
 
   * Fixed #314
   * Logic-less test cases added
 
-1.3.3
+1.3.3 (2012-10-16)
 
   * Attribute handling made consistent:
     - Splat attributes, static and dynamic attributes are now all handled the same
@@ -162,11 +172,11 @@
   * Remove UTF BOM when parsing Slim code
   * Fixed issue #303
 
-1.3.2
+1.3.2 (2012-09-26)
 
   * Fix boolean attributes #299
 
-1.3.1
+1.3.1 (2012-09-23)
 
   * Support inline html at the beginning of a line (New line indicator <). No pipe symbol is | necessary.
     It is even possible to wrap other Slim syntax in such a html block.
@@ -185,22 +195,22 @@
   * Support thread options Slim::Engine.with_options which especially useful for Rails
   * Add explicit column number to SyntaxError.to_s
 
-1.3.0
+1.3.0 (2012-09-04)
 
   * Parser wraps text blocks in [:slim, :text, ...] (Used by Translator/I18n plugin)
   * Added Translator/I18n plugin which uses GetText or FastGettext (require 'slim/translator')
   * Moved logic less mode out of the core to plugin (require 'slim/logic_less')
 
-1.2.2
+1.2.2 (2012-06-21)
 
   * Fix issue #264
 
-1.2.1
+1.2.1 (2012-05-22)
 
   * Support stylus as embedded engine
   * Fix issue #257
 
-1.2.0
+1.2.0 (2012-03-30)
 
   * Add option :shortcut which configures attribute shortcuts
     Default setting:
@@ -212,14 +222,14 @@
   * Add syntax for splat attributes (#109)
   * Support for dynamic tags, e.g. *{:tag => 'img', :src => 'image.jpg'}
 
-1.1.1
+1.1.1 (2012-02-29)
 
   * Evaluating a html attribute now happens only once (#219)
   * Code with trailing comma is treated as broken line (#226)
   * Support option :remove_empty_attrs (default true)
   * Require temple 0.4.0
 
-1.1.0
+1.1.0 (2012-01-06)
 
   * Support for special characters in class/id shortcut removed
   * Do not allow : in class/id shortcut
@@ -227,14 +237,14 @@
   * Support options :indent, :sort_attrs
   * Require temple 0.3.5
 
-1.0.4
+1.0.4 (2011-11-03)
 
   * Pass options to embedded Tilt engine
     Slim::EmbeddedEngine.set_default_options :markdown => {...}
   * Add test case for precompiled embedded engine 'builder'
   * Bug #204 fixed, tabs were not parsed correctly
 
-1.0.3
+1.0.3 (2011-10-08)
 
   * Fix rubinius test cases
   * Fix line numbers for embedded engines
@@ -245,20 +255,20 @@
   * Empty static attributes are not removed anymore
   * Line indicator =' is supported in tags
 
-1.0.2
+1.0.2 (2011-08-26)
 
   * Support for Rails 3.1 streaming (Temple > 0.3.2 required)
   * Switch to default format xhtml (supports all doctypes, including html5)
   * Improve parsing of #{interpolation} in quoted attributes (issue #159)
   * Use travis-ci for continous integration testing
 
-1.0.1
+1.0.1 (2011-08-07)
 
   * Only delimiting brackets must be balanced in ruby attributes
     e.g this is possible now `a href=(ruby_code "{")
   * Skip empty lines in text block (#156)
 
-1.0.0
+1.0.0 (2011-07-24)
 
   * Fixed html attribute issue in sections mode (#127)
   * Obsolete directive syntax removed
@@ -269,7 +279,7 @@
   * Dynamic attributes with value true/false are interpreted as boolean
   * Support boolean attributes without value e.g. option(selected id="abc")
 
-0.9.3
+0.9.3 (2011-05-15)
 
   * Allow for bypassing escaping in attributes
   * check if string encoding is valid
@@ -285,7 +295,7 @@
   * Option :auto_escape replaced with inverse option :disable_escape
   * Require temple 0.3.0
 
-0.9.2
+0.9.2 (2011-03-30)
 
   * add SassEngine which respects :pretty
   * embedded engine code refactored
@@ -295,64 +305,64 @@
   * add encoding option to Slim::Parser/Slim::Engine to enforce template encoding
   * vim support is now an external project
 
-0.9.1
+0.9.1 (2011-03-10)
 
   * add new doctype syntax without !
   * slim directive expression has type and args
 
-0.9.0
+0.9.0 (2011-01-30)
 
   * slim should not be registered as the default template handler.
   * add support for unescaped text interpolation
 
-0.8.4
+0.8.4 (2011-01-26)
 
   * Added the option to turn off automatic HTML escaping.
   * update to tilt 1.2.2
   * allow call to yield in logic less mode
   * allow doctype declaration to be capitalized
 
-0.8.3
+0.8.3 (2010-12-23)
 
   * Added support for html comments. The parser uses the :static filter instead of the :comment filter due to the way the parser is constructed.
 
-0.8.2
+0.8.2 (2010-12-22)
 
   * fix issue #96
   * Added the Temple Debugger filter.
   * Rails problems fixed
 
-0.8.1
+0.8.1 (2010-12-17)
 
   * remove backtick slim syntax -- no longer supported
   * slim executable conflict. issue #91
   * vim syntax support improved
 
-0.8.0
+0.8.0 (2010-11-29)
 
   * rails logic less support
 
-0.7.4
+0.7.4 (2010-11-22)
 
   * use ' for text block with trailing whitespace
   * allow to disable/enable embedded engines
 
-0.7.3
+0.7.3 (2010-11-16)
 
   * fix #82
   * basic rails test added
 
-0.7.2
+0.7.2 (2010-11-09)
 
   * get rid of rails deprecation warning
   * use_html_safe is activated automatically by temple
 
-0.7.1
+0.7.1 (2010-11-03)
 
   * logic less mode
   * add syntax for explicitly closed tags
 
-0.7.0
+0.7.0 (2010-10-25)
 
   * slim-mode.el for emacs added (modified haml-mode.el, needs some work to be fully functional for slim)
   * embedded engines
@@ -365,21 +375,21 @@
   * Slim now uses Temple and Tilt.
   * Choose your own attribute delimiter!
 
-0.6.1
+0.6.1 (2010-10-17)
 
   * can wrap parens around attributes if you so desire
   * added erubis to the benchmarks
 
-0.6.0
+0.6.0 (2010-10-17)
 
   * Added slim itself, haml and mustache to the development env for easier benchmarking.
   * added escape_html functionality.  need to tweak for speed
 
-0.5.1
+0.5.1 (2010-10-08)
 
   * Consecutive condition statements now working as expected.
 
-0.5.0
+0.5.0 (2010-10-07)
 
   * Added 'unless' to the list of control words.
   * Fixes for inline conditions. There must be a better way of doing this??
@@ -388,29 +398,29 @@
   * Output code (start with '=') can now accept code blocks.
   * Method calls no longer need parenthesis. We need more tests to ensure the implementation's robustness.
 
-0.4.1
+0.4.1 (2010-10-03)
 
   * Added '|' as an alias of '`' for parsing plain text. This simulates the syntax of the Jade template engine.
   * Added instructions of how to use the gem.
 
-0.4.0
+0.4.0 (2010-09-21)
 
   * support for nesting lines under backtick
   * make it so that one space is the left margin. any additional spaces will be copied over
   * support for using indentation after backtick to denote paragraphs. useful for script tags and paragraphs
 
-0.3.1
+0.3.1 (2010-09-17)
 
   * fix bug with adding end to nesting ruby code
 
-0.3.0
+0.3.0 (2010-09-17)
 
   * Optimize compiled string to reduce number of concatentations to the buffer
 
-0.2.0
+0.2.0 (2010-09-17)
 
   * can now make code call on same line as tag
 
-0.1.0
+0.1.0 (2010-09-15)
 
   * Initial release

data/Gemfile

@@ -25,8 +25,8 @@ if ENV['RAILS']
   end
 end
 
-#Choose minitest 4.7.x for sinatra or rails 3 and 4.0 otherwise go for newer version
-if (ENV['SINATRA'] && ENV['sinatra'] != 'master') || (ENV['RAILS'] && ENV['RAILS'].match(/^(3|4\.0)/))
+#Choose minitest 4.7.x for sinatra < 1.4.6 or rails 3 and 4.0 otherwise go for newer version
+if (ENV['SINATRA'] && ENV['SINATRA'] < '1.4.6') || (ENV['RAILS'] && ENV['RAILS'].match(/^(3|4\.0)/))
   gem 'minitest', '~> 4.7.4'
 else
   gem 'minitest', '~> 5.1'
@@ -37,7 +37,7 @@ if RUBY_VERSION >= '2.2.0'
   gem 'test-unit', platforms: :mri
 end
 
-if RUBY_ENGINE == 'rbx' && !ENV.key?('TRAVIS')
+if RUBY_ENGINE == 'rbx' && !ENV['TRAVIS']
   gem 'psych'
 end
 
@@ -63,3 +63,7 @@ if ENV['TASK'] == 'bench'
   gem 'erubis'
   gem 'haml'
 end
+
+if ENV['CODECLIMATE_REPO_TOKEN']
+  gem 'codeclimate-test-reporter'
+end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 - 2014 Slim Team
+Copyright (c) 2010 - 2015 Slim Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.jp.md

@@ -754,7 +754,7 @@ end
 = captured_content
 ~~~
 
-Another interesting use case is to use an enumerable and capture for each element. The helper could look like this
+別の興味深いユースケースは、enumerableを使いそれぞれの要素をキャプチャすることです。ヘルパは、このようになります。
 
 ~~~ ruby
 module Capture
@@ -766,7 +766,7 @@ module Capture
 end
 ~~~
 
-and it would be used as follows
+そして、次のように使用出来ます。
 
 ~~~ slim
 - links = { 'http://slim-lang.com' => 'The Slim Template Language' }
@@ -774,7 +774,7 @@ and it would be used as follows
   a href=url = text
 ~~~
 
-Afterwards, `link_list` contains the captured content.
+その後は、`link_list`はキャプチャしたコンテンツを含みます。
 
 ###　インクルードヘルパ
 
@@ -792,8 +792,8 @@ end
 このヘルパは次のように使用できます
 
 ~~~ slim
-nav= include_slim 'menu'
-section= include_slim 'content'
+nav = include_slim 'menu'
+section = include_slim 'content'
 ~~~
 
 しかし, このヘルパはキャッシュを行いません。その為, 目的にあったよりインテリジェントなバージョンを
@@ -1038,7 +1038,7 @@ Usage: slimrb [options]
     -c, --compile                    Compile only but do not run
     -e, --erb                        Convert to ERB
         --rails                      Generate rails compatible code (Implies --compile)
-    -r library                       Load library or plugin with -r slim/plugin
+    -r, --require library            Load library or plugin with -r slim/plugin
     -p, --pretty                     Produce pretty html
     -o, --option name=code           Set slim option
     -l, --locals Hash|YAML|JSON      Set local variables
@@ -1116,7 +1116,7 @@ Travis-CI は継続的インテグレーションテストに利用されてい
 
 Slim はすべての主要な Ruby 実装で動作します:
 
-* Ruby 1.9.3, 2.0.0 および 2.1.0
+* Ruby 1.9.3, 2.0.0, 2.1.0 および 2.2.0
 * Ruby EE
 * JRuby 1.9 mode
 * Rubinius 2.0
@@ -1131,7 +1131,7 @@ $ git clone git://github.com/slim-template/slim
 
 魔法をかけた後 pull request を送ってください。私たちは pull request が大好きです！
 
-Ruby の 2.1.0, 2.0.0, 1.9.3 と 1.8.7 でテストをすることを覚えておいてください。
+Ruby の 2.2.0, 2.1.0, 2.0.0 と 1.9.3 でテストをすることを覚えておいてください。
 
 もしドキュメントの不足を見つけたら, README.md をアップデートして私たちを助けて下さい。Slim に割く時間がないが, 私たちが知るべきものを何か見つけた場合には issue を送ってください。
 
@@ -1178,6 +1178,10 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 * [Coda](https://github.com/slim-template/Coda-2-Slim.mode)
 * [Atom](https://github.com/slim-template/language-slim)
 
+静的コード解析:
+
+* [Slim-Lint](https://github.com/sds/slim-lint)
+
 テンプレート変換 (HAML, ERB, ...):
 
 * [Haml2Slim converter](https://github.com/slim-template/haml2slim)
@@ -1193,6 +1197,8 @@ Slim は [MIT license](http://www.opensource.org/licenses/MIT) に基づいて
 * [Plim (Python port of Slim)](https://github.com/2nd/plim)
 * [Skim (Slim for Javascript)](https://github.com/jfirebaugh/skim)
 * [Emblem.js (Javascript, similar to Slim)](https://github.com/machty/emblem.js)
+* [Hamlit (High performance Haml implementation, based on Temple like Slim)](https://github.com/k0kubun/hamlit)
+* [Faml (Faster Haml implementation, also using Temple like Slim)](https://github.com/eagletmt/faml)
 * [Haml (Older engine which inspired Slim)](https://github.com/haml/haml)
 * [Jade (Similar engine for javascript)](https://github.com/visionmedia/jade)
 * [Sweet (Similar engine which also allows to write classes and functions)](https://github.com/joaomdmoura/sweet)

data/README.md

@@ -792,8 +792,8 @@ end
 This helper can then be used as follows
 
 ~~~ slim
-nav= include_slim 'menu'
-section= include_slim 'content'
+nav = include_slim 'menu'
+section = include_slim 'content'
 ~~~
 
 However this helper doesn't do any caching. You should therefore implement a more intelligent version of the helper which
@@ -883,7 +883,7 @@ Slim::Engine.options[:pretty] = true
 ### Setting options at runtime
 
 There are two ways to set options at runtime. For Tilt templates (`Slim::Template`) you can set
-the options when you instatiate the template:
+the options when you instantiate the template:
 
 ~~~ ruby
 Slim::Template.new('template.slim', optional_option_hash).render(scope)
@@ -955,7 +955,7 @@ For developers who know more about Slim and Temple architecture it is possible t
 options at different positions. Temple uses an inheritance mechanism to allow subclasses to override
 options of the superclass. The option priorities are as follows:
 
-1. `Slim::Template` options passed at engine instatination
+1. `Slim::Template` options passed at engine instantiation
 2. `Slim::Template.options`
 3. `Slim::Engine.thread_options`, `Slim::Engine.options`
 5. Parser/Filter/Generator `thread_options`, `options` (e.g `Slim::Parser`, `Slim::Compiler`)
@@ -1038,7 +1038,7 @@ Usage: slimrb [options]
     -c, --compile                    Compile only but do not run
     -e, --erb                        Convert to ERB
         --rails                      Generate rails compatible code (Implies --compile)
-    -r library                       Load library or plugin with -r slim/plugin
+    -r, --require library            Load library or plugin with -r slim/plugin
     -p, --pretty                     Produce pretty html
     -o, --option name=code           Set slim option
     -l, --locals Hash|YAML|JSON      Set local variables
@@ -1116,7 +1116,7 @@ Travis-CI is used for continuous integration testing: <http://travis-ci.org/slim
 
 Slim is working well on all major Ruby implementations:
 
-* Ruby 1.9.3, 2.0.0 and 2.1.0
+* Ruby 1.9.3, 2.0.0, 2.1.0 and 2.2.0
 * Ruby EE
 * JRuby 1.9 mode
 * Rubinius 2.0
@@ -1131,7 +1131,7 @@ $ git clone git://github.com/slim-template/slim
 
 Work your magic and then submit a pull request. We love pull requests!
 
-Please remember to keep the compatibility with Ruby versions 1.9.3, 2.0.0 and 2.1.0.
+Please remember to keep the compatibility with Ruby versions 1.9.3, 2.0.0, 2.1.0  and 2.2.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.
 
@@ -1178,6 +1178,10 @@ Syntax highlighting:
 * [Coda](https://github.com/slim-template/Coda-2-Slim.mode)
 * [Atom](https://github.com/slim-template/language-slim)
 
+Static code analysis:
+
+* [Slim-Lint](https://github.com/sds/slim-lint)
+
 Template Converters (HAML, ERB, ...):
 
 * [Haml2Slim converter](https://github.com/slim-template/haml2slim)
@@ -1193,6 +1197,8 @@ Language ports/Similar languages:
 * [Plim (Python port of Slim)](https://github.com/2nd/plim)
 * [Skim (Slim for Javascript)](https://github.com/jfirebaugh/skim)
 * [Emblem.js (Javascript, similar to Slim)](https://github.com/machty/emblem.js)
+* [Hamlit (High performance Haml implementation, based on Temple like Slim)](https://github.com/k0kubun/hamlit)
+* [Faml (Faster Haml implementation, also using Temple like Slim)](https://github.com/eagletmt/faml)
 * [Haml (Older engine which inspired Slim)](https://github.com/haml/haml)
 * [Jade (Similar engine for javascript)](https://github.com/visionmedia/jade)
 * [Sweet (Similar engine which also allows to write classes and functions)](https://github.com/joaomdmoura/sweet)

data/benchmarks/run-benchmarks.rb

@@ -25,9 +25,6 @@ class SlimBenchmarks
   end
 
   def init_compiled_benches
-    erb         = ERB.new(@erb_code)
-    erubis      = Erubis::Eruby.new(@erb_code)
-    fast_erubis = Erubis::FastEruby.new(@erb_code)
     haml_pretty = Haml::Engine.new(@haml_code, format: :html5)
     haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
 
@@ -36,10 +33,10 @@ class SlimBenchmarks
     haml_pretty.def_method(context, :run_haml_pretty)
     haml_ugly.def_method(context, :run_haml_ugly)
     context.instance_eval %{
-      def run_erb; #{erb.src}; end
-      def run_erubis; #{erubis.src}; end
+      def run_erb; #{ERB.new(@erb_code).src}; end
+      def run_erubis; #{Erubis::Eruby.new(@erb_code).src}; end
       def run_temple_erb; #{Temple::ERB::Engine.new.call @erb_code}; end
-      def run_fast_erubis; #{fast_erubis.src}; end
+      def run_fast_erubis; #{Erubis::FastEruby.new(@erb_code).src}; end
       def run_slim_pretty; #{Slim::Engine.new(pretty: true).call @slim_code}; end
       def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
     }
@@ -55,13 +52,13 @@ class SlimBenchmarks
   end
 
   def init_tilt_benches
-    tilt_erb        = Tilt::ERBTemplate.new { @erb_code }
-    tilt_erubis     = Tilt::ErubisTemplate.new { @erb_code }
-    tilt_temple_erb = Temple::ERB::Template.new { @erb_code }
-    tilt_haml_pretty= Tilt::HamlTemplate.new(format: :html5){ @haml_code }
-    tilt_haml_ugly  = Tilt::HamlTemplate.new(format: :html5, ugly: true){ @haml_code }
-    tilt_slim_pretty= Slim::Template.new(pretty: true) { @slim_code }
-    tilt_slim_ugly  = Slim::Template.new { @slim_code }
+    tilt_erb         = Tilt::ERBTemplate.new { @erb_code }
+    tilt_erubis      = Tilt::ErubisTemplate.new { @erb_code }
+    tilt_temple_erb  = Temple::ERB::Template.new { @erb_code }
+    tilt_haml_pretty = Tilt::HamlTemplate.new(format: :html5) { @haml_code }
+    tilt_haml_ugly   = Tilt::HamlTemplate.new(format: :html5, ugly: true) { @haml_code }
+    tilt_slim_pretty = Slim::Template.new(pretty: true) { @slim_code }
+    tilt_slim_ugly   = Slim::Template.new { @slim_code }
 
     context  = Context.new
 

data/doc/jp/include.md

@@ -9,7 +9,7 @@
     include partial
     include partial.txt
 
-インクルードプラグンを有効化
+インクルードプラグインを有効化
 
     require 'slim/include'
 

data/doc/smart.md

@@ -11,6 +11,7 @@ so you can easily type text like this:
 
     p
       This is text.
+      This is text, too.
 
 Slim will automatically treat any line which doesn't start
 with a lowercase tag name or any of the special characters as an implicit text line.

data/lib/slim/code_attributes.rb

@@ -29,10 +29,10 @@ module Slim
           tmp = unique_name
           [:multi,
            [:code, "#{tmp} = #{code}"],
-           [:case, tmp,
-            ['true', [:html, :attr, name, [:multi]]],
-            ['false, nil', [:multi]],
-            [:else, [:html, :attr, name, [:escape, escape, [:dynamic, tmp]]]]]]
+           [:if, tmp,
+            [:if, "#{tmp} == true",
+             [:html, :attr, name, [:multi]],
+             [:html, :attr, name, [:escape, escape, [:dynamic, tmp]]]]]]
         end
       else
         # Attribute with merging

data/lib/slim/command.rb

@@ -44,7 +44,7 @@ module Slim
         @options[:compile] = true
       end
 
-      opts.on('-r library', "Load library or plugin with -r slim/plugin") do |lib|
+      opts.on('-r', '--require library', "Load library or plugin with -r slim/plugin") do |lib|
         require lib.strip
       end
 

data/lib/slim/embedded.rb

@@ -226,7 +226,7 @@ module Slim
     class JavaScriptEngine < TagEngine
       disable_option_validator!
 
-      set_options tag: :script, attributes: { type: 'text/javascript' }
+      set_options tag: :script, attributes: {}
 
       def on_slim_embedded(engine, body)
         super(engine, [:html, :js, body])

data/lib/slim/engine.rb

@@ -1,3 +1,6 @@
+# The Slim module contains all Slim related classes (e.g. Engine, Parser).
+# Plugins might also reside within the Slim module (e.g. Include, Smart).
+# @api public
 module Slim
   # Slim engine which transforms slim code to executable ruby code
   # @api public

data/lib/slim/include.rb

@@ -9,9 +9,9 @@ module Slim
   class Include < Slim::Filter
     define_options :file, include_dirs: [Dir.pwd, '.']
 
-    def on_html_tag(tag, attributes, content)
+    def on_html_tag(tag, attributes, content = nil)
       return super if tag != 'include'
-      name = content.flatten.select {|s| String === s }.join
+      name = content.to_a.flatten.select {|s| String === s }.join
       raise ArgumentError, 'Invalid include statement' unless attributes == [:html, :attrs] && !name.empty?
       unless file = find_file(name)
         name = "#{name}.slim" if name !~ /\.slim\Z/i
@@ -41,7 +41,10 @@ module Slim
       exp
     end
 
+    # @api private
     alias call_without_include call
+
+    # @api private
     def call(input)
       Thread.current[:slim_include_engine] = self
       Thread.current[:slim_include_level] ||= 0

data/lib/slim/parser.rb

@@ -73,7 +73,8 @@ module Slim
       keys = Regexp.escape @attr_list_delims.keys.join
       @attr_list_delims_re = /\A\s*([#{keys}])/
       @embedded_re = /\A(#{Regexp.union(Embedded.engines.keys.map(&:to_s))}):(\s*)/
-      @attr_name = "\\A\\s*([^\0\"'><\/=\s#{(@attr_list_delims.flatten + @code_attr_delims.flatten).map {|x| Regexp.escape(x) }.join}]+)"
+      keys = Regexp.escape ('"\'></='.split(//) + @attr_list_delims.flatten + @code_attr_delims.flatten).uniq.join
+      @attr_name = "\\A\\s*([^\0\s#{keys}]+)"
       @quoted_attr_re = /#{@attr_name}\s*=(=?)\s*("|')/
       @code_attr_re = /#{@attr_name}\s*=(=?)\s*/
     end
@@ -246,6 +247,9 @@ module Slim
       @stacks.last << [:newline]
     end
 
+    # Unknown line indicator found. Overwrite this method if
+    # you want to add line indicators to the Slim parser.
+    # The default implementation throws a syntax error.
     def unknown_line_indicator
       syntax_error! 'Unknown line indicator'
     end

data/lib/slim/smart/parser.rb

@@ -2,6 +2,7 @@
 
 module Slim
   module Smart
+    # @api private
     class Parser < ::Slim::Parser
       define_options implicit_text: true
 

data/lib/slim/translator.rb

@@ -1,6 +1,7 @@
 require 'slim'
 
 module Slim
+  # @api private
   class Translator < Filter
     define_options :tr,
                    tr_mode: :dynamic,

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   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/'
-  s.rubyforge_project = s.name
   s.license           = 'MIT'
 
   s.files             = `git ls-files`.split("\n")

data/test/core/helper.rb

@@ -1,5 +1,11 @@
 # encoding: utf-8
 
+begin
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+rescue LoadError
+end
+
 require 'minitest/autorun'
 require 'slim'
 require 'slim/grammar'

data/test/core/test_commands.rb

@@ -1,5 +1,5 @@
+# coding: utf-8
 require 'helper'
-require 'slim/command'
 require 'open3'
 require 'tempfile'
 
@@ -103,7 +103,7 @@ class TestSlimCommands < Minitest::Test
 
   def test_require
     with_tempfile 'puts "Not in slim"', 'rb' do |lib|
-      prepare_common_test STATIC_TEMPLATE, '-r', lib, stdin_file: false, file_file: false do |out, err|
+      prepare_common_test STATIC_TEMPLATE, '--require', lib, stdin_file: false, file_file: false do |out, err|
         assert err.empty?
         assert_equal "Not in slim\n<p>Hello World!</p>\n", out
       end

data/test/core/test_embedded_engines.rb

@@ -121,7 +121,7 @@ javascript:
   alert('hello')
 p Hi
 }
-    assert_html %{<script type="text/javascript">$(function() {});\n\n\nalert('hello')</script><p>Hi</p>}, source
+    assert_html %{<script>$(function() {});\n\n\nalert('hello')</script><p>Hi</p>}, source
   end
 
   def test_render_with_opal
@@ -141,7 +141,7 @@ opal:
 
   def test_render_with_javascript_with_tabs
     source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
-    assert_html "<script type=\"text/javascript\">$(function() {});\nalert('hello')</script><p>Hi</p>", source
+    assert_html "<script>$(function() {});\nalert('hello')</script><p>Hi</p>", source
   end
 
   def test_render_with_javascript_including_variable
@@ -151,34 +151,34 @@ opal:
 javascript:   
   $(function() { #{func} });
 }
-    assert_html %q|<script type="text/javascript">$(function() { alert(&#39;hello&#39;); });</script>|, source
+    assert_html %q|<script>$(function() { alert(&#39;hello&#39;); });</script>|, source
   end
 
   def test_render_with_javascript_with_explicit_html_comment
     Slim::Engine.with_options(js_wrapper: :comment) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
-      assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
+      assert_html "<script><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_explicit_cdata_comment
     Slim::Engine.with_options(js_wrapper: :cdata) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
-      assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
+      assert_html "<script>\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_format_xhtml_comment
     Slim::Engine.with_options(js_wrapper: :guess, format: :xhtml) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
-      assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
+      assert_html "<script>\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_format_html_comment
     Slim::Engine.with_options(js_wrapper: :guess, format: :html) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
-      assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
+      assert_html "<script><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
     end
   end
 
@@ -229,14 +229,14 @@ ruby:
 javascript:
   $(function() {});
 }
-    assert_html '<script type="text/javascript">$(function() {});</script>', source, disable_engines: [:ruby]
-    assert_html '<script type="text/javascript">$(function() {});</script>', source, disable_engines: %w(ruby)
+    assert_html '<script>$(function() {});</script>', source, disable_engines: [:ruby]
+    assert_html '<script>$(function() {});</script>', source, disable_engines: %w(ruby)
 
     source = %q{
 javascript:
   $(function() {});
 }
-    assert_html '<script type="text/javascript">$(function() {});</script>', source, enable_engines: [:javascript]
-    assert_html '<script type="text/javascript">$(function() {});</script>', source, enable_engines: %w(javascript)
+    assert_html '<script>$(function() {});</script>', source, enable_engines: [:javascript]
+    assert_html '<script>$(function() {});</script>', source, enable_engines: %w(javascript)
   end
 end

data/test/include/test_include.rb

@@ -4,12 +4,13 @@ require 'slim/include'
 class TestSlimInclude < TestSlim
   def test_include
     source = %q{
+br/
 a: include slimfile
 b: include textfile
 c: include slimfile.slim
 d: include subdir/test
 }
-    assert_html '<a>slim1recslim2</a><b>1+2=3</b><c>slim1recslim2</c><d>subdir</d>', source, include_dirs: [File.expand_path('files', File.dirname(__FILE__))]
+    assert_html '<br /><a>slim1recslim2</a><b>1+2=3</b><c>slim1recslim2</c><d>subdir</d>', source, include_dirs: [File.expand_path('files', File.dirname(__FILE__))]
   end
 
   def test_include_with_newline

data/test/rails/test/helper.rb

@@ -13,7 +13,7 @@ protected
 
   def assert_xpath(xpath, message="Unable to find '#{xpath}' in response body.")
     assert_response :success, "Response type is not :success (code 200..299)."
-    
+
     body = @response.body
     assert !body.empty?, "No response body found."
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.6
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -197,9 +197,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: slim
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Slim is a template language.
 test_files: []
+has_rdoc: