add rs_utils.php

Author: xushiwei

qiniu/http.php

@@ -156,17 +156,17 @@ public function RoundTrip($req) // => ($resp, $error)
 
 class Qiniu_MacHttpClient
 {
-	private $mac;
+	public $Mac;
 
 	public function __construct($mac)
 	{
-		$this->mac = Qiniu_RequireMac($mac);
+		$this->Mac = Qiniu_RequireMac($mac);
 	}
 
 	public function RoundTrip($req) // => ($resp, $error)
 	{
 		$incbody = Qiniu_Client_incBody($req);
-		$token = $this->mac->SignRequest($req, $incbody);
+		$token = $this->Mac->SignRequest($req, $incbody);
 		$req->Header['Authorization'] = "QBox $token";
 		return Qiniu_Client_do($req);
 	}

qiniu/rs_utils.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once("rs.php");
+require_once("io.php");
+
+function Qiniu_RS_Put($self, $bucket, $key, $body, $putExtra) // => ($data, $err)
+{
+	$putPolicy = new Qiniu_RS_PutPolicy("$bucket:$key");
+	$upToken = $putPolicy->Token($self->Mac);
+	return Qiniu_Put($upToken, $key, $body, $putExtra);
+}
+
+function Qiniu_RS_PutFile($self, $bucket, $key, $localFile, $putExtra) // => ($data, $err)
+{
+	$putPolicy = new Qiniu_RS_PutPolicy("$bucket:$key");
+	$upToken = $putPolicy->Token($self->Mac);
+	return Qiniu_PutFile($upToken, $key, $localFile, $putExtra);
+}
+

tests/IoTest.php

@@ -15,7 +15,7 @@ public function setUp()
 
 	public function testPutFile()
 	{
-		$key = 'testPutFile';
+		$key = 'testPutFile' . $tid;
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
@@ -37,7 +37,7 @@ public function testPutFile()
 
 	public function testPut()
 	{
-		$key = 'testPut';
+		$key = 'testPut' . $tid;
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);

tests/RsTest.php

@@ -7,7 +7,7 @@ class RsTest extends PHPUnit_Framework_TestCase
 	public $client;
 	public $bucket;
 	public $key;
-	public $notExistKey = "not_exist";
+	public $notExistKey = 'not_exist';
 
 	public function setUp()
 	{
@@ -28,8 +28,8 @@ public function testStat()
 
 	public function testDeleteMoveCopy()
 	{
-		$key2 = rand();
-		$key3 = rand();
+		$key2 = 'testOp2' . $tid;
+		$key3 = 'testOp3' . $tid;
 		Qiniu_RS_Delete($this->client, $this->bucket, $key2);
 		Qiniu_RS_Delete($this->client, $this->bucket, $key3);
 

tests/RsUtilsTest.php

@@ -0,0 +1,54 @@
+<?php
+
+require("bootstrap.php");
+
+class RsUtilsTest extends PHPUnit_Framework_TestCase
+{
+	public $bucket;
+	public $client;
+
+	public function setUp()
+	{
+		$this->client = new Qiniu_MacHttpClient(null);
+		$this->bucket = getenv("QINIU_BUCKET_NAME");
+	}
+
+	public function testPutFile()
+	{
+		$key = 'testPutFile' . $tid;
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		$putExtra = new Qiniu_PutExtra();
+		$putExtra->CheckCrc = 1;
+		list($ret, $err) = Qiniu_RS_PutFile($this->client, $this->bucket, $key, __file__, $putExtra);
+		$this->assertNull($err);
+		$this->assertArrayHasKey('hash', $ret);
+		var_dump($ret);
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+
+	public function testPut()
+	{
+		$key = 'testPut' . $tid;
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		list($ret, $err) = Qiniu_RS_Put($this->client, $this->bucket, $key, "hello world!", null);
+		$this->assertNull($err);
+		$this->assertArrayHasKey('hash', $ret);
+		var_dump($ret);
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+}
+

tests/bootstrap.php

@@ -1,8 +1,7 @@
 <?php
 
-require_once("../qiniu/rs.php");
-require_once("../qiniu/io.php");
 require_once("../qiniu/fop.php");
+require_once("../qiniu/rs_utils.php");
 
 $accessKey = getenv("QINIU_ACCESS_KEY");
 $secretKey = getenv("QINIU_SECRET_KEY");
@@ -11,3 +10,8 @@
 	Qiniu_SetKeys($accessKey, $secretKey);
 }
 
+$tid = getenv("TRAVIS_JOB_NUMBER");
+if !empty($tid) {
+	$tid = strstr($tid, ".");
+}
+