update to v1.0.1

History.md

@@ -1,3 +1,10 @@
+1.0.1 / 2016-02-29
+==================
+
+* 修复初始化数据seed.js
+* 修复七牛API调用和测试
+
+
 1.0.0 / 2016-01-28
 ==================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jackblog-api-koa",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "jackblog API koa版",
   "main": "server/app.js",
   "scripts": {

server/app.js

@@ -21,7 +21,7 @@ fs.readdirSync(modelsPath).forEach(function (file) {
 // 初始化数据
 if(config.seedDB && config.env === 'development') { 
 	const initData = require('./config/seed'); 
-	app.use(initData());
+	initData();
 }
 
 //log记录

server/config/seed.js

@@ -1,5 +1,8 @@
 /**
  * 初始化数据
+ * 管理员用户
+ * email: [email protected]
+ * password: admin
  */
 'use strict';
 
@@ -8,13 +11,14 @@ const	User = mongoose.model('User');
 const	Article = mongoose.model('Article');
 const	TagCategory = mongoose.model('TagCategory');
 const	Tag = mongoose.model('Tag');
+const co = require('co');
+const logger = require('../util/logs').logger;
 
 //初始化标签,文章,用户
-function initData() {
-	return function *(next) {
+module.exports = function () {
+	co(function* () {
 		const userCount = yield User.count();
 		if(userCount === 0){
-			yield User.remove();
 			yield User.create({
 	 			nickname:'admin',
 	 			email:'[email protected]',
@@ -43,7 +47,6 @@ function initData() {
 		}
 		const tagCount = yield TagCategory.count();
 			if(tagCount === 0){
-				yield TagCategory.remove();
 				yield Tag.remove();
 				const languageCat = yield TagCategory.create({
 							name:'language',
@@ -107,8 +110,7 @@ function initData() {
 					});
 				});
 			}
-		yield next;
-	}
-}
-
-module.exports = initData
+	}).catch(function (err) {
+		logger.debug('Init data error');
+  });
+}

test/util/qiniu.test.js

@@ -3,7 +3,6 @@
 var should = require("should");
 var qiniuHelper = require('../../server/util/qiniu');
 var sinon = require('sinon');
-var Promise = require('bluebird');
 
 describe('test/util/qiniu.js',function () {
 	var mockKey = 'PwzqKey';
@@ -15,9 +14,9 @@ describe('test/util/qiniu.js',function () {
 		var stubFetch;
 		beforeEach(function () {
 			stubFetch = sinon.stub(qiniuHelper,'fetchFile');
-			stubFetch.withArgs(mockUrl,mockBucket,mockKey).returns(Promise.resolve([
-					{key:'/blog/article/test.png'},{status:200}
-				]));
+			stubFetch.withArgs(mockUrl,mockBucket,mockKey).returns(
+				Promise.resolve({key:'/blog/article/test.png'})
+			);
 			//stubFetch.withArgs('errUrl',mockBucket,'errKey').returns(Promise.reject());
 		});
 
@@ -39,9 +38,7 @@ describe('test/util/qiniu.js',function () {
 		var uploadStub;
 		beforeEach(function () {
 			uploadStub = sinon.stub(qiniuHelper,'uploadFile');
-			uploadStub.returns(Promise.resolve([
-					{key:'/blog/article/test.png'},{status:200}
-				]));
+			uploadStub.returns(Promise.resolve({key:'/blog/article/test.png'}));
 		});
 
 		afterEach(function () {
@@ -61,9 +58,7 @@ describe('test/util/qiniu.js',function () {
 		var moveStub;
 		beforeEach(function () {
 			moveStub = sinon.stub(qiniuHelper,'moveFile');
-			moveStub.returns(Promise.resolve([
-					{key:'/blog/article/test.png'},{status:200}
-				]));
+			moveStub.returns(Promise.resolve({key:'/blog/article/test.png'}));
 		});
 
 		afterEach(function () {
@@ -83,9 +78,7 @@ describe('test/util/qiniu.js',function () {
 		var copyStub;
 		beforeEach(function () {
 			copyStub = sinon.stub(qiniuHelper,'copyFile');
-			copyStub.returns(Promise.resolve([
-					{key:'/blog/article/test.png'},{status:200}
-				]));
+			copyStub.returns(Promise.resolve({key:'/blog/article/test.png'}));
 		});
 
 		afterEach(function () {
@@ -104,9 +97,7 @@ describe('test/util/qiniu.js',function () {
 		var removeStub;
 		beforeEach(function () {
 			removeStub = sinon.stub(qiniuHelper,'removeFile');
-			removeStub.returns(Promise.resolve([
-					{key:'/blog/article/test.png'},{status:200}
-				]));
+			removeStub.returns(Promise.resolve({key:'/blog/article/test.png'}));
 		});
 
 		afterEach(function () {
@@ -126,9 +117,7 @@ describe('test/util/qiniu.js',function () {
 		var listStub;
 		beforeEach(function () {
 			listStub = sinon.stub(qiniuHelper,'allList');
-			listStub.returns(Promise.resolve([
-					{items:[{key:'/blog/article/test.png'}]},{status:200}
-				]));
+			listStub.returns(Promise.resolve({items:[{key:'/blog/article/test.png'}]}));
 		});
 
 		afterEach(function () {