mote 1.0.0 → 1.1.0

data/lib/mote.rb

@@ -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.0.0"
+  VERSION = "1.1.0"
 
-  PATTERN = /^\s*(%)(.*?)$|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
+  PATTERN = /^(\n+)|^\s*(%)\s*(.*?)\n|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
 
   def self.parse(template, context = self, vars = [])
     terms = template.split(PATTERN)

data/test/mote_test.rb

@@ -1,6 +1,21 @@
 require File.expand_path("../lib/mote", File.dirname(__FILE__))
 
 scope do
+  test "empty lines" do
+    example = Mote.parse("\n\n \n")
+    assert_equal "\n\n \n", example.call
+  end
+
+  test "empty lines with mixed code" do
+    example = Mote.parse("\n% true\n\n% false\n\n")
+    assert_equal "\n\n\n", example.call
+  end
+
+  test "empty lines with control flow" do
+    example = Mote.parse("\n% if true\n\n\n% else\n\n% end\n")
+    assert_equal "\n\n\n", example.call
+  end
+
   test "assignment" do
     example = Mote.parse("{{ \"***\" }}")
     assert_equal "***", example.call
@@ -27,7 +42,7 @@ scope do
     EOT
 
     example = Mote.parse(template)
-    assert_equal "\n  ***\n\n", example.call
+    assert_equal "  ***\n", example.call
   end
 
   test "block evaluation" do
@@ -38,7 +53,7 @@ scope do
     EOT
 
     example = Mote.parse(template)
-    assert_equal "\n*\n\n*\n\n*\n\n", example.call
+    assert_equal "*\n*\n*\n", example.call
   end
 
   test "parameters" do
@@ -49,8 +64,8 @@ scope do
     EOT
 
     example = Mote.parse(template)
-    assert_equal "\n*\n\n*\n\n*\n\n", example[:n => 3]
-    assert_equal "\n*\n\n*\n\n*\n\n*\n\n", example[:n => 4]
+    assert_equal "*\n*\n*\n", example[:n => 3]
+    assert_equal "*\n*\n*\n*\n", example[:n => 4]
   end
 
   test "multiline" do
@@ -119,7 +134,7 @@ scope do
   end
 
   test "helpers" do
-    assert_equal "\n  *\n\n  *\n\n  *\n\n", mote("test/basic.mote", :n => 3)
+    assert_equal "  *\n  *\n  *\n", mote("test/basic.mote", :n => 3)
   end
 
   test "using functions in the context" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2156124580 !ruby/object:Gem::Requirement
+  requirement: &2155981980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156124580
+  version_requirements: *2155981980
 description: Mote is a very simple and fast template engine.
 email:
 - michel@soveran.com