Update to PicoFeed v0.1.32

composer.json

@@ -17,7 +17,7 @@
         "fguillot/simple-validator": "v1.0.0",
         "fguillot/json-rpc": "v1.2.3",
         "fguillot/picodb": "v1.0.14 ",
-        "fguillot/picofeed": "v0.1.31",
+        "fguillot/picofeed": "v0.1.32",
         "pda/pheanstalk": "v3.1.0",
         "ircmaxell/password-compat": "^1.0.4"
     },

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "287ac8083a99b8a4abb829567a4a7627",
+    "hash": "adf4db185f22a2e00d21d278ba1fa7bc",
-    "content-hash": "7964640dd4d057358aeb236996973c90",
+    "content-hash": "98e20f0db34bd3ce534c09d7bfcf0179",
     "packages": [
         {
             "name": "fguillot/json-rpc",
@@ -88,16 +88,16 @@
         },
         {
             "name": "fguillot/picofeed",
-            "version": "v0.1.31",
+            "version": "v0.1.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fguillot/picoFeed.git",
-                "reference": "b753961879d0b92c284971d902355e00cad1fd9b"
+                "reference": "fb20400dc8400474bf50d40976fa48beb018166b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/b753961879d0b92c284971d902355e00cad1fd9b",
+                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/fb20400dc8400474bf50d40976fa48beb018166b",
-                "reference": "b753961879d0b92c284971d902355e00cad1fd9b",
+                "reference": "fb20400dc8400474bf50d40976fa48beb018166b",
                 "shasum": ""
             },
             "require": {
@@ -137,7 +137,7 @@
             ],
             "description": "Modern library to handle RSS/Atom feeds",
             "homepage": "https://github.com/fguillot/picoFeed",
-            "time": "2017-01-16 03:10:21"
+            "time": "2017-04-05 19:55:52"
         },
         {
             "name": "fguillot/simple-validator",
@@ -419,27 +419,27 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.6.2",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
+                "sebastian/comparator": "^1.1|^2.0",
-                "sebastian/recursion-context": "^1.0|^2.0"
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.0",
+                "phpspec/phpspec": "^2.5|^3.2",
                 "phpunit/phpunit": "^4.8 || ^5.6.5"
             },
             "type": "library",
@@ -478,7 +478,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-11-21 14:58:47"
+            "time": "2017-03-02 20:05:34"
         },
         {
             "name": "phpunit/dbunit",
@@ -691,25 +691,30 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.8",
+            "version": "1.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4|~5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -731,20 +736,20 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2017-02-26 11:10:40"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.9",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
                 "shasum": ""
             },
             "require": {
@@ -780,7 +785,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2016-11-15 14:06:22"
+            "time": "2017-02-27 10:12:30"
         },
         {
             "name": "phpunit/phpunit",
@@ -1251,16 +1256,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.2",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                 "shasum": ""
             },
             "require": {
@@ -1300,7 +1305,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
+            "time": "2016-10-03 07:41:43"
         },
         {
             "name": "sebastian/version",

vendor/composer/installed.json

@@ -265,17 +265,17 @@
     },
     {
         "name": "fguillot/picofeed",
-        "version": "v0.1.31",
+        "version": "v0.1.32",
-        "version_normalized": "0.1.31.0",
+        "version_normalized": "0.1.32.0",
         "source": {
             "type": "git",
             "url": "https://github.com/fguillot/picoFeed.git",
-            "reference": "b753961879d0b92c284971d902355e00cad1fd9b"
+            "reference": "fb20400dc8400474bf50d40976fa48beb018166b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/b753961879d0b92c284971d902355e00cad1fd9b",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/fb20400dc8400474bf50d40976fa48beb018166b",
-            "reference": "b753961879d0b92c284971d902355e00cad1fd9b",
+            "reference": "fb20400dc8400474bf50d40976fa48beb018166b",
             "shasum": ""
         },
         "require": {
@@ -295,7 +295,7 @@
         "suggest": {
             "ext-curl": "PicoFeed will use cURL if present"
         },
-        "time": "2017-01-16 03:10:21",
+        "time": "2017-04-05 19:55:52",
         "bin": [
             "picofeed"
         ],

vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php

@@ -3,6 +3,7 @@
 namespace PicoFeed\Client;
 
 use DateTime;
+use Exception;
 use LogicException;
 use PicoFeed\Logging\Logger;
 use PicoFeed\Config\Config;
@@ -686,16 +687,21 @@ abstract class Client
 
     public function parseExpiration(HttpHeaders $headers)
     {
-        if (isset($headers['Cache-Control'])) {
+        try {
-            if (preg_match('/s-maxage=(\d+)/', $headers['Cache-Control'], $matches)) {
-                return new DateTime('+' . $matches[1] . ' seconds');
-            } else if (preg_match('/max-age=(\d+)/', $headers['Cache-Control'], $matches)) {
-                return new DateTime('+' . $matches[1] . ' seconds');
-            }
-        }
 
-        if (! empty($headers['Expires'])) {
+            if (isset($headers['Cache-Control'])) {
-            return new DateTime($headers['Expires']);
+                if (preg_match('/s-maxage=(\d+)/', $headers['Cache-Control'], $matches)) {
+                    return new DateTime('+' . $matches[1] . ' seconds');
+                } else if (preg_match('/max-age=(\d+)/', $headers['Cache-Control'], $matches)) {
+                    return new DateTime('+' . $matches[1] . ' seconds');
+                }
+            }
+
+            if (! empty($headers['Expires'])) {
+                return new DateTime($headers['Expires']);
+            }
+        } catch (Exception $e) {
+            Logger::setMessage('Unable to parse expiration date: '.$e->getMessage());
         }
 
         return new DateTime();

vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php

@@ -258,7 +258,7 @@ abstract class Parser implements ParserInterface
     public function getDateParser()
     {
         if ($this->dateParser === null) {
-            return new DateParser($this->config);
+            $this->dateParser = new DateParser($this->config);
         }
 
         return $this->dateParser;

vendor/fguillot/picofeed/lib/PicoFeed/Rules/.phoronix.com.php

@@ -6,7 +6,7 @@ return array(
             'body' => array(
                 '//div[@class="content"]',
             ),
-            'strip' => array()
+            'strip' => array(),
-        )
+        ),
-    )
+    ),
 );

vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php

@@ -4,28 +4,41 @@ return array(
         '%.*%' => array(
             'test_url' => 'http://www.wired.com/gamelife/2013/09/ouya-free-the-games/',
             'body' => array(
-                 '//div[@data-js="gallerySlides"]',
+                '//div[@data-js="gallerySlides"]',
-                 '//article',
+                 '//div[starts-with(@class,"post")]',
             ),
             'strip' => array(
-                '//*[@id="linker_widget"]',
+                '//h1',
-                '//*[@class="credit"]',
+                '//nav',
-                '//div[@data-js="slideCount"]',
+                '//button',
-                '//*[contains(@class="visually-hidden")]',
+                '//figure[starts-with(@class,"rad-slide")]',
-                '//*[@data-slide-number="_endslate"]',
+                '//figure[starts-with(@class,"end-slate")]',
-                '//*[@id="related"]',
+                '//div[contains(@class,"mobile-")]',
-                '//*[contains(@class, "bio")]',
+                '//div[starts-with(@class,"mob-gallery-launcher")]',
-                '//*[contains(@class, "entry-footer")]',
+                '//div[contains(@id,"mobile-")]',
-                '//*[contains(@class, "mobify_backtotop_link")]',
+                '//span[contains(@class,"slide-count")]',
-                '//*[contains(@class, "gallery-navigation")]',
+                '//div[contains(@class,"show-ipad")]',
-                '//*[contains(@class, "gallery-thumbnail")]',
+                '//img[contains(@id,"-hero-bg")]',
-                '//img[contains(@src, "1x1")]',
+                '//div[@data-js="overlayWrap"]',
-                '//a[contains(@href, "creativecommons")]',
+                '//ul[contains(@class,"metadata")]',
-                '//a[@href="#start-of-content"]',
+                '//div[@class="opening center"]',
+                '//p[contains(@class="byline-mob"]',
+                '//div[@id="o-gallery"]',
+                '//div[starts-with(@class,"sm-col")]',
+                '//div[contains(@class,"pad-b-huge")]',
+                '//a[contains(@class,"visually-hidden")]',
+                '//*[@class="social"]',
+                '//i',
+                '//div[@data-js="mobGalleryAd"]',
+                '//div[contains(@class,"footer")]',
+                '//div[contains(@data-js,"fader")]',
+                '//div[@id="sharing"]',
+                '//div[contains(@id,"related")]',
+                '//div[@id="most-pop"]',
                 '//ul[@id="article-tags"]',
+                '//style',
+                '//section[contains(@class,"footer")]'
             ),
         )
     )
 );
-
-

vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/adventuregamers.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%^/news.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php

@@ -1,21 +1,24 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
             'test_url' => 'http://www.aljazeera.com/news/2015/09/xi-jinping-seattle-china-150922230118373.html',
             'body' => array(
-                '//figure[@class="article-content"]',
+                '//article[@id="main-story"]',
-                '//div[@class="article-body"]',
             ),
             'strip' => array(
-                '//h1',
+                '//script',
-                '//h3',
+                '//header',
                 '//ul',
-                '//table[contains(@class, "in-article-item")]',
+                '//section[contains(@class,"profile")]',
                 '//a[@target="_self"]',
+                '//div[contains(@id,"_2")]',
+                '//div[contains(@id,"_3")]',
+                '//img[@class="viewMode"]',
+                '//table[contains(@class,"in-article-item")]',
                 '//div[@data-embed-type="Brightcove"]',
                 '//div[@class="QuoteContainer"]',
+                '//div[@class="BottomByLine"]',
             ),
         ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
@@ -10,6 +9,7 @@ return array(
             'strip' => array(
             '//p[@class="kindofstory"]',
             '//cite[@class="byline"]',
+            '//div[@class="useful-top"]',
             '//div[contains(@class,"related-topics")]',
             '//links',
             '//sharebar',

vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php

@@ -1,23 +1,25 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
             'test_url' => 'http://arstechnica.com/tech-policy/2015/09/judge-warners-2m-happy-birthday-copyright-is-bogus/',
             'body' => array(
-                '//header/h2',
+                '//article',
-                '//section[@id="article-guts"]',
-                '//div[@class="superscroll-content show"]',
-                '//div[@class="gallery"]',
             ),
-            'next_page' => '//span[@class="numbers"]/a',
             'strip' => array(
+                '//h4[@class="post-upperdek"]',
+                '//h1',
+                '//ul[@class="lSPager lSGallery"]',
+                '//div[@class="lSAction"]',
+                '//section[@class="post-meta"]',
                 '//figcaption',
-                '//div[@class="post-meta"]',
-                '//div[@class="gallery-image-credit"]',
                 '//aside',
-                '//div[@class="article-expander"]',
+                '//div[@class="gallery-image-credit"]',
+                '//section[@class="article-author"]',
+                '//*[contains(@id,"social-")]',
+                '//div[contains(@id,"footer")]',
             ),
         ),
     ),
 );
+

vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%/index.php.*comic=.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/backchannel.com.php

@@ -0,0 +1,18 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'https://medium.com/lessons-learned/917b8b63ae3e',
+            'body' => array(
+                '//div[contains(@class,"section-inner")]',
+            ),
+            'strip' => array(
+                '//div[contains(@class,"metabar")]',
+                '//img[contains(@class,"thumbnail")]',
+                '//h1',
+                '//blockquote',
+                '//p[contains(@class,"graf-after--h4")]'
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php

@@ -1,11 +1,10 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
             'test_url' => 'http://www.bangkokpost.com/news/politics/704204/new-us-ambassador-arrives-in-bangkok',
             'body' => array(
-            '//div[@class="articleContents"]',
+            '//article/div[@class="articleContents"]',
             ),
             'strip' => array(
             '//h2',
@@ -13,7 +12,6 @@ return array(
             '//div[@class="text-size"]',
             '//div[@class="relate-story"]',
             '//div[@class="text-ads"]',
-            '//script',
             '//ul',
             ),
         ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/biztimes.com.php

@@ -0,0 +1,22 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'https://www.biztimes.com/2017/02/10/settlement-would-revive-fowler-lake-condo-project-in-oconomowoc/',
+            'body' => array(
+                '//h2/span[@class="subhead"]',
+                '//div[contains(@class,"article-content")]',
+            ),
+            'strip' => array(
+                '//script',
+                '//div[contains(@class,"mobile-article-content")]',
+                '//div[contains(@class,"sharedaddy")]',
+                '//div[contains(@class,"author-details")]',
+                '//div[@class="row ad"]',
+                '//div[contains(@class,"relatedposts")]',
+                '//div[@class="col-lg-12"]',
+                '//div[contains(@class,"widget")]',
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bleepingcomputer.com.php

@@ -0,0 +1,15 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'https://www.bleepingcomputer.com/news/google/chromes-sandbox-feature-infringes-on-three-patents-so-google-must-now-pay-20m/',
+            'body' => array(
+                '//div[@class="article_section"]',
+            ),
+            'strip' => array(
+                '//*[@itemprop="headline"]',
+                '//div[@class="cz-news-story-title-section"]'
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/brewers.mlb.com.php

@@ -0,0 +1,22 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'http://m.brewers.mlb.com/news/article/161364798',
+            'body' => array(
+                '//article[contains(@class,"article")]',
+            ),
+            'strip' => array(
+                '//div[contains(@class,"ad-slot")]',
+                '//h1',
+                '//span[@class="timestamp"]',
+                '//div[contains(@class,"contributor-bottom")]',
+                '//div[contains(@class,"video")]',
+                '//ul[contains(@class,"social")]',
+                '//p[@class="tagline"]',
+                '//div[contains(@class,"social")]',
+                '//div[@class="button-wrap"]',
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%/cad/.+%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/chinafile.com.php

@@ -0,0 +1,18 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'http://www.chinafile.com/books/shanghai-faithful?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+chinafile%2FAll+%28ChinaFile%29',
+            'body' => array(
+            '//div[contains(@class,"pane-featured-photo-panel-pane-1")]',
+            '//div[contains(@class,"video-above-fold")]',
+            '//div[@class="sc-media"]',
+            '//div[contains(@class,"field-name-body")]',
+            ),
+            'strip' => array(
+                '//div[contains(@class,"cboxes")]',
+                '//div[contains(@class,"l-middle")]',
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%/comic.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
 		 '%^/products.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php

@@ -1,18 +1,18 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
             'test_url' => 'http://www.csmonitor.com/USA/Politics/2015/0925/John-Boehner-steps-down-Self-sacrificing-but-will-it-lead-to-better-government',
             'body' => array(
-            '//figure[@id="image-top-1"]',
+                '//h2[@id="summary"]',
-            '//div[@id="story-body"]',
+                '//div[@class="flex-video youtube"]',
+                '//div[contains(@class,"eza-body")]',
             ),
             'strip' => array(
-            '//script',
+                '//span[@id="breadcrumb"]',
-            '//img[@title="hide caption"]',
+                '//div[@id="byline-wrapper"]',
-            '//*[contains(@class,"promo_link")]',
+                '//div[@class="injection"]',
-            '//div[@id="story-embed-column"]',
+                '//*[contains(@class,"promo_link")]',
             ),
         ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php

@@ -1,17 +1,25 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
-            'test_url' => 'http://blogs.discovermagazine.com/the-extremo-files/2015/09/11/have-scientists-found-the-worlds-deepest-fish/',
+            'test_url' => 'http://blogs.discovermagazine.com/neuroskeptic/2017/01/25/publishers-jeffrey-beall/',
             'body' => array(
-            '//div[@class="entry"]',
+            '//div[@class="contentWell"]',
             ),
             'strip' => array(
             '//h1',
+            '//div[@class="breadcrumbs"]',
+            '//div[@class="mobile"]',
+            '//div[@class="fromIssue"]',
+            '//div[contains(@class,"belowDeck")]',
             '//div[@class="meta"]',
             '//div[@class="shareIcons"]',
+            '//div[@class="categories"]',
             '//div[@class="navigation"]',
+            '//div[@class="heading"]',
+            '//div[contains(@id,"-ad")]',
+            '//div[@class="relatedArticles"]',
+            '//div[@id="disqus_thread"]'
             ),
          ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/economist.com.php

@@ -0,0 +1,19 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'http://www.economist.com/blogs/buttonwood/2017/02/mixed-signals?fsrc=rss',
+            'body' => array(
+                '//div[@class="blog-post__inner"]',
+            ),
+            'strip' => array(
+                '//aside',
+                '//div[@class="blog-post__asideable-wrapper"]',
+                '//div[@class="video-player__wrapper"]',
+                '//div[contains(@class,"latest-updates-panel__container")]',
+                '//div[contains(@class,"blog-post__siblings-list-aside")]',
+                '//div[contains(@class,"blog-post__asideable-content")]'
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%/articles/view/comicsandcosplay/comics/critical-miss.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/foreignpolicy.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/fossbytes.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
@@ -11,6 +10,7 @@ return array(
             ),
             'strip' => array(
             '//span[@class="red"]',
+            '//div[@class="on-target"]'
             ),
         ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%/comics/oots.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/hardware.fr.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%^/news.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/indiehaven.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php

@@ -1,23 +1,36 @@
 <?php
-
 return array(
     'grabber' => array(
+        '%.%/picture-gallery/%' => array(
+            'test_url' => 'http://www.jsonline.com/picture-gallery/news/local/milwaukee/2017/02/22/photos-aclu-sues-milwaukee-police-over-profiling-stop-and-frisk/98250836/',
+            'body' => array(
+                '//div[@class="priority-asset-gallery galleries standalone hasendslate"]',
+            ),
+            'strip' => array(
+                '//div[@class="buy-photo-btn"]',
+                '//div[@class="gallery-thumbs thumbs pag-thumbs")]',
+            ),
+        ),
         '%.*%' => array(
             'test_url' => 'http://www.jsonline.com/news/usandworld/as-many-as-a-million-expected-for-popes-last-mass-in-us-b99585180z1-329688131.html',
             'body' => array(
-                '//div[@id="main"]',
+                '//div[@itemprop="articleBody"]',
             ),
             'strip' => array(
-                '//script',
+                '//h1',
-                'div[contains(@class, "header")]',
+                '//iframe',
-                'div[@class="module--headline"]',
+                '//span[@class="mycapture-small-btn mycapture-btn-with-text mycapture-expandable-photo-btn-small js-mycapture-btn-small"]',
-                'div[@class="main--inlinemeta"]',
+                '//div[@class="close-wrap"]',
-                'div[contains(@class, "leftcol--")]',
+                '//div[contains(@class,"ui-video-wrapper")]',
-                'p[@class="main--author"]',
+                '//div[contains(@class,"media-mob")]',
-                'div[@class="story--rightcol"]',
+                '//div[contains(@class,"left-mob")]',
-                'div[contains(@class, "footer")]',
+                '//div[contains(@class,"nerdbox")]',
-                'div[contains(@class, "rightcol--")]',
+                '//p/span',
-                'div[contains(@class, "author")]',
+                '//div[contains(@class,"oembed-asset")]',
+                '//*[contains(@class,"share")]',
+                '//div[contains(@class,"gallery-asset")]',
+                '//div[contains(@class,"oembed-asset")]',
+                '//div[@class="article-print-url"]',
             ),
         ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/kodi.tv.php

@@ -0,0 +1,11 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'https://kodi.tv/article/andwere-baaaaack',
+            'body' => array(
+                '//div[@class="l-region--content"]',
+            ),
+        ),
+    ),
+);

vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php

@@ -1,11 +1,10 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
             'test_url' => 'http://www.koreaherald.com/view.php?ud=20150926000018',
             'body' => array(
-            '//div[@class="content_view"]',
+            '//div[@id="articleText"]',
             ),
         ),
     ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(
@@ -8,7 +7,6 @@ return array(
                 '//div[@id="p"]',
             ),
             'strip' => array(
-                '//script',
                 '//div[@id="webtalks_btn_listenDiv"]',
             ),
         ),

vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'filter' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/legorafi.fr.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(

vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php

@@ -1,5 +1,4 @@
 <?php
-
 return array(
     'grabber' => array(
         '%.*%' => array(