koa-compress 1.0.6 → 2.0.0

package/HISTORY.md

@@ -1,10 +1,20 @@
 
+1.0.8 / 2014-09-14
+==================
+
+ * bump compressible
+ 
+1.0.7 / 2014-05-13
+==================
+
+ * bump bytes
+
 1.0.6 / 2014-04-24
 ==================
 
  * refactor
  * use statuses
- 
+
 1.0.5 / 2014-04-24
 ==================
 

package/LICENSE

@@ -0,0 +1,22 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Ong me@jongleberry.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/README.md

@@ -6,9 +6,9 @@ Compress middleware for Koa
 
 ```js
 var compress = require('koa-compress')
-var koa = require('koa')
+var Koa = require('koa')
 
-var app = koa()
+var app = new Koa()
 app.use(compress({
   filter: function (content_type) {
   	return /text/i.test(content_type)
@@ -39,34 +39,8 @@ You can always disable compression by setting `this.compress = false`.
 This bypasses the filter check.
 
 ```js
-app.use(function (next) {
-  return function *() {
-    this.compress = true
-    this.body = fs.createReadStream(file)
-  }
+app.use((ctx, next) => {
+  ctx.compress = true
+  ctx.body = fs.createReadStream(file)
 })
 ```
-
-## License
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Jonathan Ong me@jongleberry.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -26,7 +28,7 @@ var encodingMethods = {
  * @api public
  */
 
-module.exports = function (options) {
+module.exports = (options) => {
   options = options || {}
 
   var filter = options.filter || compressible
@@ -36,42 +38,42 @@ module.exports = function (options) {
     : typeof options.threshold === 'string' ? bytes(options.threshold)
     : 1024
 
-  return function* compress(next) {
-    this.vary('Accept-Encoding')
-
-    yield* next
+  return function compress(ctx, next) {
+    ctx.vary('Accept-Encoding')
 
-    var body = this.body
-    if (!body) return
-    if (this.compress === false) return
-    if (this.request.method === 'HEAD') return
-    if (status.empty[this.response.status]) return
-    if (this.response.get('Content-Encoding')) return
+    return next().then(() => {
+      var body = ctx.body
+      if (!body) return
+      if (ctx.compress === false) return
+      if (ctx.request.method === 'HEAD') return
+      if (status.empty[ctx.response.status]) return
+      if (ctx.response.get('Content-Encoding')) return
 
-    // forced compression or implied
-    if (!(this.compress === true || filter(this.response.type))) return
+      // forced compression or implied
+      if (!(ctx.compress === true || filter(ctx.response.type))) return
 
-    // identity
-    var encoding = this.acceptsEncodings('gzip', 'deflate', 'identity')
-    if (!encoding) this.throw(406, 'supported encodings: gzip, deflate, identity')
-    if (encoding === 'identity') return
+      // identity
+      var encoding = ctx.acceptsEncodings('gzip', 'deflate', 'identity')
+      if (!encoding) ctx.throw(406, 'supported encodings: gzip, deflate, identity')
+      if (encoding === 'identity') return
 
-    // json
-    if (isJSON(body)) body = this.body = JSON.stringify(body)
+      // json
+      if (isJSON(body)) body = ctx.body = JSON.stringify(body)
 
-    // threshold
-    if (threshold && this.response.length < threshold) return
+      // threshold
+      if (threshold && ctx.response.length < threshold) return
 
-    this.set('Content-Encoding', encoding)
-    this.res.removeHeader('Content-Length')
+      ctx.set('Content-Encoding', encoding)
+      ctx.res.removeHeader('Content-Length')
 
-    var stream =
-    this.body = encodingMethods[encoding](options)
+      var stream =
+      ctx.body = encodingMethods[encoding](options)
 
-    if (body instanceof Stream) {
-      body.pipe(stream)
-    } else {
-      stream.end(body)
-    }
-  }
+      if (body instanceof Stream) {
+        body.pipe(stream)
+      } else {
+        stream.end(body)
+      }
+    });
+  };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koa-compress",
   "description": "Compress middleware for koa",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "author": {
     "name": "Jonathan Ong",
     "email": "me@jongleberry.com",
@@ -11,18 +11,26 @@
   "license": "MIT",
   "repository": "koajs/compress",
   "dependencies": {
-    "statuses": "1",
-    "koa-is-json": "1",
-    "compressible": "1",
-    "bytes": "0"
+    "bytes": "^2.3.0",
+    "compressible": "^2.0.0",
+    "koa-is-json": "^1.0.0",
+    "statuses": "^1.0.0"
   },
   "devDependencies": {
-    "koa": "*",
-    "mocha": "*",
-    "should": "*",
-    "supertest": "*"
+    "istanbul": "^0.4.2",
+    "koa": "^2.0.0-alpha.3",
+    "mocha": "^2.4.1",
+    "should": "^3.0.0",
+    "supertest": "^1.0.0"
   },
   "scripts": {
-    "test": "make test"
-  }
+    "test": "NODE_ENV=test mocha --require should --reporter spec",
+    "test-cov": "NODE_ENV=test node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --require should",
+    "test-travis": "NODE_ENV=test node ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- --require should"
+  },
+  "files": [
+    "index.js",
+    "LICENSE",
+    "HISTORY.md"
+  ]
 }

package/.npmignore

@@ -1 +0,0 @@
-test

package/.travis.yml

@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - "0.11"

package/Makefile

@@ -1,11 +0,0 @@
-test:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
-		--require should \
-		--harmony-generators \
-		--reporter spec \
-		--bail
-
-clean:
-	@rm -rf node_modules
-
-.PHONY: test clean