renshi 0.1.2 → 0.1.3

data/README

@@ -1,15 +1,16 @@
-Renshi is a templating language for Ruby which is unobtrusive in HTML and XHTML structures. 
+Renshi is a templating language for Ruby which is unobtrusive in HTML and XHTML structures. It is conciser than ERB and offers 'attribute expressions', letting you build sets of inline Ruby instructions upon HTML elements. Renshi was designed to give the Ruby dev. flexibility when creating templates; the use of attribute expressions creates well-formed XHTML, $ interpretation can be used however the dev. wishes.
 
-$ Code
-======
+Renshi templates are appended with the suffix of .ren, e.g. index.html.ren or index.ren 
+
+$ Ruby Insertion
+================
 To output data on the page stick a $ in front of your var. or expression
 
-$foo
-$Time.now
+$foo, $Time.now  (ERB equivalent - <%= foo %>, <%= Time.now %>)
 
 If there's a space in your expression use ${}
 
-${some_function "takes this string as input"}
+${some_function "takes this string as input"} (ERB equiv. - <%= some_function "takes this string as input" %>)
 
 To insert statements in your template use $[]
 
@@ -19,40 +20,36 @@ $[if foo]
   $foo
 $[end]
 
+(The ERB equiv. should be obvious by now.)
+
 Attribute Expressions
 ===================
-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>. After Renshi::Parser interprets an attribute expression it removes it from the HTML output; the code is unobtrusive.
-
-r:expression_name="expression" - the expression value is treated as a Ruby expression .
-
-Some expressions, such as r:each, use the quoted value to also hold parameter information.
-
-Current Attribute Expressions (see below for an explanation of each)
-* If 
-* Unless
-* Elsif 
-* Else
-* While
-* For
-* Each
+Renshi has 'attribute expressions', which may be inserted into HTML elements as attributes. 
 
-Combinations
-============
-Attribute expressions can be combined on elements, and are interpreted in the order of appearance.
+Attribute expressions can be combined on elements and are interpreted in the order of appearance and are cumulative, allowing you to build chunks of inline code which apply to the HTML element (and anything within it).
 
 For e.g.
-
 <ul>
-  <li r:for="section in @section.sections" r:if="(section.groups & current_user.groups).any?">$section.name
+  <li r:for="section in @section.sections" r:if="authorized?(current_user, section)?" id="section_$section.name">$section.name
     <ul>
       <li r:for="page in section.pages">${link_to page.name, "#{page.path}"}</li>
     </ul>
   </li>  
 </ul>
 
+After Renshi interprets an attribute expression it removes it from the HTML output.
 
-Descriptions
-============
+$ symbols inside of attribute values are interpreted for regular HTML attributes (they're unneeded for renshi attributes).
+
+Attribute Expression Library
+============================
+* If 
+* Unless
+* Elsif 
+* Else
+* While
+* For
+* Each
 
 * If
 <span r:if="true">hello</span> would render "<span>hello</span>"
@@ -145,16 +142,8 @@ See renshi/lib/renshi/attribute_expressions for how they work.
 
 Other Rules
 ===========
-$ values inside of attributes are only interpreted as Renshi variables for regular attributes (not renshi attributes).
-
-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.
-
 To print a $ use $$, e.g. $$10.95 comes out as $10.95
 
-Renshi documents are appended with the suffix of .ren
-
-e.g. index.html.ren or index.ren 
-
 Installation
 ============
 Renshi is hosted on Rubyforge so 'sudo gem install renshi'. Alternatively, use github to do what you want with it.

data/lib/renshi/parser.rb

@@ -132,7 +132,7 @@ module Renshi
         else #$foo
           
           #divide with a delimiter for anything which is not a name character - alpa-numeric and underscore
-          words = text[(idx +1)..-1].split(/\W/)
+          words = text[(idx +1)..-1].split(/[^\w."'{}()+=*\/\-]/)
           words[0] = "'$'" if words[0] == "$"
           statement_str = words.first
           statement = Statement.new(statement_str)

data/lib/renshi.rb

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

data/spec/parser_spec.rb

@@ -109,5 +109,43 @@ describe Renshi::Parser do
       html = eval(raw, binding)
       
       html.should eql "hello world"
-    end    
+    end
+
+class Test
+  def bar
+    return "hello world"
+  end
+end
+    
+    it "should interpret single $foo.bar using \W" do
+      raw = Renshi::Parser.parse("$foo.bar")
+      foo = Test.new
+      html = eval(raw, binding)
+      
+      html.should eql "hello world"
+    end
+    
+    it "should interpret single $1+1 and $2*2 and $3/3 and $4-4 using \W" do
+      raw = Renshi::Parser.parse("$1+1")
+      foo = Test.new
+      html = eval(raw, binding)  
+      html.should eql "2"
+      
+      raw = Renshi::Parser.parse("$2*2")
+      foo = Test.new
+      html = eval(raw, binding)  
+      html.should eql "4"
+
+      raw = Renshi::Parser.parse("$3/3")
+      foo = Test.new
+      html = eval(raw, binding)  
+      html.should eql "1"
+
+      raw = Renshi::Parser.parse("$4-4")
+      foo = Test.new
+      html = eval(raw, binding)  
+      html.should eql "0"
+    end
+    
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: renshi
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nicholas Faiz
@@ -9,7 +9,7 @@ autorequire: renshi
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 +10:00
+date: 2009-08-19 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency