Merge pull request #111 from qiniu/develop

Release 6.1.5

Author: longbai

.travis.yml

@@ -1,10 +1,8 @@
 language: node_js
 node_js:
   - 0.10
-  - 0.8
-  - 0.6
 before_script:
-  - export QINIU_ACCESS_KEY="nnwjTeUgpQdfZp9cb4-iHK0EUlebKCNk4kXwoStq"
-  - export QINIU_SECRET_KEY="Ia9pXC-XEcGF6hvu1V5fdRhwFLpeUkCbt0Gxk5NW"
-  - export QINIU_TEST_BUCKET="test741"
-  - export QINIU_TEST_DOMAIN="test741.qiniudn.com"
+  - export QINIU_ACCESS_KEY=QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm
+  - export QINIU_SECRET_KEY=Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz
+  - export QINIU_TEST_BUCKET="nodesdk"
+  - export QINIU_TEST_DOMAIN="nodesdk.qiniudn.com"

CHANGELOG.md

@@ -1,5 +1,19 @@
 ## CHANGE LOG
 
+### v6.1.5
+
+2014-7-23 issue [#111](https://github.com/qiniu/nodejs-sdk/pull/111)
+
+- [#109] 统一user agent
+- [#110] 更新put policy
+
+### v6.1.4
+
+2014-7-10 issue [#108](https://github.com/qiniu/nodejs-sdk/pull/108)
+
+- [#107] 调整上传host
+
+
 ### v6.1.3
 
 2014-4-03 issue [#102](https://github.com/qiniu/nodejs-sdk/pull/102)

gopher.png

@@ -1,6 +1,6 @@
 {
   "name": "qiniu",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {

package.json

@@ -1,8 +1,16 @@
+var fs = require('fs');
+var path = require('path');
+var os = require('os');
 
 exports.ACCESS_KEY = '<PLEASE APPLY YOUR ACCESS KEY>';
 exports.SECRET_KEY = '<DONT SEND YOUR SECRET KEY TO ANYONE>';
 
-exports.USER_AGENT = 'qiniu nodejs-sdk v6.1.3';
+var pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '../', 'package.json')));
+var ua = function(){
+    return 'QiniuNodejs/' + pkg.version + ' (' + os.type() + '; ' + os.platform() + '; ' + os.arch() + '; )';
+}
+
+exports.USER_AGENT = ua();
 
 exports.UP_HOST = 'http://upload.qiniu.com';
 exports.RS_HOST = 'http://rs.qbox.me';

qiniu/conf.js

@@ -136,15 +136,16 @@ function getEncodedEntryUri(bucket, key) {
 // ----- token --------
 // @gist PutPolicy
 function PutPolicy(scope, callbackUrl, callbackBody, returnUrl, returnBody,
-                  asyncOps, endUser, expires) {
+                  asyncOps, endUser, expires, persistentOps, persistentNotifyUrl) {
   this.scope = scope || null;
   this.callbackUrl = callbackUrl || null;
   this.callbackBody = callbackBody || null;
   this.returnUrl = returnUrl || null;
   this.returnBody = returnBody || null;
-  this.asyncOps = asyncOps || null;
   this.endUser = endUser || null;
   this.expires = expires || 3600;
+  this.persistentOps = persistentOps || null;
+  this.persistentNotifyUrl = persistentNotifyUrl || null;
 }
 // @endgist
 
@@ -177,9 +178,6 @@ PutPolicy.prototype.getFlags = function(putPolicy) {
   if (this.returnBody != null) {
     flags['returnBody'] = this.returnBody;
   }
-  if (this.asyncOps != null) {
-    flags['asyncOps'] = this.asyncOps;
-  }
   if (this.endUser != null) {
     flags['endUser'] = this.endUser;
   }
@@ -189,11 +187,25 @@ PutPolicy.prototype.getFlags = function(putPolicy) {
   if (this.persistentNotifyUrl != null) {
     flags['persistentNotifyUrl'] = this.persistentNotifyUrl;
   }
+  if (this.persistentPipeline != null) {
+    flags['persistentPipeline'] = this.persistentPipeline;
+  }
+  if (this.mimeLimit != null) {
+    flags['mimeLimit'] = this.mimeLimit;
+  }
+  if (this.insertOnly != null) {
+    flags['insertOnly'] = this.insertOnly;
+  }
+  if (this.detectMime != null) {
+    flags['detectMime'] = this.detectMime;
+  }
+  if (this.saveKey != null) {
+    flags['saveKey'] = this.saveKey;
+  }
   flags['deadline'] = this.expires + Math.floor(Date.now() / 1000);
   return flags;
 }
 
-
 function GetPolicy(expires) {
   this.expires = expires || 3600;
 }

qiniu/rs.js

@@ -45,7 +45,6 @@ exports.generateAccessToken = function(uri, body) {
 }
 
 function isQiniuCallback(path, body, callbackAuth) {
-
-  var auth = exports.generateAccessToken(path, body)
+  var auth = exports.generateAccessToken(path, body);
   return auth === callbackAuth;
 }

qiniu/util.js

@@ -2,7 +2,7 @@ var fop = require('../').fop;
 
 describe('test start step 0', function() {
   describe('fop.js', function() {
-    var pic = 'http://test963.qiniudn.com/logo.png';
+    var pic = 'http://private-res.qiniudn.com/gogopher.jpg';
 
     describe('fop.Exif#makeRequest()', function() {
       it('test makeRequest', function(done) {

test/fop.test.js

@@ -88,7 +88,7 @@ describe('test start step2:', function() {
       describe('rs.Client#batchStat()', function() {
         it('get the stat of logo.png and logo2.png', function(done) {
           var entries = [
-            new EntryPath(TEST_BUCKET, logo), 
+            new EntryPath(TEST_BUCKET, logo),
             new EntryPath(TEST_BUCKET, logo2)];
 
             client.batchStat(entries, function(err, ret) {
@@ -105,7 +105,7 @@ describe('test start step2:', function() {
         it('should return code 298 when partial ok', function(done) {
 
           var entries = [
-            new EntryPath(TEST_BUCKET, logo), 
+            new EntryPath(TEST_BUCKET, logo),
             new EntryPath(TEST_BUCKET, 'not exist file')];
 
             client.batchStat(entries, function(err, ret) {
@@ -167,23 +167,14 @@ describe('test start step2:', function() {
     describe('rs.isQiniuCallBack', function() {
 
       it('test isQiniuCallback true', function(done) {
-// @gist isQiniuCallback
-// ------ auth应该是来自请求的header的'Authrization'字段，path是请求的路径，content是请求的内容
-        var auth = 'QBox nnwjTeUgpQdfZp9cb4-iHK0EUlebKCNk4kXwoStq:kyFuG6yYh6FlX1fZO0alTgJK2Jw=';
+        var auth = 'QBox QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm:4GcOC2_eiw97QBNsHiwLzSqxelI=';
         var path = '/callback';
         var content = 'key=43850.6579994258936495&hash=FllOJrhvzorEKnyMwE-o7pfciiha';
-// ------
-
         var ok = qiniu.util.isQiniuCallback(path, content, auth);
         ok.should.be.ok;
-// @endgist
         done();
       });
-
-
     });
 
-    // rs.GetPolicy#makeRequest()
-
   });
 });