rename io to storage

Author: jemygraw

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGE LOG
 
+### v7.0.0
+
+- 重构文件表单上传和分片上传代码
+- 重构CDN操作相关的代码
+- 重构资源管理相关的代码
+- 重构数据处理相关的代码
+- 重构上传策略的相关代码
+
 ### v6.1.14
 
 2017-01-16
@@ -42,10 +50,10 @@
 
 2015-12-03
 
-- Make secure base url 
-- policy add fsizeMin 
-- 修正 getEncodedEntryUri(bucket, key) 
-- 文档修正 
+- Make secure base url
+- policy add fsizeMin
+- 修正 getEncodedEntryUri(bucket, key)
+- 文档修正
 
 ### v6.1.8
 

examples/form_upload_simple.js

@@ -14,8 +14,8 @@ var uploadToken = putPolicy.uploadToken(mac);
 var config = new qiniu.conf.Config();
 var localFile = "/Users/jemy/Documents/qiniu.mp4";
 //config.zone = qiniu.zone.Zone_z0;
-var formUploader = new qiniu.form_io.FormUploader(config);
-var putExtra = new qiniu.form_io.PutExtra();
+var formUploader = new qiniu.form_up.FormUploader(config);
+var putExtra = new qiniu.form_up.PutExtra();
 
 //bytes
 formUploader.put(uploadToken, null, "hello", null, function(respErr,

examples/resume_upload_simple.js

@@ -15,8 +15,8 @@ var config = new qiniu.conf.Config();
 var localFile = "/Users/jemy/Documents/qiniu.mp4";
 config.zone = qiniu.zone.Zone_z0;
 config.useCdnDomain = true;
-var resumeUploader = new qiniu.resume_io.ResumeUploader(config);
-var putExtra = new qiniu.resume_io.PutExtra();
+var resumeUploader = new qiniu.resume_up.ResumeUploader(config);
+var putExtra = new qiniu.resume_up.PutExtra();
 putExtra.params = {
   "x:name": "",
   "x:age": 27,

index.js

@@ -5,8 +5,8 @@ module.exports = {
     digest: require(libPath + '/auth' + '/digest.js')
   },
   cdn: require(libPath + "/cdn.js"),
-  form_io: require(libPath + '/io/form.js'),
-  resume_io: require(libPath + '/io/resume.js'),
+  form_up: require(libPath + '/storage/form.js'),
+  resume_up: require(libPath + '/storage/resume.js'),
   rs: require(libPath + '/rs.js'),
   fop: require(libPath + '/fop.js'),
   conf: require(libPath + '/conf.js'),

qiniu/io/form.js renamed to qiniu/storage/form.js

@@ -19,7 +19,7 @@ before(function(done) {
 var testFilePath1 = path.join(__dirname, 'logo.png');
 var testFilePath2 = path.join(__dirname, 'github.png');
 
-describe('test form io', function() {
+describe('test form up', function() {
   var accessKey = proc.env.QINIU_ACCESS_KEY;
   var secretKey = proc.env.QINIU_SECRET_KEY;
   var bucket = proc.env.QINIU_TEST_BUCKET;
@@ -56,11 +56,11 @@ describe('test form io', function() {
   var uploadToken = putPolicy.uploadToken(mac);
   var config = new qiniu.conf.Config();
   config.zone = qiniu.zone.Zone_z0;
-  var formUploader = new qiniu.form_io.FormUploader(config);
-  var putExtra = new qiniu.form_io.PutExtra();
+  var formUploader = new qiniu.form_up.FormUploader(config);
+  var putExtra = new qiniu.form_up.PutExtra();
 
-  describe('test form io#putStreamWithoutKey', function() {
-    it('test form io#putStreamWithoutKey', function(done) {
+  describe('test form up#putStreamWithoutKey', function() {
+    it('test form up#putStreamWithoutKey', function(done) {
       var key = null;
       var rs = fs.createReadStream(testFilePath1);
       formUploader.putStream(uploadToken, key, rs, putExtra,
@@ -75,9 +75,9 @@ describe('test form io', function() {
     });
   });
 
-  describe('test form io#putStream', function() {
-    it('test form io#putStream', function(done) {
-      var key = 'io_putStream_test' + Math.random(1000);
+  describe('test form up#putStream', function() {
+    it('test form up#putStream', function(done) {
+      var key = 'storage_putStream_test' + Math.random(1000);
       var rs = fs.createReadStream(testFilePath1);
       formUploader.putStream(uploadToken, key, rs, putExtra,
         function(respErr,
@@ -91,9 +91,9 @@ describe('test form io', function() {
     });
   });
 
-  describe('test form io#put', function() {
-    it('test form io#put', function(done) {
-      var key = 'io_put_test' + Math.random(1000);
+  describe('test form up#put', function() {
+    it('test form up#put', function(done) {
+      var key = 'storage_put_test' + Math.random(1000);
       formUploader.put(uploadToken, key, "hello world", putExtra,
         function(respErr,
           respBody, respInfo) {
@@ -106,8 +106,8 @@ describe('test form io', function() {
     });
   });
 
-  describe('test form io#putWithoutKey', function() {
-    it('test form io#putWithoutKey', function(done) {
+  describe('test form up#putWithoutKey', function() {
+    it('test form up#putWithoutKey', function(done) {
       formUploader.putWithoutKey(uploadToken, "hello world",
         putExtra,
         function(respErr,
@@ -121,9 +121,9 @@ describe('test form io', function() {
     });
   });
 
-  describe('test form io#putFile', function() {
-    it('test form io#putFile', function(done) {
-      var key = 'io_putFile_test' + Math.random(1000);
+  describe('test form up#putFile', function() {
+    it('test form up#putFile', function(done) {
+      var key = 'storage_putFile_test' + Math.random(1000);
       formUploader.putFile(uploadToken, key, testFilePath2,
         putExtra,
         function(
@@ -138,8 +138,8 @@ describe('test form io', function() {
     });
   });
 
-  describe('test form io#putFileWithoutKey', function() {
-    it('test form io#putFileWithoutKey', function(done) {
+  describe('test form up#putFileWithoutKey', function() {
+    it('test form up#putFileWithoutKey', function(done) {
       formUploader.putFileWithoutKey(uploadToken, testFilePath2,
         putExtra,
         function(

qiniu/io/resume.js renamed to qiniu/storage/resume.js

@@ -18,7 +18,7 @@ before(function(done) {
 //file to upload
 var imageFile = path.join(__dirname, 'logo.png');
 
-describe('test resume io', function() {
+describe('test resume up', function() {
   var accessKey = proc.env.QINIU_ACCESS_KEY;
   var secretKey = proc.env.QINIU_SECRET_KEY;
   var bucket = proc.env.QINIU_TEST_BUCKET;
@@ -55,11 +55,11 @@ describe('test resume io', function() {
   var uploadToken = putPolicy.uploadToken(mac);
   var config = new qiniu.conf.Config();
   config.zone = qiniu.zone.Zone_z0;
-  var resumeUploader = new qiniu.resume_io.ResumeUploader(config);
-  var putExtra = new qiniu.form_io.PutExtra();
+  var resumeUploader = new qiniu.resume_up.ResumeUploader(config);
+  var putExtra = new qiniu.resume_up.PutExtra();
 
-  describe('test resume io#putFileWithoutKey', function() {
-    it('test resume io#putFileWithoutKey', function(done) {
+  describe('test resume up#putFileWithoutKey', function() {
+    it('test resume up#putFileWithoutKey', function(done) {
       resumeUploader.putFileWithoutKey(uploadToken, imageFile,
         putExtra,
         function(
@@ -74,9 +74,9 @@ describe('test resume io', function() {
     });
   });
 
-  describe('test resume io#putFile', function() {
-    it('test resume io#putFile', function(done) {
-      var key = 'io_putFile_test' + Math.random(1000);
+  describe('test resume up#putFile', function() {
+    it('test resume up#putFile', function(done) {
+      var key = 'storage_putFile_test' + Math.random(1000);
       resumeUploader.putFile(uploadToken, key, imageFile, putExtra,
         function(
           respErr,