slim 1.2.0 → 1.2.1

data/CHANGES

@@ -1,3 +1,8 @@
+1.2.1
+
+  * Support stylus as embedded engine
+  * Fix issue #257
+
 1.2.0
 
   * Add option :shortcut which configures attribute shortcuts

data/README.md

@@ -73,7 +73,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
 
         = yield
 
-        - unless items.empty?
+        - if items.any?
           table
             - for item in items do
               tr

data/lib/slim/embedded_engine.rb

@@ -184,6 +184,7 @@ module Slim
     # These engines are executed at compile time
     register :coffee,     TagEngine,  :tag => :script, :attributes => { :type => 'text/javascript' },  :engine => StaticTiltEngine
     register :less,       TagEngine,  :tag => :style,  :attributes => { :type => 'text/css' },         :engine => StaticTiltEngine
+    register :styl,       TagEngine,  :tag => :style,  :attributes => { :type => 'text/css' },         :engine => StaticTiltEngine
     register :sass,       TagEngine,  :pretty, :tag => :style, :attributes => { :type => 'text/css' }, :engine => SassEngine
     register :scss,       TagEngine,  :pretty, :tag => :style, :attributes => { :type => 'text/css' }, :engine => SassEngine
 

data/lib/slim/interpolation.rb

@@ -25,7 +25,7 @@ module Slim
           string, code = parse_expression($')
           escape = code !~ /\A\{.*\}\Z/
           block << [:slim, :output, escape, escape ? code : code[1..-2], [:multi]]
-        when /\A(#|[^#]*)/
+        when /\A([#\\]|[^#\\]*)/
           # Static text
           block << [:static, $&]
           string = $'

data/lib/slim/version.rb

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

data/test/slim/test_html_structure.rb

@@ -561,6 +561,14 @@ h1 *hash This is my title
     assert_html '<div disabled="disabled" empty1="" empty2="" empty3="">This is my title</div>', source, :remove_empty_attrs => false
   end
 
+  def test_splat_merging_with_arrays
+    source = %q{
+*{:a => 1, :b => 2} *[[:c, 3], [:d, 4]] *[[:e, 5], [:f, 6]] This is my title
+}
+
+    assert_html '<div a="1" b="2" c="3" d="4" e="5" f="6">This is my title</div>', source
+  end
+
   def test_splat_with_other_attributes
     source = %q{
 h1 data-id="123" *hash This is my title

data/test/slim/test_text_interpolation.rb

@@ -40,9 +40,10 @@ p #{hello_world}
   def test_escape_interpolation
     source = %q{
 p \\#{hello_world}
+p text1 \\#{hello_world} text2
 }
 
-    assert_html '<p>#{hello_world}</p>', source
+    assert_html '<p>#{hello_world}</p><p>text1 #{hello_world} text2</p>', source
   end
 
   def test_complex_interpolation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &4011380 !ruby/object:Gem::Requirement
+  requirement: &10177380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *4011380
+  version_requirements: *10177380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &4026080 !ruby/object:Gem::Requirement
+  requirement: &10143080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *4026080
+  version_requirements: *10143080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &4025180 !ruby/object:Gem::Requirement
+  requirement: &10142440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *4025180
+  version_requirements: *10142440
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &4024320 !ruby/object:Gem::Requirement
+  requirement: &10141640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *4024320
+  version_requirements: *10141640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &4023580 !ruby/object:Gem::Requirement
+  requirement: &10140540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4023580
+  version_requirements: *10140540
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &4022620 !ruby/object:Gem::Requirement
+  requirement: &10137320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4022620
+  version_requirements: *10137320
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &4021940 !ruby/object:Gem::Requirement
+  requirement: &10523440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4021940
+  version_requirements: *10523440
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &4021020 !ruby/object:Gem::Requirement
+  requirement: &10521700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4021020
+  version_requirements: *10521700
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.