renshi 0.2.6 → 0.2.7

data/README

@@ -14,18 +14,20 @@ e.g. you can do this
   $stylesheet_link_tag "atsida"
 
 e.g. or this
-  <p>$foo $bar</p> 
+  <p>$foo $translator("welcome human") $Time.now</p> 
 
+e.g. or this
+
+  <p>$foo $translator("welcome human") $Time.now $ now this is normal html, the final $$ signaled where the last expression ended ... </p> 
+  
+The $ symbol is the most flexible, designed to let you drop into inserting ruby code or go back to regular HTML, without having to cursor back and forth as you create templates.
 
-${} delimits where the ruby begins and ends, for insertions within a line of HTML
+
+${} delimits where the ruby begins and ends, for insertions within a line of HTML where you need to include characters the single $ can't handle (such as $, \n).
 
 e.g.
   <p>this is normal HTML but ${some_function "takes this string as input"} and now this is normal HTML</p>
 
-$= is used for inplace insertion:
-
-e.g. 
-  <p>What are you doing up at $=Time.now when you should be asleep?</p>
   
 $[] allows ruby src code to be embedded. It's a bad practice (use helpers or something) but we let you do it.
 

data/lib/renshi/parser.rb

@@ -106,9 +106,7 @@ module Renshi
       while idx != nil do
         next_char = text[(idx + 1)..(idx + 1)]
         
-        if next_char == " "          
-          raise SyntaxError, "Floating $ - use $$ to output '$': #{text[(idx +1)..-1]}", caller
-        elsif next_char == "(" 
+        if next_char == "("          
           #this may be jquery, etc. $(...) 
           end_statement_idx = (idx + 2)
           bits << text[idx..(idx + 1)]    
@@ -148,6 +146,9 @@ module Renshi
             statement = Statement.new(statement_str)
             bits << statement.compile_to_print!
             end_statement_idx = (words.first.length) + 2 + idx
+          elsif next_char =~/\s/ #the empty $ acting as a delimiter
+            end_statement_idx = (idx + 2)
+            bits << "\s"
           else #$foo
             #divide with a delimiter on \n or $ or assume ruby until the end of element
             words = text[(idx +1)..-1].split(/[\n$]/)

data/lib/renshi.rb

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

data/spec/parser_spec.rb

@@ -231,18 +231,26 @@ end
          html.should =~ /goodbye/            
        end
      
-     it "should interpret $foo until \n or end of element as ruby to string" do
-       raw = Renshi::Parser.parse("$'this should output as a string'")
-       html = eval(raw, binding)
-       
-       html.should =~ /this should output as a string/      
-     end
-      
-     it "should interpret $=foo as the single phrase" do
-       raw = Renshi::Parser.parse("this should $=foo 'hello'")
-       foo = "say"
-       html = eval(raw, binding)
-       
-       html.should =~ /this should say 'hello'/      
-     end
+   it "should interpret $foo until \n or end of element as ruby to string" do
+     raw = Renshi::Parser.parse("$'this should output as a string'")
+     html = eval(raw, binding)
+     
+     html.should =~ /this should output as a string/      
+   end
+    
+   it "should interpret $=foo as the single phrase" do
+     raw = Renshi::Parser.parse("this should $=foo 'hello'")
+     foo = "say"
+     html = eval(raw, binding)
+     
+     html.should =~ /this should say 'hello'/      
+   end
+   
+   it "should interpret $ as a delimiter " do
+     raw = Renshi::Parser.parse("this should $foo$ 'hello'")
+     foo = "say"
+     html = eval(raw, binding)
+     
+     html.should =~ /this should say 'hello'/           
+   end
 end

metadata

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