Merge pull request #7 from phpugph/1.0

1.0

Author: cblanquera

src/HandlebarsCompiler.php

@@ -499,7 +499,7 @@ protected function generateOpen(array $node, array &$open)
 
     if (!$helper) {
       //run noop
-      $node['value'] = 'noop '.$node['value'];
+      $node['value'] = 'noop ' . $node['value'];
       list($name, $args, $hash) = $this->parseArguments($node['value']);
     }
 
@@ -645,12 +645,13 @@ protected function parseArguments($string)
     $hash = [];
 
     $regex = [
-      '([a-zA-Z0-9]+\="[^"]*")',    // cat="meow"
-      '([a-zA-Z0-9]+\=\'[^\']*\')',   // mouse='squeak squeak'
-      '([a-zA-Z0-9]+\=[a-zA-Z0-9]+)', // dog=false
-      '("[^"]*")',          // "some\'thi ' ng"
-      '(\'[^\']*\')',         // 'some"thi " ng'
-      '([^\s]+)'            // <any group with no spaces>
+      '([a-zA-Z0-9\-_]+\="[^"]*")',          // cat="meow"
+      '([a-zA-Z0-9\-_]+\=\'[^\']*\')',       // mouse='squeak squeak'
+      '([a-zA-Z0-9\-_]+\=[a-zA-Z0-9_\./]+)', // dog=false dog=./woof dog=.././woof
+      '([a-zA-Z0-9\-_]+\=@[a-zA-Z0-9_]+)',   // dog=@woof
+      '("[^"]*")',                           // "some\'thi ' ng"
+      '(\'[^\']*\')',                        // 'some"thi " ng'
+      '([^\s]+)',                            // <any group with no spaces>
     ];
 
     preg_match_all('#'.implode('|', $regex).'#is', $string, $matches);
@@ -659,16 +660,17 @@ protected function parseArguments($string)
     $name = array_shift($stringArgs);
 
     $hashRegex = [
-      '([a-zA-Z0-9]+\="[^"]*")',    // cat="meow"
-      '([a-zA-Z0-9]+\=\'[^\']*\')',   // mouse='squeak squeak'
-      '([a-zA-Z0-9]+\=[a-zA-Z0-9]+)', // dog=false
+      '([a-zA-Z0-9\-_]+\="[^"]*")',          // cat="meow"
+      '([a-zA-Z0-9\-_]+\=\'[^\']*\')',       // mouse='squeak squeak'
+      '([a-zA-Z0-9\-_]+\=[a-zA-Z0-9_\./]+)', // dog=false dog=./woof dog=.././woof
+      '([a-zA-Z0-9\-_]+\=@[a-zA-Z0-9_]+)',   // dog=@woof
     ];
 
     foreach ($stringArgs as $arg) {
       //if it's an attribute
       if (!(substr($arg, 0, 1) === "'" && substr($arg, -1) === "'")
         && !(substr($arg, 0, 1) === '"' && substr($arg, -1) === '"')
-        && preg_match('#'.implode('|', $hashRegex).'#is', $arg)
+        && preg_match('#' . implode('|', $hashRegex) . '#is', $arg)
       ) {
         list($hashKey, $hashValue) = explode('=', $arg, 2);
         $hash[$hashKey] = $this->parseArgument($hashValue);