RubyGems - slim - Versions diffs - 0.4.0 → 0.4.1 - Mend

slim 0.4.0 → 0.4.1

Files changed (8) hide show

data/README.md CHANGED

@@ -1,4 +1,4 @@
-## Slim
+## Slim
 Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
@@ -10,6 +10,18 @@ Slim is a Rails 3, Ruby 1.9.2 templating option.  I do not intend on making a Ra
 Simply put, I wanted to see if I could pull of a template language that required minimum use of special characters and at least matched Erb's speed.  Yes, Slim is speedy.
+## How?
+Include Slim in your Gemfile:
+    gem 'slim'
+In `config/application.rb`, add the following line near the top:
+    require 'slim/rails'
+That's it!
 ### The syntax
 I actually like the indentation and tag closing nature of Haml.  I don't like the overall result of the markup though, it's a little cryptic.  I'm sure, with practice, people read it like the Matrix, but it's never suited me.  So why not try to improve it for me?  There may be one or two other people with the same thoughts.
@@ -118,7 +130,7 @@ So here's what I came up with:
   * __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 ('`')
+  * If you nest content (e.g. put it on the next line), start the line with a backtick ('`') or a pipe ('|')
 * 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.
@@ -126,8 +138,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 dash denotes control code (similar to Haml).  Examples of control code are loops and conditionals.
 * =

data/lib/slim.rb CHANGED

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

data/lib/slim/compiler.rb CHANGED

@@ -7,7 +7,7 @@ module Slim
     include Optimizer
     AUTOCLOSED = %w(meta img link br hr input area param col base)
-    REGEX = /^(\s*)(!?`?-?=?\w*)(\s*\w*=".+")?(.*)/
+    REGEX = /^(\s*)(!?`?\|?-?=?\w*)(\s*\w*=".+")?(.*)/
     def compile
       @_buffer = ["_buf = [];"]
@@ -39,7 +39,7 @@ module Slim
         string        =   $4
         line_type     = case marker
-                        when '`' then :text
+                        when '`', '|' then :text
                         when '-' then :control_code
                         when '=' then :output_code
                         when '!' then :declaration

data/slim.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-10-03}
   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 = [
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
      "test/helper.rb",
      "test/slim/test_compiler.rb",
      "test/slim/test_engine.rb",
-     "test/test_slim.rb"
+     "test/test_slim.rb",
+     "vim/slim.vim",
+     "vim/test.slim"
   ]
   s.homepage = %q{http://github.com/stonean/slim}
   s.rdoc_options = ["--charset=UTF-8"]

data/test/slim/test_compiler.rb CHANGED

@@ -126,9 +126,11 @@ html
   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 << "</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 << "<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

data/vim/slim.vim ADDED

@@ -0,0 +1,33 @@
+" 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 ADDED

@@ -0,0 +1,27 @@
+! 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();

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Stone
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable:
 dependencies: []
@@ -40,6 +40,8 @@ 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: []