renshi 0.0.7 → 0.0.8

data/README

@@ -7,7 +7,7 @@ To output data on the page stick a $ in front of your var. or expression
 $foo
 $Time.now
 
-If there's a space in your expression or you need formatting it use ${}
+If there's a space in your expression or you need formatting use ${}
 
 ${foo},$Time.now 
 
@@ -15,10 +15,14 @@ To insert statements in your template use $[]
 
 $[foo = "hello world"]
 
+$[if foo]
+  $foo
+$[end]
+
 Attribute Expressions
 ===================
-Renshi has a small library of expressions which can be inserted into HTML or XML elements as attributes.
-Attribute expressions generally follow the form of 
+The $ syntax will give you everything ERB does, with less typing. But Renshi also has 'attribute expressions',
+which can be inserted into a HTML element as an attribute - e.g. <span r:if="user.is_administrator">...</span>. 
 
 r:expression_name="expression" - the expression value is treated as a Ruby expression .
 
@@ -34,16 +38,12 @@ Current Attribute Expressions
 * Each
 
 * If
-<span r:if="true">hello</span>
-would render "<span>hello</span>"
+<span r:if="true">hello</span> would render "<span>hello</span>"
 
 <span r:if="false">goodbye!</span> will render "".
 
 * Unless
-<span r:unless="false">hello</span>
-would render "<span>hello</span>"
-
-<span r:unless="true">goodbye!</span> will render "".
+e.g. <span r:unless="false">hello</span>
 
 * Elsif
 
@@ -58,7 +58,6 @@ would render "<span>hello</span>"
 
 r:elsif and r:else must be adjacent (a sibling) to the element.
 
-
 For example, the below is fine, because the if and else statements are adjacent siblings in the tree of elements.
 
 <div id="menu" r:if="user.is_administrator?">
@@ -67,16 +66,6 @@ For example, the below is fine, because the if and else statements are adjacent
   <div id="user_menu"> ... </div>
 </div>  
 
-but this is not:
-
-<div id="menu" r:if="user.is_administrator?">
-  <div id="admin_menu"> ... </div>
-<div id="register">
-  <div id="register"> ... </div>
-</div>
-<div id="menu" r:else>
-  <div id="user_menu"> ... </div>
-</div>  
 
 * While
 
@@ -138,9 +127,6 @@ $ values inside of attributes are only interpreted as Renshi variables for regul
 
 E.g. <div r:if="'abc' =~ /$abc/" id="content$foo"> the r:if statement would treat $ exactly as Ruby does, while the id attribute value is transformed.
 
-
-Miscellaneous
-=============
 To print a $ use $$, e.g. $$10.95 comes out as $10.95
 
 Renshi documents are appended with the suffix of .ren
@@ -176,11 +162,12 @@ Firstly, it doesn't need a reason. It's a fun project.
 
 But ...
 
-I've always found ERB to be a bit cumbersome - <%= is quite tiring to type out when you realise it could be much shorter. I used to think that Velocity, in Java, 
-was the most fun templating language I'd used, and I had wanted something equally as concise for Ruby.
+I've always found ERB to be a bit cumbersome - <%= is quite tiring to type out when you realise it could be much shorter. I used to think that Velocity, in Java, was the most fun templating language I'd used, and I had wanted something equally as concise for Ruby.
+
+A real need for it emerged in a project which relied upon an external design house handing us HTML. Converting it incessantly into HAML was nightmarish. A colleague mentioned Genshi in Python as ideal, which was when the idea of Renshi was conceived.
 
-A real need for it emerged in a project which relied upon an external design house handing us HTML. Converting it incessantly into HAML was nightmarish. A colleague 
-mentioned Genshi in Python as ideal, which was when the idea of Renshi was conceived.
+It should give the developer power to do what they want, without being restrictive. You can throw $ statements around the place in a document
+or use attribute expressions to preserve a strict xhtml layout.
 
 English to Japanese
 ===================

data/lib/renshi/parser.rb

@@ -63,13 +63,21 @@ module Renshi
       
       bits = []
       bits << text[0..(idx -1)] if idx != 0
+      
       while idx != nil do
-        if text[(idx + 1)..(idx + 1)] == "("
-          #this may be jquery, etc. $(...)
-          return text
+        next_char = text[(idx + 1)..(idx + 1)]
+
+        if next_char == "(" 
+          #this may be jquery, etc. $(...) 
+          end_statement_idx = (idx + 2)
+          bits << text[idx..(idx + 1)]    
+        elsif next_char == "$"
+          #an escaped $ - i.e. '$$'
+          end_statement_idx = (idx + 2)
+          bits << "$"
           
           #${...}
-        elsif text[(idx + 1)..(idx + 1)] == "{"
+        elsif next_char == "{"
           begin
             closing_brace_idx = text.rindex("}")
             statement_str = text[(idx + 2)..(closing_brace_idx -1)]
@@ -81,7 +89,7 @@ module Renshi
           end
           
           #$[...]
-        elsif text[(idx + 1)..(idx + 1)] == "["
+        elsif next_char == "["
           begin
             closing_brace_idx = text.rindex("]")
             statement_str = text[(idx + 2)..(closing_brace_idx -1)]
@@ -101,7 +109,7 @@ module Renshi
         end
 
         next_statement_idx = text.index("$", end_statement_idx)
-                
+        
         if next_statement_idx
           gap = text[end_statement_idx..(next_statement_idx -1)]
           bits << gap

data/lib/renshi.rb

@@ -9,7 +9,7 @@ require 'renshi/attribute_expressions'
 require 'renshi/frameworks'
 
 module Renshi
-  VERSION="0.0.7"
+  VERSION="0.0.8"
   
   class SyntaxError < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: renshi
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Nicholas Faiz
@@ -9,7 +9,7 @@ autorequire: renshi
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 +10:00
+date: 2009-07-13 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency