Merge pull request #5 from rwifeng/rs_test

rs and rsf test

Author: xushiwei

.travis.yml

@@ -4,8 +4,10 @@ php:
   - 5.3
   - 5.4
 before_script:
-  - export QINIU_ACCESS_KEY="iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV"
-  - export QINIU_SECRET_KEY="6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j"
+  - export QINIU_ACCESS_KEY="Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ"
+  - export QINIU_SECRET_KEY="b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD"
+  - export QINIU_BUCKET_NAME="phpsdk"
+  - export QINIU_KEY_NAME="file_name"
 script:
   - cd tests; phpunit .
 

CHANGELOG.md

@@ -31,7 +31,11 @@ public function SignWithData($data) // => $token
 	public function SignRequest($req, $incbody) // => ($token, $error)
 	{
 		$url = $req->URL;
-		$data = $url['path'];
+		$url = parse_url($url['path']);
+		$data = '';
+		if (isset($url['path'])) {
+			$data = $url['path'];
+		}
 		if (isset($url['query'])) {
 			$data .= '?' . $url['query'];
 		}
@@ -40,7 +44,6 @@ public function SignRequest($req, $incbody) // => ($token, $error)
 		if ($incbody) {
 			$data .= $req->Body;
 		}
-
 		return $this->Sign($data);
 	}
 }

docs/README.md

@@ -2,7 +2,7 @@
 
 $QINIU_UP_HOST	= 'http://up.qbox.me';
 $QINIU_RS_HOST	= 'http://rs.qbox.me';
-$QINIU_RSP_HOST	= 'http://rsp.qbox.me';
+$QINIU_RSF_HOST	= 'http://rsf.qbox.me';
 
 $QINIU_ACCESS_KEY	= '<Please apply your access key>';
 $QINIU_SECRET_KEY	= '<Dont send your secret key to anyone>';

qiniu/auth_digest.php

@@ -0,0 +1,58 @@
+<?php
+
+require_once("auth_digest.php");
+
+// --------------------------------------------------------------------------------
+// class Qiniu_ImageView
+
+class Qiniu_ImageView {
+	public $Mode;
+    public $Width;
+    public $Height;
+    public $Quality;
+    public $Format;
+
+    public function MakeRequest($url)
+    {
+    	$ops = array($this->Mode);
+
+    	if (!empty($this->Width)) {
+    		$ops[] = 'w/' . $this->Width;
+    	}
+    	if (!empty($this->Height)) {
+    		$ops[] = 'h/' . $this->Height;
+    	}
+    	if (!empty($this->Quality)) {
+    		$ops[] = 'q/' . $this->Quality;
+    	}
+    	if (!empty($this->Format)) {
+    		$ops[] = 'format/' . $this->Format;
+    	}
+
+    	return $url . "?imageView/" . implode('/', $ops);
+    }
+}
+
+// --------------------------------------------------------------------------------
+// class Qiniu_Exif
+
+class Qiniu_Exif {
+
+	public function MakeRequest($url)
+	{
+		return $url . "?exif";
+	}
+
+}
+
+// --------------------------------------------------------------------------------
+// class Qiniu_ImageInfo
+
+class Qiniu_ImageInfo {
+
+	public function MakeRequest($url)
+	{
+		return $url . "?imageInfo";
+	}
+
+}

qiniu/conf.php

@@ -8,7 +8,7 @@
 class Qiniu_Error
 {
 	public $Err;	 // string
-	public $Reqid;	 // string 
+	public $Reqid;	 // string
 	public $Details; // []string
 	public $Code;	 // int
 
@@ -48,7 +48,7 @@ class Qiniu_Response
 
 	public function __construct($code, $body)
 	{
-		$this->StatusCode = code;
+		$this->StatusCode = $code;
 		$this->Header = array();
 		$this->Body = $body;
 		$this->ContentLength = strlen($body);
@@ -62,7 +62,7 @@ function Qiniu_Header_Get($header, $key) // => $val
 {
 	$val = @$header[$key];
 	if (isset($val)) {
-		if (isarray($val)) {
+		if (is_array($val)) {
 			return $val[0];
 		}
 		return $val;
@@ -117,10 +117,19 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 		CURLOPT_CUSTOMREQUEST  => 'POST',
 		CURLOPT_URL => $url['path']
 	);
+	$httpHeader = $req->Header;
+	if (!empty($httpHeader))
+	{
+		$header = array();
+		foreach($httpHeader as $key => $parsedUrlValue) {
+			$header[] = "$key: $parsedUrlValue";
+		}
+		$options[CURLOPT_HTTPHEADER] = $header;
+	}
 	$body = $req->Body;
 	if (!empty($body)) {
 		$options[CURLOPT_POSTFIELDS] = $body;
-		$options[CURLOPT_POSTFIELDSIZE] = strlen($body);
+		//$options[CURLOPT_POSTFIELDSIZE] = strlen($body);
 	}
 	curl_setopt_array($ch, $options);
 	$result = curl_exec($ch);
@@ -161,6 +170,7 @@ public function Exec($req) // => ($resp, $error)
 function Qiniu_Client_ret($resp) // => ($data, $error)
 {
 	$code = $resp->StatusCode;
+	$data = null;
 	if ($code >= 200 && $code <= 299) {
 		if ($resp->ContentLength !== 0) {
 			$data = json_decode($resp->Body, true);
@@ -201,5 +211,62 @@ function Qiniu_Client_CallNoRet($self, $url) // => $error
 	return Qiniu_ResponseError($resp);
 }
 
+function Qiniu_Client_CallWithForm($self, $url, $params, $contentType = 'application/x-www-form-urlencoded') // => ($data, $error)
+{
+	$u = array('path' => $url);
+	if ($contentType === 'application/x-www-form-urlencoded' && is_array($params)) {
+		$params = http_build_query($params);
+	}
+	$req = new Qiniu_Request($u, $params);
+	$req->Header['Content-Type'] = $contentType;
+	list($resp, $err) = $self->Exec($req);
+	if ($err !== null) {
+		return array(null, $err);
+	}
+	return Qiniu_Client_ret($resp);
+}
+
+function Qiniu_Client_CallWithMultiPart($self, $url, $fields, $files)
+{
+	list($contentType, $body) = Qiniu_Encode_MultiPart_Form($fields, $files);
+	return Qiniu_Client_CallWithForm($self, $url, $body, $contentType);
+}
+
 // --------------------------------------------------------------------------------
 
+function Qiniu_Encode_MultiPart_Form($fields, $files) // => ($contentType, $body)
+{
+	$eol = "\r\n";
+	$data = array();
+	if ($fields == '') {
+		$fields = array();
+	}
+	if ($files == '') {
+		$files = array();
+	}
+
+	$mimeBoundary = md5(time());
+	foreach ($fields as $name => $val){
+		array_push($data, '--' . $mimeBoundary);
+		array_push($data, "Content-Disposition: form-data; name=$name");
+		array_push($data, '');
+		array_push($data, $val);
+	}
+
+	foreach ($files as $file) {
+		array_push($data, '--' . $mimeBoundary);
+		list($name, $fileName, $fileCxt) = $file;
+		array_push($data, "Content-Disposition: form-data; name=$name; filename=$fileName");
+		array_push($data, 'Content-Type: application/octet-stream');
+		array_push($data, '');
+		array_push($data, $fileCxt);
+	}
+
+	array_push($data, '--' . $mimeBoundary);
+	array_push($data, '');
+
+	$body = implode($eol, $data);
+	$contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
+	return array($contentType, $body);
+}
+

qiniu/fop.php

@@ -0,0 +1,58 @@
+<?php
+
+require_once("http.php");
+require_once("auth_digest.php");
+
+
+define('UNDEFINED_KEY', "?");
+define('NO_CRC32', 0);
+define('AUTO_CRC32', 1);
+define('WITH_CRC32', 2);
+
+// ----------------------------------------------------------
+// class Qiniu_PutExtra
+
+class Qiniu_PutExtra
+{
+	public $Params;
+	public $MimeType;
+	public $Crc32;
+	public $CheckCrc;
+}
+
+function Qiniu_Put($upToken, $key, $body, $putExtra) // => ($data, $err)
+{
+	global $QINIU_UP_HOST;
+	if ($key == null) {
+		$key = UNDEFINED_KEY;
+	}
+	$fields = array('key' => $key, 'token' => $upToken);
+
+	if ( $putExtra->CheckCrc == AUTO_CRC32 || $putExtra->CheckCrc == WITH_CRC32 ) {
+		$fields['crc32'] = $putExtra->Crc32;
+	}
+	$files = array(array('file', $key, $body));
+
+	$client = new Qiniu_Client(null);
+	return Qiniu_Client_CallWithMultiPart($client, $QINIU_UP_HOST, $fields, $files);
+}
+
+function Qiniu_PutFile($upToken, $key, $localFile, $putExtra) // => ($data, $err)
+{
+	global $QINIU_UP_HOST;
+	if ($key == null) {
+		$key = UNDEFINED_KEY;
+	}
+	$fields = array('key' => $key, 'token' => $upToken, 'file' => '@' . $localFile);
+
+	if ( $putExtra->CheckCrc == AUTO_CRC32 ) {
+		$hash = hash_file('crc32b', $localFile);
+		$crc32 = unpack('N', pack('H*', $hash));
+		$fields['crc32'] = $crc32[1];
+	} elseif ($putExtra->CheckCrc == WITH_CRC32 ) {
+		$fields['crc32'] = $putExtra->Crc32;
+	}
+
+	$client = new Qiniu_Client(null);
+	return Qiniu_Client_CallWithForm($client, $QINIU_UP_HOST, $fields, 'multipart/form-data');
+}