Merge pull request #109 from longbai/new_ua

new useragent

Author: longbai

.travis.yml

@@ -4,7 +4,7 @@ node_js:
   - 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-4-03 issue [#111](https://github.com/qiniu/nodejs-sdk/pull/111)
+
+- [#109] 统一user agent
+- [#110] 更新put policy
+
+### v6.1.4
+
+2014-4-03 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

@@ -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()
-
   });
 });