Update picofeed

This commit is contained in:
Frederic Guillot 2015-03-19 18:26:02 -04:00
parent 7ec0c11190
commit 1c59f939de
14 changed files with 113 additions and 14 deletions

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba::getLoader(); return ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6::getLoader();

1
vendor/bin/picofeed vendored Symbolic link
View File

@ -0,0 +1 @@
../fguillot/picofeed/picofeed

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba class ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6
{ {
private static $loader; private static $loader;
@ -19,9 +19,9 @@ class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInita56cecf18737d4c6655b021e5f21a1a6', 'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -42,14 +42,14 @@ class ComposerAutoloaderInit093c65b5382fc7317d870fcd9f8036ba
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) { foreach ($includeFiles as $file) {
composerRequire093c65b5382fc7317d870fcd9f8036ba($file); composerRequirea56cecf18737d4c6655b021e5f21a1a6($file);
} }
return $loader; return $loader;
} }
} }
function composerRequire093c65b5382fc7317d870fcd9f8036ba($file) function composerRequirea56cecf18737d4c6655b021e5f21a1a6($file)
{ {
require $file; require $file;
} }

View File

@ -162,12 +162,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fguillot/picoFeed.git", "url": "https://github.com/fguillot/picoFeed.git",
"reference": "a006fc10642fbdc5414bebd6542aeabd35f8c98b" "reference": "acc16f1a0854fdaeae2416f1b12ee51a9c150b52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fguillot/picoFeed/zipball/a006fc10642fbdc5414bebd6542aeabd35f8c98b", "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/acc16f1a0854fdaeae2416f1b12ee51a9c150b52",
"reference": "a006fc10642fbdc5414bebd6542aeabd35f8c98b", "reference": "acc16f1a0854fdaeae2416f1b12ee51a9c150b52",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -178,7 +178,13 @@
"ext-xml": "*", "ext-xml": "*",
"php": ">=5.3.0" "php": ">=5.3.0"
}, },
"time": "2015-03-03 03:14:01", "suggest": {
"ext-curl": "PicoFeed will use cURL if present"
},
"time": "2015-03-19 22:19:36",
"bin": [
"picofeed"
],
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

View File

@ -18,7 +18,13 @@
"ext-libxml": "*", "ext-libxml": "*",
"ext-SimpleXML": "*" "ext-SimpleXML": "*"
}, },
"suggest": {
"ext-curl": "PicoFeed will use cURL if present"
},
"autoload": { "autoload": {
"psr-0": {"PicoFeed": "lib/"} "psr-0": {"PicoFeed": "lib/"}
} },
"bin" : [
"picofeed"
]
} }

View File

@ -215,7 +215,8 @@ class Attribute
* @var array * @var array
*/ */
private $add_attributes = array( private $add_attributes = array(
'a' => array('rel' => 'noreferrer', 'target' => '_blank') 'a' => array('rel' => 'noreferrer', 'target' => '_blank'),
'video' => array('controls' => 'true'),
); );
/** /**

View File

@ -2,7 +2,7 @@
return array( return array(
'test_url' => 'http://lesjoiesducode.fr/post/75576211207/quand-lappli-ne-fonctionne-plus-sans-aucune-raison', 'test_url' => 'http://lesjoiesducode.fr/post/75576211207/quand-lappli-ne-fonctionne-plus-sans-aucune-raison',
'body' => array( 'body' => array(
'//div[@class="post"]//img', '//div[@class="blog-post-content"]',
), ),
'strip' => array( 'strip' => array(
) )

View File

@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase;
class ClientTest extends PHPUnit_Framework_TestCase class ClientTest extends PHPUnit_Framework_TestCase
{ {
/**
* @group online
*/
public function testDownload() public function testDownload()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -20,6 +23,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
/** /**
* @runInSeparateProcess * @runInSeparateProcess
* @group online
*/ */
public function testPassthrough() public function testPassthrough()
{ {
@ -31,6 +35,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico'));
} }
/**
* @group online
*/
public function testCacheBothHaveToMatch() public function testCacheBothHaveToMatch()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -46,6 +53,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->assertTrue($client->isModified()); $this->assertTrue($client->isModified());
} }
/**
* @group online
*/
public function testCacheEtag() public function testCacheEtag()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -63,6 +73,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->assertFalse($client->isModified()); $this->assertFalse($client->isModified());
} }
/**
* @group online
*/
public function testCacheLastModified() public function testCacheLastModified()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -78,6 +91,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->assertFalse($client->isModified()); $this->assertFalse($client->isModified());
} }
/**
* @group online
*/
public function testCacheBoth() public function testCacheBoth()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -95,6 +111,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->assertFalse($client->isModified()); $this->assertFalse($client->isModified());
} }
/**
* @group online
*/
public function testCharset() public function testCharset()
{ {
$client = Client::getInstance(); $client = Client::getInstance();
@ -108,6 +127,9 @@ class ClientTest extends PHPUnit_Framework_TestCase
$this->assertEquals('', $client->getEncoding()); $this->assertEquals('', $client->getEncoding());
} }
/**
* @group online
*/
public function testContentType() public function testContentType()
{ {
$client = Client::getInstance(); $client = Client::getInstance();

View File

@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase;
class CurlTest extends PHPUnit_Framework_TestCase class CurlTest extends PHPUnit_Framework_TestCase
{ {
/**
* @group online
*/
public function testDownload() public function testDownload()
{ {
$client = new Curl; $client = new Curl;
@ -20,6 +23,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
/** /**
* @runInSeparateProcess * @runInSeparateProcess
* @group online
*/ */
public function testPassthrough() public function testPassthrough()
{ {
@ -31,6 +35,9 @@ class CurlTest extends PHPUnit_Framework_TestCase
$this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico'));
} }
/**
* @group online
*/
public function testRedirect() public function testRedirect()
{ {
$client = new Curl; $client = new Curl;
@ -46,6 +53,7 @@ class CurlTest extends PHPUnit_Framework_TestCase
/** /**
* @expectedException PicoFeed\Client\InvalidCertificateException * @expectedException PicoFeed\Client\InvalidCertificateException
* @group online
*/ */
public function testSSL() public function testSSL()
{ {

View File

@ -7,6 +7,9 @@ use PicoFeed\Reader\Reader;
class GrabberTest extends PHPUnit_Framework_TestCase class GrabberTest extends PHPUnit_Framework_TestCase
{ {
/**
* @group online
*/
public function testGrabContentWithCandidates() public function testGrabContentWithCandidates()
{ {
$grabber = new Grabber('http://theonion.com.feedsportal.com/c/34529/f/632231/s/309a7fe4/sc/20/l/0L0Stheonion0N0Carticles0Cobama0Ethrows0Eup0Eright0Ethere0Eduring0Esyria0Emeeting0H336850C/story01.htm'); $grabber = new Grabber('http://theonion.com.feedsportal.com/c/34529/f/632231/s/309a7fe4/sc/20/l/0L0Stheonion0N0Carticles0Cobama0Ethrows0Eup0Eright0Ethere0Eduring0Esyria0Emeeting0H336850C/story01.htm');
@ -37,6 +40,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase
} }
// 01net.com - https://github.com/fguillot/miniflux/issues/267 // 01net.com - https://github.com/fguillot/miniflux/issues/267
/**
* @group online
*/
public function testGetRules_afterRedirection() public function testGetRules_afterRedirection()
{ {
$grabber = new Grabber('http://rss.feedsportal.com/c/629/f/502199/s/422f8c8a/sc/44/l/0L0S0A1net0N0Ceditorial0C640A3130Cces0E20A150Eimprimer0Eune0Epizza0Eet0Edes0Ebiscuits0Evideo0C0T0Dxtor0FRSS0E16/story01.htm'); $grabber = new Grabber('http://rss.feedsportal.com/c/629/f/502199/s/422f8c8a/sc/44/l/0L0S0A1net0N0Ceditorial0C640A3130Cces0E20A150Eimprimer0Eune0Epizza0Eet0Edes0Ebiscuits0Evideo0C0T0Dxtor0FRSS0E16/story01.htm');
@ -44,6 +50,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase
$this->assertTrue(is_array($grabber->getRules())); $this->assertTrue(is_array($grabber->getRules()));
} }
/**
* @group online
*/
public function testGrabContent() public function testGrabContent()
{ {
$grabber = new Grabber('http://www.egscomics.com/index.php?id=1690'); $grabber = new Grabber('http://www.egscomics.com/index.php?id=1690');
@ -53,6 +62,9 @@ class GrabberTest extends PHPUnit_Framework_TestCase
$this->assertEquals('<img title="2013-08-22" src="comics/../comics/1377151029-2013-08-22.png" id="comic" border="0" />', $grabber->getContent()); $this->assertEquals('<img title="2013-08-22" src="comics/../comics/1377151029-2013-08-22.png" id="comic" border="0" />', $grabber->getContent());
} }
/**
* @group online
*/
public function testRssGrabContent() public function testRssGrabContent()
{ {
$reader = new Reader; $reader = new Reader;

View File

@ -6,6 +6,9 @@ use PHPUnit_Framework_TestCase;
class StreamTest extends PHPUnit_Framework_TestCase class StreamTest extends PHPUnit_Framework_TestCase
{ {
/**
* @group online
*/
public function testChunkedResponse() public function testChunkedResponse()
{ {
$client = new Stream; $client = new Stream;
@ -15,6 +18,9 @@ class StreamTest extends PHPUnit_Framework_TestCase
$this->assertEquals('</rss>', substr($result['body'], -6)); $this->assertEquals('</rss>', substr($result['body'], -6));
} }
/**
* @group online
*/
public function testDownload() public function testDownload()
{ {
$client = new Stream; $client = new Stream;
@ -29,6 +35,7 @@ class StreamTest extends PHPUnit_Framework_TestCase
/** /**
* @runInSeparateProcess * @runInSeparateProcess
* @group online
*/ */
public function testPassthrough() public function testPassthrough()
{ {
@ -40,6 +47,9 @@ class StreamTest extends PHPUnit_Framework_TestCase
$this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico')); $this->expectOutputString(file_get_contents('tests/fixtures/miniflux_favicon.ico'));
} }
/**
* @group online
*/
public function testRedirect() public function testRedirect()
{ {
$client = new Stream; $client = new Stream;
@ -64,6 +74,9 @@ class StreamTest extends PHPUnit_Framework_TestCase
$client->doRequest(); $client->doRequest();
} }
/**
* @group online
*/
public function testDecodeGzip() public function testDecodeGzip()
{ {
if (function_exists('gzdecode')) { if (function_exists('gzdecode')) {

View File

@ -94,7 +94,7 @@ class Rss20ParserTest extends PHPUnit_Framework_TestCase
$parser = new Rss20(file_get_contents('tests/fixtures/fulltextrss.xml')); $parser = new Rss20(file_get_contents('tests/fixtures/fulltextrss.xml'));
$feed = $parser->execute(); $feed = $parser->execute();
$this->assertEquals(new DateTime, $feed->getDate()); $this->assertEquals(time(), $feed->getDate()->getTimestamp(), '', 1);
} }
public function testFeedLanguage() public function testFeedLanguage()

View File

@ -77,6 +77,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertEquals(array(), $favicon->extract($html)); $this->assertEquals(array(), $favicon->extract($html));
} }
/**
* @group online
*/
public function testExists() public function testExists()
{ {
$favicon = new Favicon; $favicon = new Favicon;
@ -87,6 +90,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertFalse($favicon->exists('')); $this->assertFalse($favicon->exists(''));
} }
/**
* @group online
*/
public function testFind_inMeta() public function testFind_inMeta()
{ {
$favicon = new Favicon; $favicon = new Favicon;
@ -123,6 +129,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertEmpty($favicon->getContent()); $this->assertEmpty($favicon->getContent());
} }
/**
* @group online
*/
public function testFind_directLinkFirst() public function testFind_directLinkFirst()
{ {
$favicon = new Favicon; $favicon = new Favicon;
@ -135,6 +144,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertNotEmpty($favicon->getContent()); $this->assertNotEmpty($favicon->getContent());
} }
/**
* @group online
*/
public function testFind_fallsBackToExtract() public function testFind_fallsBackToExtract()
{ {
$favicon = new Favicon; $favicon = new Favicon;
@ -146,6 +158,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertNotEmpty($favicon->getContent()); $this->assertNotEmpty($favicon->getContent());
} }
/**
* @group online
*/
public function testDataUri() public function testDataUri()
{ {
$favicon = new Favicon; $favicon = new Favicon;
@ -160,6 +175,9 @@ class FaviconTest extends PHPUnit_Framework_TestCase
$this->assertEquals($expected, $favicon->getDataUri()); $this->assertEquals($expected, $favicon->getDataUri());
} }
/**
* @group online
*/
public function testDataUri_withBadContentType() public function testDataUri_withBadContentType()
{ {
$favicon = new Favicon; $favicon = new Favicon;

View File

@ -15,6 +15,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase
$this->assertEquals('https://google.com', $reader->prependScheme('https://google.com')); $this->assertEquals('https://google.com', $reader->prependScheme('https://google.com'));
} }
/**
* @group online
*/
public function testDownload_withHTTP() public function testDownload_withHTTP()
{ {
$reader = new Reader; $reader = new Reader;
@ -22,6 +25,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase
$this->assertNotEmpty($feed); $this->assertNotEmpty($feed);
} }
/**
* @group online
*/
public function testDownload_withHTTPS() public function testDownload_withHTTPS()
{ {
$reader = new Reader; $reader = new Reader;
@ -29,6 +35,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase
$this->assertNotEmpty($feed); $this->assertNotEmpty($feed);
} }
/**
* @group online
*/
public function testDownload_withCache() public function testDownload_withCache()
{ {
$reader = new Reader; $reader = new Reader;
@ -210,6 +219,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase
$this->assertEquals(array(), $feeds); $this->assertEquals(array(), $feeds);
} }
/**
* @group online
*/
public function testDiscover() public function testDiscover()
{ {
$reader = new Reader; $reader = new Reader;