slim 0.9.2 → 0.9.3

data/lib/slim/filter.rb

@@ -6,28 +6,25 @@ module Slim
   # of the expression.
   #
   # @api private
-  class Filter < Temple::Filter
-    # Dispatch on_slim_*
-    temple_dispatch :slim
+  class Filter < Temple::HTML::Filter
+    # Pass-through handler
+    def on_slim_embedded(type, content)
+      [:slim, :embedded, code, compile(content)]
+    end
 
+    # Pass-through handler
     def on_slim_control(code, content)
       [:slim, :control, code, compile(content)]
     end
 
-    def on_slim_comment(content)
-      [:slim, :comment, compile(content)]
+    # Pass-through handler
+    def on_slim_condcomment(condition, content)
+      [:slim, :condcomment, condition, compile(content)]
     end
 
+    # Pass-through handler
     def on_slim_output(code, escape, content)
       [:slim, :output, code, escape, compile(content)]
     end
-
-    def on_slim_tag(name, attrs, closed, content)
-      [:slim, :tag, name, compile(attrs), closed, compile(content)]
-    end
-
-    def on_slim_attrs(*attrs)
-      [:slim, :attrs, *attrs.map {|k, v| [k, compile(v)] }]
-    end
   end
 end

data/lib/slim/grammar.rb

@@ -0,0 +1,19 @@
+module Slim
+  # Slim expression grammar
+  # @api private
+  module Grammar
+    extend Temple::Grammar
+
+    Expression <<
+      [:slim, :control, String, Expression]       |
+      [:slim, :condcomment, String, Expression]   |
+      [:slim, :output, Bool, String, Expression]  |
+      [:slim, :interpolate, String]               |
+      [:slim, :embedded, String, Expression]      |
+      [:slim, :directive, Value('doctype'), String]
+
+    HTMLAttr <<
+      [:slim, :attr, String, Bool, String]
+
+  end
+end

data/lib/slim/interpolation.rb

@@ -1,14 +1,14 @@
 module Slim
   # Perform interpolation of #{var_name} in the
-  # expressions `[:slim, :text, string]`.
+  # expressions `[:slim, :interpolate, string]`.
   #
   # @api private
   class Interpolation < Filter
-    # Handle text expression `[:slim, :text, string]`
+    # Handle interpolate expression `[:slim, :interpolate, string]`
     #
-    # @param [String] string Static text
+    # @param [String] string Static interpolate
     # @return [Array] Compiled temple expression
-    def on_slim_text(string)
+    def on_slim_interpolate(string)
       # Interpolate variables in text (#{variable}).
       # Split the text into multiple dynamic and static parts.
       block = [:multi]
@@ -22,7 +22,7 @@ module Slim
           # Interpolation
           string, code = parse_expression($')
           escape = code !~ /^\{.*\}$/
-          block << [:slim, :output, escape, escape ? code : code[1..-2], [:multi]]
+          block << [:escape, escape, [:dynamic, escape ? code : code[1..-2]]]
         when /^([^#]+|#)/
           # Static text
           block << [:static, $&]
@@ -32,6 +32,8 @@ module Slim
       block
     end
 
+    protected
+
     def parse_expression(string)
       stack, code = [], ''
 

data/lib/slim/parser.rb

@@ -37,7 +37,14 @@ module Slim
     # @param [String] str Slim code
     # @return [Array] Temple expression representing the code
     def call(str)
-      str.force_encoding(options[:encoding]) if options[:encoding] && str.respond_to?(:force_encoding)
+      # Set string encoding if option is set
+      if options[:encoding] && str.respond_to?(:encoding)
+        old = str.encoding
+        str = str.dup if str.frozen?
+        str.force_encoding(options[:encoding])
+        # Fall back to old encoding if new encoding is invalid
+        str.force_encoding(old_enc) unless str.valid_encoding?
+      end
 
       lineno = 0
       result = [:multi]
@@ -110,7 +117,7 @@ module Slim
             # This line happens to be indented deeper (or equal) than the block start character (|, ', /).
             # This means that it's a part of the block.
 
-            if !in_comment
+            unless in_comment
               # The indentation of first line of the text block determines the text base indentation.
               newline = text_indent ? "\n" : ''
               text_indent ||= indent
@@ -120,7 +127,7 @@ module Slim
               syntax_error! 'Unexpected text indentation', line, lineno if offset < 0
 
               # Generate the additional spaces in front.
-              stacks.last << [:slim, :text, newline + (' ' * offset) + line]
+              stacks.last << [:slim, :interpolate, newline + (' ' * offset) + line]
             end
 
             stacks.last << [:newline]
@@ -166,29 +173,36 @@ module Slim
         end
 
         case line[0]
-        when ?|, ?', ?/
-          # Found a block.
-          ch = line.slice!(0)
-
-          # We're now expecting the next line to be indented, so we'll need
-          # to push a block to the stack.
+        when ?/
+          # Found a comment block.
           block = [:multi]
-          stacks.last << if ch == ?'
-                           # Additional whitespace in front
-                           [:multi, block, [:slim, :text, ' ']]
-                         elsif ch == ?/ && line[0] == ?!
+          stacks.last << if line =~ %r{^/!( ?)(.*)$}
                            # HTML comment
-                           line.slice!(0)
-                           [:slim, :comment, block]
+                           block_indent = indent
+                           text_indent = block_indent + ($1 ? 2 : 1)
+                           block << [:slim, :interpolate, $2] if $2
+                           [:html, :comment, block]
+                         elsif line =~ %r{^/\[\s*(.*?)\s*\]\s*$}
+                           # HTML conditional comment
+                           [:slim, :condcomment, $1, block]
                          else
-                           in_comment = ch == ?/
+                           # Slim comment
+                           block_indent = indent
+                           in_comment = true
                            block
                          end
           stacks << block
+        when ?|, ?'
+          # Found a text block.
+          # We're now expecting the next line to be indented, so we'll need
+          # to push a block to the stack.
+          block = [:multi]
           block_indent = indent
-
-          if !in_comment && !line.strip.empty?
-            block << [:slim, :text, line.sub(/^( )/, '')]
+          stacks.last << (line.slice!(0) == ?' ?
+                          [:multi, block, [:static, ' ']] : block)
+          stacks << block
+          unless line.strip.empty?
+            block << [:slim, :interpolate, line.sub(/^( )/, '')]
             text_indent = block_indent + ($1 ? 2 : 1)
           end
         when ?-
@@ -213,8 +227,8 @@ module Slim
         else
           if line =~ /^(\w+):\s*$/
             # Embedded template detected. It is treated as block.
-            block = [:slim, :embedded, $1]
-            stacks.last << [:newline] << block
+            block = [:multi]
+            stacks.last << [:newline] << [:slim, :embedded, $1, block]
             stacks << block
             block_indent = indent
             next
@@ -276,13 +290,13 @@ module Slim
       # Now we'll have to find all the attributes. We'll store these in an
       # nested array: [[name, value], [name2, value2]]. The value is a piece
       # of Ruby code.
-      attributes = [:slim, :attrs]
+      attributes = [:html, :attrs]
 
       # Find any literal class/id attributes
       while line =~ CLASS_ID_REGEX
         # The class/id attribute is :static instead of :slim :text,
         # because we don't want text interpolation in .class or #id shortcut
-        attributes << [ATTR_SHORTHAND[$1], [:static, $2]]
+        attributes << [:html, :attr, ATTR_SHORTHAND[$1], [:static, $2]]
         line = $'
       end
 
@@ -296,21 +310,22 @@ module Slim
 
       # Parse attributes
       while line =~ ATTR_REGEX
-        key = $1
+        name = $1
         line = $'
         if line =~ QUOTED_VALUE_REGEX
           # Value is quoted (static)
           line = $'
-          attributes << [key, [:slim, :text, $1[1..-2]]]
+          attributes << [:html, :attr, name, [:slim, :interpolate, $1[1..-2]]]
         else
           # Value is ruby code
-          line, value = parse_ruby_attribute(orig_line, line, lineno, delimiter)
-          attributes << [key, [:slim, :output, true, value, [:multi]]]
+          escape = line[0] != ?=
+          line, code = parse_ruby_attribute(orig_line, escape ? line : line[1..-1], lineno, delimiter)
+          attributes << [:slim, :attr, name, escape, code]
         end
       end
 
       # Find ending delimiter
-      if !delimiter.empty?
+      unless delimiter.empty?
         if line =~ /^\s*#{Regexp.escape delimiter}/
           line = $'
         else
@@ -319,7 +334,7 @@ module Slim
       end
 
       content = [:multi]
-      tag = [:slim, :tag, tag, attributes, false, content]
+      tag = [:html, :tag, tag, attributes, content]
 
       if line =~ /^\s*=(=?)/
         # Handle output code
@@ -329,14 +344,14 @@ module Slim
         [tag, block, broken_line, nil]
       elsif line =~ /^\s*\//
         # Closed tag
-        tag[4] = true
+        tag.pop
         [tag, block, nil, nil]
       elsif line =~ /^\s*$/
         # Empty line
         [tag, content, nil, nil]
       else
         # Handle text content
-        content << [:slim, :text, line.sub(/^( )/, '')]
+        content << [:slim, :interpolate, line.sub(/^( )/, '')]
         [tag, content, nil, orig_line.size - line.size + ($1 ? 1 : 0)]
       end
     end
@@ -371,7 +386,7 @@ module Slim
         end
       end
 
-      syntax_error! "Expected closing attribute delimiter #{stack.last}", orig_line, lineno if !stack.empty?
+      syntax_error! "Expected closing attribute delimiter #{stack.last}", orig_line, lineno unless stack.empty?
       syntax_error! 'Invalid empty attribute', orig_line, lineno if value.empty?
 
       # Remove attribute wrapper which doesn't belong to the ruby code
@@ -381,7 +396,7 @@ module Slim
       return line, value
     end
 
-    # A little helper for raising exceptions.
+    # Helper for raising exceptions
     def syntax_error!(message, *args)
       raise SyntaxError.new(message, options[:file], *args)
     end

data/lib/slim/sections.rb

@@ -20,7 +20,7 @@ module Slim
         dictionary = options[:dictionary]
         dictionary = "Slim::Wrapper.new(#{dictionary})" if options[:dictionary_access] == :wrapped
         [:multi,
-         [:block, "_slimdict = #{dictionary}"],
+         [:code, "_slimdict = #{dictionary}"],
          super]
       else
         exp
@@ -36,38 +36,34 @@ module Slim
       end
     end
 
+    def on_slim_output(escape, name, content)
+      raise 'Output statements with content are forbidden in sections mode' if !empty_exp?(content)
+      [:slim, :output, escape, access(name), content]
+    end
+
+    protected
+
     def on_slim_inverted_section(name, content)
-      tmp = tmp_var(:section)
+      tmp = unique_name
       [:multi,
-       [:block, "#{tmp} = #{access name}"],
-       [:block, "if !#{tmp} || #{tmp}.respond_to?(:empty) && #{tmp}.empty?"],
-                  compile(content),
-       [:block, 'end']]
+       [:code, "#{tmp} = #{access name}"],
+       [:if, "!#{tmp} || #{tmp}.respond_to?(:empty) && #{tmp}.empty?",
+        compile(content)]]
     end
 
     def on_slim_section(name, content)
       content = compile(content)
-      tmp1, tmp2 = tmp_var(:dict), tmp_var(:dict)
+      tmp1, tmp2 = unique_name, unique_name
 
-      [:multi,
-       [:block, "if #{tmp1} = #{access name}"],
-       [:block,   "if #{tmp1} == true"],
-                     content,
-       [:block,   'else'],
-                    # Wrap map in array because maps implement each
-       [:block,     "#{tmp1} = [#{tmp1}] if #{tmp1}.respond_to?(:has_key?) || !#{tmp1}.respond_to?(:map)"],
-       [:block,     "#{tmp2} = _slimdict"],
-       [:block,     "#{tmp1}.each do |_slimdict|"],
-                      content,
-       [:block,     'end'],
-       [:block,     "_slimdict = #{tmp2}"],
-       [:block,   'end'],
-       [:block, 'end']]
-    end
-
-    def on_slim_output(escape, name, content)
-      raise 'Output statements with content are forbidden in sections mode' if !empty_exp?(content)
-      [:slim, :output, escape, access(name), content]
+      [:if, "#{tmp1} = #{access name}",
+       [:if, "#{tmp1} == true",
+        content,
+        [:multi,
+         # Wrap map in array because maps implement each
+         [:code, "#{tmp1} = [#{tmp1}] if #{tmp1}.respond_to?(:has_key?) || !#{tmp1}.respond_to?(:map)"],
+         [:code, "#{tmp2} = _slimdict"],
+         [:block, "#{tmp1}.each do |_slimdict|", content],
+         [:code, "_slimdict = #{tmp2}"]]]]
     end
 
     private

data/lib/slim/template.rb

@@ -6,12 +6,12 @@ module Slim
   if Object.const_defined?(:Rails)
     # Rails template implementation for Slim
     # @api public
-    RailsTemplate = Temple::Templates::Rails(Slim::Engine, :register_as => :slim)
-
-    # Use rails-specific generator. This is necessary
-    # to support block capturing. Disable the internal slim capturing.
-    # Rails takes care of the capturing by itself.
-    RailsTemplate.set_default_options :generator => Temple::Generators::RailsOutputBuffer,
-                                      :disable_capture => true
+    RailsTemplate = Temple::Templates::Rails(Slim::Engine,
+                                             :register_as => :slim,
+                                             # Use rails-specific generator. This is necessary
+                                             # to support block capturing. Disable the internal slim capturing.
+                                             # Rails takes care of the capturing by itself.
+                                             :generator => Temple::Generators::RailsOutputBuffer,
+                                             :disable_capture => true)
   end
 end

data/lib/slim/version.rb

@@ -1,3 +1,5 @@
 module Slim
-  VERSION = '0.9.2'
+  # Slim version string
+  # @api public
+  VERSION = '0.9.3'
 end

data/lib/slim/wrapper.rb

@@ -1,5 +1,6 @@
 module Slim
   # For logic-less mode, objects can be encased in the Wrapper class.
+  # @api private
   class Wrapper
     attr_reader :value, :parent
 

data/slim.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+require File.dirname(__FILE__) + '/lib/slim/version'
+require 'date'
+
+Gem::Specification.new do |s|
+  s.name              = 'slim'
+  s.version           = Slim::VERSION
+  s.date              = Date.today.to_s
+  s.authors           = ['Andrew Stone', 'Fred Wu', 'Daniel Mendler']
+  s.email             = ['andy@stonean.com', 'ifredwu@gmail.com', 'mail@daniel-mendler.de']
+  s.summary           = 'Slim is a template language.'
+  s.description       = 'Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.'
+  s.homepage          = 'http://github.com/stonean/slim'
+  s.extra_rdoc_files  = %w(README.md)
+  s.rdoc_options      = %w(--charset=UTF-8)
+  s.rubyforge_project = s.name
+
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = %w(lib)
+
+  s.add_runtime_dependency('temple', ['~> 0.3.0']) unless ENV['SLIM_USE_TEMPLE']
+  s.add_runtime_dependency('tilt', ['~> 1.2'])
+
+  s.add_development_dependency('rake', ['>= 0.8.7'])
+  s.add_development_dependency('haml', ['>= 3.1.0'])
+  s.add_development_dependency('sass', ['>= 3.1.0'])
+  s.add_development_dependency('minitest', ['>= 0'])
+  s.add_development_dependency('rcov', ['>= 0'])
+  s.add_development_dependency('rdiscount', ['>= 0'])
+  s.add_development_dependency('liquid', ['>= 0'])
+  s.add_development_dependency('yard', ['>= 0'])
+  s.add_development_dependency('creole', ['>= 0'])
+end

data/test/helper.rb

@@ -3,13 +3,17 @@
 require 'rubygems'
 require 'minitest/unit'
 require 'slim'
+require 'slim/grammar'
 
 MiniTest::Unit.autorun
 
+Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
+Slim::Engine.before Slim::Compiler, Temple::Filters::Validator, :grammar => Slim::Grammar
+Slim::Engine.before Temple::HTML::Pretty, Temple::Filters::Validator
+
 class TestSlim < MiniTest::Unit::TestCase
   def setup
     @env = Env.new
-    # Slim::Engine.set_default_options :debug => true
   end
 
   def teardown

data/test/slim/test_code_escaping.rb

@@ -33,7 +33,7 @@ p = HtmlSafeString.new("<strong>Hello World\\n, meet \\"Slim\\"</strong>.")
     assert_html "<p><strong>Hello World\n, meet \"Slim\"</strong>.</p>", source, :use_html_safe => true
   end
 
-  def test_render_with_auto_escape_true
+  def test_render_with_disable_escape_false
     source = %q{
 = "<p>Hello</p>"
 == "<p>World</p>"
@@ -42,12 +42,12 @@ p = HtmlSafeString.new("<strong>Hello World\\n, meet \\"Slim\\"</strong>.")
     assert_html "&lt;p&gt;Hello&lt;&#47;p&gt;<p>World</p>", source
   end
 
-  def test_render_with_auto_escape_false
+  def test_render_with_disable_escape_true
     source = %q{
 = "<p>Hello</p>"
 == "<p>World</p>"
 }
 
-    assert_html "<p>Hello</p><p>World</p>", source, :auto_escape => false
+    assert_html "<p>Hello</p><p>World</p>", source, :disable_escape => true
   end
 end