test: use npm scripts instead of Makefile (#9)

.eslintignore

@@ -0,0 +1,4 @@
+test/fixtures
+examples/**/app/public
+logs
+run

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "eslint-config-egg"
+}

.gitignore

@@ -1,5 +1,4 @@
-lib-cov
-coverage.html
+coverage
 *.seed
 *.log
 *.csv
@@ -13,4 +12,4 @@ logs
 results
 
 node_modules
-npm-debug.log
+npm-debug.log

.travis.yml

@@ -1,5 +1,12 @@
+sudo: false
 language: node_js
 node_js:
-  - '0.10'
-  - '0.11'
-script: make test-coveralls
+  - '4'
+  - '6'
+  - '7'
+install:
+  - npm i npminstall && npminstall
+script:
+  - npm run ci
+after_script:
+  - npminstall codecov && codecov

AUTHORS

@@ -1,6 +1,4 @@
 # Ordered by date of first contribution.
-# Auto-generated by 'contributors' on Mon, 20 Jan 2014 01:34:58 GMT.
-# https://github.com/xingrz/node-contributors
 
 fengmk2 <fengmk2@gmail.com> (https://github.com/fengmk2)
-kof <oleg008@gmail.com> (https://github.com/kof)
+Oleg Slobodskoi <oleg008@gmail.com> (https://github.com/kof)

LICENSE.txt

@@ -1,6 +1,7 @@
 This software is licensed under the MIT License.
 
 Copyright (C) 2012 - 2015 fengmk2 <fengmk2@gmail.com>
+Copyright (c) node-modules and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,27 +1,20 @@
 charset
 =======
 
-
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]
-[![Test coverage][coveralls-image]][coveralls-url]
-[![Gittip][gittip-image]][gittip-url]
+[![Test coverage][codecov-image]][codecov-url]
 [![David deps][david-image]][david-url]
-[![node version][node-image]][node-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/charset.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/charset
 [travis-image]: https://img.shields.io/travis/node-modules/charset.svg?style=flat-square
 [travis-url]: https://travis-ci.org/node-modules/charset
-[coveralls-image]: https://img.shields.io/coveralls/node-modules/charset.svg?style=flat-square
-[coveralls-url]: https://coveralls.io/r/node-modules/charset?branch=master
-[gittip-image]: https://img.shields.io/gittip/fengmk2.svg?style=flat-square
-[gittip-url]: https://www.gittip.com/fengmk2/
+[codecov-image]: https://codecov.io/gh/node-modules/charset/branch/master/graph/badge.svg
+[codecov-url]: https://codecov.io/gh/node-modules/charset
 [david-image]: https://img.shields.io/david/node-modules/charset.svg?style=flat-square
 [david-url]: https://david-dm.org/node-modules/charset
-[node-image]: https://img.shields.io/badge/node.js-%3E=_0.10-green.svg?style=flat-square
-[node-url]: http://nodejs.org/download/
 [download-image]: https://img.shields.io/npm/dm/charset.svg?style=flat-square
 [download-url]: https://npmjs.org/package/charset
 
@@ -68,9 +61,9 @@ You can combine with [jschardet] to help you detect the finally charset.
 This example codes come from [stackoverflow#12326688](http://stackoverflow.com/a/18712021/2496088):
 
 ```js
-var request = require('request'),
-    charset = require('charset'),
-    jschardet = require('jschardet');
+var request = require('request');
+var charset = require('charset');
+var jschardet = require('jschardet');
 
 request({
   url: 'http://www.example.com',
@@ -87,7 +80,6 @@ request({
 
 ## License
 
-MIT
-
+[MIT](LICENSE.txt)
 
 [jschardet]: https://github.com/aadsm/jschardet

appveyor.yml

@@ -0,0 +1,16 @@
+environment:
+  matrix:
+    - nodejs_version: '4'
+    - nodejs_version: '6'
+    - nodejs_version: '7'
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm i npminstall && node_modules\.bin\npminstall
+
+test_script:
+  - node --version
+  - npm --version
+  - npm run ci
+
+build: off

index.js

@@ -1 +1,59 @@
-module.exports = require('./lib/charset');
+'use strict';
+
+const CHARTSET_RE = /(?:charset|encoding)\s*=\s*['"]? *([\w\-]+)/i;
+
+module.exports = charset;
+
+/**
+ * guest data charset from req.headers, xml, html content-type meta tag
+ * headers:
+ *  'content-type': 'text/html;charset=gbk'
+ * meta tag:
+ *  <meta http-equiv="Content-Type" content="text/html; charset=xxxx"/>
+ * xml file:
+ *  <?xml version="1.0" encoding="UTF-8"?>
+ *
+ * @param {Object} obj `Content-Type` String, or `res.headers`, or `res` Object
+ * @param {Buffer} [data] content buffer
+ * @param {Number} [peekSize] max content peek size, default is 512
+ * @return {String} charset, lower case, e.g.: utf8, gbk, gb2312, ....
+ *  If can\'t guest, return null
+ * @api public
+ */
+function charset(obj, data, peekSize) {
+  let matchs = null;
+  let end = 0;
+  if (data) {
+    peekSize = peekSize || 512;
+    // https://github.com/node-modules/charset/issues/4
+    end = data.length > peekSize ? peekSize : data.length;
+  }
+  // charset('text/html;charset=gbk')
+  let contentType = obj;
+  if (contentType && typeof contentType !== 'string') {
+    // charset(res.headers)
+    let headers = obj;
+    if (obj.headers) {
+      // charset(res)
+      headers = obj.headers;
+    }
+    contentType = headers['content-type'] || headers['Content-Type'];
+  }
+  if (contentType) {
+    // guest from obj first
+    matchs = CHARTSET_RE.exec(contentType);
+  }
+  if (!matchs && end > 0) {
+    // guest from content body (html/xml) header
+    contentType = data.slice(0, end).toString();
+    matchs = CHARTSET_RE.exec(contentType);
+  }
+  let cs = null;
+  if (matchs) {
+    cs = matchs[1].toLowerCase();
+    if (cs === 'utf-8') {
+      cs = 'utf8';
+    }
+  }
+  return cs;
+}