Replace ${ } with {{ }} (via @tizoc, @soveran).

Cyril David · Cyril David · commit 235050cfdc2a · 2011-08-24T10:37:14.000-07:00
diff --git a/README.markdown b/README.markdown
@@ -22,9 +22,9 @@ the different use cases you may face:
 
 
     % if user == "Bruno"
-      ${user} rhymes with Piano
+      {{user}} rhymes with Piano
     % elsif user == "Brutus"
-      ${user} rhymes with Opus
+      {{user}} rhymes with Opus
     % end
 
 ## Control flow
@@ -33,7 +33,7 @@ Lines that start with `%` are evaluated as Ruby code.
 
 ## Assignment
 
-Whatever it is between `${` and `}` gets printed in the template.
+Whatever it is between `{{` and `}}` gets printed in the template.
 
 ## Comments
 
@@ -47,14 +47,14 @@ There's nothing special about comments, it's just a `#` inside your Ruby code:
 As with control instructions, it happens naturally:
 
     % 3.times do |i|
-      ${i}
+      {{i}}
     % end
 
 ## Parameters
 
 The values passed to the template are available as local variables:
 
-    example = Mote.parse("Hello ${name}")
+    example = Mote.parse("Hello {{name}}")
     assert_equal "Hello world", example.call(name: "world")
     assert_equal "Hello Bruno", example.call(name: "Bruno")
 
@@ -75,4 +75,4 @@ version of its content. The compiled template is cached for subsequent calls.
 Installation
 ------------
 
-    $ gem install mote
+    $ gem install mote
diff --git a/benchmarks/src/complex.mote b/benchmarks/src/complex.mote
@@ -5,14 +5,14 @@
     <title>Simple Benchmark</title>
   </head>
   <body>
-    <h1>${ params[:header] }</h1>
+    <h1>{{ params[:header] }}</h1>
     % unless params[:item].empty?
       <ul>
       % for i in params[:item]
         % if i[:current]
-          <li><strong>${ i[:name] }</strong></li>
+          <li><strong>{{ i[:name] }}</strong></li>
         % else
-          <li><a href="${ i[:url] }">${ i[:name] }</a></li>
+          <li><a href="{{ i[:url] }}">{{ i[:name] }}</a></li>
         % end
       % end
       </ul>
diff --git a/lib/mote.rb b/lib/mote.rb
@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "0.1.0"
+  VERSION = "0.0.2"
 
   def self.parse(template, context = self, vars = [])
-    terms = template.split(/^\s*(%)(.*?)$|(\$\{)(.*?)\}/)
+    terms = template.split(/^\s*(%)(.*?)$|(\{\{)(.*?)\}\}/)
 
     parts = "Proc.new do |params, __o|\n params ||= {}; __o ||= ''\n"
 
@@ -32,7 +32,7 @@ def self.parse(template, context = self, vars = [])
     while term = terms.shift
       case term
       when "%"  then parts << "#{terms.shift}\n"
-      when "${" then parts << "__o << (#{terms.shift}).to_s\n"
+      when "{{" then parts << "__o << (#{terms.shift}).to_s\n"
       else           parts << "__o << #{term.inspect}\n"
       end
     end
@@ -52,4 +52,4 @@ def mote_cache
       Thread.current[:_mote_cache] ||= {}
     end
   end
-end
+end
diff --git a/test/mote_test.rb b/test/mote_test.rb
@@ -2,7 +2,7 @@
 
 scope do
   test "assignment" do
-    example = Mote.parse("${ \"***\" }")
+    example = Mote.parse("{{ \"***\" }}")
     assert_equal "***", example.call
   end
 
@@ -54,7 +54,7 @@
   end
 
   test "multiline" do
-    example = Mote.parse("The\nMan\nAnd\n${\"The\"}\nSea")
+    example = Mote.parse("The\nMan\nAnd\n{{\"The\"}}\nSea")
     assert_equal "The\nMan\nAnd\nThe\nSea", example[:n => 3]
   end
 
@@ -67,16 +67,21 @@
     context = Object.new
     context.instance_variable_set(:@user, "Bruno")
 
-    example = Mote.parse("${ @user }", context)
+    example = Mote.parse("{{ @user }}", context)
     assert_equal "Bruno", example.call
   end
 
   test "locals" do
     context = Object.new
 
-    example = Mote.parse("${ user }", context, [:user])
+    example = Mote.parse("{{ user }}", context, [:user])
     assert_equal "Bruno", example.call(user: "Bruno")
   end
+
+  test "curly bug" do
+    example = Mote.parse("{{ [1, 2, 3].map { |i| i * i }.join(',') }}")
+    assert_equal "1,4,9", example.call
+  end
 end
 
 include Mote::Helpers
@@ -85,4 +90,4 @@
   test "helpers" do
     assert_equal "\n  *\n\n  *\n\n  *\n\n", mote("test/basic.erb", :n => 3)
   end
-end
+end
