slim 1.2.1 → 1.2.2

data/CHANGES

@@ -1,3 +1,7 @@
+1.2.2
+
+  * Fix issue #264
+
 1.2.1
 
   * Support stylus as embedded engine

data/README.md

@@ -405,7 +405,10 @@ This project is released under the MIT license.
 
 * [Rails 3 Generators](https://github.com/leogalmeida/slim-rails)
 
-* [Skim (Slim for Javascript)](https://github.com/jfirebaugh/skim)
-* [Slim for Clojure](https://github.com/chaslemley/slim.clj)
-* [Hamlet.rb (Similar template language)](https://github.com/gregwebs/hamlet.rb)
 * [Coffee script plugin for Slim](https://github.com/yury/coffee-views)
+
+* [Clojure port of Slim](https://github.com/chaslemley/slim.clj)
+* [Hamlet.rb (Similar template language)](https://github.com/gregwebs/hamlet.rb)
+* [Plim (Python port of Slim)](https://github.com/2nd/plim)
+* [Skim (Slim for Javascript)](https://github.com/jfirebaugh/skim)
+

data/lib/slim/end_inserter.rb

@@ -10,7 +10,7 @@ module Slim
   #
   # @api private
   class EndInserter < Filter
-    ELSE_REGEX = /\Aelse|elsif|when\b/
+    ELSE_REGEX = /\A(else|elsif|when)\b/
     END_REGEX = /\Aend\b/
 
     # Handle multi expression `[:multi, *exps]`

data/lib/slim/version.rb

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

data/test/slim/test_code_structure.rb

@@ -37,6 +37,18 @@ div
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
+  def test_render_with_when_string_in_condition
+    source = %q{
+- if true
+  | Hello
+
+- unless 'when' == nil
+  |  world
+}
+
+    assert_html 'Hello world', source
+  end
+
   def test_render_with_conditional_and_following_nonconditonal
     source = %q{
 div

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &10177380 !ruby/object:Gem::Requirement
+  requirement: &19629360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *10177380
+  version_requirements: *19629360
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &10143080 !ruby/object:Gem::Requirement
+  requirement: &19628360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *10143080
+  version_requirements: *19628360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10142440 !ruby/object:Gem::Requirement
+  requirement: &19627580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *10142440
+  version_requirements: *19627580
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &10141640 !ruby/object:Gem::Requirement
+  requirement: &19626760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *10141640
+  version_requirements: *19626760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10140540 !ruby/object:Gem::Requirement
+  requirement: &19626240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10140540
+  version_requirements: *19626240
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &10137320 !ruby/object:Gem::Requirement
+  requirement: &19625720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10137320
+  version_requirements: *19625720
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &10523440 !ruby/object:Gem::Requirement
+  requirement: &19625040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10523440
+  version_requirements: *19625040
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &10521700 !ruby/object:Gem::Requirement
+  requirement: &19624240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10521700
+  version_requirements: *19624240
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email: