slim 0.4.1 → 0.5.0

data/README.md

@@ -53,12 +53,12 @@ So here's what I came up with:
           p No items found
 
         div id="footer"
-          ` Copyright © 2010 Andrew Stone
+          | Copyright © 2010 Andrew Stone
 
         = render partial: 'tracking_code' 
 
         script
-          ` $(content).do_something();
+          | $(content).do_something();
 
 
 ### How do I?
@@ -70,11 +70,11 @@ So here's what I came up with:
       body
         h1 id="headline" Welcome to my site.
 
-      # Or nest it.  __Note:__ Must use backtick (with following space) to escape processing
+      # Or nest it.  __Note:__ Must use a pipe or a backtick (followed by a space) to escape processing
 
       body
         h1 id="headline" 
-          ` Welcome to my site.
+          | Welcome to my site.
 
 #### Add content to a tag with code
 
@@ -86,8 +86,32 @@ So here's what I came up with:
       # Or nest it.  
 
       body
-        h1 id="headline" 
+        h1 id="headline"
+          = page_headline
+
+#### Shortcut form for `id` and `class` attributes
+
+      # Similarly to Haml, you can specify the `id` and `class`
+      # attributes in the following shortcut form
+      # Note: the shortcut form does not evaluate ruby code
+
+      body
+        h1#headline
           = page_headline
+        h2#tagline.small.tagline
+          = page_tagline
+        .content
+          = show_content
+
+      # this is the same as
+
+      body
+        h1 id="headline"
+          = page_headline
+        h2 id="tagline" class="small tagline"
+          = page_tagline
+        div class="content"
+          = show_content
 
 #### Set an attribute's value with a method?
 
@@ -106,7 +130,7 @@ So here's what I came up with:
 
       body
         p
-          '
+          |
            This is a test of the text block.
         
       # The parsed result of the above:
@@ -118,7 +142,7 @@ So here's what I came up with:
 
       body
         p
-          '
+          |
            This line is on the left margin.
             This line will have one space in front of it.
              This line will have two spaces in front of it.
@@ -128,9 +152,8 @@ So here's what I came up with:
 
 * Standard Ruby syntax after '-' and '='
   * __end__ is not required
-  * If you're making a method call, wrap the arguments in parenthesis (__TODO:__ make this a non requirement)
 * Can put content on same line or nest it.
-  * If you nest content (e.g. put it on the next line), start the line with a backtick ('`') or a pipe ('|')
+  * If you nest content (e.g. put it on the next line), start the line with a pipe ('|') a backtick ('`').
 * Indentation matters, but it's not as strict as Haml.
   * If you want to indent 2 spaces, then 5.  It's your choice. To nest markup you only need to indent by one space, the rest is gravy.
 
@@ -138,10 +161,10 @@ So here's what I came up with:
 ### Line indicators:
   __Please note that all line indicators must be followed by a space__
 
-* `
-  * The backtick tells Slim to just copy the line.  It essentially escapes any processing.
 * |
-  * *Same as `\``.*
+  * The pipe tells Slim to just copy the line. It essentially escapes any processing.
+* `
+  * _Same as the pipe ('|')._
 * -
   * The dash denotes control code (similar to Haml).  Examples of control code are loops and conditionals.
 * =

data/lib/slim.rb

@@ -8,7 +8,7 @@ require 'slim/engine'
 module Slim
   class << self
     def version
-      '0.4.1'
+      '0.5.0'
     end
   end
 end

data/lib/slim/compiler.rb

@@ -7,11 +7,18 @@ module Slim
     include Optimizer
     AUTOCLOSED = %w(meta img link br hr input area param col base)
 
-    REGEX = /^(\s*)(!?`?\|?-?=?\w*)(\s*\w*=".+")?(.*)/
+    CONTROL_WORDS = %w{if unless else elsif do}
+
+    REGEX_LINE_PARSER                = /^(\s*)(!?`?\|?-?=?\w*)((?:\s*(?:\w|-)*="[^=]+")+|(\s*[#.]\S+))?(.*)/
+    REGEX_LINE_CONTAINS_OUTPUT_CODE  = /^=(.*)/
+    REGEX_METHOD_HAS_NO_PARENTHESES  = /^\w+( )/
+    REGEX_CODE_BLOCK_DETECTED        = / do ?(.*)$/
+    REGEX_CODE_CONTROL_WORD_DETECTED = /(?:( )|(\())(#{CONTROL_WORDS * '|'})\b ?(.*)$/
+    REGEX_FIND_ATTR_ID               = /#([^.\s]+)/
+    REGEX_FIND_ATTR_CLASS            = /\.([^#\s]+)/
 
     def compile
       @_buffer = ["_buf = [];"]
-
       @in_text = false
 
       text_indent = last_indent = -1; enders = []
@@ -24,9 +31,9 @@ module Slim
           next 
         end
 
-        line    =~ REGEX
+        line =~ REGEX_LINE_PARSER
 
-        indent  =   $1.to_s.length
+        indent = $1.to_s.length
 
         if @in_text && indent > text_indent
           spaces = indent - text_indent
@@ -34,17 +41,23 @@ module Slim
           next
         end
 
-        marker        =   $2
-        attrs         =   $3
-        string        =   $4 
+        marker         = $2
+        attrs          = $3
+        shortcut_attrs = $4
+        string         = $5
+
+        # prepends "div" to the shortcut form of attrs if no marker is given
+        if shortcut_attrs && marker.empty?
+          marker = "div"
+        end
 
-        line_type     = case marker
-                        when '`', '|' then :text
-                        when '-' then :control_code
-                        when '=' then :output_code
-                        when '!' then :declaration
-                        else :markup
-                        end
+        line_type = case marker
+                    when '`', '|' then :text
+                    when '-'      then :control_code
+                    when '='      then :output_code
+                    when '!'      then :declaration
+                    else :markup
+                    end
 
         if line_type != :text
           @in_text    = false
@@ -52,12 +65,13 @@ module Slim
         end
 
         if attrs
-          attrs.gsub!('"', '\"') 
+          attrs = normalize_attributes(attrs) if shortcut_attrs
+          attrs.gsub!('"', '\"')
         end
 
         if string
           string.strip!
-          string    = nil unless string.strip.length > 0
+          string = nil if string.empty?
         end
 
         unless indent > last_indent
@@ -84,30 +98,28 @@ module Slim
           if AUTOCLOSED.include?(marker)
             @_buffer << "_buf << \"<#{marker}#{attrs || ''}/>\";"
           else
-            enders << ["_buf << \"</#{marker}>\";", indent]
+            enders   << ["_buf << \"</#{marker}>\";", indent]
             @_buffer << "_buf << \"<#{marker}#{attrs || ''}>\";"
           end
 
           if string
             string.lstrip!
-            if string =~ /^=(.*)/
-              @_buffer << "_buf << #{$1.strip};"
+            if string =~ REGEX_LINE_CONTAINS_OUTPUT_CODE
+              @_buffer << "_buf << #{parenthesesify_method($1.strip)};"
             else
               @_buffer << "_buf << \"#{string}\";"
             end
           end
         when :text
-          @in_text = true
+          @in_text    = true
           text_indent = indent
-          
           @_buffer << "_buf << \"#{string}\";" if string.to_s.length > 0
         when :control_code
-          unless enders.detect{|e| e[0] == 'end;' && e[1] == indent}
-            enders << ['end;', indent]
-          end
+          enders   << ['end;', indent] unless enders.detect{|e| e[0] == 'end;' && e[1] == indent}
           @_buffer << "#{string};"
         when :output_code
-          @_buffer << "_buf << #{string};"
+          enders   << ['end;', indent] if string =~ REGEX_CODE_BLOCK_DETECTED
+          @_buffer << "_buf << #{parenthesesify_method(string)};"
         when :declaration
           @_buffer << "_buf << \"<!#{string}>\";"
         else
@@ -127,5 +139,23 @@ module Slim
 
       return nil
     end
+
+    private
+
+    # adds a pair of parentheses to the method
+    def parenthesesify_method(string)
+      if string =~ REGEX_METHOD_HAS_NO_PARENTHESES
+        string.sub!(' ', '(') && string.sub!(REGEX_CODE_CONTROL_WORD_DETECTED, '\2) \3 \4') || string << ')'
+      end
+      string
+    end
+
+    # converts 'p#hello.world' to 'p id="hello" class="world"'
+    def normalize_attributes(string)
+      string.sub!(REGEX_FIND_ATTR_ID, ' id="\1"')
+      string.sub!(REGEX_FIND_ATTR_CLASS, ' class="\1"')
+      string.gsub!('.', ' ')
+      string
+    end
   end
 end

data/lib/slim/optimizer.rb

@@ -51,7 +51,8 @@ module Slim
   module Optimizer
     def optimize
       @optimized = ""
-      string = nil
+      string     = nil
+
       @_buffer.each do |line|
         if line =~ /^_buf << "(.+)"/
           string ||= ""

data/slim.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-10-03}
+  s.date = %q{2010-10-07}
   s.description = %q{Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.}
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -8,17 +8,22 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'slim'
 
-
 class Env
   def id_helper
     "notice"
   end
 
-  def show_first?
-    false
+  def show_first?(show = false)
+    show
+  end
+
+  def hello_world(text = "Hello World from @env", opts = {})
+    text << opts.to_a * " " if opts.any?
+    yield if block_given?
+    text
   end
 
-  def hello_world
-    "Hello World from @env"
+  def in_keyword
+    "starts with keyword"
   end
 end

data/test/slim/test_compiler.rb

@@ -26,26 +26,19 @@ HTML
 
     expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_html_with_empty_lines
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
+body
 
-    p Hello World, meet Slim.
+  p Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
-
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf.join;|
 
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_html_with_wraparound_text
@@ -59,9 +52,7 @@ HTML
 
     expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean gravida porta neque eu tincidunt. Aenean auctor blandit est sed consectetur. Quisque feugiat massa quis diam vestibulum accumsan. Morbi pharetra accumsan augue, in imperdiet sapien viverra non. Suspendisse molestie metus in sapien hendrerit dictum sit amet et leo. Donec accumsan, justo id porttitor luctus, velit erat tincidunt lorem, eu euismod enim nisl quis justo. Aliquam orci odio, ultricies sed ultrices nec, ultrices at mi. Vestibulum vel lacus eu massa mattis venenatis. In porta, quam ut dignissim varius, neque lectus laoreet felis, eget scelerisque odio lacus sed massa. Donec fringilla laoreet mi in dignissim. Curabitur porttitor ullamcorper ultrices. Quisque hendrerit odio ut ipsum blandit quis molestie diam vehicula. Suspendisse diam nibh, sollicitudin id faucibus et, pharetra sit amet massa. Mauris molestie elit id nulla euismod tempus.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
 
@@ -69,248 +60,236 @@ HTML
     string = <<HTML
 ! doctype html5
 html
-  head
-    title Simple Test Title
   body
     p Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<!doctype html5>";_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
-
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<!doctype html5>";_buf << "<html>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
 
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
 
   def test_simple_html_with_params
     string = <<HTML
-html 
+html
   head
     title Simple Test Title
     meta name="description" content="This is a Slim Test, that's all"
-  body
-    p Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "</head>";_buf << "</html>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_html_with_params_meta_first
     string = <<HTML
-html 
+html
   head
     meta name="description" content="This is a Slim Test, that's all"
     title Simple Test Title
-  body
-    p Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "</html>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_nested_content
     string = <<HTML
-html 
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    p 
-      ` Hello World, meet Slim.
-    p
-      | Hello World, meet Slim again.
+body
+  p 
+    ` Hello World, meet Slim.
+  p
+    | Hello World, meet Slim again.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "<p>";_buf << "Hello World, meet Slim again.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
-
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "<p>";_buf << "Hello World, meet Slim again.";_buf << "</p>";_buf << "</body>";_buf.join;|
 
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_closing_tag_without_content_or_attributes
     string = <<HTML
-html 
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    hr
-    p 
-      ` Hello World, meet Slim.
+hr
+p 
+  ` Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<hr/>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<hr/>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
 
   def test_closing_tag_without_content
     string = <<HTML
-html 
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    img width="100" height="50" src="/images/test.jpg"
-    p 
-      ` Hello World, meet Slim.
+img width="100" height="50" src="/images/test.jpg"
+p 
+  ` Hello World, meet Slim.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<img width=\"100\" height=\"50\" src=\"/images/test.jpg\"/>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<img width=\"100\" height=\"50\" src=\"/images/test.jpg\"/>";_buf << "<p>";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
 
   def test_text_that_starts_with_tag_name
     string = <<HTML
-html
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    img width="100" height="50" src="/images/test.jpg"
-    p 
-      ` another one bites the dust
-    p
-      ` i am iron man
+p 
+  ` another one bites the dust
+p
+  ` i am iron man
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<img width=\"100\" height=\"50\" src=\"/images/test.jpg\"/>";_buf << "<p>";_buf << "another one bites the dust";_buf << "</p>";_buf << "<p>";_buf << "i am iron man";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
-
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<p>";_buf << "another one bites the dust";_buf << "</p>";_buf << "<p>";_buf << "i am iron man";_buf << "</p>";_buf.join;|
 
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
 
   def test_simple_if_code_block
     string = <<HTML
-html
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    - if something
-      p 
-        ` another one bites the dust
-    - else
-      p
-        ` i am iron man
+body
+  - if something
+    p 
+      ` another one bites the dust
+  - else
+    p
+      ` i am iron man
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";if something;_buf << "<p>";_buf << "another one bites the dust";_buf << "</p>";else;_buf << "<p>";_buf << "i am iron man";_buf << "</p>";end;_buf << "</body>";_buf << "</html>";_buf.join;|
-
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<body>";if something;_buf << "<p>";_buf << "another one bites the dust";_buf << "</p>";else;_buf << "<p>";_buf << "i am iron man";_buf << "</p>";end;_buf << "</body>";_buf.join;|
 
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_output_code
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    p 
-      = hello_world
+p 
+  = hello_world
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << hello_world;_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << hello_world;_buf << "</p>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_output_code_with_params
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    p 
-      = hello_world(params[:key])
+p 
+  = hello_world(params[:key])
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<p>";_buf << hello_world(params[:key]);_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << hello_world(params[:key]);_buf << "</p>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_html_with_params_and_content_on_same_line
     string = <<TEMPLATE
-html 
-  head
-    title Simple Test Title
-    meta name="description" content="This is a Slim Test, that's all"
-  body
-    p id="first" Hello World, meet Slim.
+body
+  p id="first" class="hello world" Hello World, meet Slim.
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "</head>";_buf << "<body>";_buf << "<p id=\"first\">";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\" class=\"hello world\">";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
-
-    assert_equal expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
   def test_simple_html_with_params_and_code_call
     string = <<TEMPLATE
-html 
-  head
-    title Simple Test Title
-    meta name="description" content="This is a Slim Test, that's all"
-  body
-    p id="first" = hello_world
+body
+  p id="first" = hello_world
 TEMPLATE
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "</head>";_buf << "<body>";_buf << "<p id=\"first\">";_buf << hello_world;_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << hello_world;_buf << "</p>";_buf << "</body>";_buf.join;|
 
-    output = TestEngine.new(string).compiled
+    assert_equal expected, TestEngine.new(string).compiled
+  end
 
-    assert_equal expected, output
+  def test_simple_html_with_params_and_parameterized_code_call
+    string = <<TEMPLATE
+body
+  p id="first" = hello_world("Hello Ruby!")
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << hello_world("Hello Ruby!");_buf << "</p>";_buf << "</body>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
-  def test_text_that_starts_with_tag_name
+  def test_simple_html_with_params_and_spaced_parameterized_code_call
+    string = <<TEMPLATE
+body
+  p id="first" = hello_world "Hello Ruby!"
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << hello_world("Hello Ruby!");_buf << "</p>";_buf << "</body>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
+
+  def test_simple_html_with_params_and_spaced_parameterized_code_call_2
+    string = <<TEMPLATE
+body
+  p id="first" = hello_world "Hello Ruby!", :dummy => "value"
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\">";_buf << hello_world("Hello Ruby!", :dummy => "value");_buf << "</p>";_buf << "</body>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
+
+  def test_simple_html_with_multiple_wraparound_text
     string = <<HTML
-html
-  head
-    meta name="description" content="This is a Slim Test, that's all"
-    title Simple Test Title
-  body
-    img width="100" height="50" src="/images/test.jpg"
-    p 
-      ` 
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam malesuada, dui at condimentum dapibus, purus sapien fringilla est, vel eleifend massa purus ut lectus. Praesent aliquam, ipsum eu ornare porta, tellus lacus viverra diam, nec scelerisque ipsum nunc et lacus. Nam adipiscing velit eget dolor ultricies in dignissim augue ultricies. Sed sed leo in sapien pretium dictum. Fusce sem quam, tincidunt vel lobortis sed, tincidunt vulputate est. Phasellus et ipsum quam, ac fringilla orci. In facilisis est et ante tempus suscipit. Morbi elementum quam ut urna laoreet vel malesuada justo adipiscing. Suspendisse eu lorem id lacus molestie dapibus fringilla ut orci. Cras pellentesque auctor leo, nec bibendum est suscipit id. Mauris dignissim aliquet libero vitae vulputate. Maecenas viverra sodales suscipit. Aenean eu nisi velit.
+p 
+  ` 
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam malesuada, dui at condimentum dapibus, purus sapien fringilla est, vel eleifend massa purus ut lectus. Praesent aliquam, ipsum eu ornare porta, tellus lacus viverra diam, nec scelerisque ipsum nunc et lacus. Nam adipiscing velit eget dolor ultricies in dignissim augue ultricies. Sed sed leo in sapien pretium dictum. Fusce sem quam, tincidunt vel lobortis sed, tincidunt vulputate est. Phasellus et ipsum quam, ac fringilla orci. In facilisis est et ante tempus suscipit. Morbi elementum quam ut urna laoreet vel malesuada justo adipiscing. Suspendisse eu lorem id lacus molestie dapibus fringilla ut orci. Cras pellentesque auctor leo, nec bibendum est suscipit id. Mauris dignissim aliquet libero vitae vulputate. Maecenas viverra sodales suscipit. Aenean eu nisi velit.
 
-       Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.
+   Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.
 HTML
 
-    expected = %q|_buf = [];_buf << "<html>";_buf << "<head>";_buf << "<meta name=\"description\" content=\"This is a Slim Test, that's all\"/>";_buf << "<title>";_buf << "Simple Test Title";_buf << "</title>";_buf << "</head>";_buf << "<body>";_buf << "<img width=\"100\" height=\"50\" src=\"/images/test.jpg\"/>";_buf << "<p>";_buf << " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam malesuada, dui at condimentum dapibus, purus sapien fringilla est, vel eleifend massa purus ut lectus. Praesent aliquam, ipsum eu ornare porta, tellus lacus viverra diam, nec scelerisque ipsum nunc et lacus. Nam adipiscing velit eget dolor ultricies in dignissim augue ultricies. Sed sed leo in sapien pretium dictum. Fusce sem quam, tincidunt vel lobortis sed, tincidunt vulputate est. Phasellus et ipsum quam, ac fringilla orci. In facilisis est et ante tempus suscipit. Morbi elementum quam ut urna laoreet vel malesuada justo adipiscing. Suspendisse eu lorem id lacus molestie dapibus fringilla ut orci. Cras pellentesque auctor leo, nec bibendum est suscipit id. Mauris dignissim aliquet libero vitae vulputate. Maecenas viverra sodales suscipit. Aenean eu nisi velit.";_buf << "<br/>";_buf << "Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.";_buf << "</p>";_buf << "</body>";_buf << "</html>";_buf.join;|
+    expected = %q|_buf = [];_buf << "<p>";_buf << " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam malesuada, dui at condimentum dapibus, purus sapien fringilla est, vel eleifend massa purus ut lectus. Praesent aliquam, ipsum eu ornare porta, tellus lacus viverra diam, nec scelerisque ipsum nunc et lacus. Nam adipiscing velit eget dolor ultricies in dignissim augue ultricies. Sed sed leo in sapien pretium dictum. Fusce sem quam, tincidunt vel lobortis sed, tincidunt vulputate est. Phasellus et ipsum quam, ac fringilla orci. In facilisis est et ante tempus suscipit. Morbi elementum quam ut urna laoreet vel malesuada justo adipiscing. Suspendisse eu lorem id lacus molestie dapibus fringilla ut orci. Cras pellentesque auctor leo, nec bibendum est suscipit id. Mauris dignissim aliquet libero vitae vulputate. Maecenas viverra sodales suscipit. Aenean eu nisi velit.";_buf << "<br/>";_buf << "Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.";_buf << "</p>";_buf.join;|
+
+    iterate_it expected, TestEngine.new(string).compiled
+  end
+
+  def test_shortcut_html_with_params
+    string = <<TEMPLATE
+body
+  p#first.hello.world Hello World, meet Slim.
+TEMPLATE
 
-    output = TestEngine.new(string).compiled
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<p id=\"first\" class=\"hello world\">";_buf << "Hello World, meet Slim.";_buf << "</p>";_buf << "</body>";_buf.join;|
 
-    iterate_it expected, output
+    assert_equal expected, TestEngine.new(string).compiled
   end
 
+  def test_shortcut_div_tag_with_params
+    string = <<TEMPLATE
+body
+  #first.hello.world Hello World, meet Slim.
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<body>";_buf << "<div id=\"first\" class=\"hello world\">";_buf << "Hello World, meet Slim.";_buf << "</div>";_buf << "</body>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
+
+  def test_control_code_loop
+    string = <<TEMPLATE
+p
+  - 3.times do
+    | Hey!
+TEMPLATE
+
+    expected = %q|_buf = [];_buf << "<p>";3.times do;_buf << "Hey!";end;_buf << "</p>";_buf.join;|
+
+    assert_equal expected, TestEngine.new(string).compiled
+  end
 
   # Use this to do a line by line check. Much easier to see where the problem is.
   def iterate_it(expected, output)

data/test/slim/test_engine.rb

@@ -15,141 +15,258 @@ html
     p Hello World, meet Slim.
 HTML
 
-    engine = Slim::Engine.new(string)
-
     expected = "<html><head><title>Simple Test Title</title></head><body><p>Hello World, meet Slim.</p></body></html>"
 
-    assert_equal expected, engine.render
+    assert_equal expected, Slim::Engine.new(string).render
   end
 
   def test_render_with_conditional
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    - if show_first?
-        p The first paragraph
-    - else
-        p The second paragraph
+div
+  - if show_first?
+      p The first paragraph
+  - else
+      p The second paragraph
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<div><p>The second paragraph</p></div>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_parameterized_conditional
+    string = <<HTML
+div
+  - if show_first? false
+      p The first paragraph
+  - else
+      p The second paragraph
+HTML
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><p>The second paragraph</p></body></html>"
+    expected = "<div><p>The second paragraph</p></div>"
 
-    assert_equal expected, engine.render(@env)
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
   def test_render_with_call
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    p
-      = hello_world
+p
+  = hello_world
+HTML
+
+    expected = "<p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_conditional_call
+    string = <<HTML
+p
+  = hello_world if true
+HTML
+
+    expected = "<p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_parameterized_call
+    string = <<HTML
+p
+  = hello_world("Hello Ruby!")
+HTML
+
+    expected = "<p>Hello Ruby!</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_spaced_parameterized_call
+    string = <<HTML
+p
+  = hello_world "Hello Ruby!"
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<p>Hello Ruby!</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_spaced_parameterized_call_2
+    string = <<HTML
+p
+  = hello_world "Hello Ruby!", :dummy => "value"
+HTML
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><p>Hello World from @env</p></body></html>"
+    expected = "<p>Hello Ruby!dummy value</p>"
 
-    assert_equal expected, engine.render(@env)
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
   def test_render_with_call_and_inline_text
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    h1 This is my title
-    p
-      = hello_world
+h1 This is my title
+p
+  = hello_world
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<h1>This is my title</h1><p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_call_to_set_attributes
+    string = <<HTML
+p id="#\{id_helper}" class="hello world"
+  = hello_world
+HTML
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><h1>This is my title</h1><p>Hello World from @env</p></body></html>"
+    expected = "<p id=\"notice\" class=\"hello world\">Hello World from @env</p>"
 
-    assert_equal expected, engine.render(@env)
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
-  def test_render_with_call_to_set_attribute
+  def test_render_with_call_to_set_custom_attributes
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    h1 This is my title
-    p id="#\{id_helper}"
-      = hello_world
+p data-id="#\{id_helper}" data-class="hello world"
+  = hello_world
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<p data-id=\"notice\" data-class=\"hello world\">Hello World from @env</p>"
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><h1>This is my title</h1><p id=\"notice\">Hello World from @env</p></body></html>"
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 
-    assert_equal expected, engine.render(@env)
+  def test_render_with_shortcut_attributes
+    string = <<HTML
+h1#title This is my title
+#notice.hello.world
+  = hello_world
+HTML
+
+    expected = "<h1 id=\"title\">This is my title</h1><div id=\"notice\" class=\"hello world\">Hello World from @env</div>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
-  def test_render_with_call_to_set_attribute_and_call_to_set_content
+  def test_render_with_call_to_set_attributes_and_call_to_set_content
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    h1 This is my title
-    p id="#\{id_helper}" = hello_world
+p id="#\{id_helper}" class="hello world" = hello_world
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<p id=\"notice\" class=\"hello world\">Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_parameterized_call_to_set_attributes_and_call_to_set_content
+    string = <<HTML
+p id="#\{id_helper}" class="hello world" = hello_world("Hello Ruby!")
+HTML
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><h1>This is my title</h1><p id=\"notice\">Hello World from @env</p></body></html>"
+    expected = "<p id=\"notice\" class=\"hello world\">Hello Ruby!</p>"
 
-    assert_equal expected, engine.render(@env)
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
-  def test_render_with_text_block
+  def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    h1 This is my title
-    p id="#\{id_helper}"
-      `
-       Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.
+p id="#\{id_helper}" class="hello world" = hello_world "Hello Ruby!"
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<p id=\"notice\" class=\"hello world\">Hello Ruby!</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content_2
+    string = <<HTML
+p id="#\{id_helper}" class="hello world" = hello_world "Hello Ruby!", :dummy => "value"
+HTML
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><h1>This is my title</h1><p id=\"notice\">Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.</p></body></html>"
+    expected = "<p id=\"notice\" class=\"hello world\">Hello Ruby!dummy value</p>"
 
-    assert_equal expected, engine.render(@env)
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
+  def test_render_with_text_block
+    string = <<HTML
+p
+  `
+   Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+HTML
+
+    expected = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 
   def test_render_with_text_block_with_subsequent_markup
     string = <<HTML
-html
-  head
-    title Simple Test Title
-  body
-    h1 This is my title
-    p id="#\{id_helper}"
-      `
-        Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.
-    p Some more markup
+p
+  `
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+p Some more markup
 HTML
 
-    engine = Slim::Engine.new(string)
+    expected = "<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p><p>Some more markup</p>"
 
-    expected = "<html><head><title>Simple Test Title</title></head><body><h1>This is my title</h1><p id=\"notice\"> Phasellus ultricies vulputate lacus, eget pretium orci tincidunt tristique. Duis vitae luctus risus. Aliquam turpis massa, adipiscing in adipiscing ut, congue sed justo. Sed egestas ullamcorper nisl placerat dictum. Sed a leo lectus, sit amet vehicula nisl. Duis adipiscing congue tortor ut vulputate. Phasellus ligula lectus, congue non lobortis sed, dictum sed tellus. Vestibulum viverra vestibulum felis convallis pharetra. Phasellus a dignissim tellus. Proin dapibus malesuada lorem, et porttitor diam bibendum a. Donec et dui mauris, et tempus metus. Etiam pharetra varius dignissim. Maecenas lacinia, ligula ut tincidunt porttitor, sapien nisi pulvinar magna, nec sollicitudin libero odio bibendum nisi. Aenean ipsum eros, convallis id consequat nec, commodo eget diam. Integer malesuada, libero non dignissim varius, velit metus malesuada lectus, a consequat turpis purus ut elit.</p><p>Some more markup</p></body></html>"
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_output_code_block
+    string = <<HTML
+p
+  = hello_world "Hello Ruby!" do
+    | Hello from within a block!
+HTML
+
+    expected = "<p>Hello from within a block!Hello Ruby!</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 
-    assert_equal expected, engine.render(@env)
+  def test_render_with_output_code_within_block
+    string = <<HTML
+p
+  = hello_world "Hello Ruby!" do
+    = hello_world "Hello from within a block! "
+HTML
+
+    expected = "<p>Hello from within a block! Hello Ruby!</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
   end
 
+  def test_render_with_control_code_loop
+    string = <<HTML
+p
+  - 3.times do
+    | Hey!
+HTML
+
+    expected = "<p>Hey!Hey!Hey!</p>"
 
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_inline_condition
+    string = <<HTML
+p = hello_world if true
+HTML
+
+    expected = "<p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_render_with_attribute_starts_with_keyword
+    string = <<HTML
+p = hello_world in_keyword
+HTML
+
+    expected = "<p>starts with keyword</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -04:00
+date: 2010-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: []