slim 0.6.0.beta.1 → 0.6.0.beta.2

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
-gemspec
+gemspec
+
+gem 'slim', :path => File.dirname(__FILE__), :group => :development

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slim (0.5.1)
+    slim (0.6.0.beta.2)
       escape_utils
 
 GEM
@@ -10,11 +10,13 @@ GEM
     escape_utils (0.1.8)
     gemcutter (0.6.1)
     git (1.2.5)
+    haml (3.0.21)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
+    mustache (0.11.2)
     rake (0.8.7)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -24,6 +26,8 @@ PLATFORMS
 
 DEPENDENCIES
   escape_utils
+  haml
   jeweler
+  mustache
   rake
   slim!

data/README.md

@@ -115,16 +115,28 @@ So here's what I came up with:
 
 #### Set an attribute's value with a method?
 
-    # Just use standard Ruby interpolation.
+    # Use standard Ruby interpolation.
 
     body
       table
         - for user in users do
           tr id="user_#{user.id}"
 
+#### Call a method in content
+
+    # Use standard Ruby interpolation.
+
+    body
+      h1 Welcome #{current_user.name} to the show.
+
+    # To escape the interpolation (i.e. render as is)
+
+    body
+      h1 Welcome \#{current_user.name} to the show.
+
 #### Escape the escaping?
 
-    # Just use a double equal sign
+    # Use a double equal sign
 
     body
       h1 id="headline"
@@ -132,8 +144,9 @@ So here's what I came up with:
 
 #### Treat multiple lines of code as text that should bypass parsing.
 
-    # Use a backtick to start the escape.  Each following line that is
-    # indented greater than the backtick is copied over.
+    # Use a pipe ('|') or backtick ('`') to start the escape.  
+    # Each following line that is indented greater than 
+    # the backtick is copied over.
 
     body
       p
@@ -151,9 +164,9 @@ So here's what I came up with:
       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.
-          And so on...
+           This line will have one space in front of it.
+             This line will have two spaces in front of it.
+               And so on...
 
 #### Add ruby code comments?
 
@@ -173,7 +186,7 @@ So here's what I came up with:
 * Standard Ruby syntax after '-' and '='
   * __end__ is not required
 * 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 pipe ('|') a backtick ('`').
+  * If you nest content (e.g. put it on the next line), start the line with a pipe ('|') or 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.
 

data/Rakefile

@@ -8,19 +8,22 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "slim"
     gem.version = Slim.version
-    gem.rubyforge_project = "slim"
+    gem.rubyforge_project = gem.name
     gem.summary = "Slim is a template language."
     gem.description = "Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic."
-    gem.email = "andy@stonean.com"
     gem.homepage = "http://github.com/stonean/slim"
-    gem.authors = ["Andrew Stone"]
+    gem.authors = ["Andrew Stone", "Fred Wu"]
+    gem.email = ["andy@stonean.com", "ifredwu@gmail.com"]
+    gem.files = ['*', 'lib/**/*', 'test/**/*']
     gem.add_dependency 'escape_utils'
     gem.add_development_dependency 'rake'
     gem.add_development_dependency 'jeweler'
+    gem.add_development_dependency 'haml'
+    gem.add_development_dependency 'mustache'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
 end
 
 begin
@@ -31,7 +34,7 @@ begin
   end
 rescue LoadError
   task :yard do
-    abort "YARD is not available. In order to run yard, you must: sudo gem install yard"
+    abort "YARD is not available. In order to run yard, you must: gem install yard"
   end
 end
 
@@ -51,7 +54,7 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
+    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
   end
 end
 

data/lib/slim.rb

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

data/lib/slim/compiler.rb

@@ -10,10 +10,11 @@ module Slim
     CONTROL_WORDS      = %w{if unless do}
     ELSE_CONTROL_WORDS = %w{else elsif}
 
-    REGEX_LINE_PARSER                     = /^(\s*)(!?`?\|?-?=?\/?\w*)((?:\s*(?:\w|-)*="[^=]+")+|(\s*[#.]\S+))?(.*)/
-    REGEX_LINE_CONTAINS_OUTPUT_CODE       = /^=(.*)/
+    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_LINE_CONTAINS_METHOD_DETECTED   = /^(\w+\(.*\))/
     REGEX_METHOD_HAS_NO_PARENTHESES       = /^\w+\s/
     REGEX_CODE_BLOCK_DETECTED             = / do ?.*$/
     REGEX_CODE_CONTROL_WORD_DETECTED      = /(?:\s|(\())(#{CONTROL_WORDS * '|'})\b\s?(.*)$/
@@ -49,7 +50,10 @@ module Slim
         marker         = $2
         attrs          = $3
         shortcut_attrs = $4
-        string         = $5.strip
+        string         = $5
+
+        # 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?
@@ -89,14 +93,13 @@ module Slim
         case line_type
         when :markup
           if AUTOCLOSED.include?(marker)
-            @_buffer << "_buf << \"<#{marker}#{attrs || ''}/>\";"
+            @_buffer << "_buf << \"<#{marker}#{attrs}/>\";"
           else
             enders   << ["_buf << \"</#{marker}>\";", indent]
-            @_buffer << "_buf << \"<#{marker}#{attrs || ''}>\";"
+            @_buffer << "_buf << \"<#{marker}#{attrs}>\";"
           end
 
           unless string.empty?
-            string.lstrip!
             if string =~ REGEX_LINE_CONTAINS_OUTPUT_CODE
               @_buffer << "_buf << #{parse_string($1.strip)};"
             else
@@ -106,7 +109,7 @@ module Slim
         when :text
           in_text     = true
           text_indent = indent
-          @_buffer << "_buf << \"#{string}\";" if string.to_s.length > 0
+          @_buffer << "_buf << \"#{string}\";" unless string.empty?
         when :control_code
           enders   << ['end;', indent] unless enders.detect{|e| e[0] == 'end;' && e[1] == indent}
           @_buffer << "#{string};"
@@ -148,7 +151,7 @@ module Slim
 
     # escapes the string
     def wraps_with_slim_escape!(string)
-      string.sub!(REGEX_LINE_CONTAINS_METHOD_DETECTED, 'Slim.escape_html(\1) \2')
+      string.sub!(REGEX_LINE_CONTAINS_METHOD_DETECTED, 'Slim.escape_html(\1)')
     end
 
     # converts 'p#hello.world.mate' to 'p id="hello" class="world mate"'

data/slim.gemspec

@@ -5,19 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.6.0.beta.1"
+  s.version = "0.6.0.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Stone"]
+  s.authors = ["Andrew Stone", "Fred Wu"]
   s.date = %q{2010-10-14}
   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.email = ["andy@stonean.com", "ifredwu@gmail.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
+    "Gemfile",
      "Gemfile.lock",
      "README.md",
      "Rakefile",
@@ -30,9 +29,7 @@ Gem::Specification.new do |s|
      "test/helper.rb",
      "test/slim/test_compiler.rb",
      "test/slim/test_engine.rb",
-     "test/test_slim.rb",
-     "vim/slim.vim",
-     "vim/test.slim"
+     "test/test_slim.rb"
   ]
   s.homepage = %q{http://github.com/stonean/slim}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -55,15 +52,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<escape_utils>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<haml>, [">= 0"])
+      s.add_development_dependency(%q<mustache>, [">= 0"])
     else
       s.add_dependency(%q<escape_utils>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<mustache>, [">= 0"])
     end
   else
     s.add_dependency(%q<escape_utils>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<mustache>, [">= 0"])
   end
 end
 

data/test/slim/test_compiler.rb

@@ -340,7 +340,7 @@ TEMPLATE
     assert_equal expected, TestEngine.new(string).compiled
   end
 
-  def test_irregular_spaces
+  def test_irregular_indentions
     string = <<TEMPLATE
   body
       p

data/test/slim/test_engine.rb

@@ -303,4 +303,96 @@ HTML
 
     assert_equal expected, Slim::Engine.new(string).render(@env)
   end
+
+
+  def test_nested_text
+    string = <<HTML
+p 
+ |
+  This is line one.
+   This is line two.
+    This is line three.
+     This is line four.
+p This is a new paragraph.
+HTML
+
+    expected = "<p>This is line one. This is line two.  This is line three.   This is line four.</p><p>This is a new paragraph.</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_nested_text_with_nested_html
+    string = <<HTML
+p
+ |
+  This is line one.
+   This is line two.
+    This is line three.
+     This is line four.
+ span.bold This is a bold line in the paragraph.
+ |  This is more content.
+HTML
+
+    expected = "<p>This is line one. This is line two.  This is line three.   This is line four.<span class=\"bold\">This is a bold line in the paragraph.</span> This is more content.</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+
+  end
+
+
+  def test_simple_paragraph_with_padding
+    string = <<HTML
+p    There will be 3 spaces in front of this line.
+HTML
+
+    expected = "<p>   There will be 3 spaces in front of this line.</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_output_code_with_leading_spaces
+    string = <<HTML
+p= hello_world
+p = hello_world
+p    = hello_world
+HTML
+
+    expected = "<p>Hello World from @env</p><p>Hello World from @env</p><p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_interpolation_in_text
+    string = <<HTML
+p 
+ | \#{hello_world}
+p 
+ | 
+  A message from the compiler: \#{hello_world}
+HTML
+
+    expected = "<p>Hello World from @env</p><p>A message from the compiler: Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_interpolation_in_tag
+    string = <<HTML
+p \#{hello_world}
+HTML
+
+    expected = "<p>Hello World from @env</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
+
+  def test_escape_interpolation
+    string = <<HTML
+p \\\#{hello_world}
+HTML
+
+    expected = "<p>\#{hello_world}</p>"
+
+    assert_equal expected, Slim::Engine.new(string).render(@env)
+  end
 end

metadata

@@ -7,11 +7,12 @@ version: !ruby/object:Gem::Version
   - 6
   - 0
   - beta
-  - 1
-  version: 0.6.0.beta.1
+  - 2
+  version: 0.6.0.beta.2
 platform: ruby
 authors: 
 - Andrew Stone
+- Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -58,8 +59,36 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: haml
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mustache
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
-email: andy@stonean.com
+email: 
+- andy@stonean.com
+- ifredwu@gmail.com
 executables: []
 
 extensions: []
@@ -67,7 +96,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -82,8 +110,6 @@ files:
 - test/slim/test_compiler.rb
 - test/slim/test_engine.rb
 - test/test_slim.rb
-- vim/slim.vim
-- vim/test.slim
 has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []
@@ -98,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4287789825889488572
+      hash: 3027777953181693052
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,6 +0,0 @@
-*.swp
-pkg
-readme.html
-.yardoc/
-doc/
-.bundle/

data/vim/slim.vim

@@ -1,33 +0,0 @@
-" Vim syntax file
-" Language: Slim
-" Maintainer: Andrew Stone <andy@stonean.com>
-" Version:  1
-" Last Change:  2010 Sep 25
-" TODO: Feedback is welcomed.
-
-" Quit when a syntax file is already loaded.
-if exists("b:current_syntax")
-  finish
-endif
-
-if !exists("main_syntax")
-  let main_syntax = 'slim'
-endif
-
-" Allows a per line syntax evaluation.
-let b:ruby_no_expensive = 1
-
-" Include Ruby syntax highlighting
-syn include @slimRuby syntax/ruby.vim
-
-" Include HTML 
-runtime! syntax/html.vim
-unlet! b:current_syntax
-
-syntax region slimHtml start="^\s*[^-=]\w" end="$" contains=htmlTagName, htmlArg, htmlString
-
-syntax region slimControl  start="-" end="$"  contains=@slimRuby keepend
-syntax region slimOutput   start=".*=\s" end="$"  contains=@slimRuby keepend
-
-
-let b:current_syntax = "slim"

data/vim/test.slim

@@ -1,27 +0,0 @@
-! doctype html
-  head
-    title Slim Vim Test
-    meta name="keywords" content="slim, vim, syntax"
-  body
-    h1 = @page_title
-    p id="notice"
-      '
-        Welcome to the the syntax test.  This file is to excercise the various markup.
-
-    - unless @users.empty?
-      table
-        - for user in users do 
-          tr
-            td = user.name
-    - else
-      p There are no users.
-
-    script type="text/javascript"
-     '
-      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-
-    script type="text/javascript"
-     '
-      var pageTracker = _gat._getTracker("UA-12345678-9");
-      pageTracker._trackPageview();