RubyGems - slim - Versions diffs - 0.1.0 → 0.2.0 - Mend

slim 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/README.md CHANGED

@@ -8,7 +8,7 @@ Slim is a Rails 3, Ruby 1.9.2 templating option.  I do not intend on making a Ra
 ## Why?
-Simply put, I wanted to see if I could pull of a minimalistic template language that was at least matched Erb's speed.  Yes, Slim is speedy.
+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.
 ### The syntax
@@ -16,7 +16,8 @@ I actually like the indentation and tag closing nature of Haml.  I don't like th
 So here's what I came up with:
+    ! doctype html
     html
       head
         title Slim Examples
@@ -48,11 +49,48 @@ So here's what I came up with:
           ` $(content).do_something();
+### How do I?
+#### Add content to a tag
+      # Either start on the same line as the tag
+      body
+        h1 id="headline" Welcome to my site.
+      # Or nest it.  __Note:__ Must use backtick (with following space) to escape processing
+      body
+        h1 id="headline"
+          ` Welcome to my site.
+#### Add content to a tag with code
+      # Can make the call on the same line
+      body
+        h1 id="headline" = page_headline
+      # Or nest it.
+      body
+        h1 id="headline"
+          = page_headline
+#### Set an attribute's value with a method?
+      # Just use standard Ruby interpolation.
+      body
+        table
+          - for user in users do
+            tr id="user_#{user.id}"
 ### Things to know:
 * Standard Ruby syntax after '-' and '='
   * __end__ is not required
-  * Ruby code must be on it's own line (__TODO:__ allow inline)
   * 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 ('`')
@@ -61,6 +99,7 @@ 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.
@@ -73,9 +112,4 @@ So here's what I came up with:
         ` ! doctype html renders  <!doctype html> `
-### Stuff I need to do (in no particular order)
-* Tackle Encoding.
-* Optimize the compiled code.  I know it can be even faster.
-* Tackle the __TODO's__ above
-* ??? Suggestions...
+### Please add feature requests and bugs to the Github issue tracker.

data/lib/slim.rb CHANGED

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

data/lib/slim/compiler.rb CHANGED

@@ -70,7 +70,12 @@ module Slim
           end
           if string
-            @compiled << "_buf << \"#{string}\";"
+            string.lstrip!
+            if string =~ /^=(.*)/
+              @compiled << "_buf << #{$1.strip};"
+            else
+              @compiled << "_buf << \"#{string}\";"
+            end
           end
         when :text
           @compiled << "_buf << \"#{string}\";"

data/slim.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{slim}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-17}
   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 CHANGED

@@ -10,6 +10,10 @@ require 'slim'
 class Env
+  def id_helper
+    "notice"
+  end
   def show_first?
     false
   end

data/test/slim/test_compiler.rb CHANGED

@@ -270,6 +270,24 @@ TEMPLATE
     assert_equal expected, output
   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
+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;|
+    output = TestEngine.new(string).compiled
+    assert_equal expected, output
+  end
   # Use this to do a line by line check. Much easier to see where the problem is.
   def iterate_it(expected, output)
     es = expected.split(';')

data/test/slim/test_engine.rb CHANGED

@@ -76,6 +76,42 @@ HTML
     assert_equal expected, engine.render(@env)
   end
+  def test_render_with_call_to_set_attribute
+    string = <<HTML
+html
+  head
+    title Simple Test Title
+  body
+    h1 This is my title
+    p id="#\{id_helper}"
+      = hello_world
+HTML
+    engine = Slim::Engine.new(string)
+    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, engine.render(@env)
+  end
+  def test_render_with_call_to_set_attribute_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
+HTML
+    engine = Slim::Engine.new(string)
+    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, engine.render(@env)
+  end
 end

data/test/test_slim.rb CHANGED

@@ -2,6 +2,6 @@ require 'helper'
 class TestSlim < MiniTest::Unit::TestCase
   def test_version_is_current
-    assert_equal '0.0.1', Slim.version
+    assert_equal '0.1.0', Slim.version
   end
 end

metadata CHANGED

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-15 00:00:00 -04:00
+date: 2010-09-17 00:00:00 -04:00
 default_executable:
 dependencies: []