renshi 0.1.0 → 0.1.2

data/README

@@ -7,9 +7,9 @@ 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 use ${}
+If there's a space in your expression use ${}
 
-${foo},$Time.now 
+${some_function "takes this string as input"}
 
 To insert statements in your template use $[]
 
@@ -27,7 +27,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 (see below for an explanation of each)
 * If 
 * Unless
 * Elsif 
@@ -36,6 +36,24 @@ Current Attribute Expressions
 * For
 * Each
 
+Combinations
+============
+Attribute expressions can be combined on elements, and are interpreted in the order of appearance.
+
+For e.g.
+
+<ul>
+  <li r:for="section in @section.sections" r:if="(section.groups & current_user.groups).any?">$section.name
+    <ul>
+      <li r:for="page in section.pages">${link_to page.name, "#{page.path}"}</li>
+    </ul>
+  </li>  
+</ul>
+
+
+Descriptions
+============
+
 * If
 <span r:if="true">hello</span> would render "<span>hello</span>"
 

data/lib/renshi/parser.rb

@@ -120,7 +120,6 @@ module Renshi
           #$[...]
         elsif next_char == "["
           begin
-
             # closing_brace_idx = text.rindex("]")
             closing_brace_idx = close_of_phrase_ending_with("]", text, idx)
             statement_str = text[(idx + 2)..(closing_brace_idx -1)]
@@ -131,7 +130,9 @@ module Renshi
             raise SyntaxError, "No closing bracket: #{text}", caller
           end          
         else #$foo
-          words = text[(idx +1)..-1].split(/\s/)
+          
+          #divide with a delimiter for anything which is not a name character - alpa-numeric and underscore
+          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.0"
+  VERSION="0.1.2"
   
   class SyntaxError < StandardError; end
 end

data/spec/data/example1.ren

@@ -20,3 +20,7 @@
     </div>
   </body>
 </html>
+
+<!-- possibility
+  $div{id='wrapper' style="width: 700px; margin: 0 auto; text-align: left; padding: 30px"}[ $p[Breadcrumbs $render_breadcrumbs]]
+  -->

data/spec/parser_spec.rb

@@ -6,72 +6,72 @@ def N(str)
 end
 
 describe Renshi::Parser do  
-    # it "should parse a $foo var in elements" do
-    #   title = "hello world"
-    #   out = interpret("data/hello_world1.ren", binding)
-    # 
-    #   doc = Nokogiri::XML(out)
-    #   (doc/"title").text.should eql "hello world"
-    # end
-    # 
-    # it "should interpret vars surrounded by whitespace" do 
-    #   foo = "in space no one can hear you scream"
-    #   out = interpret("data/white_space.ren", binding)
-    #   doc = N(out)
-    #   (doc/"div[@id='content']").text.strip.should eql "in space no one can hear you scream"
-    # end  
-    # 
-    # it "should ignore $(..)" do      
-    #   doc = Nokogiri::HTML.fragment("$(foo)")
-    #   node = doc.children.first
-    #   eval(deliver_compiled(node), binding).should eql "$(foo)"
-    # end
-    # 
-    # it "should parse attribute values - e.g. <div id='content$i'>" do
-    #   i = 1
-    #   html = interpret("data/attribute_values_parsed.ren", binding)
-    #   html = N(html)
-    #   (html/"div[@id='content1']").text.strip.should =~ /hello/      
-    # end
-    # 
+    it "should parse a $foo var in elements" do
+      title = "hello world"
+      out = interpret("data/hello_world1.ren", binding)
+    
+      doc = Nokogiri::XML(out)
+      (doc/"title").text.should eql "hello world"
+    end
+    
+    it "should interpret vars surrounded by whitespace" do 
+      foo = "in space no one can hear you scream"
+      out = interpret("data/white_space.ren", binding)
+      doc = N(out)
+      (doc/"div[@id='content']").text.strip.should eql "in space no one can hear you scream"
+    end  
+    
+    it "should ignore $(..)" do      
+      doc = Nokogiri::HTML.fragment("$(foo)")
+      node = doc.children.first
+      eval(deliver_compiled(node), binding).should eql "$(foo)"
+    end
+    
+    it "should parse attribute values - e.g. <div id='content$i'>" do
+      i = 1
+      html = interpret("data/attribute_values_parsed.ren", binding)
+      html = N(html)
+      (html/"div[@id='content1']").text.strip.should =~ /hello/      
+    end
+    
     def foo(one, two = "", three = {})
       "#{one}, #{two}"
     end
-    # 
-    # it "should understand double quotations marks within ruby code!" do
-    #   #${link_to "alter this template", edit_cms_page_template_path(PageTemplate.find_by_file_name("default.html.erb"))}       
-    #   raw = compile_file("data/quots.ren")
-    #   html = eval(raw, binding)
-    #   html = N(html)
-    #   (html/"div[@id='content']").text.strip.should =~ /1, 2/      
-    # end
-    # 
-    # it "should understand double quotations marks within ruby code!" do
-    #   #${link_to "alter this template", edit_cms_page_template_path(PageTemplate.find_by_file_name("default.html.erb"))}       
-    #   raw = compile_file("data/quots2.ren")
-    #   html = eval(raw, binding)
-    #   html = N(html)
-    #   (html/"div[@id='content']").text.strip.should =~ /1, 2/      
-    #   (html/"div[@id='content2']").text.strip.should =~ /a, 2/      
-    # end
-    # 
-    # it "should understand double quotations marks within ruby code! 2" do
-    #   doc = Nokogiri::HTML(%Q!<p>${foo "1", foo("3", "4")}</p>!)
-    #   
-    #   puts doc.root
-    # 
-    #   body = doc.root.children.first
-    #   node = body.children.first
-    #   eval(deliver_compiled(node), binding).should eql "1, 3, 4"
-    # end
-    # 
-    # it "should understand multiple statements on the same line" do    
-    #   raw = compile_file("data/multiple_statements.ren")
-    #   html = eval(raw, binding)
-    #   html = N(html)
-    #   (html/"div[@id='content']").text.strip.should =~ /1, 2, 3, 4/      
-    #   (html/"div[@id='content2']").text.strip.should =~ /1, 2/      
-    # end
+    
+    it "should understand double quotations marks within ruby code!" do
+      #${link_to "alter this template", edit_cms_page_template_path(PageTemplate.find_by_file_name("default.html.erb"))}       
+      raw = compile_file("data/quots.ren")
+      html = eval(raw, binding)
+      html = N(html)
+      (html/"div[@id='content']").text.strip.should =~ /1, 2/      
+    end
+    
+    it "should understand double quotations marks within ruby code!" do
+      #${link_to "alter this template", edit_cms_page_template_path(PageTemplate.find_by_file_name("default.html.erb"))}       
+      raw = compile_file("data/quots2.ren")
+      html = eval(raw, binding)
+      html = N(html)
+      (html/"div[@id='content']").text.strip.should =~ /1, 2/      
+      (html/"div[@id='content2']").text.strip.should =~ /a, 2/      
+    end
+    
+    it "should understand double quotations marks within ruby code! 2" do
+      doc = Nokogiri::HTML(%Q!<p>${foo "1", foo("3", "4")}</p>!)
+      
+      puts doc.root
+    
+      body = doc.root.children.first
+      node = body.children.first
+      eval(deliver_compiled(node), binding).should eql "1, 3, 4"
+    end
+    
+    it "should understand multiple statements on the same line" do    
+      raw = compile_file("data/multiple_statements.ren")
+      html = eval(raw, binding)
+      html = N(html)
+      (html/"div[@id='content']").text.strip.should =~ /1, 2, 3, 4/      
+      (html/"div[@id='content2']").text.strip.should =~ /1, 2/      
+    end
     
     
      # STRING_END = "^R_END" #maybe replace this with a funky unicode char
@@ -100,4 +100,14 @@ describe Renshi::Parser do
       
       html.should =~/head/
     end
+    
+    it "should interpret single $foos using \W, i.e. $foo$bar should render" do
+      raw = Renshi::Parser.parse("$foo$bar")
+      foo = "hello"
+      bar = " world"
+      
+      html = eval(raw, binding)
+      
+      html.should eql "hello world"
+    end    
 end

metadata

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