add fop

Author: rwifeng

.travis.yml

@@ -6,7 +6,7 @@ php:
 before_script:
   - export QINIU_ACCESS_KEY="Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ"
   - export QINIU_SECRET_KEY="b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD"
-  - export QINIU_BUCKET_NAME="php_sdk_test_bucket"
+  - export QINIU_BUCKET_NAME="phpsdk"
   - export QINIU_KEY_NAME="file_name"
 script:
   - cd tests; phpunit .

qiniu/fop.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";
+	}
+
+}

tests/FopTest.php

@@ -0,0 +1,39 @@
+<?php
+
+require_once('bootstrap.php');
+
+class FopTest extends PHPUnit_Framework_TestCase
+{
+
+	public	$url = 'http://phpsdk.qiniudn.com/f22.jpeg';
+
+	public function testImageView()
+	{
+		$imageView = new Qiniu_ImageView();
+		$imageView->Mode = 1;
+		$imageView->Width = 80;
+		$imageView->Format = 'jpg';
+
+		$url = $this->url;
+
+		$expectedUrl = $url . '?imageView/1/w/80/format/jpg';
+		$this->assertEquals($imageView->MakeRequest($url), $expectedUrl);
+	}
+
+	public function testExif()
+	{
+		$exif = new Qiniu_Exif();
+		$url = $this->url;
+		$expectedUrl = $url . '?exif';
+		$this->assertEquals($exif->MakeRequest($url), $expectedUrl);
+	}
+
+	public function testImageInfo()
+	{
+		$imageView = new Qiniu_ImageInfo();
+		$url = $this->url;
+		$expectedUrl = $url . '?imageInfo';
+
+		$this->assertEquals($imageView->MakeRequest($url), $expectedUrl);
+	}
+}

tests/RsTest.php

@@ -2,7 +2,7 @@
 
 require("bootstrap.php");
 
-class RsApiTest extends PHPUnit_Framework_TestCase
+class RsTest extends PHPUnit_Framework_TestCase
 {
 	public $client;
 	public $bucket;

tests/RsfTest.php

@@ -23,8 +23,8 @@ public function testRsf()
 		$this->assertNull($err);
 		$this->assertArrayHasKey('marker', $ret);
 
-		list($ret, $err) = $this->rsf->ListPrefix($this->bucket, "file", $ret['marker'], 2);
-		$this->assertNull($err);
+		list($ret, $err) = $this->rsf->ListPrefix($this->bucket, "file", $ret['marker'], 1);
+		$this->assertEquals($err, 'EOF');
 	}
 
 }

tests/bootstrap.php

@@ -3,6 +3,7 @@
 require_once("../qiniu/rs.php");
 require_once("../qiniu/rsf.php");
 require_once("../qiniu/io.php");
+require_once("../qiniu/fop.php");
 
 $accessKey = getenv("QINIU_ACCESS_KEY");
 $secretKey = getenv("QINIU_SECRET_KEY");