Merge pull request #1 from ngmy/0.5.0

Change the version of the dependency, etc

Author: ngmy

composer.json

@@ -16,8 +16,8 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.1.*",
-        "anlutro/curl": "dev-master"
+        "illuminate/support": "~4.0",
+        "anlutro/curl": "0.6.1"
     },
     "require-dev": {
         "orchestra/testbench": "2.1.*",

src/Ngmy/L4Dav/Facades/L4Dav.php

@@ -5,7 +5,7 @@
  * Licensed under MIT License.
  *
  * @package    L4Dav
- * @version    0.4.0
+ * @version    0.5.0
  * @author     Ngmy <y.nagamiya@gmail.com>
  * @license    http://opensource.org/licenses/MIT MIT License
  * @copyright  (c) 2014, Ngmy <y.nagamiya@gmail.com>
@@ -32,4 +32,3 @@ protected static function getFacadeAccessor()
 	}
 
 }
-

src/Ngmy/L4Dav/L4Dav.php

@@ -5,13 +5,15 @@
  * Licensed under MIT License.
  *
  * @package    L4Dav
- * @version    0.4.0
+ * @version    0.5.0
  * @author     Ngmy <y.nagamiya@gmail.com>
  * @license    http://opensource.org/licenses/MIT MIT License
  * @copyright  (c) 2014, Ngmy <y.nagamiya@gmail.com>
  * @link       https://github.com/ngmy/l4-dav
  */
 
+use Ngmy\L4Dav\Service\Http\RequestInterface;
+
 /**
  * A WebDAV client class.
  *
@@ -59,26 +61,32 @@ class L4Dav {
 	 */
 	protected $url;
 
+	protected $request;
+
 	/**
 	 * Create a new L4Dav class object.
 	 *
-	 * @param string $webDavUrl The URL of the WebDAV server.
+	 * @param Ngmy\L4Dav\Service\Http\RequestInterface $request
+	 * @param string  $webDavUrl  The URL of the WebDAV server.
+	 * @param integer $webDavPort The port of the WebDAV server.
 	 * @access public
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 * @return void
 	 */
-	public function __construct($webDavUrl)
+	public function __construct(RequestInterface $request, $webDavUrl, $webDavPort = 80)
 	{
 		if (!preg_match('/([a-z]+):\/\/([a-zA-Z0-9\.]+)(:[0-9]+){0,1}(.*)/', $webDavUrl, $m)) {
 			throw new \InvalidArgumentException('Invalid URL format ('.$webDavUrl.')');
 		}
 
 		$this->schema = $m[1];
 		$this->host   = $m[2];
-		$this->port   = isset($m[3]) ? (int) ltrim($m[3], ':') : 80;
+		$this->port   = isset($m[3]) ? (int) ltrim($m[3], ':') : $webDavPort;
 		$this->path   = isset($m[4]) ? rtrim($m[4], '/').'/' : '/';
 
 		$this->url = $this->schema.'://'.$this->host.$this->path;
+
+		$this->request = $request;
 	}
 
 	/**
@@ -99,7 +107,10 @@ public function get($srcPath, $destPath)
 			CURLOPT_RETURNTRANSFER => true,
 		);
 
-		$result = $this->executeWebRequest('GET', $this->url.$srcPath, array(), $options);
+		$result = $this->request->method('GET')
+			->url($this->url.$srcPath)
+			->options($options)
+			->send();
 
 		fclose($fh);
 
@@ -126,7 +137,10 @@ public function put($srcPath, $destPath)
 			CURLOPT_INFILESIZE => $filesize,
 		);
 
-		$result = $this->executeWebRequest('PUT', $this->url.$destPath, array(), $options);
+		$result = $this->request->method('PUT')
+			->url($this->url.$destPath)
+			->options($options)
+			->send();
 
 		fclose($fh);
 
@@ -144,7 +158,10 @@ public function delete($path)
 	{
 		$options = array(CURLOPT_PORT => $this->port);
 
-		return $this->executeWebRequest('DELETE',$this->url.$path, array(), $options);
+		return $this->request->method('DELETE')
+			->url($this->url.$path)
+			->options($options)
+			->send();
 	}
 
 	/**
@@ -160,7 +177,11 @@ public function copy($srcPath, $destPath)
 		$options = array(CURLOPT_PORT => $this->port);
 		$headers = array('Destination' => $this->url.$destPath);
 
-		return $this->executeWebRequest('COPY', $this->url.$srcPath, $headers, $options);
+		return $this->request->method('COPY')
+			->url($this->url.$srcPath)
+			->headers($headers)
+			->options($options)
+			->send();
 	}
 
 	/**
@@ -176,7 +197,11 @@ public function move($srcPath, $destPath)
 		$options = array(CURLOPT_PORT => $this->port);
 		$headers = array('Destination' => $this->url.$destPath);
 
-		return $this->executeWebRequest('MOVE', $this->url.$srcPath, $headers, $options);
+		return $this->request->method('MOVE')
+			->url($this->url.$srcPath)
+			->headers($headers)
+			->options($options)
+			->send();
 	}
 
 	/**
@@ -190,7 +215,10 @@ public function mkdir($path)
 	{
 		$options = array(CURLOPT_PORT => $this->port);
 
-		return $this->executeWebRequest('MKCOL', $this->url.$path, array(), $options);
+		return $this->request->method('MKCOL')
+			->url($this->url.$path)
+			->options($options)
+			->send();
 	}
 
 	/**
@@ -208,7 +236,10 @@ public function exists($path)
 			CURLOPT_RETURNTRANSFER => true,
 		);
 
-		$response = $this->executeWebRequest('GET', $this->url.$path, array(), $options);
+		$response = $this->request->method('GET')
+			->url($this->url.$path)
+			->options($options)
+			->send();
 
 		if ($response->getStatus() < 200 || $response->getStatus() > 300) {
 			return false;
@@ -229,7 +260,11 @@ public function ls($path)
 		$options = array(CURLOPT_PORT => $this->port);
 		$headers = array('Depth' => 1);
 
-		$response = $this->executeWebRequest('PROPFIND', $this->url.$path, $headers, $options);
+		$response = $this->request->method('PROPFIND')
+			->url($this->url.$path)
+			->headers($headers)
+			->options($options)
+			->send();
 
 		if ($response->getStatus() < 200 || $response->getStatus() > 300) {
 			return array();
@@ -243,26 +278,4 @@ public function ls($path)
 		}
 	}
 
-	/**
-	 * Execute the request to the WebDAV server.
-	 *
-	 * @param string $method  The HTTP method.
-	 * @param string $url     The request URL.
-	 * @param array  $headers The HTTP headers.
-	 * @param array  $options The cURL options.
-	 * @access protected
-	 * @return \Ngmy\L4Dav\Response Returns a Response class object.
-	 */
-	protected function executeWebRequest($method, $url, $headers, $options)
-	{
-		$curl = new cURL;
-
-		$result = $curl->newRequest($method, $url)
-			->setHeaders($headers)
-			->setOptions($options)
-			->send();
-
-		return $result;
-	}
-
 }

src/Ngmy/L4Dav/L4DavServiceProvider.php

@@ -5,14 +5,16 @@
  * Licensed under MIT License.
  *
  * @package    L4Dav
- * @version    0.4.0
+ * @version    0.5.0
  * @author     Ngmy <y.nagamiya@gmail.com>
  * @license    http://opensource.org/licenses/MIT MIT License
  * @copyright  (c) 2014, Ngmy <y.nagamiya@gmail.com>
  * @link       https://github.com/ngmy/l4-dav
  */
 
 use Illuminate\Support\ServiceProvider;
+use Ngmy\L4Dav\Library\cURL;
+use Ngmy\L4Dav\Service\Http\CurlRequest;
 
 /**
  * A service provider class to bootstrap the L4Dav class in Laravel 4.
@@ -47,8 +49,16 @@ public function register()
 	{
 		$this->app['l4-dav'] = $this->app->share(function($app)
 		{
-			$webDavUrl = $app['config']['ngmy/l4-dav::url'];
-			return new L4Dav($webDavUrl);
+			$config = $app['config'];
+
+			$curl = new cURL;
+
+			$request = new CurlRequest($curl);
+
+			$webDavUrl  = $config['ngmy/l4-dav::url'];
+			$webDavPort = $config['ngmy/l4-dav::port'];
+
+			return new L4Dav($request, $webDavUrl, $webDavPort);
 		});
 	}
 

src/Ngmy/L4Dav/cURL.php src/Ngmy/L4Dav/Library/cURL.php

@@ -1,19 +1,19 @@
-<?php namespace Ngmy\L4Dav;
+<?php namespace Ngmy\L4Dav\Library;
 /**
  * Part of the L4Dav package.
  *
  * Licensed under MIT License.
  *
  * @package    L4Dav
- * @version    0.4.0
+ * @version    0.5.0
  * @author     Ngmy <y.nagamiya@gmail.com>
  * @license    http://opensource.org/licenses/MIT MIT License
  * @copyright  (c) 2014, Ngmy <y.nagamiya@gmail.com>
  * @link       https://github.com/ngmy/l4-dav
  */
 
 /**
- * A wrapper class for the cURL class.
+ * A wrapper class for the anlutro/curl.
  *
  * @package L4Dav
  */
@@ -42,6 +42,6 @@ class cURL extends \anlutro\cURL\cURL {
 	*
 	* @var string
 	*/
-	protected $responseClass = '\Ngmy\L4Dav\Response';
+	protected $responseClass = '\Ngmy\L4Dav\Service\Http\CurlResponse';
 
 }