Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Avoid cache filename collision. #14

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Avoid cache filename collision. #14

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b20a143
Fixes #7
vesselinv Mar 10, 2013
01cd4a1
Added test case for #7 fix
vesselinv Mar 30, 2013
d836f11
Avoid cache collision for complex file structures.
marcioAlmada May 16, 2013
00b2179
Merge pull request #1 from vesselinv/master
marcioAlmada Oct 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Everzet/Jade/Lexer/Lexer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,13 @@ protected function scanAttributes()
$index = $this->getDelimitersIndex('(', ')');
$input = mb_substr($this->input, 1, $index - 1);
$token = $this->takeToken('attributes', $input);
$attributes = preg_split('/ *, *(?=[\'"\w-]+ *[:=]|[\w-]+ *$)/', $token->value);
$attributes = preg_split('/ *(?<!\\\\), *(?=[\'"\w-]+ *[:=]|[\w-]+ *$)/', $token->value);
$this->consumeInput($index + 1);
$token->attributes = array();

foreach ($attributes as $i => $pair) {
$pair = preg_replace('/^ *| *$/', '', $pair);
$pair = str_replace('\,', ',', $pair);
$colon = mb_strpos($pair, ':');
$equal = mb_strpos($pair, '=');

Expand Down
24 changes: 12 additions & 12 deletions tests/Everzet/Jade/JadeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,18 +331,18 @@ public function testAttrs()
$this->assertEquals('<p class="foo"></p>',
$this->parse("p(\"class\": 'foo')"), 'Keys with double quotes');

// $this->assertEquals(
// '<meta name="viewport" content="width=device-width, user-scalable=no" />',
// $this->parse(
// "meta(name: 'viewport', content:\"width=device-width, user-scalable=no\")"
// ), 'Commas in attrs'
// );
// $this->assertEquals(
// '<meta name="viewport" content="width=device-width, user-scalable=no" />',
// $this->parse(
// "meta(name: 'viewport', content:'width=device-width, user-scalable=no')"
// ), 'Commas in attrs'
// );
$this->assertEquals(
'<meta name="viewport" content="width=device-width, user-scalable=no" />',
$this->parse(
"meta(name: 'viewport', content:\"width=device-width\\, user-scalable=no\")"
), 'Commas in attrs'
);
$this->assertEquals(
'<meta name="viewport" content="width=device-width, user-scalable=no" />',
$this->parse(
"meta(name: 'viewport', content:'width=device-width\\, user-scalable=no')"
), 'Commas in attrs'
);
}

public function testCodeAttrs()
Expand Down