barber-emblem 0.0.3 → 0.0.4

data/lib/barber/emblem/version.rb

@@ -1,5 +1,5 @@
 module Barber
   module Emblem
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/barber/javascripts/emblem.js

@@ -332,7 +332,7 @@ Emblem.Parser = (function() {
 
             // 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;
+            if(!IS_EMBER || !ch.match(/[A-Z]/)) return ret;
 
             ret.mustache = unshiftParam(ret.mustache, defaultCapitalizedHelper);
             return ret;
@@ -629,71 +629,78 @@ Emblem.Parser = (function() {
           }
         },
         peg$c125 = function(a) {
-          return [new AST.ContentNode(' '), a]; 
+          return [new AST.ContentNode(' ')].concat(a); 
         },
         peg$c126 = /^[A-Za-z.:0-9_]/,
         peg$c127 = "[A-Za-z.:0-9_]",
         peg$c128 = function(id) { return new AST.MustacheNode([id]); },
         peg$c129 = function(event, mustacheNode) {
           // Unshift the action helper and augment the hash
-          return unshiftParam(mustacheNode, 'action', [['on', new AST.StringNode(event)]]);
+          return [unshiftParam(mustacheNode, 'action', [['on', new AST.StringNode(event)]])];
         },
         peg$c130 = function(value) { return value.replace(/ *$/, ''); },
-        peg$c131 = function(key, value) { 
+        peg$c131 = function(key, value) { return IS_EMBER; },
+        peg$c132 = function(key, value) { 
           var hashNode = new AST.HashNode([[key, new AST.StringNode(value)]]);
           var params = [new AST.IdNode(['bindAttr'])];
-
-          return new AST.MustacheNode(params, hashNode);
+          return [new AST.MustacheNode(params, hashNode)];
         },
-        peg$c132 = function(key, value) { 
+        peg$c133 = function(key, id) { 
+          return [
+            new AST.ContentNode(key + '=' + '"'),
+            new AST.MustacheNode([id]),
+            new AST.ContentNode('"'),
+          ];
+        },
+        peg$c134 = function(key, value) { 
           var s = key + '=' + '"' + value + '"';
-          return new AST.ContentNode(s);
+          return [new AST.ContentNode(s)];
         },
-        peg$c133 = "_",
-        peg$c134 = "\"_\"",
-        peg$c135 = "-",
-        peg$c136 = "\"-\"",
-        peg$c137 = "%",
-        peg$c138 = "\"%\"",
-        peg$c139 = "#",
-        peg$c140 = "\"#\"",
-        peg$c141 = function(c) { return c;},
-        peg$c142 = "CSSIdentifier",
-        peg$c143 = function(nmstart, nmchars) { return nmstart + nmchars; },
-        peg$c144 = /^[_a-zA-Z0-9\-]/,
-        peg$c145 = "[_a-zA-Z0-9\\-]",
-        peg$c146 = /^[_a-zA-Z]/,
-        peg$c147 = "[_a-zA-Z]",
-        peg$c148 = /^[\x80-\xFF]/,
-        peg$c149 = "[\\x80-\\xFF]",
-        peg$c150 = "KnownHTMLTagName",
-        peg$c151 = function(t) { return !!KNOWN_TAGS[t]; },
-        peg$c152 = function(t) { return t; },
-        peg$c153 = /^[:_a-zA-Z0-9\-]/,
-        peg$c154 = "[:_a-zA-Z0-9\\-]",
-        peg$c155 = "a JS event",
-        peg$c156 = function(t) { return !!KNOWN_EVENTS[t]; },
-        peg$c157 = "INDENT",
-        peg$c158 = "\uEFEF",
-        peg$c159 = "\"\\uEFEF\"",
-        peg$c160 = function() { return ''; },
-        peg$c161 = "DEDENT",
-        peg$c162 = "\uEFFE",
-        peg$c163 = "\"\\uEFFE\"",
-        peg$c164 = "Unmatched DEDENT",
-        peg$c165 = "\uEFEE",
-        peg$c166 = "\"\\uEFEE\"",
-        peg$c167 = "LineEnd",
-        peg$c168 = "\uEFFF",
-        peg$c169 = "\"\\uEFFF\"",
-        peg$c170 = "\n",
-        peg$c171 = "\"\\n\"",
-        peg$c172 = "ANYDEDENT",
-        peg$c173 = "RequiredWhitespace",
-        peg$c174 = "OptionalWhitespace",
-        peg$c175 = "InlineWhitespace",
-        peg$c176 = /^[ \t]/,
-        peg$c177 = "[ \\t]",
+        peg$c135 = "_",
+        peg$c136 = "\"_\"",
+        peg$c137 = "-",
+        peg$c138 = "\"-\"",
+        peg$c139 = "%",
+        peg$c140 = "\"%\"",
+        peg$c141 = "#",
+        peg$c142 = "\"#\"",
+        peg$c143 = function(c) { return c;},
+        peg$c144 = "CSSIdentifier",
+        peg$c145 = function(nmstart, nmchars) { return nmstart + nmchars; },
+        peg$c146 = /^[_a-zA-Z0-9\-]/,
+        peg$c147 = "[_a-zA-Z0-9\\-]",
+        peg$c148 = /^[_a-zA-Z]/,
+        peg$c149 = "[_a-zA-Z]",
+        peg$c150 = /^[\x80-\xFF]/,
+        peg$c151 = "[\\x80-\\xFF]",
+        peg$c152 = "KnownHTMLTagName",
+        peg$c153 = function(t) { return !!KNOWN_TAGS[t]; },
+        peg$c154 = function(t) { return t; },
+        peg$c155 = /^[:_a-zA-Z0-9\-]/,
+        peg$c156 = "[:_a-zA-Z0-9\\-]",
+        peg$c157 = "a JS event",
+        peg$c158 = function(t) { return !!KNOWN_EVENTS[t]; },
+        peg$c159 = "INDENT",
+        peg$c160 = "\uEFEF",
+        peg$c161 = "\"\\uEFEF\"",
+        peg$c162 = function() { return ''; },
+        peg$c163 = "DEDENT",
+        peg$c164 = "\uEFFE",
+        peg$c165 = "\"\\uEFFE\"",
+        peg$c166 = "Unmatched DEDENT",
+        peg$c167 = "\uEFEE",
+        peg$c168 = "\"\\uEFEE\"",
+        peg$c169 = "LineEnd",
+        peg$c170 = "\uEFFF",
+        peg$c171 = "\"\\uEFFF\"",
+        peg$c172 = "\n",
+        peg$c173 = "\"\\n\"",
+        peg$c174 = "ANYDEDENT",
+        peg$c175 = "RequiredWhitespace",
+        peg$c176 = "OptionalWhitespace",
+        peg$c177 = "InlineWhitespace",
+        peg$c178 = /^[ \t]/,
+        peg$c179 = "[ \\t]",
 
         peg$currPos          = 0,
         peg$reportedPos      = 0,
@@ -3662,7 +3669,10 @@ Emblem.Parser = (function() {
         if (s2 === null) {
           s2 = peg$parseboundAttribute();
           if (s2 === null) {
-            s2 = peg$parsenormalAttribute();
+            s2 = peg$parserawMustacheAttribute();
+            if (s2 === null) {
+              s2 = peg$parsenormalAttribute();
+            }
           }
         }
         if (s2 !== null) {
@@ -3956,7 +3966,7 @@ Emblem.Parser = (function() {
     }
 
     function peg$parseboundAttribute() {
-      var s0, s1, s2, s3;
+      var s0, s1, s2, s3, s4;
 
       s0 = peg$currPos;
       s1 = peg$parsekey();
@@ -3970,9 +3980,61 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           s3 = peg$parseboundAttributeValue();
+          if (s3 !== null) {
+            peg$reportedPos = peg$currPos;
+            s4 = peg$c131(s1,s3);
+            if (s4) {
+              s4 = peg$c1;
+            } else {
+              s4 = peg$c0;
+            }
+            if (s4 !== null) {
+              peg$reportedPos = s0;
+              s1 = peg$c132(s1,s3);
+              if (s1 === null) {
+                peg$currPos = s0;
+                s0 = s1;
+              } else {
+                s0 = s1;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$c0;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$c0;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$c0;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$c0;
+      }
+
+      return s0;
+    }
+
+    function peg$parserawMustacheAttribute() {
+      var s0, s1, s2, s3;
+
+      s0 = peg$currPos;
+      s1 = peg$parsekey();
+      if (s1 !== null) {
+        if (input.charCodeAt(peg$currPos) === 61) {
+          s2 = peg$c25;
+          peg$currPos++;
+        } else {
+          s2 = null;
+          if (peg$silentFails === 0) { peg$fail(peg$c26); }
+        }
+        if (s2 !== null) {
+          s3 = peg$parsepathIdNode();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c131(s1,s3);
+            s1 = peg$c133(s1,s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4012,7 +4074,7 @@ Emblem.Parser = (function() {
           s3 = peg$parsestring();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c132(s1,s3);
+            s1 = peg$c134(s1,s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4078,19 +4140,19 @@ Emblem.Parser = (function() {
         }
         if (s0 === null) {
           if (input.charCodeAt(peg$currPos) === 95) {
-            s0 = peg$c133;
+            s0 = peg$c135;
             peg$currPos++;
           } else {
             s0 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c134); }
+            if (peg$silentFails === 0) { peg$fail(peg$c136); }
           }
           if (s0 === null) {
             if (input.charCodeAt(peg$currPos) === 45) {
-              s0 = peg$c135;
+              s0 = peg$c137;
               peg$currPos++;
             } else {
               s0 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c136); }
+              if (peg$silentFails === 0) { peg$fail(peg$c138); }
             }
           }
         }
@@ -4104,11 +4166,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c137;
+        s1 = peg$c139;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c138); }
+        if (peg$silentFails === 0) { peg$fail(peg$c140); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
@@ -4138,17 +4200,17 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 35) {
-        s1 = peg$c139;
+        s1 = peg$c141;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c140); }
+        if (peg$silentFails === 0) { peg$fail(peg$c142); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c141(s2);
+          s1 = peg$c143(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4209,7 +4271,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c142); }
+        if (peg$silentFails === 0) { peg$fail(peg$c144); }
       }
 
       return s0;
@@ -4234,7 +4296,7 @@ Emblem.Parser = (function() {
         s2 = s3;
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c143(s1,s2);
+          s1 = peg$c145(s1,s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4256,12 +4318,12 @@ Emblem.Parser = (function() {
     function peg$parsenmchar() {
       var s0;
 
-      if (peg$c144.test(input.charAt(peg$currPos))) {
+      if (peg$c146.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c145); }
+        if (peg$silentFails === 0) { peg$fail(peg$c147); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -4273,12 +4335,12 @@ Emblem.Parser = (function() {
     function peg$parsenmstart() {
       var s0;
 
-      if (peg$c146.test(input.charAt(peg$currPos))) {
+      if (peg$c148.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c147); }
+        if (peg$silentFails === 0) { peg$fail(peg$c149); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -4290,12 +4352,12 @@ Emblem.Parser = (function() {
     function peg$parsenonascii() {
       var s0;
 
-      if (peg$c148.test(input.charAt(peg$currPos))) {
+      if (peg$c150.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c149); }
+        if (peg$silentFails === 0) { peg$fail(peg$c151); }
       }
 
       return s0;
@@ -4329,11 +4391,11 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c137;
+        s1 = peg$c139;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c138); }
+        if (peg$silentFails === 0) { peg$fail(peg$c140); }
       }
       if (s1 !== null) {
         s2 = peg$parsetagString();
@@ -4360,7 +4422,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c150); }
+        if (peg$silentFails === 0) { peg$fail(peg$c152); }
       }
 
       return s0;
@@ -4373,7 +4435,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c151(s1);
+        s2 = peg$c153(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -4381,7 +4443,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c152(s1);
+          s1 = peg$c154(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4403,12 +4465,12 @@ Emblem.Parser = (function() {
     function peg$parsetagChar() {
       var s0;
 
-      if (peg$c153.test(input.charAt(peg$currPos))) {
+      if (peg$c155.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c154); }
+        if (peg$silentFails === 0) { peg$fail(peg$c156); }
       }
 
       return s0;
@@ -4422,7 +4484,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c156(s1);
+        s2 = peg$c158(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -4430,7 +4492,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c152(s1);
+          s1 = peg$c154(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4448,7 +4510,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c155); }
+        if (peg$silentFails === 0) { peg$fail(peg$c157); }
       }
 
       return s0;
@@ -4488,15 +4550,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61423) {
-        s1 = peg$c158;
+        s1 = peg$c160;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c159); }
+        if (peg$silentFails === 0) { peg$fail(peg$c161); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c160();
+        s1 = peg$c162();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4507,7 +4569,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c157); }
+        if (peg$silentFails === 0) { peg$fail(peg$c159); }
       }
 
       return s0;
@@ -4519,15 +4581,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61438) {
-        s1 = peg$c162;
+        s1 = peg$c164;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c163); }
+        if (peg$silentFails === 0) { peg$fail(peg$c165); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c160();
+        s1 = peg$c162();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4538,7 +4600,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c161); }
+        if (peg$silentFails === 0) { peg$fail(peg$c163); }
       }
 
       return s0;
@@ -4550,15 +4612,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61422) {
-        s1 = peg$c165;
+        s1 = peg$c167;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c166); }
+        if (peg$silentFails === 0) { peg$fail(peg$c168); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c160();
+        s1 = peg$c162();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4569,7 +4631,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c164); }
+        if (peg$silentFails === 0) { peg$fail(peg$c166); }
       }
 
       return s0;
@@ -4581,19 +4643,19 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61439) {
-        s1 = peg$c168;
+        s1 = peg$c170;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c169); }
+        if (peg$silentFails === 0) { peg$fail(peg$c171); }
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 10) {
-          s2 = peg$c170;
+          s2 = peg$c172;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c171); }
+          if (peg$silentFails === 0) { peg$fail(peg$c173); }
         }
         if (s2 !== null) {
           s1 = [s1, s2];
@@ -4609,7 +4671,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c167); }
+        if (peg$silentFails === 0) { peg$fail(peg$c169); }
       }
 
       return s0;
@@ -4626,7 +4688,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c172); }
+        if (peg$silentFails === 0) { peg$fail(peg$c174); }
       }
 
       return s0;
@@ -4654,7 +4716,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c173); }
+        if (peg$silentFails === 0) { peg$fail(peg$c175); }
       }
 
       return s0;
@@ -4673,7 +4735,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c174); }
+        if (peg$silentFails === 0) { peg$fail(peg$c176); }
       }
 
       return s0;
@@ -4683,17 +4745,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (peg$c176.test(input.charAt(peg$currPos))) {
+      if (peg$c178.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c177); }
+        if (peg$silentFails === 0) { peg$fail(peg$c179); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c175); }
+        if (peg$silentFails === 0) { peg$fail(peg$c177); }
       }
 
       return s0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barber-emblem
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: barber