Minor updates inspired by my work on:

https://codalyzed.com/videos/lesscode

The changes are:

* Improving the `PATTERN` regex to handle more edge cases
* Documenting the third type of template interpolation
* A couple of minor style updates to the library code
* Some minor clarifications in the tests

Author: JEG2

README.md

@@ -22,16 +22,26 @@ Silly example, you may say, and I would agree. What follows is a short list of
 the different use cases you may face:
 
 ```
+% # This is a comment
 % if user == "Bruno"
   {{user}} rhymes with Piano
 % elsif user == "Brutus"
   {{user}} rhymes with Opus
 % end
+
+<?
+  # Multiline code evaluation
+  lucky = [1, 3, 7, 9, 13, 15]
+  prime = [2, 3, 5, 7, 11, 13]
+?>
+
+{{ lucky & prime }}
 ```
 
 ## Control flow
 
-Lines that start with `%` are evaluated as Ruby code.
+Lines that start with `%` are evaluated as Ruby code. Anything between
+`<?` and `?>`, including new lines, is also evaluated as Ruby code.
 
 ## Assignment
 
@@ -45,7 +55,6 @@ There's nothing special about comments, it's just a `#` inside your Ruby code:
 % # This is a comment.
 ```
 
-
 ## Block evaluation
 
 As with control instructions, it happens naturally:

lib/mote.rb

@@ -20,18 +20,18 @@
 class Mote
   VERSION = "1.1.3"
 
-  PATTERN = /^(\n)|^\s*(%)\s*(.*?)(?:\n|\Z)|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
+  PATTERN = /^[^\S\n]*(%)[^\S\n]*(.*?)(?:\n|\Z)|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
 
   def self.parse(template, context = self, vars = [])
     terms = template.split(PATTERN)
 
     parts = "Proc.new do |params, __o|\n params ||= {}; __o ||= ''\n"
 
     vars.each do |var|
-      parts << "%s = params[%s]\n" % [var, var.inspect]
+      parts << "%s = params[%p]\n" % [var, var]
     end
 
-    while term = terms.shift
+    while (term = terms.shift)
       case term
       when "<?" then parts << "#{terms.shift}\n"
       when "%"  then parts << "#{terms.shift}\n"

test/mote_test.rb

@@ -22,7 +22,7 @@
   end
 
   test "assignment" do
-    example = Mote.parse("{{ \"***\" }}")
+    example = Mote.parse("{{ '***' }}")
     assert_equal "***", example.call
   end
 
@@ -75,7 +75,7 @@
 
   test "multiline" do
     example = Mote.parse("The\nMan\nAnd\n{{\"The\"}}\nSea")
-    assert_equal "The\nMan\nAnd\nThe\nSea", example[:n => 3]
+    assert_equal "The\nMan\nAnd\nThe\nSea", example.call
   end
 
   test "quotes" do
@@ -87,8 +87,8 @@
     context = Object.new
     def context.user; "Bruno"; end
 
-    example = Mote.parse("{{ context.user }}", context, [:context])
-    assert_equal "Bruno", example.call(context: context)
+    example = Mote.parse("{{ user }}", context)
+    assert_equal "Bruno", example.call
   end
 
   test "locals" do
@@ -101,23 +101,19 @@ def context.user; "Bruno"; end
     assert_equal "", example.call(user: nil)
   end
 
-  test "curly bug" do
-    example = Mote.parse("{{ [1, 2, 3].map { |i| i * i }.join(',') }}")
-    assert_equal "1,4,9", example.call
-  end
-
   test "multi-line XML-style directives" do
     template = (<<-EOT).gsub(/^    /, "")
-    <? res = ""
-       [1, 2, 3].each_with_index do |item, idx|
-         res << "%d. %d\n" % [idx + 1, item * item]
-       end
+    <?
+      # Multiline code evaluation
+      lucky = [1, 3, 7, 9, 13, 15]
+      prime = [2, 3, 5, 7, 11, 13]
     ?>
-    {{ res }}
+
+    {{ lucky & prime }}
     EOT
 
     example = Mote.parse(template)
-    assert_equal "\n1. 1\n2. 4\n3. 9\n\n", example.call
+    assert_equal "\n\n[3, 7, 13]\n", example.call
   end
 
   test "preserve XML directives" do