Capitalization view helper doesn't kick in if suffix helpers already …

…did. Fixes #2
machty · Feb 1, 2013 · be3c733 · be3c733
1 parent 5c0b100
commit be3c733
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 5 deletions.
diff --git a/dist/emblem.js b/dist/emblem.js
@@ -2318,10 +2318,19 @@ Emblem.Parser = (function() {
 
           if(ret.mustache) {
             // Block. Modify inner MustacheNode and return.
+
+            // Make sure a suffix modifier hasn't already been applied.
+            var ch = ret.mustache.id.string.charAt(0);
+            if(!ch.match(/[A-Z]/)) return ret;
+
             ret.mustache = unshiftParam(ret.mustache, defaultCapitalizedHelper);
             return ret;
           } else {
-            // ret is the MustacheNode
+
+            // Make sure a suffix modifier hasn't already been applied.
+            var ch = ret.id.string.charAt(0);
+            if(!ch.match(/[A-Z]/)) return ret;
+
             return unshiftParam(ret, defaultCapitalizedHelper);
           }
         },

diff --git a/dist/emblem.min.js b/dist/emblem.min.js
diff --git a/lib/parser.js b/lib/parser.js
@@ -131,10 +131,19 @@ Emblem.Parser = (function() {
 
           if(ret.mustache) {
             // Block. Modify inner MustacheNode and return.
+
+            // Make sure a suffix modifier hasn't already been applied.
+            var ch = ret.mustache.id.string.charAt(0);
+            if(!ch.match(/[A-Z]/)) return ret;
+
             ret.mustache = unshiftParam(ret.mustache, defaultCapitalizedHelper);
             return ret;
           } else {
-            // ret is the MustacheNode
+
+            // Make sure a suffix modifier hasn't already been applied.
+            var ch = ret.id.string.charAt(0);
+            if(!ch.match(/[A-Z]/)) return ret;
+
             return unshiftParam(ret, defaultCapitalizedHelper);
           }
         },

diff --git a/spec/qunit_spec.coffee b/spec/qunit_spec.coffee
@@ -579,7 +579,6 @@ test "should not kick in explicit {{mustache}}", ->
   shouldCompileTo emblem, { SomeView: 'erp' }, '<p>Yeah erp</p>'
 
 
-
 # TODO test overriding the default helper name (instead of always "view")
 
 
@@ -890,6 +889,13 @@ test "line number is provided for preprocessor error", ->
 
 suite "misc."
 
+test "capitalized view helper should not kick in if suffix modifiers present", ->
+  emblem =
+  """
+  Foo!
+  """
+  shouldCompileToString emblem, '<unbound class="Foo">Foo</unbound>'
+
 test "Emblem has a VERSION defined", ->
   ok(Emblem.VERSION, "Emblem.VERSION should be defined")
 
diff --git a/spec/qunit_spec.js b/spec/qunit_spec.js
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -96,10 +96,19 @@ capitalizedLineStarterMustache
 
   if(ret.mustache) {
     // Block. Modify inner MustacheNode and return.
+
+    // Make sure a suffix modifier hasn't already been applied.
+    var ch = ret.mustache.id.string.charAt(0);
+    if(!ch.match(/[A-Z]/)) return ret;
+
     ret.mustache = unshiftParam(ret.mustache, defaultCapitalizedHelper);
     return ret;
   } else {
-    // ret is the MustacheNode
+
+    // Make sure a suffix modifier hasn't already been applied.
+    var ch = ret.id.string.charAt(0);
+    if(!ch.match(/[A-Z]/)) return ret;
+
     return unshiftParam(ret, defaultCapitalizedHelper);
   }
 }