Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added Area tag #58

Merged
merged 8 commits into from
Apr 29, 2015
Merged

added Area tag #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb19d83
test out adding <area> parsing
Nov 22, 2014
954a8a0
fix bug in original parser not checking for sub h-* items
Nov 24, 2014
ccb6320
case sensative file system
Dec 5, 2014
9a12cce
adding tests to validate update
Dec 5, 2014
67f4d2e
fix php complaint
Jan 7, 2015
e097f59
fix case sensitivity unit test failing
Mar 20, 2015
17124a3
add test of h-card in category
Mar 22, 2015
cdffcad
correct test
Mar 28, 2015
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
64 changes: 54 additions & 10 deletions Mf2/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ function mfNamesFromClass($class, $prefix='h-') {
$matches = array();

foreach ($classes as $classname) {
$compare_classname = strtolower(' ' . $classname);
$compare_prefix = strtolower(' ' . $prefix);
if (stristr($compare_classname, $compare_prefix) !== false && ($compare_classname != $compare_prefix)) {
$compare_classname = ' ' . $classname;
$compare_prefix = ' ' . $prefix;
if (strstr($compare_classname, $compare_prefix) !== false && ($compare_classname != $compare_prefix)) {
$matches[] = ($prefix === 'h-') ? $classname : substr($classname, strlen($prefix));
}
}
Expand Down Expand Up @@ -688,6 +688,11 @@ public function parseH(\DOMElement $e) {
$this->elementPrefixParsed($subMF, 'dt');
$this->elementPrefixParsed($subMF, 'e');
}
if($e->tagName == 'area') {
$coords = $e->getAttribute('coords');
$shape = $e->getAttribute('shape');

}

// Handle p-*
foreach ($this->xpath->query('.//*[contains(concat(" ", @class) ," p-")]', $e) as $p) {
Expand Down Expand Up @@ -762,22 +767,43 @@ public function parseH(\DOMElement $e) {
if (!array_key_exists('name', $return)) {
try {
// Look for img @alt
if ($e->tagName == 'img' and $e->getAttribute('alt') != '')
if (($e->tagName == 'img' or $e->tagName == 'area') and $e->getAttribute('alt') != '')
throw new Exception($e->getAttribute('alt'));

if ($e->tagName == 'abbr' and $e->hasAttribute('title'))
throw new Exception($e->getAttribute('title'));

// Look for nested img @alt
foreach ($this->xpath->query('./img[count(preceding-sibling::*)+count(following-sibling::*)=0]', $e) as $em) {
if ($em->getAttribute('alt') != '')
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames) && $em->getAttribute('alt') != ''){
throw new Exception($em->getAttribute('alt'));
}
}

// Look for nested area @alt
foreach ($this->xpath->query('./area[count(preceding-sibling::*)+count(following-sibling::*)=0]', $e) as $em) {
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames) && $em->getAttribute('alt') != ''){
throw new Exception($em->getAttribute('alt'));
}
}


// Look for double nested img @alt
foreach ($this->xpath->query('./*[count(preceding-sibling::*)+count(following-sibling::*)=0]/img[count(preceding-sibling::*)+count(following-sibling::*)=0]', $e) as $em) {
if ($em->getAttribute('alt') != '')
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames) && $em->getAttribute('alt') != ''){
throw new Exception($em->getAttribute('alt'));
}
}

// Look for double nested img @alt
foreach ($this->xpath->query('./*[count(preceding-sibling::*)+count(following-sibling::*)=0]/area[count(preceding-sibling::*)+count(following-sibling::*)=0]', $e) as $em) {
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames) && $em->getAttribute('alt') != ''){
throw new Exception($em->getAttribute('alt'));
}
}

throw new Exception($e->nodeValue);
Expand Down Expand Up @@ -812,13 +838,25 @@ public function parseH(\DOMElement $e) {
// Check for u-url
if (!array_key_exists('url', $return)) {
// Look for img @src
if ($e->tagName == 'a')
if ($e->tagName == 'a' or $e->tagName == 'area')
$url = $e->getAttribute('href');

// Look for nested img @src
// Look for nested a @href
foreach ($this->xpath->query('./a[count(preceding-sibling::a)+count(following-sibling::a)=0]', $e) as $em) {
$url = $em->getAttribute('href');
break;
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames)){
$url = $em->getAttribute('href');
break;
}
}

// Look for nested area @src
foreach ($this->xpath->query('./area[count(preceding-sibling::area)+count(following-sibling::area)=0]', $e) as $em) {
$emNames = mfNamesFromElement($em, 'h-');
if(empty($emNames)){
$url = $em->getAttribute('href');
break;
}
}

if (!empty($url))
Expand All @@ -833,6 +871,12 @@ public function parseH(\DOMElement $e) {
'type' => $mfTypes,
'properties' => $return
);
if (!empty($shape)){
$parsed['shape'] = $shape;
}
if (!empty($coords)){
$parsed['coords'] = $coords;
}
if (!empty($children))
$parsed['children'] = array_values(array_filter($children));
return $parsed;
Expand Down
6 changes: 3 additions & 3 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<phpunit bootstrap="tests/mf2/bootstrap.php">
<phpunit bootstrap="tests/Mf2/bootstrap.php">
<testsuites>
<testsuite name="php-mf2">
<directory suffix="Test.php">tests/mf2</directory>
<directory suffix="Test.php">tests/Mf2</directory>
</testsuite>
</testsuites>
</phpunit>
</phpunit>
49 changes: 49 additions & 0 deletions tests/Mf2/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public function testHtmlEncodesNonEProperties() {
$this->assertEquals('<dt>', $output['items'][0]['properties']['published'][0]);
$this->assertEquals('<u>', $output['items'][0]['properties']['url'][0]);
}


public function testHtmlEncodesImpliedProperties() {
$input = '<a class="h-card" href="&lt;url&gt;"><img src="&lt;img&gt;" />&lt;name&gt;</a>';
Expand Down Expand Up @@ -257,4 +258,52 @@ public function testConvertsNestedImgElementToAltOrSrc() {
$result = Mf2\parse($input, 'http://waterpigs.co.uk/articles/five-legged-elephant');
$this->assertEquals('It is a strange thing to see a five legged elephant', $result['items'][0]['properties']['content'][0]['value']);
}

// parser not respecting not[h-*] in rule "else if .h-x>a[href]:only-of-type:not[.h-*] then use that [href] for url"
public function testNotImpliedUrlFromHCard() {
$input = '<span class="h-entry">
<a class="h-card" href="http://test.com">John Q</a>
</span>';

$parser = new Parser($input);
$output = $parser->parse();

$this->assertArrayNotHasKey('url', $output['items'][0]['properties']);
}

public function testAreaTag() {
$input = '<div class="h-entry">
<area class="p-category h-card" href="http://personB.example.com" alt="Person Bee" shape="rect" coords="100,100,120,120">
</div>';

$parser = new Parser($input);
$output = $parser->parse();

$this->assertEquals('', $output['items'][0]['properties']['name'][0]);
$this->assertEquals('rect', $output['items'][0]['properties']['category'][0]['shape']);
$this->assertEquals('100,100,120,120', $output['items'][0]['properties']['category'][0]['coords']);
$this->assertEquals('Person Bee', $output['items'][0]['properties']['category'][0]['value']);

}

public function testParseHcardInCategory() {

$input = '<span class="h-entry">
<a class="p-author h-card" href="http://a.example.com/">Alice</a> tagged
<a href="http://b.example.com/" class="u-category h-card">Bob Smith</a> in
<a class="u-tag-of u-in-reply-to" href="http://s.example.com/permalink47">
<img src="http://s.example.com/photo47.png" alt="a photo of Bob and Cole" /></a>
</span>';

$parser = new Parser($input);
$output = $parser->parse();

$this->assertContains('h-entry', $output['items'][0]['type']);
$this->assertArrayHasKey('category', $output['items'][0]['properties']);
$this->assertContains('h-card', $output['items'][0]['properties']['category'][0]['type']);
$this->assertArrayHasKey('name', $output['items'][0]['properties']['category'][0]['properties']);
$this->assertEquals('Bob Smith', $output['items'][0]['properties']['category'][0]['properties']['name'][0]);
$this->assertArrayHasKey('url', $output['items'][0]['properties']['category'][0]['properties']);
$this->assertEquals('http://b.example.com/', $output['items'][0]['properties']['category'][0]['properties']['url'][0]);
}
}