Merge branch 'develop' of github.com:qiniu/nodejs-sdk into develop

Author: longbai

docs/README.gist.md

@@ -333,6 +333,19 @@ PutExtra是上传时的可选信息，默认为null
 ### 云处理
 
 <a云处理使用说明\>
+
+#### pfop
+`pfop`的作用是对已存在七牛服务器上的文件做持久化的fop，具体见[api文档](http://developer.qiniu.com/docs/v6/api/overview/fop/persistent-fop.html)
+
+```{javascript}
+// 原型
+func pfop(bucketName, keyName, fops, opts, callback);
+
+// 例子
+@gist(../test/io.test.js#pfop)
+
+```
+
 #### 查看图像信息
 
 ```{javascript}

docs/README.md

@@ -530,6 +530,23 @@ qiniu.rsf.listPrefix(bucketname, prefix, marker, limit, function(err, ret) {
 ### 云处理
 
 <a云处理使用说明\>
+
+#### pfop
+`pfop`的作用是对已存在七牛服务器上的文件做持久化的fop，具体见[api文档](http://developer.qiniu.com/docs/v6/api/overview/fop/persistent-fop.html)
+
+```{javascript}
+// 原型
+func pfop(bucketName, keyName, fops, opts, callback);
+
+// 例子
+// pfop
+      qiniu.fop.pfop(TEST_BUCKET, keys[0], 'avinfo', {notifyUrl: 'www.test.com', force: true}, function(err, ret) {
+        ret.should.have.keys('persistentId');
+        done();
+      });
+
+```
+
 #### 查看图像信息
 
 ```{javascript}

index.js

@@ -8,5 +8,5 @@ module.exports = {
   fop: require(libpath + '/fop.js'),
   conf: require(libpath + '/conf.js'),
   rpc: require(libpath + '/rpc.js'),
-  util: require(libpath + '/util.js'),
+  util: require(libpath + '/util.js')
 };

qiniu/fop.js

@@ -1,8 +1,12 @@
+var util = require('./util');
+var rpc = require('./rpc');
 
+var querystring = require('querystring');
 
 exports.ImageView = ImageView;
 exports.ImageInfo = ImageInfo;
 exports.Exif = Exif;
+exports.pfop = pfop;
 
 function ImageView(mode, width, height, quality, format) {
   this.mode = mode || 1;
@@ -49,3 +53,27 @@ Exif.prototype.makeRequest = function(url) {
 }
 
 
+function pfop(bucket, key, fops, opts, onret) {
+
+  opts = opts || {};
+
+  param = {
+    bucket: bucket,
+    key: key,
+    fops: fops
+  };
+  if (opts.notifyURL) {
+    param.notifyURL = opts.notifyURL;
+  } else {
+    param.notifyURL = 'www.test.com';
+  }
+  if (opts.force) {
+    param.force = 1;
+  }
+
+  var uri = 'http://api.qiniu.com/pfop/';
+  var body = querystring.stringify(param);
+  var auth = util.generateAccessToken(uri, body);
+  rpc.postWithForm(uri, body, auth, onret);
+}
+

qiniu/rs.js

@@ -183,6 +183,12 @@ PutPolicy.prototype.getFlags = function(putPolicy) {
   if (this.endUser != null) {
     flags['endUser'] = this.endUser;
   }
+  if (this.persistentOps != null) {
+    flags['persistentOps'] = this.persistentOps;
+  }
+  if (this.persistentNotifyUrl != null) {
+    flags['persistentNotifyUrl'] = this.persistentNotifyUrl;
+  }
   flags['deadline'] = this.expires + Math.floor(Date.now() / 1000);
   return flags;
 }

test/io.test.js

@@ -133,4 +133,16 @@ describe('test start step1:', function() {
       });
     });
   });
+
+  describe('pfop', function() {
+    it('do pfop', function(done) {
+// @gist pfop
+// pfop
+      qiniu.fop.pfop(TEST_BUCKET, keys[0], 'avinfo', {notifyURL: 'www.test.com'}, function(err, ret) {
+        ret.should.have.keys('persistentId');
+        done();
+      });
+// @endgist
+    })
+  });
 });