diff options
27 files changed, 134 insertions, 86 deletions
diff --git a/composer.lock b/composer.lock index 8d5a6466b..14c36c274 100644 --- a/composer.lock +++ b/composer.lock @@ -57,12 +57,12 @@ "source": { "type": "git", "url": "https://github.com/fguillot/picoFeed.git", - "reference": "502c2b740fee15e67e047ebe169965689eff1331" + "reference": "4798deed1b5a69becaa792038ca446534f3345f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/502c2b740fee15e67e047ebe169965689eff1331", - "reference": "502c2b740fee15e67e047ebe169965689eff1331", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/4798deed1b5a69becaa792038ca446534f3345f1", + "reference": "4798deed1b5a69becaa792038ca446534f3345f1", "shasum": "" }, "require": { @@ -97,7 +97,7 @@ ], "description": "Modern library to handle RSS/Atom feeds", "homepage": "https://github.com/fguillot/picoFeed", - "time": "2016-01-14 13:06:11" + "time": "2016-01-20 21:03:34" }, { "name": "pear/net_url2", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 32ed14d4e..f45d0b986 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -209,12 +209,12 @@ "source": { "type": "git", "url": "https://github.com/fguillot/picoFeed.git", - "reference": "502c2b740fee15e67e047ebe169965689eff1331" + "reference": "4798deed1b5a69becaa792038ca446534f3345f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/502c2b740fee15e67e047ebe169965689eff1331", - "reference": "502c2b740fee15e67e047ebe169965689eff1331", + "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/4798deed1b5a69becaa792038ca446534f3345f1", + "reference": "4798deed1b5a69becaa792038ca446534f3345f1", "shasum": "" }, "require": { @@ -229,7 +229,7 @@ "suggest": { "ext-curl": "PicoFeed will use cURL if present" }, - "time": "2016-01-14 13:06:11", + "time": "2016-01-20 21:03:34", "bin": [ "picofeed" ], diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php index f369d4345..81c008694 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php @@ -5,16 +5,17 @@ return array( '%.*%' => array( 'test_url' => 'http://www.aljazeera.com/news/2015/09/xi-jinping-seattle-china-150922230118373.html', 'body' => array( - '//figure[@class="article-content"]', - '//div[@class="article-body"]', + '//figure[@class="article-content"]', + '//div[@class="article-body"]', ), 'strip' => array( - '//h1', - '//h3', - '//ul', - '//a[@target="_self"]', - '//div[@data-embed-type="Brightcove"]', - '//div[@class="QuoteContainer"]', + '//h1', + '//h3', + '//ul', + '//table[contains(@class, "in-article-item")]', + '//a[@target="_self"]', + '//div[@data-embed-type="Brightcove"]', + '//div[@class="QuoteContainer"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php index 2956eabf8..3ead1e7ff 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php @@ -8,6 +8,7 @@ return array( '//div[contains(@class, "entry-content")]', ), 'strip' => array( + '//div[@class="dmcss_login_form"]', '//*[contains(@class, "sharedaddy")]', ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php index 921f8f991..95a9b562d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php @@ -4,7 +4,13 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.koreatimes.co.kr/www/news/nation/2015/12/116_192409.html', - 'body' => '//div[@class="view_page_news_article_wrapper"]', + 'body' => array( + '//div[@id="p"]', + ), + 'strip' => array( + '//script', + '//div[@id="webtalks_btn_listenDiv"]', + ), ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php index ac74d5975..c31bc8d86 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php @@ -4,9 +4,11 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.linux.org/threads/lua-the-scripting-interpreter.8352/', - 'body' => '//div[@class="messageContent"]', + 'body' => array( + '//div[@class="messageContent"]', + ), 'strip' => array( - '//aside', + '//aside', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php index ab345e735..2ad69cce8 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php @@ -4,10 +4,12 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.linuxinsider.com/story/82526.html?rss=1', - 'body' => '//div[@id="story"]', + 'body' => array( + '//div[@id="story"]', + ), 'strip' => array( '//script', - '//h1]', + '//h1', '//div[@id="story-toolbox1"]', '//div[@id="story-byline"]', '//div[@id="story"]/p', diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mlb.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mlb.com.php index 3646aa4b1..55dbfffab 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mlb.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mlb.com.php @@ -5,15 +5,15 @@ return array( '%.*%' => array( 'test_url' => 'http://m.brewers.mlb.com/news/article/161364798', 'body' => array( - '//article', + '//article', ), 'strip' => array( - '//div[@class="article-top"]', - '//div[contains(@class, "contributor-bottom")]', - '//p[@class="tagline"]', - '//div[contains(@class, "social-")]', - '//div[@class="button-wrap"]', + '//div[@class="article-top"]', + '//div[contains(@class, "contributor-bottom")]', + '//p[@class="tagline"]', + '//div[contains(@class, "social-")]', + '//div[@class="button-wrap"]', ), - ), + ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/muckrock.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/muckrock.com.php new file mode 100644 index 000000000..845b18e80 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/muckrock.com.php @@ -0,0 +1,17 @@ +<?php + +return array( + 'grabber' => array( + '%.*%' => array( + 'test_url' => 'https://www.muckrock.com/news/archives/2016/jan/13/5-concerns-private-prisons/', + 'body' => array( + '//div[@class="content"]', + ), + 'strip' => array( + '//h1', + '//div[@class="secondary"]', + '//aside', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nationaljournal.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nationaljournal.com.php new file mode 100644 index 000000000..124afc3b6 --- /dev/null +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nationaljournal.com.php @@ -0,0 +1,16 @@ +<?php + +return array( + 'grabber' => array( + '%.*%' => array( + 'test_url' => 'http://www.nationaljournal.com/s/354962/south-carolina-evangelicals-outstrip-establishment?mref=home_top_main', + 'body' => array( + '//div[@class="section-body"]', + ), + 'strip' => array( + '//*[contains(@class, "-related")]', + '//*[contains(@class, "social")]', + ), + ), + ), +); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nature.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nature.com.php index 1dad8b66f..6b9e87f45 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nature.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nature.com.php @@ -1,20 +1,13 @@ <?php return array( 'grabber' => array( - 'http://dx.doi.org/10.1038.*%' => array( - 'test_url' => 'http://dx.doi.org/10.1038/525184a', - 'body' => array( - '//div[@class="content "]', - ), - 'strip' => array() - ), '%.*%' => array( 'test_url' => 'http://www.nature.com/doifinder/10.1038/nature.2015.18340', 'body' => array( '//div[contains(@class,"main-content")]', ), - 'strip' => array() + 'strip' => array(), ), - ) + ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onmilwaukee.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onmilwaukee.php index 75de01753..c1ef6b023 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onmilwaukee.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onmilwaukee.php @@ -4,13 +4,15 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://onmilwaukee.com/movies/articles/downerspelunking.html', - 'body' => '//article[@class="show"]', + 'body' => array( + '//article[contains(@class, "show")]', + ), 'strip' => array( '//h1', '//div[contains(@class, "-ad")]', '//div[contains(@class, "_ad")]', '//div[@id="pub_wrapper"]', - '//div[@class="share_tools"]', + '//div[contains(@class, "share_tools")]', '//div[@class="clearfix"]', '//div[contains(@class,"image_control")]', '//section[@class="ribboned"]', diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php index 4dce0b06d..5511411d1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php @@ -13,6 +13,7 @@ return array( '//script', '//div[contains(@class,"sharedaddy")]', '//div[@class="post-send-off"]', + '//div[@class="large-12 columns"]', '//div[contains(@class,"inner-related-article")]', ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php index a12720de8..0b1b98bb5 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php @@ -4,7 +4,9 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.securityfocus.com/news/11569?ref=rss', - 'body' => '//div[@class="expanded"]', + 'body' => array( + '//div[@class="expanded"]', + ), ), ), ); diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php index 08bec4d85..214ba2965 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php @@ -4,7 +4,9 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.soundandvision.com/content/james-guthrie-mixing-roger-waters-and-pink-floyd-51', - 'body' => '//div[@id="left"]', + 'body' => array( + '//div[@id="left"]', + ), 'strip' => array( '//div[@class="meta"]', '//div[@class="ratingsbox"]', diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php index 97fc4045f..9ea43b3d3 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php @@ -5,7 +5,7 @@ return array( '%.*%' => array( 'test_url' => 'http://www.stereophile.com/content/2015-rocky-mountain-audio-fest-starts-friday', 'body' => array( - '//div[@class="content clear-block"]', + '//div[@class="content clear-block"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php index 307b59927..127b216a0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php @@ -5,7 +5,7 @@ return array( '%.*%' => array( 'test_url' => 'http://blog.the-ebook-reader.com/2015/09/25/kobo-glo-hd-and-kobo-touch-2-0-covers-and-cases-roundup/', 'body' => array( - '//div[@class="entry"]', + '//div[@class="entry"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php index 5583f4118..0c3201b56 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php @@ -5,18 +5,18 @@ return array( '%.*%' => array( 'test_url' => 'http://www.theatlantic.com/politics/archive/2015/09/what-does-it-mean-to-lament-the-poor-inside-panem/407317/', 'body' => array( - '//picture[@class="img"]', - '//figure/figcaption/span', - '//div/p[@itemprop="description"]', - '//div[@class="article-body"]', + '//picture[@class="img"]', + '//figure/figcaption/span', + '//div/p[@itemprop="description"]', + '//div[@class="article-body"]', ), 'strip' => array( - '//aside[@class="callout"]', - '//span[@class="credit"]', - '//figcaption[@class="credit"]', - '//aside[contains(@class,"partner-box")]', - '//div[contains(@class,"ad")]', - '//a[contains(@class,"social-icon")]', + '//aside[@class="callout"]', + '//span[@class="credit"]', + '//figcaption[@class="credit"]', + '//aside[contains(@class,"partner-box")]', + '//div[contains(@class,"ad")]', + '//a[contains(@class,"social-icon")]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php index 37464ba10..f7439851d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php @@ -5,15 +5,15 @@ return array( '%.*%' => array( 'test_url' => 'http://www.thehindu.com/sci-tech/science/why-is-the-shape-of-cells-in-a-honeycomb-always-hexagonal/article7692306.ece?utm_source=RSS_Feed&utm_medium=RSS&utm_campaign=RSS_Syndication', 'body' => array( - '//div/img[@class="main-image"]', - '//div[@class="photo-caption"]', - '//div[@class="articleLead"]', - '//p', - '//span[@class="upper"]', + '//div/img[@class="main-image"]', + '//div[@class="photo-caption"]', + '//div[@class="articleLead"]', + '//p', + '//span[@class="upper"]', ), 'strip' => array( - '//div[@id="articleKeywords"]', - '//div[@class="photo-source"]', + '//div[@id="articleKeywords"]', + '//div[@class="photo-source"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php index a6f9ed5b0..db21b158d 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php @@ -5,14 +5,14 @@ return array( '%.*%' => array( 'test_url' => 'http://www.themoscowtimes.com/business/article/535500.html', 'body' => array( - '//div[@class="article_main_img"]', - '//div[@class="article_text"]', + '//div[@class="article_main_img"]', + '//div[@class="article_text"]', ), 'strip' => array( - '//div[@class="articlebottom"]', - '//p/b', - '//p/a[contains(@href, "/article.php?id=")]', - '//div[@class="disqus_wrap"]', + '//div[@class="articlebottom"]', + '//p/b', + '//p/a[contains(@href, "/article.php?id=")]', + '//div[@class="disqus_wrap"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thenewslens.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thenewslens.com.php index 359320e36..8085cffc8 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thenewslens.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thenewslens.com.php @@ -5,7 +5,7 @@ return array( '%.*%' => array( 'test_url' => 'http://international.thenewslens.com/post/255032/', 'body' => array( - '//article/main[contains(@class, "content-post")]', + '//article/main[contains(@class, "content-post")]', ), 'strip' => array( '//div[@class="photo-credit"]', diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php index dd403f031..c1a51daf1 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php @@ -5,8 +5,8 @@ return array( '%.*%' => array( 'test_url' => 'http://www.theonion.com/article/wild-eyed-jim-harbaugh-informs-players-they-must-k-51397?utm_medium=RSS&utm_campaign=feeds', 'body' => array( - '//div[@class="content-masthead"]/figure/div/noscript/img', - '//div[@class="content-text"]', + '//div[@class="content-masthead"]/figure/div/noscript/img', + '//div[@class="content-text"]', ), ), ), diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php index d43db2c81..31ea09623 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php @@ -4,7 +4,9 @@ return array( 'grabber' => array( '%.*%' => array( 'test_url' => 'http://www.thestandard.com.hk/breaking_news_detail.asp?id=67156', - 'body' => '//div[contains(@class,"storyBody")]', + 'body' => array( + '//table/tr/td/span[@class="bodyCopy"]', + ), 'strip' => array( '//script', '//br', diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php index 5d78f8b93..cc34eb172 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php @@ -5,11 +5,11 @@ return array( '%.*%' => array( 'test_url' => 'http://www.upi.com/Top_News/US/2015/09/26/Tech-giants-Hollywood-stars-among-guests-at-state-dinner-for-Chinas-Xi-Jinping/4541443281006/', 'body' => array( - '//div[@class="img"]', - '//div/article[@itemprop="articleBody"]', + '//div[@class="img"]', + '//div/article[@itemprop="articleBody"]', ), 'strip' => array( - '//div[@align="center"]', + '//div[@align="center"]', ), ), ), |