renshi 0.0.5 → 0.0.6

data/README

@@ -2,21 +2,19 @@ Renshi is a templating language for Ruby which is unobtrusive in HTML and XHTML
 
 $ Code
 ======
-To output data on the page stick a $ in front of your expression
+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 around your expression use ${}
+If there's a space in your expression or you need formatting it use ${}
 
 ${foo},$Time.now 
 
-To insert code in your template use $[]
+To insert statements in your template use $[]
 
 $[foo = "hello world"]
 
-$foo
-
 Attribute Expressions
 ===================
 Renshi has a small library of expressions which can be inserted into HTML or XML elements as attributes.
@@ -26,7 +24,7 @@ r:expression_name="expression" - the expression value is treated as a Ruby expre
 
 Some expressions, such as r:each, use the quoted value to also hold parameter information.
 
-* Current Attribute Expressions
+Current Attribute Expressions
 * If 
 * Unless
 * Elsif 
@@ -80,18 +78,6 @@ but this is not:
   <div id="user_menu"> ... </div>
 </div>  
 
-but this is:
-
-<div id="menu" r:if="user.is_administrator?">
-  <div id="admin_menu"> ... </div>
-<div id="menu" r:else>
-  <div id="user_menu"> ... </div>
-</div>  
-<div id="register">
-  <div id="register"> ... </div>
-</div>
-
-
 * While
 
 <div r:while="foo != 2" id="content$foo">
@@ -126,6 +112,10 @@ hello99
 </div>
 
 * Each
+The expression takes the object and then any arguments for the each block after a comma; so you can do anything with it that each supports.
+
+r:each="foos, |k,v|", r:each="foos, |foo|"..
+
 <div id="content$foo" r:each="foos, |foo|">
 hello$foo
 </div>
@@ -138,13 +128,10 @@ hello0
 hello99
 </div>
 
-
 Further elements will appear as I have time to make them or others want to contribute them. There isn't much to making them. 
 
 See renshi/lib/renshi/attribute_expressions for how they work.
 
-Planned element expressions:
-
 Other Rules
 ===========
 $ values inside of attributes are only interpreted as Renshi variables for regular attributes (not renshi attributes).
@@ -190,7 +177,7 @@ 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 funnest templating language I'd used, and I had wanted something equally as concise for Ruby.
+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.

data/lib/renshi/parser.rb

@@ -26,7 +26,7 @@ module Renshi
       
       inner_html = doc.inner_html
       compiled = compile_to_buffer(inner_html) if inner_html
-      # puts "\n", compiled, "\n"
+       # puts "\n", compiled, "\n"
       return compiled
     end
 
@@ -67,6 +67,8 @@ module Renshi
         if text[(idx + 1)..(idx + 1)] == "("
           #this may be jquery, etc. $(...)
           return text
+          
+          #${...}
         elsif text[(idx + 1)..(idx + 1)] == "{"
           begin
             closing_brace_idx = text.rindex("}")
@@ -77,6 +79,8 @@ module Renshi
           rescue Renshi::StandardError
             raise SyntaxError, "No closing brace: #{text[(idx +1)..-1]}", caller
           end
+          
+          #$[...]
         elsif text[(idx + 1)..(idx + 1)] == "["
           begin
             closing_brace_idx = text.rindex("]")
@@ -106,7 +110,7 @@ module Renshi
         end
         idx = next_statement_idx
       end       
-      
+
       return bits.join
     end
     

data/lib/renshi.rb

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

data/spec/each_spec.rb

@@ -2,11 +2,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'nokogiri'
 
 describe Renshi::Parser do      
-  it "should evaluate r:unless(false)" do
+  it "should evaluate r:each" do
     foos = [0,1,2]
-     doc = Nokogiri::HTML("<span id='red$foo' r:each='foos, |foo|'/>hello$foo</span>")
-     compiled = Renshi::Parser.parse(doc.root.to_s)
-     out = eval(compiled, binding)
+    doc = Nokogiri::HTML("<span id='red$foo' r:each='foos, |foo|'>hello$foo</span>")
+    compiled = Renshi::Parser.parse(doc.root.to_s)
+    doc = eval(compiled, binding)
+    doc = N(doc)
     (doc/"span[@id='red0']").text.strip.should eql "hello0"
     (doc/"span[@id='red1']").text.strip.should eql "hello1"
     (doc/"span[@id='red2']").text.strip.should eql "hello2"

data/spec/unless_spec.rb

@@ -5,7 +5,9 @@ describe Renshi::Parser do
   it "should evaluate r:unless(false)" do
     doc = Nokogiri::HTML("<span id='red' r:unless='false'>hello</span>")
     compiled = Renshi::Parser.parse(doc.root.to_s)
+    puts compiled
     out = eval(compiled, binding)
-   (doc/"span[@id='red']").text.strip.should eql "hello"
+    out = N(out)
+    (out/"span[@id='red']").text.strip.should eql "hello"
   end   
 end

data/spec/while_spec.rb

@@ -9,5 +9,7 @@ describe Renshi::Parser do
     doc = N(out)
     (doc/"div[@id='content0']").text.strip.should =~ /hello0/
     (doc/"div[@id='content1']").text.strip.should =~ /hello1/
+    
+    puts doc
   end   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: renshi
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Nicholas Faiz