Merge pull request #1 from Allenice/dev

update to v0.0.5 添加 register 方法和请求日志

Author: Allenice

README.md

@@ -3,6 +3,7 @@ ohana
 一个返回模拟 json 数据的 http 服务器
 特点：
 
+
  - 使用 mockjs 生成 json 数据
  - 支持路由规则
  - 可跨域访问
@@ -53,6 +54,25 @@ server.listen(3000);
  - options: 
 	 - delay: 延迟多少毫秒后返回，
 	 - data: 返回的数据，可以接受对象和方法, 方法中的参数 params 是路由匹配的参数，query 是提交或查询的参数。
+	 
+```javascript
+server.get('/article/:id', {
+	data: function (params, query) {
+		return {
+			"status": "ok",
+			"data": {
+				"id": params.id,
+				"title": "@TITLE(5, 7)",
+				"author": "@NAME",
+				"post_time": "@DATETIME('yyyy-MM-dd HH:mm:ss')",
+				"content": "@PARAGRAPH(2)",
+				"poster": "@IMAGE('700x350', '#ccc', '#000', 'hello world')",
+				"read_count|0-1000": 100
+			}
+		}
+	}
+});
+```
 
 ### server.post(path, options）
 与 get 同理
@@ -63,7 +83,19 @@ server.listen(3000);
 ### server.patch(path, options)
 与 get 同理
 
-### server.listen(port, host)
+### server.register(apiList);
+注册 api
+
+- apiList:  api 模块列表
+
+```javascript
+server.register([
+	require('./article/index'),
+	require('./user/index')
+]);
+```
+
+### server.start(port, host)
  - port:  服务器监听的网络端口
  - host： 主机
 

example/app.js

@@ -1,9 +1,11 @@
 
 var Server = require("../index.js");
-var article = require('./article/index');
 
 var server = new Server();
 
-article(server);
+server.register([
+	require('./article/index'),
+	require('./user/index')
+]);
 
-server.listen(3000);
+server.start(3000);

example/user/index.js

@@ -0,0 +1,29 @@
+/*
+ * user 列子
+ * 	-- 路由规则：https://github.com/aaronblohowiak/routes.js
+ * 	-- 数据模板文档：http://mockjs.com/
+ * */
+
+module.exports = function (server) {
+	// 获取用户列表
+	server.get('/user/', {
+		delay: 200,
+		data: function(params, query) {
+			console.log(params);
+			console.log(query);
+
+			return {
+				"status": "ok",
+				"total_count": 100,
+				"data|10": [
+					{
+						"id|1-10000": 1,
+						"user_name": "@NAME",
+						"gender|1": ['male', 'female']
+					}
+				]
+			}
+		}
+	});
+
+}

index.js

@@ -74,29 +74,49 @@ Server.prototype = {
 		});
 	},
 
+	/**
+	 * 注册 api
+	 * @param {Array[Function]} apiList - api 模块列表
+	 */
+	register: function (apiList) {
+		var self = this;
+
+		apiList.forEach(function (api) {
+			if(typeof api === 'function') {
+				api(self);
+			}
+		});
+	},
+
 	/**
 	 * create http server
 	 * @param port
-	 * @param host
+	 * @param [host]
 	 */
-	listen: function (port, host) {
+	start: function (port, host) {
 		port = port || 8080;
 
 		http.createServer(function (req, res) {
-			var path = url.parse(req.url).pathname;
+
+			var path = url.parse(req.url).pathname,
+					statusCode,
+					date = new Date(),
+					dateString = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.toLocaleTimeString();
 
 			// 查找匹配的路由
-			var match = router.match(req.method + path);
-			var header = {
-				'Content-Type': 'application/json; charset=utf-8',
-				'Access-Control-Allow-Origin': '*',
-				'Access-Control-Allow-Methods': 'POST, GET, DELETE, PUT, PATCH'
-			};
+			var match = router.match(req.method + path),
+					header = {
+					'Content-Type': 'application/json; charset=utf-8',
+					'Access-Control-Allow-Origin': '*',
+					'Access-Control-Allow-Methods': 'POST, GET, DELETE, PUT, PATCH'
+				};
 
 			if(match) {
-				// 允许跨域访问
-				res.writeHead(200, header);
+				statusCode = 200;
+				console.log(req.method, statusCode, req.url, dateString);
 
+				// 允许跨域访问
+				res.writeHead(statusCode, header);
 				if(req.method === 'GET') {
 					match.query = url.parse(req.url, true).query || {};
 					match.fn(req, res, match);
@@ -113,10 +133,13 @@ Server.prototype = {
 					});
 				}
 			} else {
-				res.writeHead(404, header);
-				res.end(JSON.stringify({status: 404}));
+				statusCode = 404;
+				console.log(req.method, statusCode, req.url, dateString);
+				res.writeHead(statusCode, header);
+				res.end(JSON.stringify({status: statusCode}));
 			}
 
+
 		}).listen(port, host);
 
 		console.log('Server running at http://'+ (host||'localhost') +':'+ port +'/');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohana",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A simple server that return fake json data for test",
   "main": "index.js",
   "scripts": {