mv rsf class to func

Author: rwifeng

qiniu/rsf.php

@@ -2,43 +2,36 @@
 
 require_once("http.php");
 
-// ----------------------------------------------------------
-// class Qiniu_RSF_Client
-
-class Qiniu_RSF_Client
+/**
+ * 1. 首次请求 marker = ""
+ * 2. 无论 err 值如何，均应该先看 items 是否有内容
+ * 3. 如果后续没有更多数据，err 返回 EOF，markerOut 返回 ""（但不通过该特征来判断是否结束）
+ */
+function Qiniu_RSF_ListPrefix($self, $bucket, $prefix, $marker, $limit) // => ($items, $markerOut, $err)
 {
-	public $Conn;
-
-	public function __construct($mac)
-	{
-		$this->Conn = new Qiniu_MacHttpClient($mac);
+	global $QINIU_RSF_HOST;
+	$query = array("bucket" => $bucket);
+	if (!empty($prefix)) {
+		$query["prefix"] = $prefix;
+	}
+	if (!empty($marker)) {
+		$query["marker"] = $marker;
+	}
+	if (!empty($limit)) {
+		$query["limit"] = $limit;
 	}
 
-	/**
-	 * 1. 首次请求 marker = ""
-	 * 2. 无论 err 值如何，均应该先看 entries 是否有内容
-	 * 3. 如果后续没有更多数据，err 返回 EOF，markerOut 返回 ""（但不通过该特征来判断是否结束）
-	 */
-	public function ListPrefix($bucket, $prefix, $marker, $limit) // => ($ret => array('items' => items, 'marker': markerOut), $err)
-	{
-		global $QINIU_RSF_HOST;
-		$query = array("bucket" => $bucket);
-		if (!empty($prefix)) {
-			$query["prefix"] = $prefix;
-		}
-		if (!empty($marker)) {
-			$query["marker"] = $marker;
-		}
-		if (!empty($limit)) {
-			$query["limit"] = $limit;
-		}
+	$url =  $QINIU_RSF_HOST . "/list?" . http_build_query($query);
+	list($ret, $err) = Qiniu_Client_Call($self, $url);
 
-		$url =  $QINIU_RSF_HOST . "/list?" . http_build_query($query);
-		list($ret, $err) = Qiniu_Client_Call($this->Conn, $url);
-		if (!isset($ret['marker'])) {
-			$err = new Qiniu_Error(400, 'EOF');
-		}
-		return array($ret, $err);
+	$items = $ret['items'];
+	if (!isset($ret['marker'])) {
+		$markerOut = '';
+		$err = new Qiniu_Error(400, 'EOF');
+	} else {
+		$markerOut = $ret['marker'];
 	}
 
+	return array($items, $markerOut, $err);
 }
+

tests/RsfTest.php

@@ -10,21 +10,22 @@ class RsfTest extends PHPUnit_Framework_TestCase
 	public function setUp()
 	{
 		initKeys();
-		$this->client = new Qiniu_RSF_Client(null);
+		$this->client = new Qiniu_MacHttpClient(null);
 		$this->bucket = getenv('QINIU_BUCKET_NAME');
 		$this->key = getenv('QINIU_KEY_NAME');
 	}
 
 	public function testListPrefix()
 	{
 		echo $this->bucket;
-		list($ret, $err) = $this->client->ListPrefix($this->bucket, null, null, null);
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, null, null, null);
 		$this->assertEquals($err->Err, 'EOF');
+		$this->assertEquals($markerOut, '');
 
-		list($ret, $err) = $this->client->ListPrefix($this->bucket, null, null, 1);
-		$this->assertArrayHasKey('marker', $ret);
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, null, null, 1);
+		$this->assertFalse($markerOut === '');
 
-		list($ret, $err) = $this->client->ListPrefix($this->bucket, $this->key, null, null);
-		$this->assertLessThanOrEqual(1, count($ret['items']));
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, $this->key, null, null);
+		$this->assertLessThanOrEqual(1, count($items));
 	}
 }