renshi 0.2.5 → 0.2.6

data/README

@@ -17,16 +17,16 @@ e.g. or this
   <p>$foo $bar</p> 
 
 
-${} delimits where the ruby begins and ends, for inplace insertions"
+${} delimits where the ruby begins and ends, for insertions within a line of HTML
 
 e.g.
-  <p>${some_function "takes this string as input"} and this is normal HTML</p>
+  <p>this is normal HTML but ${some_function "takes this string as input"} and now this is normal HTML</p>
 
-$^ outputs a single phrase:
+$= is used for inplace insertion:
 
 e.g. 
-  <p>What are you doing up at $^Time.now when you should be asleep?</p>
-
+  <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.
 
 $[if foo]

data/lib/renshi/parser.rb

@@ -140,7 +140,7 @@ module Renshi
           rescue StandardError
             raise SyntaxError, "No closing bracket: #{text}", caller
           end
-          elsif next_char == "^" #$!foo
+          elsif next_char == "=" #$=foo
             #divide with a delimiter for anything which is not a name character - alpa-numeric and underscore
             words = text[(idx + 2)..-1].split(/[^\w."'{}()+=*\/\-@\[\]:?!%]/)
             words[0] = "'$'" if words[0] == "$"

data/lib/renshi.rb

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

data/spec/parser_spec.rb

@@ -101,8 +101,8 @@ 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")
+    it "should interpret single $=foos using \W, i.e. $=foo$=bar should render" do
+      raw = Renshi::Parser.parse("$=foo$=bar")
       foo = "hello"
       bar = " world"
       
@@ -110,6 +110,14 @@ describe Renshi::Parser do
       
       html.should eql "hello world"
     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
 
 class Test
   def bar
@@ -198,13 +206,6 @@ end
        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!")
@@ -237,8 +238,8 @@ end
        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'")
+     it "should interpret $=foo as the single phrase" do
+       raw = Renshi::Parser.parse("this should $=foo 'hello'")
        foo = "say"
        html = eval(raw, binding)
        

metadata

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