mote 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97237b0155b66dfbd3b2d984f21d3785895f8bab
-  data.tar.gz: 51b922147551b06f5b3135e5f51e144c789f111f
+  metadata.gz: 0bf64ea0a8637abd44b6e4ffe5c8307849171e7d
+  data.tar.gz: df273253e96dca30b70aa34b0f5b02fe6be78a2b
 SHA512:
-  metadata.gz: 6a034be6380e394e4732d001a2edeb32a70eb445048eac0509ce8505ab847adb4b6518256ea90cf31253f85cf8884ba6f50131d2ddc149b7a67e12902cce9901
-  data.tar.gz: 0b2ca78c4758fdac89db5fbe499e3627388c5d71b4cf6ea5d3ee5950f0742a053c493c52e280c3c2bc8c4c60a03e256f016cd731842e6370352e05c816214626
+  metadata.gz: 28f751114df86a5345052b7fec958e3c08fcdeedd9bfb71a7278e2bc0eba77ca3c8aa3a2ca97ce946b80ce09442bed017c9f642cd9e42d22c9ba4d6e7d6a7ec5
+  data.tar.gz: d2d889b1f9d050089adb4c126e63ccaa1497ad9cf62b5e33dbdce893c091b7fc9ed4159f0a93ebfa0b3f42585039fc93caa93656bc6899a552fbe4f011b36135

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012 Michel Martens
+Copyright (c) 2011-2015 Michel Martens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

data/lib/mote.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Michel Martens
+# Copyright (c) 2011-2015 Michel Martens
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 
-  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)
@@ -28,10 +28,10 @@ class Mote
     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"

data/test/mote_test.rb

@@ -22,7 +22,7 @@ scope do
   end
 
   test "assignment" do
-    example = Mote.parse("{{ \"***\" }}")
+    example = Mote.parse("{{ '***' }}")
     assert_equal "***", example.call
   end
 
@@ -75,7 +75,7 @@ scope do
 
   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 @@ scope do
     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 @@ scope do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest