slim 0.6.0 → 0.6.1

data/Gemfile.lock

@@ -1,12 +1,15 @@
 PATH
   remote: .
   specs:
-    slim (0.6.0.beta.3)
+    slim (0.6.0)
       escape_utils
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     escape_utils (0.1.8)
     gemcutter (0.6.1)
     git (1.2.5)
@@ -16,7 +19,6 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    mustache (0.11.2)
     rake (0.8.7)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -25,9 +27,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  erubis
   escape_utils
   haml
   jeweler
-  mustache
   rake
   slim!

data/README.md

@@ -151,6 +151,13 @@ __Please note that all line indicators must be followed by a space__
       div class="content"
         = show_content
 
+### Wrap attributes with parens
+
+    # If parens make the syntax more readable for you
+
+    body
+      h1(id="tagline" class="small tagline") = page_tagline
+
 ### Set an attribute's value with a method
 
     # Use standard Ruby interpolation.
@@ -222,31 +229,39 @@ __Please note that all line indicators must be followed by a space__
 
 ## Benchmarks
 
-    # OS X 10.6 + REE 1.8.7
-
-                            user     system      total        real
-    erb                 0.500000   0.000000   0.500000 (  0.516644)
-    slim                0.550000   0.000000   0.550000 (  0.579362)
-    haml                3.390000   0.050000   3.440000 (  3.669325)
-    mustache            1.130000   0.040000   1.170000 (  1.213134)
-    erb (cached)        0.090000   0.000000   0.090000 (  0.099274)
-    slim (cached)       0.080000   0.000000   0.080000 (  0.079823)
-    haml (cached)       0.290000   0.000000   0.290000 (  0.312542)
-    mustache (cached)   0.080000   0.000000   0.080000 (  0.079184)
-
-    # OS X 10.6 + Ruby 1.9.2
-
-                            user     system      total        real
-    erb                 0.400000   0.000000   0.400000 (  0.431967)
-    slim                0.410000   0.010000   0.420000 (  0.425059)
-    haml                3.030000   0.030000   3.060000 (  3.199970)
-    mustache            1.360000   0.030000   1.390000 (  1.435129)
-    erb (cached)        0.150000   0.000000   0.150000 (  0.157284)
-    slim (cached)       0.130000   0.010000   0.140000 (  0.129576)
-    haml (cached)       0.320000   0.000000   0.320000 (  0.344316)
-    mustache (cached)   0.040000   0.000000   0.040000 (  0.049058)
+    # Ubuntu 10.4 + Ruby 1.9.2
+
+    Rehearsal --------------------------------------------------------
+    erb                    0.580000   0.010000   0.590000 (  0.611149)
+    erubis                 0.480000   0.000000   0.480000 (  0.506241)
+    fast erubis            0.480000   0.010000   0.490000 (  0.499427)
+    slim                   0.640000   0.000000   0.640000 (  0.667160)
+    haml                   4.140000   0.000000   4.140000 (  4.221195)
+    haml ugly              3.960000   0.000000   3.960000 (  4.018103)
+    erb (cached)           0.200000   0.000000   0.200000 (  0.208529)
+    erubis (cached)        0.160000   0.000000   0.160000 (  0.167134)
+    fast erubis (cached)   0.140000   0.000000   0.140000 (  0.152149)
+    slim (cached)          0.150000   0.000000   0.150000 (  0.159058)
+    haml (cached)          0.450000   0.010000   0.460000 (  0.462814)
+    haml ugly (cached)     0.370000   0.000000   0.370000 (  0.387312)
+    ---------------------------------------------- total: 11.780000sec
+
+    user     system      total        real
+    erb                    0.560000   0.010000   0.570000 (  0.574373)
+    erubis                 0.480000   0.000000   0.480000 (  0.501512)
+    fast erubis            0.470000   0.000000   0.470000 (  0.481918)
+    slim                   0.610000   0.000000   0.610000 (  0.612794)
+    haml                   3.930000   0.010000   3.940000 (  3.939419)
+    haml ugly              3.790000   0.010000   3.800000 (  3.798528)
+    erb (cached)           0.190000   0.000000   0.190000 (  0.188593)
+    erubis (cached)        0.160000   0.000000   0.160000 (  0.159869)
+    fast erubis (cached)   0.140000   0.000000   0.140000 (  0.135476)
+    slim (cached)          0.150000   0.000000   0.150000 (  0.153698)
+    haml (cached)          0.430000   0.000000   0.430000 (  0.436980)
+    haml ugly (cached)     0.370000   0.000000   0.370000 (  0.372770)
+
 
 ## Authors
 
 * [Andrew Stone](http://github.com/stonean)
-* [Fred Wu](http://github.com/fredwu)
+* [Fred Wu](http://github.com/fredwu)

data/Rakefile

@@ -19,7 +19,7 @@ begin
     gem.add_development_dependency 'rake'
     gem.add_development_dependency 'jeweler'
     gem.add_development_dependency 'haml'
-    gem.add_development_dependency 'mustache'
+    gem.add_development_dependency 'erubis'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/slim.rb

@@ -10,7 +10,7 @@ require 'slim/engine'
 module Slim
   class << self
     def version
-      '0.6.0'
+      '0.6.1'
     end
 
     def escape_html(html)

data/lib/slim/compiler.rb

@@ -10,7 +10,7 @@ module Slim
     CONTROL_WORDS      = %w{if unless do}
     ELSE_CONTROL_WORDS = %w{else elsif}
 
-    REGEX_LINE_PARSER = /^(\s*)(!?`?\|?-?=?\/?\w*)((\S*[#.]\S+)?(?:\s*(?:\w|-)*="[^=]+")*)?(.*)/
+    REGEX_LINE_PARSER = /^(\s*)(!?`?\|?-?=?\/?\w*)\(?((\S*[#.]\S+)?(?:\s*(?:\w|-)*="[^=]+")*)?\)?(.*)/
 
     REGEX_LINE_CONTAINS_OUTPUT_CODE       = /^\s*=(.*)/
     REGEX_LINE_CONTAINS_METHOD_DETECTED   = /^((?:(?!#{CONTROL_WORDS * '\b|'}\b).)*)/
@@ -63,9 +63,10 @@ module Slim
                     else :markup
                     end
 
-        if attrs
+        unless attrs.empty?
           normalize_attributes!(attrs) if shortcut_attrs
           attrs.gsub!('"', '\"')
+          attrs = " #{attrs}" unless attrs =~ /^\s/
         end
 
         unless indent > last_indent

data/slim.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone", "Fred Wu"]
@@ -54,20 +54,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<haml>, [">= 0"])
-      s.add_development_dependency(%q<mustache>, [">= 0"])
+      s.add_development_dependency(%q<erubis>, [">= 0"])
     else
       s.add_dependency(%q<escape_utils>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<mustache>, [">= 0"])
+      s.add_dependency(%q<erubis>, [">= 0"])
     end
   else
     s.add_dependency(%q<escape_utils>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<mustache>, [">= 0"])
+    s.add_dependency(%q<erubis>, [">= 0"])
   end
 end
 

data/test/slim/test_engine.rb

@@ -435,4 +435,24 @@ HTML
 
     assert_equal expected, Slim::Engine.new(string).render(@env)
   end
+
+  def test_parens_around_attributes
+    string = <<HTML
+p(id="marvin" class="martian" data-info="Illudium Q-36") = output_number
+HTML
+
+    expected = %(<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>)
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_parens_around_attributes_with_equal_sign_snug_to_right_paren
+    string = <<HTML
+p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number
+HTML
+
+    expected = %(<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>)
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -71,7 +71,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mustache
+  name: erubis
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 686036806339254494
+      hash: -160104932492896005
       segments: 
       - 0
       version: "0"