Added configuration to requestResolvers #21

Author: oscarotero

Embed/Request.php

@@ -6,7 +6,8 @@
 
 class Request extends Url
 {
-    private static $defaultResolver = 'Embed\\RequestResolvers\\Curl';
+    private static $resolverClass = 'Embed\\RequestResolvers\\Curl';
+    private static $resolverConfig;
 
     private $resolver;
     private $xmlContent;
@@ -19,7 +20,7 @@ class Request extends Url
      *
      * @param string $className
      */
-    public static function setDefaultResolver($className)
+    public static function setDefaultResolver($className, array $config = null)
     {
         if (!class_exists($className)) {
             throw new \Exception("This class does not exists");
@@ -31,7 +32,22 @@ public static function setDefaultResolver($className)
             throw new \Exception("The resolver class must implement the Embed\\RequestResolvers\\RequestResolverInterface interface");
         }
 
-        self::$defaultResolver = $className;
+        self::$resolverClass = $className;
+
+        if ($config !== null) {
+            self::setResolverConfig($config);
+        }
+    }
+
+
+    /**
+     * Set the resolver configuration used for http requests
+     *
+     * @param array $config
+     */
+    public static function setResolverConfig(array $config)
+    {
+        self::$resolverConfig = $config;
     }
 
 
@@ -45,7 +61,11 @@ public function setUrl($url)
         if ($url instanceof RequestResolvers\RequestResolverInterface) {
             $this->resolver = $url;
         } else {
-            $this->resolver = new self::$defaultResolver($url);
+            $this->resolver = new self::$resolverClass($url);
+        }
+
+        if (self::$resolverConfig) {
+            $this->resolver->setConfig(self::$resolverConfig);
         }
 
         $this->parseUrl($this->resolver->getLatestUrl());

Embed/RequestResolvers/Curl.php

@@ -9,6 +9,12 @@ class Curl implements RequestResolverInterface
     protected $content;
     protected $result;
     protected $url;
+    protected $config = array(
+        'user_agent' => 'Embed PHP Library',
+        'max_redirections' => 20,
+        'connection_timeout' => 10,
+        'timeout' => 10,
+    );
 
 
     /**
@@ -20,6 +26,15 @@ public function __construct($url)
     }
 
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setConfig(array $config)
+    {
+        $this->config = $config + $this->config;
+    }
+
+
     /**
      * {@inheritdoc}
      */
@@ -122,16 +137,16 @@ protected function resolve()
             CURLOPT_URL => $this->url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_MAXREDIRS => 20,
-            CURLOPT_CONNECTTIMEOUT => 10,
-            CURLOPT_TIMEOUT => 10,
+            CURLOPT_MAXREDIRS => $this->config['max_redirections'],
+            CURLOPT_CONNECTTIMEOUT => $this->config['connection_timeout'],
+            CURLOPT_TIMEOUT => $this->config['timeout'],
             CURLOPT_SSL_VERIFYPEER => false,
             CURLOPT_SSL_VERIFYHOST => false,
             CURLOPT_ENCODING => '',
             CURLOPT_AUTOREFERER => true,
             CURLOPT_COOKIEJAR => $tmpCookies,
             CURLOPT_COOKIEFILE => $tmpCookies,
-            CURLOPT_USERAGENT => 'Embed PHP Library'
+            CURLOPT_USERAGENT => $this->config['user_agent']
         ));
 
         $this->content = curl_exec($connection);

Embed/RequestResolvers/RequestResolverInterface.php

@@ -15,6 +15,14 @@ interface RequestResolverInterface
     public function __construct($url);
 
 
+    /**
+     * Sets the configuration
+     *
+     * @param array $config
+     */
+    public function setConfig(array $config);
+
+
     /**
      * Set a new url (and clear data of previous url)
      */