Rename to decompress-response and other tweaks

Fixes #7

Author: sindresorhus

.gitattributes

@@ -1 +1,2 @@
 * text=auto
+*.js text eol=lf

index.js

@@ -3,23 +3,25 @@ const PassThrough = require('stream').PassThrough;
 const zlib = require('zlib');
 
 module.exports = res => {
-	// TODO: use Array#includes when targeting Node.js 6
+	// TODO: Use Array#includes when targeting Node.js 6
 	if (['gzip', 'deflate'].indexOf(res.headers['content-encoding']) === -1) {
 		return res;
 	}
 
 	const unzip = zlib.createUnzip();
 	const stream = new PassThrough();
 
-	stream.httpVersion = res.httpVersion;
+	// https://nodejs.org/api/http.html#http_class_http_incomingmessage
+	stream.destroy = res.destroy.bind(res);
+	stream.setTimeout = res.setTimeout.bind(res);
+	stream.socket = res.socket;
 	stream.headers = res.headers;
-	stream.rawHeaders = res.rawHeaders;
 	stream.trailers = res.trailers;
-	stream.rawTrailers = res.rawTrailers;
-	stream.setTimeout = res.setTimeout.bind(res);
+	stream.rawHeaders = res.rawHeaders;
 	stream.statusCode = res.statusCode;
+	stream.httpVersion = res.httpVersion;
+	stream.rawTrailers = res.rawTrailers;
 	stream.statusMessage = res.statusMessage;
-	stream.socket = res.socket;
 
 	unzip.on('error', err => {
 		if (err.code === 'Z_BUF_ERROR') {

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "unzip-response",
+  "name": "decompress-response",
   "version": "3.0.0",
-  "description": "Unzip a HTTP response if needed",
+  "description": "Decompress a HTTP response if needed",
   "license": "MIT",
-  "repository": "sindresorhus/unzip-response",
+  "repository": "sindresorhus/decompress-response",
   "maintainers": [
     {
       "name": "Sindre Sorhus",
@@ -26,24 +26,26 @@
     "index.js"
   ],
   "keywords": [
+    "decompress",
+    "response",
     "http",
-    "unzip",
+    "https",
     "zlib",
     "gzip",
+    "zip",
     "deflate",
+    "unzip",
+    "ungzip",
     "incoming",
     "message",
-    "response",
-    "stream"
+    "stream",
+    "compressed"
   ],
   "devDependencies": {
     "ava": "*",
-    "get-stream": "^2.3.0",
+    "get-stream": "^3.0.0",
     "pify": "^2.3.0",
     "rfpify": "^1.0.0",
     "xo": "*"
-  },
-  "xo": {
-    "esnext": true
   }
 }

readme.md

@@ -1,25 +1,25 @@
-# unzip-response [![Build Status](https://travis-ci.org/sindresorhus/unzip-response.svg?branch=master)](https://travis-ci.org/sindresorhus/unzip-response)
+# decompress-response [![Build Status](https://travis-ci.org/sindresorhus/decompress-response.svg?branch=master)](https://travis-ci.org/sindresorhus/decompress-response)
 
-> Unzip a HTTP response if needed
+> Decompress a HTTP response if needed
 
-Unzips the response from [`http.request`](https://nodejs.org/api/http.html#http_http_request_options_callback) if it's gzipped/deflated, otherwise just passes it through.
+Decompresses the [response](https://nodejs.org/api/http.html#http_class_http_incomingmessage) from [`http.request`](https://nodejs.org/api/http.html#http_http_request_options_callback) if it's gzipped or deflated, otherwise just passes it through.
 
 
 ## Install
 
 ```
-$ npm install --save unzip-response
+$ npm install decompress-response
 ```
 
 
 ## Usage
 
 ```js
 const http = require('http');
-const unzipResponse = require('unzip-response');
+const decompressResponse = require('decompress-response');
 
-http.get('http://sindresorhus.com', res => {
-	res = unzipResponse(res);
+http.get('http://sindresorhus.com', response => {
+	response = decompressResponse(response);
 });
 ```
 

test/helpers/server.js

@@ -1,26 +1,20 @@
-'use strict';
-const http = require('http');
-const pify = require('pify');
+import http from 'http';
+import pify from 'pify';
 
-exports.host = 'localhost';
-exports.port = 6765;
-
-exports.createServer = port => {
-	const host = exports.host;
-
-	port = port || exports.port;
+export const host = 'localhost';
+export const port = 6765;
 
+export function createServer(givenPort = port) {
 	const s = http.createServer((req, resp) => {
 		s.emit(req.url, req, resp);
 	});
 
 	s.host = host;
-	s.port = port;
-	s.url = `http://${host}:${port}`;
+	s.port = givenPort;
+	s.url = `http://${host}:${givenPort}`;
 	s.protocol = 'http';
-
 	s.listen = pify(s.listen);
 	s.close = pify(s.close);
 
 	return s;
-};
+}

test/test.js

@@ -4,8 +4,8 @@ import test from 'ava';
 import getStream from 'get-stream';
 import pify from 'pify';
 import rfpify from 'rfpify';
-import m from '../';
-import {createServer} from './helpers/server.js';
+import m from '..';
+import {createServer} from './helpers/server';
 
 const zlibP = pify(zlib);
 const httpGetP = rfpify(http.get);
@@ -18,29 +18,33 @@ test.before('setup', async () => {
 
 	s.on('/', async (req, res) => {
 		res.statusCode = 200;
-		res.setHeader('Content-Type', 'text/plain');
-		res.setHeader('Content-Encoding', 'gzip');
+		res.setHeader('content-type', 'text/plain');
+		res.setHeader('content-encoding', 'gzip');
 		res.end(await zlibP.gzip(fixture));
 	});
 
 	s.on('/deflate', async (req, res) => {
 		res.statusCode = 200;
-		res.setHeader('Content-Encodingnt-Type', 'text/plain');
-		res.setHeader('Content-Encoding', 'deflate');
+		res.setHeader('content-encoding-type', 'text/plain');
+		res.setHeader('content-encoding', 'deflate');
 		res.end(await zlibP.deflate(fixture));
 	});
 
 	s.on('/missing-data', async (req, res) => {
 		res.statusCode = 200;
-		res.setHeader('Content-Encodingnt-Type', 'text/plain');
-		res.setHeader('Content-Encoding', 'gzip');
+		res.setHeader('content-encoding-type', 'text/plain');
+		res.setHeader('content-encoding', 'gzip');
 		res.end((await zlibP.gzip(fixture)).slice(0, -1));
 	});
 
 	await s.listen(s.port);
 });
 
-test('unzip gzipped content', async t => {
+test.after('cleanup', async () => {
+	await s.close();
+});
+
+test('decompress gzipped content', async t => {
 	const res = m(await httpGetP(s.url));
 
 	t.is(typeof res.httpVersion, 'string');
@@ -51,7 +55,7 @@ test('unzip gzipped content', async t => {
 	t.is(await getStream(res), fixture);
 });
 
-test('unzip deflated content', async t => {
+test('decompress deflated content', async t => {
 	const res = m(await httpGetP(`${s.url}/deflate`));
 
 	t.is(typeof res.httpVersion, 'string');
@@ -72,7 +76,3 @@ test('ignore missing data', async t => {
 
 	t.is(await getStream(res), fixture);
 });
-
-test.after('cleanup', async () => {
-	await s.close();
-});