Merge branch 'es6-rewrite'

Author: Hans Kristian Flaatten

.eslintrc

@@ -0,0 +1,19 @@
+# vi:syntax=json
+{
+  "extends": "airbnb-base",
+  "env": {
+    "mocha": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "script",
+    "ecmaFeatures": {
+      "modules": false
+    }
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "no-param-reassign": [2, { "props": false }]
+  }
+}

.jshintrc

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Den Norske Turistforening (DNT), Hans Kristian Flaatten
+Copyright (c) 2014-2016 Den Norske Turistforening (DNT), Hans Kristian Flaatten
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,10 +1,12 @@
-# MongoDB QueryString
+# MongoDB QueryString Parser
 
-[![Build status](https://img.shields.io/wercker/ci/566dca6762f42c407207777a.svg "Build status")](https://app.wercker.com/project/bykey/a31eed21b34f26d9b7af766b4614c260)
+[![Build status](https://app.wercker.com/status/b33b844c0ab10d56c318e116e587e2fa/s "wercker status")](https://app.wercker.com/project/bykey/b33b844c0ab10d56c318e116e587e2fa)
+[![Codacy grade](https://img.shields.io/codacy/grade/782d0dc482ea4033892f99f968090b35.svg "Codacy grade")](https://www.codacy.com/app/DNT/node-mongo-querystring)
+[![Codacy coverage](https://img.shields.io/codacy/coverage/782d0dc482ea4033892f99f968090b35.svg "Codacy coverage")](https://www.codacy.com/app/DNT/node-mongo-querystring)
 [![NPM downloads](https://img.shields.io/npm/dm/mongo-querystring.svg "NPM downloads")](https://www.npmjs.com/package/mongo-querystring)
 [![NPM version](https://img.shields.io/npm/v/mongo-querystring.svg "NPM version")](https://www.npmjs.com/package/mongo-querystring)
 [![Node version](https://img.shields.io/node/v/mongo-querystring.svg "Node version")](https://www.npmjs.com/package/mongo-querystring)
-[![Dependency status](https://img.shields.io/david/turistforeningen/node-mongo-querystring.svg "Dependency status")](https://david-dm.org/turistforeningen/node-mongo-querystring)
+[![Dependency status](https://img.shields.io/david/Turistforeningen/node-mongo-querystring.svg "Dependency status")](https://david-dm.org/Turistforeningen/node-mongo-querystring)
 
 Accept MongoDB query parameters through URI queries safe and easy. This is
 useful when building an API and accepting various user specificed queries.

README.md

@@ -1,13 +1,19 @@
-mongo:
+version: '2'
+
+services:
+  mongo:
     image: mongo:latest
 
-dev:
-  image: node:argon
-  links:
-    - mongo
-  working_dir: /usr/src/app
-  volumes:
-    - ".:/usr/src/app"
-  command: "npm run watch"
-  environment:
-    - NODE_ENV=development
+  node:
+    image: node:argon
+    working_dir: /usr/src/app
+    links:
+      - mongo
+    volumes:
+      - .:/usr/src/app
+    environment:
+      - NODE_ENV=development
+      - NPM_CONFIG_LOGLEVEL=silent
+      - NPM_CONFIG_PROGRESS=false
+      - NPM_CONFIG_SPIN=false
+    command: npm test

docker-compose.yml

@@ -1,32 +1,34 @@
 'use strict';
 
-var express = require('express');
-var app = module.exports = express();
+const express = require('express');
+const app = module.exports = express();
 
-var MongoQS = require('../index');
+const JSONStream = require('JSONStream');
+const MongoQS = require('../index');
+const mongo = require('./db');
 
 // Create a new Mongo QueryString parser
-var qs = new MongoQS({
+const qs = new MongoQS({
   custom: {
     bbox: 'geojson',
-    near: 'geojson'
-  }
+    near: 'geojson',
+  },
 });
 
-app.get('/api/places', function(req, res) {
+app.get('/api/places', (req, res) => {
   res.set('Content-Type', 'application/json');
 
   // Parse the request query parameters
-  var query = qs.parse(req.query);
-  var collection = require('./db').db.collection('places');
-  var cursor = collection.find(query).limit(3);
+  const query = qs.parse(req.query);
+  const collection = mongo.db.collection('places');
+  const cursor = collection.find(query).limit(3);
 
-  cursor.stream().pipe(require('JSONStream').stringify()).pipe(res);
+  cursor.stream().pipe(JSONStream.stringify()).pipe(res);
 });
 
 if (!module.parent) {
-  require('./db').once('ready', function() {
+  mongo.once('ready', () => {
     app.listen(3000);
-    console.log('Express started on port 3000');
+    console.log('Express started on port 3000'); // eslint-disable-line no-console
   });
 }

examples/app.js

@@ -1,25 +1,23 @@
 'use strict';
 
-var EventEmitter = require('events').EventEmitter;
-var MongoClient = require('mongodb').MongoClient;
-var inherits = require('util').inherits;
+const EventEmitter = require('events').EventEmitter;
+const MongoClient = require('mongodb').MongoClient;
+const inherits = require('util').inherits;
 
-var Mongo = function(uri) {
+function Mongo(uri) {
   EventEmitter.call(this);
 
   this.db = null;
 
-  var $this = this;
-
-  new MongoClient.connect(uri, function(err, db) {
+  MongoClient.connect(uri, (err, db) => {
     if (err) { throw err; }
 
-    $this.db = db;
-    $this.emit('ready');
+    this.db = db;
+    this.emit('ready');
   });
 
   return this;
-};
+}
 
 inherits(Mongo, EventEmitter);