mote 0.1.0 → 0.2.0

data/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

data/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.2.0"
 
   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 @@ class Mote
     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

data/test/mote_test.rb

@@ -2,7 +2,7 @@ require File.expand_path("../lib/mote", File.dirname(__FILE__))
 
 scope do
   test "assignment" do
-    example = Mote.parse("${ \"***\" }")
+    example = Mote.parse("{{ \"***\" }}")
     assert_equal "***", example.call
   end
 
@@ -54,7 +54,7 @@ scope do
   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 @@ scope do
     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 @@ scope do
   test "helpers" do
     assert_equal "\n  *\n\n  *\n\n  *\n\n", mote("test/basic.erb", :n => 3)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000 -07:00
+date: 2011-08-24 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152242200 !ruby/object:Gem::Requirement
+  requirement: &2153612340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152242200
+  version_requirements: *2153612340
 description: Mote is the little brother of ERB. It only provides a subset of ERB's
   features, but praises itself of being simple--both internally and externally--and
   super fast.