slim 0.7.0 → 0.7.1

data/lib/slim/end_inserter.rb

@@ -10,7 +10,7 @@ module Slim
   #
   # @api private
   class EndInserter < Filter
-    ELSE_REGEX = /^(else|elsif|when|end)\b/
+    ELSE_REGEX = /^else|elsif|when\b/
     END_REGEX = /^end\b/
 
     # Handle multi expression `[:multi, *exps]`
@@ -22,15 +22,14 @@ module Slim
 
       exps.each do |exp|
         if control?(exp)
-          if prev_indent
-            # Two control code in a row. If this one is *not*
-            # an else block, we should close the previous one.
-            append_end(result) if exp[2] !~ ELSE_REGEX
-            prev_indent = exp[2].match(END_REGEX).nil?
-          else
-            # Indent if the control code contains something.
-            prev_indent = !empty_exp?(exp[3])
-          end
+          raise 'Explicit end statements are forbidden' if exp[2] =~ END_REGEX
+
+          # Two control code in a row. If this one is *not*
+          # an else block, we should close the previous one.
+          append_end(result) if prev_indent && exp[2] !~ ELSE_REGEX
+
+          # Indent if the control code contains something.
+          prev_indent = !empty_exp?(exp[3])
         elsif exp[0] != :newline && prev_indent
           # This is *not* a control code, so we should close the previous one.
           # Ignores newlines because they will be inserted after each line.
@@ -38,7 +37,7 @@ module Slim
           prev_indent = false
         end
 
-        result << compile(exp)
+        result << compile!(exp)
       end
 
       # The last line can be a control code too.

data/lib/slim/engine.rb

@@ -3,11 +3,16 @@ module Slim
   # @api public
   class Engine < Temple::Engine
     use Slim::Parser, :file
+    filter :Debugger, :debug, :prefix => 'before end insertion'
     use Slim::EndInserter
+    filter :Debugger, :debug, :prefix => 'after end insertion'
     use Slim::EmbeddedEngine
-    use Slim::Compiler, :use_html_safe
-    #use Slim::Debugger
-    use Temple::HTML::Fast, :format, :attr_wrapper => '"', :format => :html5
+    use Slim::Compiler
+    filter :Debugger, :debug, :prefix => 'after compilation'
+    filter :EscapeHTML, :use_html_safe
+    use Temple::HTML::Pretty, :format, :attr_wrapper, :id_delimiter, :id_concat, :pretty,
+                              :pretty => false, :attr_wrapper => '"', :format => :html5, :id_delimiter => nil
+    filter :Debugger, :debug, :prefix => 'after html'
     filter :MultiFlattener
     filter :StaticMerger
     filter :DynamicInliner

data/lib/slim/filter.rb

@@ -1,48 +1,19 @@
 module Slim
   # Base class for Temple filters used in Slim
   # @api private
-  class Filter
-    include Temple::Utils
+  class Filter < Temple::Filter
+    temple_dispatch :slim
 
-    DEFAULT_OPTIONS = {}
-
-    def initialize(options = {})
-      @options = DEFAULT_OPTIONS.merge(options)
-    end
-
-    def compile(exp)
-      if exp[0] == :slim
-        _, type, *args = exp
-      else
-        type, *args = exp
-      end
-
-      if respond_to?("on_#{type}")
-        send("on_#{type}", *args)
-      else
-        exp
-      end
-    end
-
-    def on_control(code, content)
-      [:slim, :control, code, compile(content)]
+    def on_slim_control(code, content)
+      [:slim, :control, code, compile!(content)]
     end
 
-    def on_tag(name, attrs, content)
-      [:slim, :tag, name, attrs, compile(content)]
+    def on_slim_output(code, escape, content)
+      [:slim, :output, code, escape, compile!(content)]
     end
 
-    def on_multi(*exps)
-      [:multi, *exps.map { |exp| compile(exp) }]
-    end
-  end
-
-  # Simple filter which prints Temple expression
-  # @api private
-  class Debugger < Filter
-    def compile(exp)
-      puts exp.inspect
-      exp
+    def on_slim_tag(name, attrs, closed, content)
+      [:slim, :tag, name, attrs, closed, compile!(content)]
     end
   end
 end

data/lib/slim/parser.rb

@@ -2,6 +2,8 @@ module Slim
   # Parses Slim code and transforms it to a Temple expression
   # @api private
   class Parser
+    include Temple::Mixins::Options
+
     class SyntaxError < StandardError
       attr_reader :error, :file, :line, :lineno, :column
 
@@ -22,11 +24,11 @@ module Slim
       end
     end
 
-    attr_reader :options
+    default_options[:tabsize] = 4
 
     def initialize(options = {})
-      @options = options
-      @tab     = ' ' * (options[:tabsize] || 4)
+      super
+      @tab = ' ' * @options[:tabsize]
     end
 
     # Compile string to Temple expression
@@ -72,8 +74,8 @@ module Slim
       str.each_line do |line|
         lineno += 1
 
-        # Remove the newline at the ned
-        line.chop!
+        # Remove the newline at the end
+        line.chomp!
 
         # Handle broken lines
         if broken_line
@@ -177,24 +179,20 @@ module Slim
             block << [:slim, :text, line.sub(/^( )/, '')]
             text_indent = block_indent + ($1 ? 2 : 1)
           end
-        when ?-, ?=
-          # Found a potential code block.
-
-          # First of all we need to push a exp into the stack. Anything
-          # indented deeper will be pushed into this exp. We'll include the
-          # same exp in the current-stack, which makes sure that it'll be
-          # included in the generated code.
+        when ?-
+          # Found a code block.
+          # We expect the line to be broken or the next line to be indented.
           block = [:multi]
-          if line[1] == ?=
-            broken_line = line[2..-1].strip
-            stacks.last << [:slim, :output, false, broken_line, block]
-          elsif line[0] == ?=
-            broken_line = line[1..-1].strip
-            stacks.last << [:slim, :output, true, broken_line, block]
-          else
-            broken_line = line[1..-1].strip
-            stacks.last << [:slim, :control, broken_line, block]
-          end
+          broken_line = line[1..-1].strip
+          stacks.last << [:slim, :control, broken_line, block]
+          stacks << block
+        when ?=
+          # Found a output bloc
+          # We expect the line to be broken or the next line to be indented.
+          block = [:multi]
+          escape = line[1] != ?=
+          broken_line = escape ? line[1..-1].strip : line[2..-1].strip
+          stacks.last << [:slim, :output, escape, broken_line, block]
           stacks << block
         when ?!
           # Found a directive (currently only used for doctypes)
@@ -297,12 +295,12 @@ module Slim
         if line[0, 1] == delimiter
           line.slice!(0)
         else
-          syntax_error! "Expected closing attribute delimiter #{delimiter}", orig_line, lineno, orig_line.size - line.size
+          syntax_error! "Expected closing delimiter #{delimiter}", orig_line, lineno, orig_line.size - line.size
         end
       end
 
       content = [:multi]
-      tag = [:slim, :tag, tag, attributes, content]
+      tag = [:slim, :tag, tag, attributes, false, content]
 
       if line =~ /^\s*=(=?)/
         # Handle output code
@@ -310,6 +308,10 @@ module Slim
         broken_line = $'.strip
         content << [:slim, :output, $1 != '=', broken_line, block]
         [tag, block, broken_line, nil]
+      elsif line =~ /^\s*\//
+        # Closed tag
+        tag[4] = true
+        [tag, block, nil, nil]
       elsif !line.empty?
         # Handle text content
         content << [:slim, :text, line.sub(/^( )/, '')]
@@ -362,7 +364,7 @@ module Slim
 
     # A little helper for raising exceptions.
     def syntax_error!(message, *args)
-      raise SyntaxError.new(message, @options[:file], *args)
+      raise SyntaxError.new(message, options[:file], *args)
     end
   end
 end

data/lib/slim/template.rb

@@ -1,37 +1,8 @@
 module Slim
   # Tilt template implementation for Slim
   # @api public
-  class Template < Tilt::Template
-    # Prepare Slim template
-    #
-    # Called immediately after template data is loaded.
-    #
-    # @return [void]
-    def prepare
-      @src = Engine.new(options.merge(:file => eval_file)).compile(data)
-    end
-
-    # Process the template and return the result.
-    #
-    # Template executationis guaranteed to be performed in the scope object with the locals
-    # specified and with support for yielding to the block.
-    #
-    # @param [Object] scope Scope object where the code is evaluated
-    # @param [Hash]   locals Local variables
-    # @yield Block given to the template code
-    # @return [String] Evaluated template
-    def evaluate(scope, locals, &block)
-      scope.instance_eval { extend Slim::Helpers } if options[:helpers]
-      super
-    end
-
-    # A string containing the (Ruby) source code for the template.
-    #
-    # @param [Hash]   locals Local variables
-    # @return [String] Compiled template ruby code
-    def precompiled_template(locals)
-      @src
-    end
+  class Template < Temple::Template
+    engine Slim::Engine
   end
 
   Tilt.register 'slim', Template

data/lib/slim/version.rb

@@ -1,3 +1,3 @@
 module Slim
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/slim.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<escape_utils>, [">= 0.1.9"]) unless RUBY_PLATFORM == "java"
-  s.add_runtime_dependency(%q<temple>, ["~> 0.1.3"])
+  s.add_runtime_dependency(%q<temple>, ["~> 0.1.4"])
   s.add_runtime_dependency(%q<tilt>, ["~> 1.1"])
   s.add_development_dependency(%q<rake>, [">= 0.8.7"])
   s.add_development_dependency(%q<haml>, [">= 0"])

data/test/helper.rb

@@ -2,36 +2,40 @@
 
 require 'rubygems'
 require 'minitest/unit'
+require 'slim'
 
 MiniTest::Unit.autorun
 
-require File.dirname(__FILE__) + '/../lib/slim'
-
 class TestSlim < MiniTest::Unit::TestCase
   def setup
     @env = Env.new
+    # Slim::Filter::DEFAULT_OPTIONS[:debug] = true
   end
 
   def teardown
     String.send(:undef_method, :html_safe?) if String.method_defined?(:html_safe?)
     String.send(:undef_method, :html_safe)  if String.method_defined?(:html_safe)
     Object.send(:undef_method, :html_safe?) if Object.method_defined?(:html_safe?)
-    Slim::Filter::DEFAULT_OPTIONS.delete(:use_html_safe)
+    Temple::Filters::EscapeHTML.default_options.delete(:use_html_safe)
+  end
+
+  def render(source, options = {}, &block)
+    Slim::Template.new(options[:file], options) { source }.render(@env, &block)
   end
 
-  def assert_html(expected, source, options = {})
-    assert_equal expected, Slim::Template.new(options[:file], options) { source }.render(@env)
+  def assert_html(expected, source, options = {}, &block)
+    assert_equal expected, render(source, options, &block)
   end
 
   def assert_syntax_error(message, source, options = {})
-    Slim::Template.new(options[:file], options) { source }.render(@env)
+    render(source, options)
     raise 'Syntax error expected'
   rescue Slim::Parser::SyntaxError => ex
     assert_equal message, ex.message
   end
 
   def assert_ruby_error(error, from, source, options = {})
-    Slim::Template.new(options[:file], options) { source }.render(@env)
+    render(source, options)
     raise 'Ruby error expected'
   rescue error => ex
     ex.backtrace[0] =~ /^(.*?:\d+):/
@@ -39,15 +43,28 @@ class TestSlim < MiniTest::Unit::TestCase
   end
 
   def assert_ruby_syntax_error(from, source, options = {})
-    Slim::Template.new(options[:file], options) { source }.render(@env)
+    render(source, options)
     raise 'Ruby syntax error expected'
   rescue SyntaxError => ex
     ex.message =~ /^(.*?:\d+):/
     assert_equal from, $1
   end
+
+  def assert_runtime_error(message, source, options = {})
+    render(source, options)
+    raise Exception, 'Runtime error expected'
+  rescue RuntimeError => ex
+    assert_equal message, ex.message
+  end
 end
 
 class Env
+  attr_reader :var
+
+  def initialize
+    @var = 'instance'
+  end
+
   def id_helper
     "notice"
   end
@@ -60,6 +77,16 @@ class Env
     show
   end
 
+  def define_macro(name, &block)
+    @macro ||= {}
+    @macro[name.to_s] = block
+    ''
+  end
+
+  def call_macro(name, *args)
+    @macro[name.to_s].call(*args)
+  end
+
   def hello_world(text = "Hello World from @env", opts = {})
     text << opts.to_a * " " if opts.any?
     if block_given?

data/test/slim/test_code_blocks.rb

@@ -15,12 +15,37 @@ p
     source = %q{
 p
   = hello_world "Hello Ruby!" do
-    = hello_world "Hello from within a block! "
+    = hello_world "Hello from within a block!"
 }
 
-    assert_html '<p>Hello Ruby! Hello from within a block!  Hello Ruby!</p>', source
+    assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
   end
 
+  def test_render_with_output_code_within_block_2
+    source = %q{
+p
+  = hello_world "Hello Ruby!" do
+    = hello_world "Hello from within a block!" do
+      = hello_world "And another one!"
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block! And another one! Hello from within a block! Hello Ruby!</p>', source
+  end
+
+  def test_output_block_with_arguments
+    source = %q{
+p
+  = define_macro :person do |first_name, last_name|
+    .first_name = first_name
+    .last_name = last_name
+  == call_macro :person, 'John', 'Doe'
+  == call_macro :person, 'Max', 'Mustermann'
+}
+
+    assert_html '<p><div class="first_name">John</div><div class="last_name">Doe</div><div class="first_name">Max</div><div class="last_name">Mustermann</div></p>', source
+  end
+
+
   def test_render_with_control_code_loop
     source = %q{
 p
@@ -30,4 +55,14 @@ p
 
     assert_html '<p>Hey!Hey!Hey!</p>', source
   end
+
+  def test_captured_code_block_with_conditional
+    source = %q{
+= hello_world "Hello Ruby!" do
+  - if true
+    | Hello from within a block!
+}
+
+    assert_html 'Hello Ruby! Hello from within a block! Hello Ruby!', source
+  end
 end

data/test/slim/test_code_escaping.rb

@@ -47,7 +47,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 
   def test_render_with_global_html_safe_false
     String.send(:define_method, :html_safe?) { false }
-    Slim::Filter::DEFAULT_OPTIONS[:use_html_safe] = false
+    Temple::Filters::EscapeHTML.default_options[:use_html_safe] = false
 
     source = %q{
 p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
@@ -58,7 +58,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 
   def test_render_with_global_html_safe_true
     String.send(:define_method, :html_safe?) { true }
-    Slim::Filter::DEFAULT_OPTIONS[:use_html_safe] = true
+    Temple::Filters::EscapeHTML.default_options[:use_html_safe] = true
 
     source = %q{
 p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."