slim 0.6.0.beta.2 → 0.6.0.beta.3

data/Gemfile

@@ -2,4 +2,7 @@ source :rubygems
 
 gemspec
 
-gem 'slim', :path => File.dirname(__FILE__), :group => :development
+group :development do
+  gem 'slim', :path => File.dirname(__FILE__)
+  gem 'minitest' if RUBY_VERSION < '1.9'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slim (0.6.0.beta.2)
+    slim (0.6.0.beta.3)
       escape_utils
 
 GEM

data/lib/slim.rb

@@ -10,11 +10,11 @@ require 'slim/engine'
 module Slim
   class << self
     def version
-      '0.6.0.beta.2'
+      '0.6.0.beta.3'
     end
 
     def escape_html(html)
-      EscapeUtils.escape_html(html)
+      EscapeUtils.escape_html(html.to_s)
     end
   end
 end

data/lib/slim/compiler.rb

@@ -13,9 +13,8 @@ module Slim
     REGEX_LINE_PARSER  = /^(\s*)(!?`?\|?-?=?\/?\w*)((?:\s*(?:\w|-)*="[^=]+")+|(\S*[#.]\S+))?(.*)/
 
     REGEX_LINE_CONTAINS_OUTPUT_CODE       = /^\s*=(.*)/
-    REGEX_LINE_CONTAINS_ONLY_HTML_TAG     = /^\s*\w+\S?$/
-    REGEX_LINE_CONTAINS_METHOD_DETECTED   = /^(\w+\(.*\))/
-    REGEX_METHOD_HAS_NO_PARENTHESES       = /^\w+\s/
+    REGEX_LINE_CONTAINS_METHOD_DETECTED   = /^((?:(?!#{CONTROL_WORDS * '\b|'}\b).)*)/
+    REGEX_METHOD_HAS_NO_PARENTHESES       = /^\w+\s+\S+/
     REGEX_CODE_BLOCK_DETECTED             = / do ?.*$/
     REGEX_CODE_CONTROL_WORD_DETECTED      = /(?:\s|(\())(#{CONTROL_WORDS * '|'})\b\s?(.*)$/
     REGEX_CODE_ELSE_CONTROL_WORD_DETECTED = /^#{ELSE_CONTROL_WORDS * '\b|'}\b/
@@ -55,9 +54,6 @@ module Slim
         # Remove the first space, but allow people to pad if they want.
         string.slice!(0) if string =~ /^\s/
 
-        # prepends "div" to the shortcut form of attrs if no marker is given
-        marker = 'div' if shortcut_attrs && marker.empty?
-
         line_type = case marker
                     when '`', '|' then :text
                     when '-'      then :control_code
@@ -78,9 +74,8 @@ module Slim
             continue_closing = true
             ender, ender_indent = enders.pop
 
-            unless ender_indent < indent || ender == 'end;' && line_type == :control_code &&
-              ender_indent == indent && string =~ REGEX_CODE_ELSE_CONTROL_WORD_DETECTED
-                @_buffer << ender
+            unless ender_indent < indent || ender_indent == indent && string =~ REGEX_CODE_ELSE_CONTROL_WORD_DETECTED
+              @_buffer << ender
             else
               enders << [ender, ender_indent]
               continue_closing = false
@@ -95,6 +90,9 @@ module Slim
           if AUTOCLOSED.include?(marker)
             @_buffer << "_buf << \"<#{marker}#{attrs}/>\";"
           else
+            # prepends "div" to the shortcut form of attrs if no marker is given
+            marker = 'div' if shortcut_attrs && marker.empty?
+
             enders   << ["_buf << \"</#{marker}>\";", indent]
             @_buffer << "_buf << \"<#{marker}#{attrs}>\";"
           end
@@ -136,12 +134,13 @@ module Slim
     private
 
     def parse_string(string)
-      string = string_skip_escape = $1.strip if string =~ REGEX_LINE_CONTAINS_OUTPUT_CODE
-      string << ' '                          if string =~ REGEX_LINE_CONTAINS_ONLY_HTML_TAG
-      parenthesesify_method!(string)         if string =~ REGEX_METHOD_HAS_NO_PARENTHESES
-      wraps_with_slim_escape!(string)        unless string =~ REGEX_CODE_BLOCK_DETECTED || string_skip_escape
-
-      string.strip
+      if string =~ REGEX_LINE_CONTAINS_OUTPUT_CODE
+        $1.strip
+      else
+        parenthesesify_method!(string)  if string =~ REGEX_METHOD_HAS_NO_PARENTHESES
+        wraps_with_slim_escape!(string) unless string =~ REGEX_CODE_BLOCK_DETECTED
+        string.strip
+      end
     end
 
     # adds a pair of parentheses to the method
@@ -157,8 +156,7 @@ module Slim
     # converts 'p#hello.world.mate' to 'p id="hello" class="world mate"'
     def normalize_attributes!(string)
       string.sub!(REGEX_FIND_HTML_ATTR_ID, ' id="\1"')
-      string.sub!(REGEX_FIND_HTML_ATTR_CLASSES, ' class="\1"')
-      string.gsub!('.', ' ')
+      string.sub!(REGEX_FIND_HTML_ATTR_CLASSES, ' class="\1"') && string.gsub!('.', ' ')
     end
   end
 end

data/slim.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.6.0.beta.2"
+  s.version = "0.6.0.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone", "Fred Wu"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2010-10-16}
   s.description = %q{Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.}
   s.email = ["andy@stonean.com", "ifredwu@gmail.com"]
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -34,4 +34,8 @@ class Env
   def evil_method
     "<script>do_something_evil();</script>"
   end
+
+  def output_number
+    1337
+  end
 end

data/test/slim/test_compiler.rb

@@ -188,7 +188,7 @@ p
   = hello_world
 HTML
 
-    expected = %q|_buf = [];_buf << "<p>";_buf << Slim.escape_html(hello_world());_buf << "</p>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << Slim.escape_html(hello_world);_buf << "</p>";_buf.join;|
 
     assert_equal expected, TestEngine.new(string).compiled
   end
@@ -221,7 +221,7 @@ body
   p id="first" = hello_world
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << Slim.escape_html(hello_world());_buf << "</p>";_buf << "</body>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << Slim.escape_html(hello_world);_buf << "</p>";_buf << "</body>";_buf.join;|
 
     assert_equal expected, TestEngine.new(string).compiled
   end
@@ -312,17 +312,27 @@ TEMPLATE
 p = session[:id]
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<p>";_buf << session[:id];_buf << "</p>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << Slim.escape_html(session[:id]);_buf << "</p>";_buf.join;|
 
     assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_escape_escaping
     string = <<TEMPLATE
+p == session[:id]
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<p>";_buf << session[:id];_buf << "</p>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
+
+  def test_escape_escaping2
+    string = <<TEMPLATE
 p == safe_method_call
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<p>";_buf << safe_method_call();_buf << "</p>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << safe_method_call;_buf << "</p>";_buf.join;|
 
     assert_equal expected, TestEngine.new(string).compiled
   end
@@ -348,7 +358,22 @@ TEMPLATE
        == hello
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<body>";_buf << "<p>";_buf << "hey";_buf << hello();_buf << "</p>";_buf << "</body>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p>";_buf << "hey";_buf << hello;_buf << "</p>";_buf << "</body>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
+
+  def test_code_block
+    string = <<TEMPLATE
+- unless items.empty?
+  ul
+    - items.each do |item|
+      li = item
+- else
+  p No items
+TEMPLATE
+
+    expected = %q|_buf = [];unless items.empty?;_buf << "<ul>";items.each do \|item\|;_buf << "<li>";_buf << Slim.escape_html(item);_buf << "</li>";end;_buf << "</ul>";else;_buf << "<p>";_buf << "No items";_buf << "</p>";end;_buf.join;|
 
     assert_equal expected, TestEngine.new(string).compiled
   end

data/test/slim/test_engine.rb

@@ -395,4 +395,14 @@ HTML
 
     assert_equal expected, Slim::Engine.new(string).render(@env)
   end
+
+  def test_number_type_interpolation
+    string = <<HTML
+p = output_number
+HTML
+
+    expected = "<p>1337</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 6
   - 0
   - beta
-  - 2
-  version: 0.6.0.beta.2
+  - 3
+  version: 0.6.0.beta.3
 platform: ruby
 authors: 
 - Andrew Stone
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +11:00
+date: 2010-10-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3027777953181693052
+      hash: 2018264533147870573
       segments: 
       - 0
       version: "0"