renshi 0.2.0 → 0.2.1

data/README

@@ -1,16 +1,12 @@
 Renshi is a templating language for Ruby which is versatile and cooperative with HTML. It has a concise syntax and 'attribute expressions', which let you build and combine sets of inline Ruby instructions upon HTML elements.
 
-Renshi gives the Ruby dev. flexibility when templating; 'attribute expressions' create well-formed XHTML, $ interpretations can be used as a conciser ERB notation.
-
-Renshi integrates with Rails and Sinatra out of the box. Simply 'require renshi'! In Sinatra the helper method simply use 'ren' where you would have used 'erb'/'haml'.
-
-Renshi templates are appended with the suffix of .ren, e.g. index.html.ren or index.ren. 
+Renshi integrates with Rails and Sinatra transparently. Simply 'require renshi'. In Sinatra use 'ren' where you would have used the 'erb'/'haml' methods. Renshi templates are appended with the suffix of .ren, e.g. index.html.ren or index.ren. 
 
 $ Ruby Interpretation
 =====================
 Like ERB, but less typing.
 
-Use $ or ${..} where you would use <%= ... %> . The single $ is used for one word phrases.
+Use $ or ${..} where you would use <%= ... %> . The single $ is used for an unbroken phrase (see below).
 
 $foo[0], $1+1, $Time.now - ERB equiv. <%= foo[0] %>, <%= 1+1 %>, <%= Time.now %> 
 
@@ -28,23 +24,22 @@ Attr. expressions are insertable into HTML elements as attributes.
 
 <p r:if="user.known?">Welcome $user.name</p>
 
-They can be combined on elements and are interpreted in the order of appearance and are cumulative, allowing you to program inline on the HTML structure: if a variable is created by an attr. expression it can be used within its scope. 
+They can be combined on elements and are interpreted in the order of appearance and are cumulative, allowing you to program inline on the HTML structure.
 
 <li r:each="@sphinx.results[:words], |k,v|" r:if="v[:hits].to_i > 0">
     $k - Hits $v[:hits] in $v[:docs] documents
 </li>
 
-If you use a variable within an attr. expression, the $ notation is not needed. It's only for insertion in regular HTML.
+In the above, you can see that the if statement is scoped within the preceding each block, so you can reference variables between attr. expressions. Variables within an attr. expression don't need the $ symbol. That's only for setting up Ruby insertions within regular HTML.
 
-Renshi will automatically guess the natural ending of boolean structures.
+One more thing, Renshi will guess the expected ending of boolean structures.
 
 <td r:if="dataset.published?">...</td>      
 <td r:else>...</td>
 
-You don't need to supply an 'end' element; it can be guessed by the structure of the HTML document (see r:if below in the library).
-
-None of the r:foo attr.expressions are rendered in the HTML source. 
+You don't need to supply an 'end' element; it is inferred by the HTML structure (see below).
 
+None of the attr.expressions appear in the HTML rendered to the browser.
 
 Attribute Expression Library
 ============================
@@ -151,7 +146,7 @@ To print a $ use $$, e.g. $$10.95 comes out as $10.95
 
 Because the $foo evaluation can take all sorts of symbols to interpret a Ruby statement, if you are using a special symbol *immediately* before it, you'll have to use ${foo} instead. For example, because $greetings[0].upcase is interpretable, if you want to output "[HELLO]" where the brackets surround the string, you'd use [${greetings[0].upcase}]
 
-The $ parser *delimits* (splits) on any character which is not in this list - . " ' { } ( ) + = * / \ - @ [ ] : ? ! \w 
+The $ parser *delimits* (splits) on any character which is not in this list - . " ' { } ( ) + = * / \ - @ [ ] : ? ! % \w 
 
 Installation
 ============

data/lib/renshi/parser.rb

@@ -29,6 +29,10 @@ module Renshi
       parser = self.new(doc)
       out = parser.parse
       
+      if ENV['RENSHI_SHOW_SRC']
+        puts "Renshi src: \n#{out}"
+      end
+      
       return out
     end
     
@@ -137,9 +141,8 @@ module Renshi
             raise SyntaxError, "No closing bracket: #{text}", caller
           end          
         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.2.0"
+  VERSION="0.2.1"
   
   class SyntaxError < StandardError; end
 end

data/spec/parser_spec.rb

@@ -212,4 +212,12 @@ end
       
       html.should eql "FOO"
     end
+    
+    it "should interpret $Time.now.strftime('%I:%M')" do
+      raw = Renshi::Parser.parse("$Time.now.strftime('%I:%M')")
+      html = eval(raw, binding)
+      
+      html.should =~ /:/
+    end
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: renshi
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Nicholas Faiz
@@ -9,7 +9,7 @@ autorequire: renshi
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 +10:00
+date: 2009-09-21 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ files:
 - lib/renshi.rb
 - README
 has_rdoc: true
-homepage: http://treefallinginthewoods.com
+homepage: http://github.com/biv/renshi/tree/master
 licenses: []
 
 post_install_message: 
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Renshi is a templating language for Ruby which is versatile and cooperative with HTML.