update examples

koajs · Nov 19, 2015 · 8dd23e9 · 8dd23e9
1 parent 3187fcc
commit 8dd23e9
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 57 deletions.
diff --git a/examples/cascade.js b/examples/cascade.js
@@ -11,26 +11,29 @@
  */
 
 var mount = require('..');
-var koa = require('koa');
+var Koa = require('koa');
 
-var app = koa();
-var a = koa();
-var b = koa();
-var c = koa();
+var app = new Koa();
+var a = new Koa();
+var b = new Koa();
+var c = new Koa();
 
-a.use(function *(next){
-    yield next;
-    if (!this.body) this.body = 'foo';
+a.use((ctx, next) => {
+  return next().then(() => {
+    if (!ctx.body) ctx.body = 'foo';
+  });
 });
 
-b.use(function *(next){
-    yield next;
-    if (!this.body) this.body = 'bar';
+b.use((ctx, next) => {
+  return next().then(() => {
+    if (!ctx.body) ctx.body = 'bar';
+  });
 });
 
-c.use(function *(next){
-    yield next;
-    this.body = 'baz';
+c.use((ctx, next) => {
+  return next().then(() => {
+    ctx.body = 'baz';
+  });
 });
 
 app.use(mount('/foo', a));

diff --git a/examples/errors.js b/examples/errors.js
@@ -6,23 +6,24 @@
  */
 
 var mount = require('..');
-var koa = require('koa');
+var Koa = require('koa');
 
-var a = koa();
-var b = koa();
-var c = koa();
+var a = new Koa();
+var b = new Koa();
+var c = new Koa();
 
-a.use(function *(next){
-    yield next;
+a.use((ctx, next) => {
+  return next();
 });
 
-b.use(function *(next){
-    yield next;
+b.use((ctx, next) => {
+  return next();
 });
 
-c.use(function *(next){
-    yield next;
+c.use((ctx, next) => {
+  return next().then(() => {
     throw new Error('tobi escaped!');
+  });
 });
 
 a.use(mount(b));

diff --git a/examples/middleware.js b/examples/middleware.js
@@ -5,19 +5,21 @@
  */
 
 var mount = require('..');
-var koa = require('koa');
+var Koa = require('koa');
 
-function *hello(next){
-  yield next;
-  this.body = 'Hello';
+function hello(ctx, next){
+  return next().then(() => {
+    ctx.body = 'Hello';
+  });
 }
 
-function *world(next){
-  yield next;
-  this.body = 'World';
+function world(ctx, next){
+  return next().then(() => {
+    ctx.body = 'World';
+  });
 }
 
-var app = koa();
+var app = new Koa();
 
 app.use(mount('/hello', hello));
 app.use(mount('/world', world));

diff --git a/examples/pathless.js b/examples/pathless.js
@@ -6,29 +6,31 @@
  */
 
 var mount = require('..');
-var koa = require('koa');
+var Koa = require('koa');
 
 // GET /hello
 
-var a = koa();
+var a = new Koa();
 
-a.use(function *(next){
-    yield next;
-    if ('/hello' == this.path) this.body = 'Hello';
+a.use((ctx, next) => {
+  return next().then(() => {
+    if ('/hello' == ctx.path) ctx.body = 'Hello';
+  });
 });
 
 // GET /world
 
-var b = koa();
+var b = new Koa();
 
-b.use(function *(next){
-    yield next;
-    if ('/world' == this.path) this.body = 'World';
+b.use((ctx, next) => {
+  return next().then(() => {
+    if ('/world' == ctx.path) ctx.body = 'World';
+  });
 });
 
 // app
 
-var app = koa();
+var app = new Koa();
 
 app.use(mount(a));
 app.use(mount(b));

diff --git a/examples/simple.js b/examples/simple.js
@@ -8,32 +8,32 @@
  * GET /world
  */
 
-var mount = require('./');
-var koa = require('koa');
+var mount = require('../');
+var Koa = require('koa');
 
 // hello
 
-var a = koa();
+var a = new Koa();
 
-a.use(function *(next){
-    yield next;
-    this.body = 'Hello';
-  }
-);
+a.use((ctx, next) => {
+  return next().then(() => {
+    ctx.body = 'Hello';
+  });
+});
 
 // world
 
-var b = koa();
+var b = new Koa();
 
-b.use(function *(next){
-    yield next;
-    this.body = 'World';
-  }
-);
+b.use((ctx, next) => {
+  return next().then(() => {
+    ctx.body = 'World';
+  });
+});
 
 // app
 
-var app = koa();
+var app = new Koa();
 
 app.use(mount('/hello', a));
 app.use(mount('/world', b));