renshi 0.2.7 → 0.2.8

data/README

@@ -7,7 +7,9 @@ index.html.ren means you're working with a Renshi file!
 
 $ Ruby Interpretation
 =====================
-$ interprets everything after it as ruby which will be to_stringed until the next $, a newline character, or the end of the element.
+The $ symbol is designed to let you drop into ruby code or go back to regular HTML, without having to cursor back and forth as you build your templates.
+
+$ interprets everything after it as ruby which will be to_stringed until the next $, a newline character, or the end of the element. Leave a $ with a space after it to switch back into writing regular HTML.
 
 e.g. you can do this
 
@@ -16,17 +18,18 @@ e.g. you can do this
 e.g. or this
   <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.
+e.g. or this (contrived) example
 
+<p>$Page.find_by_text("this is the way world ends, \ not with a bang but a whimper).full_text$ A poem by T.S. Eliot, which we thought you'd like $current_user.name</p> 
 
 ${} 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>
+  <p>this is normal HTML but ${some_function "takes this string as input or uses a \n or /foo$/ regex"} and now this is normal HTML</p>
+
+$^ allows you to insert single phrases, as an alternative to surrounding your ruby with on each side.
+e.g.
+  <p>It has been $^current_user.days_absent since we last saw you.</p>
 
   
 $[] allows ruby src code to be embedded. It's a bad practice (use helpers or something) but we let you do it.
@@ -44,7 +47,7 @@ Attribute expressions are insertable into HTML elements.
 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
+    $^k - Hits $v[:hits]$ in $v[:docs]$ documents
 </li>
 
 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.

data/lib/renshi/parser.rb

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

metadata

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