summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-11-26 11:31:17 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-11-26 11:31:17 +0100
commit4cd84306ff1bb897bdec9c6a0deb3aee924bc51f (patch)
tree2d8f973f091a179be58f7b4776fdcd2e393943c9
parent2edae61620ed20efcc5ef55576950b8f92044fc3 (diff)
update picofeed
-rw-r--r--composer.lock8
-rw-r--r--vendor/autoload.php2
-rw-r--r--vendor/composer/autoload_real.php10
-rw-r--r--vendor/composer/installed.json10
-rw-r--r--vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php1
-rw-r--r--vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php16
6 files changed, 31 insertions, 16 deletions
diff --git a/composer.lock b/composer.lock
index f7d2160ee..0e25a2be0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -57,12 +57,12 @@
"source": {
"type": "git",
"url": "https://github.com/fguillot/picoFeed.git",
- "reference": "c03c972a60a708d995dac7b0fe2107161dc9a338"
+ "reference": "687cc58b51d739f06bc1729d69280e5a867840dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/c03c972a60a708d995dac7b0fe2107161dc9a338",
- "reference": "c03c972a60a708d995dac7b0fe2107161dc9a338",
+ "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/687cc58b51d739f06bc1729d69280e5a867840dd",
+ "reference": "687cc58b51d739f06bc1729d69280e5a867840dd",
"shasum": ""
},
"require": {
@@ -86,7 +86,7 @@
],
"description": "Modern library to write or read feeds (RSS/Atom)",
"homepage": "http://fguillot.github.io/picoFeed",
- "time": "2014-11-23 15:47:57"
+ "time": "2014-11-25 23:40:52"
},
{
"name": "pear/net_url2",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 5e62a4d6f..357c2c52a 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb::getLoader();
+return ComposerAutoloaderInit80e526884d05a69ec5f87ea0eadf0d03::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 98280551c..bc6f011c7 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb
+class ComposerAutoloaderInit80e526884d05a69ec5f87ea0eadf0d03
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit80e526884d05a69ec5f87ea0eadf0d03', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit80e526884d05a69ec5f87ea0eadf0d03', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ class ComposerAutoloaderInit41392fc5dd4291cdd3bcf85c58151ffb
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequire41392fc5dd4291cdd3bcf85c58151ffb($file);
+ composerRequire80e526884d05a69ec5f87ea0eadf0d03($file);
}
return $loader;
}
}
-function composerRequire41392fc5dd4291cdd3bcf85c58151ffb($file)
+function composerRequire80e526884d05a69ec5f87ea0eadf0d03($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 94c5d704b..7c9dac276 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -119,20 +119,20 @@
"source": {
"type": "git",
"url": "https://github.com/fguillot/picoFeed.git",
- "reference": "c03c972a60a708d995dac7b0fe2107161dc9a338"
+ "reference": "687cc58b51d739f06bc1729d69280e5a867840dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/c03c972a60a708d995dac7b0fe2107161dc9a338",
- "reference": "c03c972a60a708d995dac7b0fe2107161dc9a338",
+ "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/687cc58b51d739f06bc1729d69280e5a867840dd",
+ "reference": "687cc58b51d739f06bc1729d69280e5a867840dd",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
- "time": "2014-11-23 15:47:57",
+ "time": "2014-11-25 23:40:52",
"type": "library",
- "installation-source": "dist",
+ "installation-source": "source",
"autoload": {
"psr-0": {
"PicoFeed": "lib/"
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
index 4e4658639..2b0d7e1c0 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
@@ -160,7 +160,6 @@ class Curl extends Client
curl_setopt($ch, CURLOPT_URL, $this->url);
curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->timeout);
- curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ch, CURLOPT_HTTPHEADER, $this->prepareHeaders());
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ini_get('open_basedir') === '');
curl_setopt($ch, CURLOPT_MAXREDIRS, $this->max_redirects);
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php
new file mode 100644
index 000000000..74d3fa16d
--- /dev/null
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php
@@ -0,0 +1,16 @@
+<?php
+return array(
+ 'test_url' => 'https://www.openrightsgroup.org/blog/2014/3-days-to-go-till-orgcon2014',
+ 'body' => array(
+ '//div[contains(@class, "content")]/div',
+ ),
+ 'strip' => array(
+ '//h2[1]',
+ '//div[@class="info"]',
+ '//div[@class="tags"]',
+ '//div[@class="comments"]',
+ '//div[@class="breadcrumbs"]',
+ '//h1[@class="pageTitle"]',
+ '//p[@class="bookmarkThis"]',
+ ),
+); \ No newline at end of file