j0k3r · j0k3r · Apr 10, 2017 · Apr 10, 2017 · Apr 10, 2017 · Apr 10, 2017
diff --git a/src/Extractor/ContentExtractor.php b/src/Extractor/ContentExtractor.php
@@ -24,7 +24,7 @@ class ContentExtractor
     private $siteConfig = null;
     private $title = null;
     private $language = null;
-    private $author = [];
+    private $authors = [];
     private $body = null;
     private $nativeAd = false;
     private $date = null;
@@ -89,7 +89,7 @@ public function reset()
         $this->nativeAd = false;
         $this->date = null;
         $this->language = null;
-        $this->author = [];
+        $this->authors = [];
         $this->nextPageUrl = null;
         $this->success = false;
     }
@@ -240,16 +240,11 @@ public function process($html, $url, SiteConfig $siteConfig = null, $smartTidy =
         }
 
         // try to get author (if it hasn't already been set)
-        if (empty($this->author)) {
+        if (empty($this->authors)) {
             foreach ($this->siteConfig->author as $pattern) {
                 $this->logger->log('debug', 'Trying {pattern} for author', ['pattern' => $pattern]);
 
-                // since there is no author, if we find some we need to store them in a new array
-                $returnCallback = function ($e) {
-                    return [trim($e)];
-                };
-
-                if ($this->extractEntityFromPattern('author', $pattern, $returnCallback)) {
+                if ($this->extractMultipleEntityFromPattern('authors', $pattern)) {
                     break;
                 }
             }
@@ -357,7 +352,7 @@ public function process($html, $url, SiteConfig $siteConfig = null, $smartTidy =
             $detectDate = true;
         }
         // detect author?
-        if (empty($this->author) && (empty($this->siteConfig->author) || $this->siteConfig->autodetect_on_failure())) {
+        if (empty($this->authors) && (empty($this->siteConfig->author) || $this->siteConfig->autodetect_on_failure())) {
             $detectAuthor = true;
         }
 
@@ -433,7 +428,7 @@ public function process($html, $url, SiteConfig $siteConfig = null, $smartTidy =
         // one author, but it could also indicate that we're processing
         // a page listing different articles with different authors.
         $detectAuthor = $this->extractEntityFromQuery(
-            'author',
+            'authors',
             $detectAuthor,
             "//a[contains(concat(' ',normalize-space(@rel),' '),' author ')]",
             $this->readability->dom,
@@ -612,7 +607,7 @@ public function getDate()
 
     public function getAuthors()
     {
-        return $this->author;
+        return $this->authors;
     }
 
     public function getLanguage()
@@ -786,18 +781,18 @@ private function extractAuthor($detectAuthor, \DOMNode $node)
             if ($fns && $fns->length > 0) {
                 foreach ($fns as $fn) {
                     if (trim($fn->textContent) !== '') {
-                        $this->author[] = trim($fn->textContent);
+                        $this->authors[] = trim($fn->textContent);
                         $this->logger->log('debug', 'hNews: found author: ' . trim($fn->textContent));
                     }
                 }
             } else {
                 if (trim($author->textContent) !== '') {
-                    $this->author[] = trim($author->textContent);
+                    $this->authors[] = trim($author->textContent);
                     $this->logger->log('debug', 'hNews: found author: ' . trim($author->textContent));
                 }
             }
 
-            return empty($this->author);
+            return empty($this->authors);
         }
 
         return true;
@@ -940,10 +935,12 @@ private function extractEntityFromPattern($entity, $pattern, $returnCallback = n
 
         if (is_string($elems) && trim($elems) !== '') {
             $entityValue = $returnCallback($elems);
+
             $this->logger->log('debug', "{$entity} expression evaluated as string: {{$entity}}", [$entity => $entityValue]);
             $this->logger->log('debug', '...XPath match: {pattern}', ['pattern', $pattern]);
         } elseif ($elems instanceof \DOMNodeList && $elems->length > 0) {
             $entityValue = $returnCallback($elems->item(0)->textContent);
+
             $this->logger->log('debug', "{$entity} matched: {{$entity}}", [$entity => $entityValue]);
             $this->logger->log('debug', '...XPath match: {pattern}', ['pattern', $pattern]);
 
@@ -963,4 +960,57 @@ private function extractEntityFromPattern($entity, $pattern, $returnCallback = n
 
         return false;
     }
+
+    /**
+     * Same as extractEntityFromPattern except this one always return all matched elements.
+     *
+     * @see extractEntityFromPattern
+     *
+     * @param string   $entity         Entity to look for ('title', 'date')
+     * @param string   $pattern        Pattern to look for
+     * @param callable $returnCallback Function to apply on the value
+     *
+     * @return bool Telling if the entity has been found
+     */
+    private function extractMultipleEntityFromPattern($entity, $pattern, $returnCallback = null)
+    {
+        // we define the default callback here
+        if (!is_callable($returnCallback)) {
+            $returnCallback = function ($e) {
+                return trim($e);
+            };
+        }
+
+        $elems = $this->xpath->evaluate($pattern, $this->readability->dom);
+        $entityValue = null;
+
+        if (is_string($elems) && trim($elems) !== '') {
+            $entityValue[] = $returnCallback($elems);
+
+            $this->logger->log('debug', "{$entity} expression evaluated as string: {{$entity}}", [$entity => $entityValue]);
+            $this->logger->log('debug', '...XPath match: {pattern}', ['pattern', $pattern]);
+        } elseif ($elems instanceof \DOMNodeList && $elems->length > 0) {
+            foreach ($elems as $item) {
+                $entityValue[] = $returnCallback($item->textContent);
+
+                // remove entity from document
+                try {
+                    $item->parentNode->removeChild($item);
+                } catch (\DOMException $e) {
+                    // do nothing
+                }
+            }
+
+            $this->logger->log('debug', "{$entity} matched: {{$entity}}", [$entity => $entityValue]);
+            $this->logger->log('debug', '...XPath match: {pattern}', ['pattern', $pattern]);
+        }
+
+        if ($entityValue !== null) {
+            $this->{$entity} = $entityValue;
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/tests/GrabyFunctionalTest.php b/tests/GrabyFunctionalTest.php
@@ -273,7 +273,7 @@ public function dataAuthors()
     {
         return [
             ['http://www.lexpress.fr/actualite/medias/thierry-ardisson-et-bruno-masure-se-sont-affrontes-sur-c8_1892942.html', ['Audrey Kucinskas']],
-            ['https://www.reddit.com/r/LinuxActionShow/comments/1fccny/arch_linux_survival_guide/', ['blackout24']],
+            ['http://www.liberation.fr/planete/2017/04/05/donald-trump-et-xi-jinping-tentative-de-flirt-en-floride_1560768', ['Raphaël Balenieri, correspondant à Pékin', 'Frédéric Autran, correspondant à New York']],
         ];
     }
 
@@ -282,7 +282,14 @@ public function dataAuthors()
      */
     public function testAuthors($url, $expectedAuthors)
     {
-        $graby = new Graby(['debug' => true]);
+        $graby = new Graby([
+            'debug' => true,
+            'extractor' => [
+                'config_builder' => [
+                    'site_config' => [__DIR__ . '/fixtures/site_config'],
+                ],
+            ],
+        ]);
         $res = $graby->fetchContent($url);
 
         $this->assertCount(11, $res);

diff --git a/tests/fixtures/site_config/liberation.fr.txt b/tests/fixtures/site_config/liberation.fr.txt
@@ -0,0 +1,4 @@
+body: //div[contains(concat(' ',normalize-space(@class),' '),' width-padded-left ')]
+strip_id_or_class: article-rel-item
+author: //div[@class='article-head-metas']/a
+date: //span[@class='date']/time