slim 0.8.4 → 0.9.0

data/lib/slim/interpolation.rb

@@ -12,15 +12,16 @@ module Slim
       block = [:multi]
       until string.empty?
         case string
-        when /^\\\#\{/
+        when /^\\#\{/
           # Escaped interpolation
           block << [:static, '#{']
           string = $'
-        when /^\#\{/
+        when /^#\{/
           # Interpolation
           string, code = parse_expression($')
-          block << [:slim, :output, true, code, [:multi]]
-        when /^([^\#]+|\#)/
+          escape = code !~ Parser::DELIMITER_REGEX || Parser::DELIMITERS[$&] != code[-1, 1]
+          block << [:slim, :output, escape, escape ? code : code[1..-2], [:multi]]
+        when /^([^#]+|#)/
           # Static text
           block << [:static, $&]
           string = $'
@@ -40,12 +41,12 @@ module Slim
           break
         elsif string =~ Parser::DELIMITER_REGEX
           # Delimiter found, push it on the stack
-          stack << Parser::DELIMITERS[$1]
+          stack << Parser::DELIMITERS[$&]
           code << string.slice!(0)
         elsif string =~ Parser::CLOSE_DELIMITER_REGEX
           # Closing delimiter found, pop it from the stack if everything is ok
-          raise "Text interpolation: Unexpected closing #{$1}" if stack.empty?
-          raise "Text interpolation: Expected closing #{stack.last}" if stack.last != $1
+          raise "Text interpolation: Unexpected closing #{$&}" if stack.empty?
+          raise "Text interpolation: Expected closing #{stack.last}" if stack.last != $&
           code << string.slice!(0)
           stack.pop
         else

data/lib/slim/parser.rb

@@ -236,12 +236,12 @@ module Slim
       '[' => ']',
       '{' => '}',
     }.freeze
-    DELIMITER_REGEX = /^([\(\[\{])/
-    CLOSE_DELIMITER_REGEX = /^([\)\]\}])/
+    DELIMITER_REGEX = /^[\(\[\{]/
+    CLOSE_DELIMITER_REGEX = /^[\)\]\}]/
 
     private
 
-    ATTR_REGEX = /^ (\w[:\w-]*)=/
+    ATTR_REGEX = /^\s+(\w[:\w-]*)=/
     QUOTED_VALUE_REGEX = /^("[^"]+"|'[^']+')/
     ATTR_SHORTHAND = {
       '#' => 'id',
@@ -258,7 +258,7 @@ module Slim
       orig_line = line
 
       case line
-      when /^(#|\.)/
+      when /^[#\.]/
         tag = 'div'
       when /^\w[:\w-]*/
         tag = $&
@@ -281,7 +281,7 @@ module Slim
       # Check to see if there is a delimiter right after the tag name
       delimiter = ''
       if line =~ DELIMITER_REGEX
-        delimiter = DELIMITERS[$1]
+        delimiter = DELIMITERS[$&]
         # Replace the delimiter with a space so we can continue parsing as normal.
         line[0] = ?\s
       end
@@ -303,8 +303,8 @@ module Slim
 
       # Find ending delimiter
       if !delimiter.empty?
-        if line[0, 1] == delimiter
-          line.slice!(0)
+        if line =~ /^\s*#{Regexp.escape delimiter}/
+          line = $'
         else
           syntax_error! "Expected closing delimiter #{delimiter}", orig_line, lineno, orig_line.size - line.size
         end
@@ -350,12 +350,12 @@ module Slim
           break
         elsif line =~ DELIMITER_REGEX
           # Delimiter found, push it on the stack
-          stack << DELIMITERS[$1]
+          stack << DELIMITERS[$&]
           value << line.slice!(0)
         elsif line =~ CLOSE_DELIMITER_REGEX
           # Closing delimiter found, pop it from the stack if everything is ok
-          syntax_error! "Unexpected closing #{$1}", orig_line, lineno if stack.empty?
-          syntax_error! "Expected closing #{stack.last}", orig_line, lineno if stack.last != $1
+          syntax_error! "Unexpected closing #{$&}", orig_line, lineno if stack.empty?
+          syntax_error! "Expected closing #{stack.last}", orig_line, lineno if stack.last != $&
           value << line.slice!(0)
           stack.pop
         else
@@ -368,7 +368,7 @@ module Slim
 
       # Remove attribute wrapper which doesn't belong to the ruby code
       # e.g id=[hash[:a] + hash[:b]]
-      value = value[1..-2] if value =~ DELIMITER_REGEX && DELIMITERS[value[0, 1]] == value[-1, 1]
+      value = value[1..-2] if value =~ DELIMITER_REGEX && DELIMITERS[$&] == value[-1, 1]
 
       return line, value
     end

data/lib/slim/rails.rb

@@ -5,7 +5,9 @@ Slim::Engine.default_options[:disable_capture] = true
 
 module ActionView
   module TemplateHandlers
-    raise "Slim supports only Rails 3.x and greater, your Rails version is #{Rails::VERSION::STRING}" if Rails::VERSION::MAJOR < 3
+    if Rails::VERSION::MAJOR < 3
+      raise "Slim supports only Rails 3.x and greater, your Rails version is #{Rails::VERSION::STRING}"
+    end
 
     if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR < 1
       # Slim handler for Rails 3.0
@@ -26,5 +28,5 @@ module ActionView
     end
   end
 
-  Template.register_default_template_handler :slim, TemplateHandlers::SlimHandler
+  Template.register_template_handler :slim, TemplateHandlers::SlimHandler
 end

data/lib/slim/version.rb

@@ -1,3 +1,3 @@
 module Slim
-  VERSION = '0.8.4'
+  VERSION = '0.9.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 4
-  version: 0.8.4
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency