renshi 0.1.8 → 0.1.9

data/README

@@ -1,12 +1,12 @@
-Renshi is a templating language for Ruby which is unobtrusive in HTML and XHTML structures. It has a conciser syntax than ERB and an 'attribute expression' library which lets you build and combine sets of inline Ruby instructions upon HTML elements.
+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 templates are appended with the suffix of .ren, e.g. index.html.ren or index.ren 
 
-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.
+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. It's especially useful when working alongside a HTML designer.
 
-$ Ruby Insertion
-================
-Very much like ERB.
+$ Ruby Interpretation
+=====================
+Very much like ERB with less typing.
 
 Use $ or ${..} where you would use <%= ... %> . The single $ is used for one word phrases.
 
@@ -24,7 +24,7 @@ Attribute Expressions
 ===================
 Renshi has 'attribute expressions', which may be inserted into HTML elements as attributes. 
 
-Attribute expressions 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 (the element and everything within it).
+Attribute expressions 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 (the element and everything within it).
 
 For e.g.
 <ul>
@@ -35,6 +35,17 @@ For e.g.
   </li>  
 </ul>
 
+Another e.g.
+<li r:each="@sphinx.results[:words], |k,v|" r:if="v[:hits].to_i > 0">
+    $k - Hits $v[:hits] in $v[:docs] documents
+</li>
+
+Another e.g.
+<td r:if="dataset.published?">${link_to 'Hide', hide_cms_dataset_path(dataset)}</td>      
+<td r:else>${link_to 'Publish', publish_cms_dataset_path(dataset)}</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).
+
 After Renshi interprets an attribute expression it removes it from the HTML output.
 
 $ symbols inside of attribute values are interpreted for regular HTML attributes (they're unneeded for renshi attributes).
@@ -142,9 +153,9 @@ Other Rules
 ===========
 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.
+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}]
 
-For example, because $"hello".upcase works, if you want to do "$"hello".upcase" to produce "HELLO" you'll need to use "${"hello".upcase}" instead.
+The $ character accepts the following characters as legitmate ruby characters - " ' { } ( ) + = * / \ - @ [ ] : ? along with the ^\w (any character which is not a Ruby word character).
 
 Installation
 ============

data/lib/renshi/frameworks/sinatra.rb

@@ -0,0 +1,21 @@
+
+# module Renshi
+#   module Frameworks
+#     module Sinatra
+# 
+
+module Sinatra
+  module Templates
+    def ren(template, options={}, locals={})
+        render :ren, template, options, locals
+    end
+  
+    private
+    def render_ren(data, options, locals, &block)
+      # ::Haml::Engine.new(data, options).render(self, locals, &block)
+      # 
+      out = Renshi::Parser.parse(source)
+      return eval(out, binding)
+    end            
+  end
+end

data/lib/renshi/frameworks.rb

@@ -3,6 +3,7 @@ module Renshi
     #framework integrations can be loaded within notice by checking the environment
     def self.notice
       require 'renshi/frameworks/rails' if defined? ENV['RAILS_ENV']
+      # require 'renshi/frameworks/sinatra' if defined? Sinatra
     end    
   end
 end

data/lib/renshi/parser.rb

@@ -139,7 +139,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.8"
+  VERSION="0.1.9"
   
   class SyntaxError < StandardError; end
 end

data/spec/if_spec.rb

@@ -28,4 +28,12 @@ describe Renshi::Parser do
       (doc/"div[@id='content']").text.strip.should =~ /hello/      
       (doc/"div[@id='inner_content']").text.strip.should eql "world"
     end   
+    
+    # it "trying to replicate a problem ..." do
+    #   @foos = [1, 2]
+    #   raw = Renshi::Parser.parse("<p r:if='@foos.empty?'>hello</p>")
+    #   html = eval(raw, binding)
+    #   
+    #   html.should eql ""
+    # end
 end

data/spec/parser_spec.rb

@@ -181,4 +181,35 @@ end
       
       html.should eql "<a href=\"#{r.path}\">hello</a>"
     end
+    
+    it "should interpret $foo.nil?" do
+      foo = nil
+      raw = Renshi::Parser.parse("$foo.nil?")
+      html = eval(raw, binding)
+      
+      html.should eql true.to_s      
+    end    
+   
+    it "should interpret $@foo.nil?" do
+      @foo = nil
+      raw = Renshi::Parser.parse("$@foo.nil?")
+      html = eval(raw, binding)
+      
+      html.should eql true.to_s      
+    end    
+    
+    it "should interpret $a$b$c" do
+      a = 'a'; b = 'b'; c = 'c';
+      raw = Renshi::Parser.parse("$a$b$c")
+      html = eval(raw, binding)
+      
+      html.should eql "abc"
+    end
+    
+    it "should interpret $'foo'.upcase!" do
+      raw = Renshi::Parser.parse("$'foo'.upcase!")
+      html = eval(raw, binding)
+      
+      html.should eql "FOO"
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: renshi
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Nicholas Faiz
@@ -9,7 +9,7 @@ autorequire: renshi
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +10:00
+date: 2009-09-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ files:
 - lib/renshi/attribute_expressions.rb
 - lib/renshi/frameworks/generic.rb
 - lib/renshi/frameworks/rails.rb
+- lib/renshi/frameworks/sinatra.rb
 - lib/renshi/frameworks.rb
 - lib/renshi/node.rb
 - lib/renshi/parser.rb