Merge 285853b into e7ffbdf

index.js

@@ -11,6 +11,7 @@ var basename = path.basename;
 var extname = path.extname;
 var resolve = path.resolve;
 var fs = require('mz/fs');
+var co = require('co');
 
 /**
  * Expose `send()`.
@@ -45,8 +46,8 @@ function send(ctx, path, opts) {
   var format = opts.format || opts.format === undefined ? true : false;
   var gzip = opts.gzip || opts.gzip === undefined ? true : false;
 
-  return function *(){
-    var encoding = this.acceptsEncodings('gzip', 'deflate', 'identity');
+  return co(function *(){
+    var encoding = ctx.acceptsEncodings('gzip', 'deflate', 'identity');
 
     // normalize path
     path = decode(path);
@@ -97,7 +98,7 @@ function send(ctx, path, opts) {
     ctx.body = fs.createReadStream(path);
 
     return path;
-  }
+  });
 }
 
 /**

package.json

@@ -13,6 +13,7 @@
     "index.js"
   ],
   "devDependencies": {
+    "babel": "^5.8.23",
     "istanbul-harmony": "0",
     "koa": "1",
     "mocha": "^2.3.3",
@@ -21,13 +22,14 @@
   },
   "license": "MIT",
   "dependencies": {
+    "co": "^4.6.0",
     "debug": "*",
     "mz": "^2.0.0",
     "resolve-path": "^1.2.1"
   },
   "scripts": {
-    "test": "mocha --require should --reporter spec",
-    "test-cov": "node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --require should",
-    "test-travis": "node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- --require should"
+    "test": "mocha --require should --reporter spec test/index.js test/experimental/index.js",
+    "test-cov": "node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --require should test/index.js test/experimental/index.js",
+    "test-travis": "node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- --require should test/index.js test/experimental/index.js"
   }
 }

test/experimental/async.js

@@ -0,0 +1,23 @@
+'use strict';
+
+var request = require('supertest');
+var koa = require('koa');
+var send = require('../../');
+
+describe('asyncAwait support with koa experimental', function(){
+    it('should 200', function(done){
+        var app = koa();
+
+        app.experimental = true;
+
+        app.use(async function(){
+            var ctx  = this;
+            await send(ctx, 'test/fixtures/hello.txt');
+        });
+
+        request(app.listen())
+        .get('/')
+        .expect(200)
+        .expect('world', done);
+    });
+});

test/experimental/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+require('babel/register')({
+    optional: ['asyncToGenerator']
+});
+require('./async');
+