->method('fetchContent')
->willReturn([
'html' => false,
- 'title' => '',
+ 'title' => 'my title',
'url' => '',
'content_type' => '',
'language' => '',
'status' => '',
- 'open_graph' => [
- 'og_title' => 'my title',
- 'og_description' => 'desc',
- ],
+ 'description' => 'desc',
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'http://3.3.3.3/cover.jpg',
+ 'description' => 'OG desc',
+ 'image' => 'http://3.3.3.3/cover.jpg',
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
+ 'language' => 'fr',
+ 'status' => '200',
+ 'description' => 'OG desc',
+ 'image' => null,
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
+ ]);
+
+ $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
+ $entry = new Entry(new User());
+ $proxy->updateEntry($entry, 'http://0.0.0.0');
+
+ $this->assertSame('http://1.1.1.1', $entry->getUrl());
+ $this->assertSame('this is my title', $entry->getTitle());
+ $this->assertContains('content', $entry->getContent());
+ $this->assertNull($entry->getPreviewPicture());
+ $this->assertSame('text/html', $entry->getMimetype());
+ $this->assertSame('fr', $entry->getLanguage());
+ $this->assertSame('200', $entry->getHttpStatus());
+ $this->assertSame(4.0, $entry->getReadingTime());
+ $this->assertSame('1.1.1.1', $entry->getDomainName());
+ }
+
+ public function testWithContentAndContentImage()
+ {
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag');
+
+ $graby = $this->getMockBuilder('Graby\Graby')
+ ->setMethods(['fetchContent'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $graby->expects($this->any())
+ ->method('fetchContent')
+ ->willReturn([
+ 'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>",
+ 'title' => 'this is my title',
+ 'url' => 'http://1.1.1.1',
'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
- $this->assertNull($entry->getPreviewPicture());
+ $this->assertSame("<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>", $entry->getContent());
+ $this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
$this->assertSame('200', $entry->getHttpStatus());
- $this->assertSame(4.0, $entry->getReadingTime());
+ $this->assertSame(0.0, $entry->getReadingTime());
+ $this->assertSame('1.1.1.1', $entry->getDomainName());
+ }
+
+ public function testWithContentImageAndOgImage()
+ {
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag');
+
+ $graby = $this->getMockBuilder('Graby\Graby')
+ ->setMethods(['fetchContent'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $graby->expects($this->any())
+ ->method('fetchContent')
+ ->willReturn([
+ 'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>",
+ 'title' => 'this is my title',
+ 'url' => 'http://1.1.1.1',
+ 'content_type' => 'text/html',
+ 'language' => 'fr',
+ 'status' => '200',
+ 'open_graph' => [
+ 'og_title' => 'my OG title',
+ 'og_description' => 'OG desc',
+ 'og_image' => 'http://3.3.3.3/cover.jpg',
+ ],
+ ]);
+
+ $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
+ $entry = new Entry(new User());
+ $proxy->updateEntry($entry, 'http://0.0.0.0');
+
+ $this->assertSame('http://1.1.1.1', $entry->getUrl());
+ $this->assertSame('this is my title', $entry->getTitle());
+ $this->assertSame("<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>", $entry->getContent());
+ $this->assertSame('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
+ $this->assertSame('text/html', $entry->getMimetype());
+ $this->assertSame('fr', $entry->getLanguage());
+ $this->assertSame('200', $entry->getHttpStatus());
+ $this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
}
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'dontexist',
'status' => '200',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]);
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertNull($entry->getLanguage());
$this->assertSame('200', $entry->getHttpStatus());
'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'https://',
+ 'description' => 'OG desc',
+ 'image' => 'https://',
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertNull($entry->getPreviewPicture());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '1395635872',
'authors' => ['Jeremy', 'Nico', 'Thomas'],
- 'all_headers' => [
- 'Cache-Control' => 'no-cache',
+ 'headers' => [
+ 'cache-control' => 'no-cache',
+ 'content-type' => 'text/html',
],
]
);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
$this->assertSame(4.0, $entry->getReadingTime());
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '2016-09-08T11:55:58+0200',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
$this->assertSame(4.0, $entry->getReadingTime());
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '01 02 2012',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
$this->assertSame('http://1.1.1.1', $entry->getUrl());
$this->assertSame('this is my title', $entry->getTitle());
- $this->assertContains('this is my content', $entry->getContent());
+ $this->assertContains('content', $entry->getContent());
$this->assertSame('text/html', $entry->getMimetype());
$this->assertSame('fr', $entry->getLanguage());
$this->assertSame(4.0, $entry->getReadingTime());
$records = $handler->getRecords();
- $this->assertCount(1, $records);
+ $this->assertCount(3, $records);
$this->assertContains('Error while defining date', $records[0]['message']);
}
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
'html' => $html,
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'http://3.3.3.3/cover.jpg',
+ //'og_title' => 'my OG title',
+ 'description' => 'OG desc',
+ 'image' => 'http://3.3.3.3/cover.jpg',
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]
);
'html' => '<p><img src="http://1.1.1.1/image.jpg" /></p>',
'title' => 'this is my title',
'url' => 'http://1.1.1.1/image.jpg',
- 'content_type' => 'image/jpeg',
'status' => '200',
- 'open_graph' => [],
+ 'headers' => [
+ 'content-type' => 'image/jpeg',
+ ],
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
}
/**
- * https://stackoverflow.com/a/18506801
+ * Data provider for testWithChangedUrl.
+ *
+ * Arrays contain the following values:
+ * $entry_url
+ * $origin_url
+ * $content_url
+ * $expected_entry_url
+ * $expected_origin_url
+ * $expected_domain
+ */
+ public function dataForChangedUrl()
+ {
+ return [
+ 'normal' => [
+ 'http://0.0.0.0',
+ null,
+ 'http://1.1.1.1',
+ 'http://1.1.1.1',
+ 'http://0.0.0.0',
+ '1.1.1.1',
+ ],
+ 'origin already set' => [
+ 'http://0.0.0.0',
+ 'http://hello',
+ 'http://1.1.1.1',
+ 'http://1.1.1.1',
+ 'http://hello',
+ '1.1.1.1',
+ ],
+ 'trailing slash' => [
+ 'https://example.com/hello-world',
+ null,
+ 'https://example.com/hello-world/',
+ 'https://example.com/hello-world/',
+ null,
+ 'example.com',
+ ],
+ 'query string in fetched content' => [
+ 'https://example.org/hello',
+ null,
+ 'https://example.org/hello?world=1',
+ 'https://example.org/hello?world=1',
+ 'https://example.org/hello',
+ 'example.org',
+ ],
+ 'fragment in fetched content' => [
+ 'https://example.org/hello',
+ null,
+ 'https://example.org/hello#world',
+ 'https://example.org/hello',
+ null,
+ 'example.org',
+ ],
+ 'fragment and query string in fetched content' => [
+ 'https://example.org/hello',
+ null,
+ 'https://example.org/hello?foo#world',
+ 'https://example.org/hello?foo#world',
+ 'https://example.org/hello',
+ 'example.org',
+ ],
+ 'different path and query string in fetch content' => [
+ 'https://example.org/hello',
+ null,
+ 'https://example.org/world?foo',
+ 'https://example.org/world?foo',
+ 'https://example.org/hello',
+ 'example.org',
+ ],
+ 'feedproxy ignore list test' => [
+ 'http://feedproxy.google.com/~r/Wallabag/~3/helloworld',
+ null,
+ 'https://example.org/hello-wallabag',
+ 'https://example.org/hello-wallabag',
+ null,
+ 'example.org',
+ ],
+ 'feedproxy ignore list test with origin url already set' => [
+ 'http://feedproxy.google.com/~r/Wallabag/~3/helloworld',
+ 'https://example.org/this-is-source',
+ 'https://example.org/hello-wallabag',
+ 'https://example.org/hello-wallabag',
+ 'https://example.org/this-is-source',
+ 'example.org',
+ ],
+ 'lemonde ignore pattern test' => [
+ 'http://www.lemonde.fr/tiny/url',
+ null,
+ 'http://example.com/hello-world',
+ 'http://example.com/hello-world',
+ null,
+ 'example.com',
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider dataForChangedUrl
+ */
+ public function testWithChangedUrl($entry_url, $origin_url, $content_url, $expected_entry_url, $expected_origin_url, $expected_domain)
+ {
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag');
+
+ $proxy = new ContentProxy((new Graby()), $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage, true);
+ $entry = new Entry(new User());
+ $entry->setOriginUrl($origin_url);
+ $proxy->updateEntry(
+ $entry,
+ $entry_url,
+ [
+ 'html' => false,
+ 'title' => '',
+ 'url' => $content_url,
+ 'content_type' => '',
+ 'language' => '',
+ ],
+ true
+ );
+
+ $this->assertSame($expected_entry_url, $entry->getUrl());
+ $this->assertSame($expected_domain, $entry->getDomainName());
+ $this->assertSame($expected_origin_url, $entry->getOriginUrl());
+ }
+
+ /**
+ * https://stackoverflow.com/a/18506801.
+ *
* @param $string
+ *
* @return string
*/
- private function strToHex($string){
+ private function strToHex($string)
+ {
$hex = '';
- for ($i=0; $i<strlen($string); $i++){
- $ord = ord($string[$i]);
+ for ($i = 0; $i < \strlen($string); ++$i) {
+ $ord = \ord($string[$i]);
$hexCode = dechex($ord);
- $hex .= substr('0'.$hexCode, -2);
+ $hex .= substr('0' . $hexCode, -2);
}
- return strToUpper($hex);
+
+ return strtoupper($hex);
}
/**
- * https://stackoverflow.com/a/18506801
+ * https://stackoverflow.com/a/18506801.
+ *
* @param $hex
+ *
* @return string
*/
- private function hexToStr($hex){
- $string='';
- for ($i=0; $i < strlen($hex)-1; $i+=2){
- $string .= chr(hexdec($hex[$i].$hex[$i+1]));
+ private function hexToStr($hex)
+ {
+ $string = '';
+ for ($i = 0; $i < \strlen($hex) - 1; $i += 2) {
+ $string .= \chr(hexdec($hex[$i] . $hex[$i + 1]));
}
+
return $string;
}
projects / github / wallabag / wallabag.git / blobdiff