Fix header name

.eslintignore

@@ -1,2 +0,0 @@
-**/*.min.js
-config.js

.eslintrc.json

@@ -1,25 +0,0 @@
-{
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": [
-            "error",
-            2
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    }
-}

README.md

@@ -38,9 +38,9 @@ STDOUT.  Check the README there for more details and usages.
 * `host` - the host the server runs on (default localhost)
 * `port` - the port the server runs on (default 7777)
 * `keyLength` - the length of the keys to user (default 10)
-* `maxLength` - maximum length of a paste (default 400000)
+* `maxLength` - maximum length of a paste (default none)
 * `staticMaxAge` - max age for static assets (86400)
-* `recompressStaticAssets` - whether or not to compile static js assets (true)
+* `recompressStatisAssets` - whether or not to compile static js assets (true)
 * `documents` - static documents to serve (ex: http://hastebin.com/about.com)
   in addition to static assets.  These will never expire.
 * `storage` - storage options (see below)
@@ -97,9 +97,7 @@ something like:
 }
 ```
 
-where `path` represents where you want the files stored.
+Where `path` represents where you want the files stored
-
-File storage currently does not support paste expiration, you can follow [#191](https://github.com/seejohnrun/haste-server/issues/191) for status updates.
 
 ### Redis
 
@@ -156,9 +154,9 @@ All of which are optional except `type` with very logical default values.
 
 ### Memcached
 
-To use memcache storage you must install the `memcached` package via npm
+To use memcached storage you must install the `memcache` package via npm
 
-`npm install memcached`
+`npm install memcache`
 
 Once you've done that, your config section should look like:
 
@@ -176,66 +174,6 @@ forward on GETs.
 
 All of which are optional except `type` with very logical default values.
 
-### RethinkDB
-
-To use the RethinkDB storage system, you must install the `rethinkdbdash` package via npm
-
-`npm install rethinkdbdash`
-
-Once you've done that, your config section should look like this:
-
-``` json
-{
-  "type": "rethinkdb",
-  "host": "127.0.0.1",
-  "port": 28015,
-  "db": "haste"
-}
-```
-
-In order for this to work, the database must be pre-created before the script is ran.
-Also, you must create an `uploads` table, which will store all the data for uploads.
-
-You can optionally add the `user` and `password` properties to use a user system.
-
-### Amazon S3
-
-To use [Amazon S3](https://aws.amazon.com/s3/) as a storage system, you must
-install the `aws-sdk` package via npm:
-
-`npm install aws-sdk`
-
-Once you've done that, your config section should look like this:
-
-```json
-{
-  "type": "amazon-s3",
-  "bucket": "your-bucket-name",
-  "region": "us-east-1"
-}
-```
-
-Authentication is handled automatically by the client. Check
-[Amazon's documentation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html)
-for more information. You will need to grant your role these permissions to
-your bucket:
-
-```json
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Action": [
-                "s3:GetObject",
-                "s3:PutObject"
-            ],
-            "Effect": "Allow",
-            "Resource": "arn:aws:s3:::your-bucket-name-goes-here/*"
-        }
-    ]
-}
-```
-
 ## Author
 
 John Crepezzi <john.crepezzi@gmail.com>

about.md

@@ -19,7 +19,7 @@ Most of the time I want to show you some text, it's coming from my current
 console session.  We should make it really easy to take code from the console
 and send it to people.
 
-`cat something | haste` # https://hastebin.com/1238193
+`cat something | haste` # http://hastebin.com/1238193
 
 You can even take this a step further, and cut out the last step of copying the
 URL with:

config.js

@@ -33,9 +33,7 @@
   },
 
   "storage": {
-    "type": "memcached",
+    "type": "postgres",
-    "host": "127.0.0.1",
-    "port": 11211,
     "expire": 2592000
   },
 

lib/document_handler.js

@@ -36,7 +36,7 @@ DocumentHandler.prototype.handleRawGet = function(key, response, skipExpire) {
   this.store.get(key, function(ret) {
     if (ret) {
       winston.verbose('retrieved raw document', { key: key });
-      response.writeHead(200, { 'content-type': 'text/plain; charset=UTF-8' });
+      response.writeHead(200, { 'content-type': 'text/plain' });
       response.end(ret);
     }
     else {
@@ -69,7 +69,8 @@ DocumentHandler.prototype.handlePost = function (request, response) {
     _this.chooseKey(function (key) {
       _this.store.set(key, buffer, function (res) {
         if (res) {
-          winston.verbose('added document', { key: key });
+          var ip = request.headers['x-forwarded-for'] || request.ip;
+          winston.verbose('added document', { key: key, ip: ip });
           response.writeHead(200, { 'content-type': 'application/json' });
           response.end(JSON.stringify({ key: key }));
         }
@@ -123,7 +124,7 @@ DocumentHandler.prototype.chooseKey = function(callback) {
     } else {
       callback(key);
     }
-  }, true); // Don't bump expirations when key searching
+  });
 };
 
 DocumentHandler.prototype.acceptableKey = function() {

lib/document_stores/amazon-s3.js

@@ -1,56 +0,0 @@
-/*global require,module,process*/
-
-var AWS = require('aws-sdk');
-var winston = require('winston');
-
-var AmazonS3DocumentStore = function(options) {
-  this.expire = options.expire;
-  this.bucket = options.bucket;
-  this.client = new AWS.S3({region: options.region});
-};
-
-AmazonS3DocumentStore.prototype.get = function(key, callback, skipExpire) {
-  var _this = this;
-
-  var req = {
-    Bucket: _this.bucket,
-    Key: key
-  };
-
-  _this.client.getObject(req, function(err, data) {
-    if(err) {
-      callback(false);
-    }
-    else {
-      callback(data.Body.toString('utf-8'));
-      if (_this.expire && !skipExpire) {
-        winston.warn('amazon s3 store cannot set expirations on keys');
-      }
-    }
-  });
-}
-
-AmazonS3DocumentStore.prototype.set = function(key, data, callback, skipExpire) {
-  var _this = this;
-
-  var req = {
-    Bucket: _this.bucket,
-    Key: key,
-    Body: data,
-    ContentType: 'text/plain'
-  };
-
-  _this.client.putObject(req, function(err, data) {
-    if (err) {
-      callback(false);
-    }
-    else {
-      callback(true);
-      if (_this.expire && !skipExpire) {
-        winston.warn('amazon s3 store cannot set expirations on keys');
-      }
-    }
-  });
-}
-
-module.exports = AmazonS3DocumentStore;

lib/document_stores/memcached.js

@@ -1,52 +1,45 @@
-const memcached = require('memcached');
+var memcached = require('memcache');
-const winston = require('winston');
+var winston = require('winston');
-
-class MemcachedDocumentStore {
 
 // Create a new store with options
-  constructor(options) {
+var MemcachedDocumentStore = function(options) {
   this.expire = options.expire;
-
+  if (!MemcachedDocumentStore.client) {
-    const host = options.host || '127.0.0.1';
+    MemcachedDocumentStore.connect(options);
-    const port = options.port || 11211;
-    const url = `${host}:${port}`;
-    this.connect(url);
   }
+};
 
 // Create a connection
-  connect(url) {
+MemcachedDocumentStore.connect = function(options) {
-    this.client = new memcached(url);
+  var host = options.host || '127.0.0.1';
-
+  var port = options.port || 11211;
-    winston.info(`connecting to memcached on ${url}`);
+  this.client = new memcached.Client(port, host);
-
+  this.client.connect();
-    this.client.on('failure', function(error) {
+  this.client.on('connect', function() {
-      winston.info('error connecting to memcached', {error});
+    winston.info('connected to memcached on ' + host + ':' + port);
   });
-  }
+  this.client.on('error', function(e) {
+    winston.info('error connecting to memcached', { error: e });
+  });
+};
 
 // Save file in a key
-  set(key, data, callback, skipExpire) {
+MemcachedDocumentStore.prototype.set =
-    this.client.set(key, data, skipExpire ? 0 : this.expire, (error) => {
+function(key, data, callback, skipExpire) {
-      callback(!error);
+  MemcachedDocumentStore.client.set(key, data, function(err, reply) {
-    });
+    err ? callback(false) : callback(true);
-  }
+  }, skipExpire ? 0 : this.expire);
+};
 
 // Get a file from a key
-  get(key, callback, skipExpire) {
+MemcachedDocumentStore.prototype.get = function(key, callback, skipExpire) {
-    this.client.get(key, (error, data) => {
+  var _this = this;
-      callback(error ? false : data);
+  MemcachedDocumentStore.client.get(key, function(err, reply) {
-
+    callback(err ? false : reply);
-      // Update the key so that the expiration is pushed forward
+    if (_this.expire && !skipExpire) {
-      if (!skipExpire) {
+      winston.warn('store does not currently push forward expirations on GET');
-        this.set(key, data, (updateSucceeded) => {
-          if (!updateSucceeded) {
-            winston.error('failed to update expiration on GET', {key});
-          }
-        }, skipExpire);
     }
   });
-  }
+};
-
-}
 
 module.exports = MemcachedDocumentStore;

lib/document_stores/postgres.js

@@ -23,7 +23,7 @@ PostgresDocumentStore.prototype = {
         key,
         data,
         that.expireJS && !skipExpire ? that.expireJS + now : null
-      ], function (err) {
+      ], function (err, result) {
         if (err) {
           winston.error('error persisting value to postgres', { error: err });
           return callback(false);
@@ -50,7 +50,7 @@ PostgresDocumentStore.prototype = {
           client.query('UPDATE entries SET expiration = $1 WHERE ID = $2', [
             that.expireJS + now,
             result.rows[0].id
-          ], function (err) {
+          ], function (err, result) {
             if (!err) {
               done();
             }

lib/document_stores/redis.js

@@ -29,12 +29,7 @@ RedisDocumentStore.connect = function(options) {
   if (options.password) {
     RedisDocumentStore.client.auth(options.password);
   }
-
+  RedisDocumentStore.client.select(index, function(err, reply) {
-  RedisDocumentStore.client.on('error', function(err) {
-    winston.error('redis disconnected', err);
-  });
-
-  RedisDocumentStore.client.select(index, function(err) {
     if (err) {
       winston.error(
         'error connecting to redis index ' + index,
@@ -51,7 +46,7 @@ RedisDocumentStore.connect = function(options) {
 // Save file in a key
 RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
   var _this = this;
-  RedisDocumentStore.client.set(key, data, function(err) {
+  RedisDocumentStore.client.set(key, data, function(err, reply) {
     if (err) {
       callback(false);
     }
@@ -67,7 +62,7 @@ RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
 // Expire a key in expire time if set
 RedisDocumentStore.prototype.setExpiration = function(key) {
   if (this.expire) {
-    RedisDocumentStore.client.expire(key, this.expire, function(err) {
+    RedisDocumentStore.client.expire(key, this.expire, function(err, reply) {
       if (err) {
         winston.error('failed to set expiry on key: ' + key);
       }

lib/document_stores/rethinkdb.js

@@ -1,46 +0,0 @@
-const crypto = require('crypto');
-const rethink = require('rethinkdbdash');
-const winston = require('winston');
-
-const md5 = (str) => {
-  const md5sum = crypto.createHash('md5');
-  md5sum.update(str);
-  return md5sum.digest('hex');
-};
-
-class RethinkDBStore {
-  constructor(options) {
-    this.client = rethink({
-      silent: true,
-      host: options.host || '127.0.0.1',
-      port: options.port || 28015,
-      db: options.db || 'haste',
-      user: options.user || 'admin',
-      password: options.password || ''
-    });
-  }
-
-  set(key, data, callback) {
-    this.client.table('uploads').insert({ id: md5(key), data: data }).run((error) => {
-      if (error) {
-        callback(false);
-        winston.error('failed to insert to table', error);
-        return;
-      }
-      callback(true);
-    });
-  }
-
-  get(key, callback) {
-    this.client.table('uploads').get(md5(key)).run((error, result) => {
-      if (error || !result) {
-        callback(false);
-        if (error) winston.error('failed to insert to table', error);
-        return;
-      }
-      callback(result.data);
-    });
-  }
-}
-
-module.exports = RethinkDBStore;

lib/key_generators/dictionary.js

@@ -1,32 +0,0 @@
-const fs = require('fs');
-
-module.exports = class DictionaryGenerator {
-
-  constructor(options, readyCallback) {
-    // Check options format
-    if (!options)      throw Error('No options passed to generator');
-    if (!options.path) throw Error('No dictionary path specified in options');
-
-    // Load dictionary
-    fs.readFile(options.path, 'utf8', (err, data) => {
-      if (err) throw err;
-
-      this.dictionary = data.split(/[\n\r]+/);
-
-      if (readyCallback) readyCallback();
-    });
-  }
-
-  // Generates a dictionary-based key, of keyLength words
-  createKey(keyLength) {
-    let text = '';
-
-    for (let i = 0; i < keyLength; i++) {
-      const index = Math.floor(Math.random() * this.dictionary.length);
-      text += this.dictionary[index];
-    }
-
-    return text;
-  }
-
-};

lib/key_generators/phonetic.js

@@ -1,27 +1,33 @@
 // Draws inspiration from pwgen and http://tools.arantius.com/password
-
+var PhoneticKeyGenerator = function(options) {
-const randOf = (collection) => {
+  // No options
-  return () => {
-    return collection[Math.floor(Math.random() * collection.length)];
-  };
 };
 
-// Helper methods to get an random vowel or consonant
+// Generate a phonetic key
-const randVowel = randOf('aeiou');
+PhoneticKeyGenerator.prototype.createKey = function(keyLength) {
-const randConsonant = randOf('bcdfghjklmnpqrstvwxyz');
+  var text = '';
-
+  var start = Math.round(Math.random());
-module.exports = class PhoneticKeyGenerator {
+  for (var i = 0; i < keyLength; i++) {
-
+    text += (i % 2 == start) ? this.randConsonant() : this.randVowel();
-  // Generate a phonetic key of alternating consonant & vowel
-  createKey(keyLength) {
-    let text = '';
-    const start = Math.round(Math.random());
-
-    for (let i = 0; i < keyLength; i++) {
-      text += (i % 2 == start) ? randConsonant() : randVowel();
   }
-
   return text;
-  }
-
 };
+
+PhoneticKeyGenerator.consonants = 'bcdfghjklmnpqrstvwxyz';
+PhoneticKeyGenerator.vowels = 'aeiou';
+
+// Get an random vowel
+PhoneticKeyGenerator.prototype.randVowel = function() {
+  return PhoneticKeyGenerator.vowels[
+    Math.floor(Math.random() * PhoneticKeyGenerator.vowels.length)
+  ];
+};
+
+// Get an random consonant
+PhoneticKeyGenerator.prototype.randConsonant = function() {
+  return PhoneticKeyGenerator.consonants[
+    Math.floor(Math.random() * PhoneticKeyGenerator.consonants.length)
+  ];
+};
+
+module.exports = PhoneticKeyGenerator;

lib/key_generators/random.js

@@ -1,20 +1,19 @@
-module.exports = class RandomKeyGenerator {
+var RandomKeyGenerator = function(options) {
-
+  if (!options) {
-  // Initialize a new generator with the given keySpace
+    options = {};
-  constructor(options = {}) {
-    this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   }
+  this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+};
 
-  // Generate a key of the given length
+// Generate a random key
-  createKey(keyLength) {
+RandomKeyGenerator.prototype.createKey = function(keyLength) {
   var text = '';
-
+  var index;
   for (var i = 0; i < keyLength; i++) {
-      const index = Math.floor(Math.random() * this.keyspace.length);
+    index = Math.floor(Math.random() * this.keyspace.length);
     text += this.keyspace.charAt(index);
   }
-
   return text;
-  }
-
 };
+
+module.exports = RandomKeyGenerator;

package-lock.json

@@ -1,548 +0,0 @@
-{
-  "name": "haste",
-  "version": "0.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "async": {
-      "version": "0.1.22",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
-      "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE="
-    },
-    "async-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-cache/-/async-cache-1.0.0.tgz",
-      "integrity": "sha1-yH9tgMcrOU7g+QYe3rJNjEtiKto=",
-      "requires": {
-        "lru-cache": "2.3.1"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bl": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz",
-      "integrity": "sha1-/FQhoo/UImA2w7OJGmaiW8ZNIm4=",
-      "requires": {
-        "readable-stream": "2.0.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-      "dev": true
-    },
-    "buffer-writer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.0.tgz",
-      "integrity": "sha1-bCnDst6gyeRVofJhoZmkigT4iwg="
-    },
-    "busboy": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.4.tgz",
-      "integrity": "sha1-GXfpbh7ohGSWUevfVIypAHWLp/M=",
-      "requires": {
-        "dicer": "0.2.3",
-        "readable-stream": "1.1.14"
-      }
-    },
-    "colors": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
-    },
-    "commander": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-      "dev": true,
-      "requires": {
-        "graceful-readlink": "1.0.1"
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "connect": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz",
-      "integrity": "sha1-ohNh0/QJnvdhzabcSpc7seuwo00=",
-      "requires": {
-        "debug": "2.2.0",
-        "finalhandler": "0.4.1",
-        "parseurl": "1.3.1",
-        "utils-merge": "1.0.0"
-      }
-    },
-    "connect-ratelimit": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/connect-ratelimit/-/connect-ratelimit-0.0.7.tgz",
-      "integrity": "sha1-5uCclQZJ6ElJnKsYcKQVoH9zFWg="
-    },
-    "connect-route": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/connect-route/-/connect-route-0.1.5.tgz",
-      "integrity": "sha1-48IYMZ0uiKiprgsOD+Cacpw5dEo="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cycle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI="
-    },
-    "debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-      "requires": {
-        "ms": "0.7.1"
-      }
-    },
-    "dicer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.3.tgz",
-      "integrity": "sha1-8AKBGJpVwjUe+ASQpP6fssWcSTk=",
-      "requires": {
-        "readable-stream": "1.1.14",
-        "streamsearch": "0.1.2"
-      }
-    },
-    "diff": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-      "dev": true
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eyes": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
-    },
-    "fd": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/fd/-/fd-0.0.2.tgz",
-      "integrity": "sha1-4O2yvXqIzIbdnxY5HLqDJBj9h+4="
-    },
-    "finalhandler": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz",
-      "integrity": "sha1-haF8bFmpRxfSYtYSMNSw6+PUoU0=",
-      "requires": {
-        "debug": "2.2.0",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "unpipe": "1.0.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "generic-pool": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz",
-      "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0="
-    },
-    "glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "optional": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-      "dev": true
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "lru-cache": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz",
-      "integrity": "sha1-s632s9hW6VTiw5DmzvIggSRaU9Y="
-    },
-    "mime": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "1.1.8"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "mocha": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
-      "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.0",
-        "commander": "2.9.0",
-        "debug": "2.2.0",
-        "diff": "3.2.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.1",
-        "growl": "1.9.2",
-        "he": "1.1.1",
-        "mkdirp": "0.5.1",
-        "supports-color": "3.1.2"
-      }
-    },
-    "ms": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "packet-reader": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz",
-      "integrity": "sha1-gZ300BC4LV6lZx+KGjrPA5vNdwA="
-    },
-    "parseurl": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "pg": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-4.1.1.tgz",
-      "integrity": "sha1-mEgKz8089qP5Yhyl1FiUFVgqVzI=",
-      "requires": {
-        "buffer-writer": "1.0.0",
-        "generic-pool": "2.1.1",
-        "packet-reader": "0.2.0",
-        "pg-connection-string": "0.1.3",
-        "pg-types": "1.6.0",
-        "pgpass": "0.0.3",
-        "semver": "4.3.6"
-      }
-    },
-    "pg-connection-string": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-      "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
-    },
-    "pg-types": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.6.0.tgz",
-      "integrity": "sha1-OHKg8ZkUMCVJf07ipl/a8A1+qLM="
-    },
-    "pgpass": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.3.tgz",
-      "integrity": "sha1-EuZ+NDsxicLzEgbrycwL7//PkUA=",
-      "requires": {
-        "split": "0.3.3"
-      }
-    },
-    "pkginfo": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
-      "integrity": "sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg="
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "0.0.1",
-        "string_decoder": "0.10.31"
-      }
-    },
-    "redis": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-0.8.1.tgz",
-      "integrity": "sha1-FZ8hMFmaL3GeRLA/C0t2EvmS/LI="
-    },
-    "redis-url": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/redis-url/-/redis-url-0.1.0.tgz",
-      "integrity": "sha1-TaXlsYG2wMrW4aVcf1Co5u53ebs=",
-      "requires": {
-        "redis": "0.8.1"
-      }
-    },
-    "request": {
-      "version": "2.9.203",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
-      "integrity": "sha1-bBcRpUB/uUoRQhlWPkQUW8v0cjo="
-    },
-    "semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "split": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-      "requires": {
-        "through": "2.3.8"
-      }
-    },
-    "st": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/st/-/st-1.1.0.tgz",
-      "integrity": "sha1-c7ltsLdkTZp4zjg0o+T37G6Hz3Y=",
-      "requires": {
-        "async-cache": "1.0.0",
-        "bl": "1.0.3",
-        "fd": "0.0.2",
-        "graceful-fs": "4.1.11",
-        "mime": "1.3.6",
-        "negotiator": "0.6.1"
-      }
-    },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
-    },
-    "streamsearch": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
-      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
-    "supports-color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-      "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-      "dev": true,
-      "requires": {
-        "has-flag": "1.0.0"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "uglify-js": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz",
-      "integrity": "sha512-/rseyxEKEVMBo8279lqpoJgD6C/i/CIi+9TJDvWmb+Xo6mqMKwjA8Io3IMHlcXQzj99feR6zrN8m3wqqvm/nYA==",
-      "requires": {
-        "commander": "2.11.0",
-        "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
-        }
-      }
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "utils-merge": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg="
-    },
-    "winston": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-      "integrity": "sha1-QUT+JYbNwZphK/jANVkBMskGS9I=",
-      "requires": {
-        "async": "0.1.22",
-        "colors": "0.6.2",
-        "cycle": "1.0.3",
-        "eyes": "0.1.8",
-        "pkginfo": "0.2.3",
-        "request": "2.9.203",
-        "stack-trace": "0.0.10"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    }
-  }
-}

package.json

@@ -19,19 +19,17 @@
     "connect": "3.4.1",
     "st": "1.1.0",
     "winston": "0.6.2",
-    "redis-url": "0.1.0",
+    "uglify-js": "1.3.3",
-    "redis": "0.8.1",
-    "uglify-js": "3.1.6",
     "busboy": "0.2.4",
     "pg": "4.1.1"
   },
   "devDependencies": {
-    "mocha": "^4.0.1"
+    "mocha": "*",
+    "should": "*"
   },
   "bundledDependencies": [],
   "engines": {
-    "node": "8.1.4",
+    "node": "0.10.35"
-    "npm": "5.2.0"
   },
   "bin": {
     "haste-server": "./server.js"
@@ -46,6 +44,6 @@
   },
   "scripts": {
     "start": "node server.js",
-    "test": "mocha --recursive"
+    "test": "mocha -r should spec/*"
   }
 }

server.js

@@ -1,7 +1,7 @@
 var http = require('http');
+var url = require('url');
 var fs = require('fs');
 
-var uglify = require('uglify-js');
 var winston = require('winston');
 var connect = require('connect');
 var route = require('connect-route');
@@ -19,10 +19,7 @@ config.host = process.env.HOST || config.host || 'localhost';
 if (config.logging) {
   try {
     winston.remove(winston.transports.Console);
-  } catch(e) {
+  } catch(er) { }
-    /* was not present */
-  }
-
   var detail, type;
   for (var i = 0; i < config.logging.length; i++) {
     detail = config.logging[i];
@@ -55,14 +52,21 @@ else {
 
 // Compress the static javascript assets
 if (config.recompressStaticAssets) {
+  var jsp = require("uglify-js").parser;
+  var pro = require("uglify-js").uglify;
   var list = fs.readdirSync('./static');
-  for (var j = 0; j < list.length; j++) {
+  for (var i = 0; i < list.length; i++) {
-    var item = list[j];
+    var item = list[i];
-    if ((item.indexOf('.js') === item.length - 3) && (item.indexOf('.min.js') === -1)) {
+    var orig_code, ast;
-      var dest = item.substring(0, item.length - 3) + '.min' + item.substring(item.length - 3);
+    if ((item.indexOf('.js') === item.length - 3) &&
-      var orig_code = fs.readFileSync('./static/' + item, 'utf8');
+        (item.indexOf('.min.js') === -1)) {
-
+      dest = item.substring(0, item.length - 3) + '.min' +
-      fs.writeFileSync('./static/' + dest, uglify.minify(orig_code).code, 'utf8');
+        item.substring(item.length - 3);
+      orig_code = fs.readFileSync('./static/' + item, 'utf8');
+      ast = jsp.parse(orig_code);
+      ast = pro.ast_mangle(ast);
+      ast = pro.ast_squeeze(ast);
+      fs.writeFileSync('./static/' + dest, pro.gen_code(ast), 'utf8');
       winston.info('compressed ' + item + ' into ' + dest);
     }
   }
@@ -109,17 +113,17 @@ if (config.rateLimits) {
 // first look at API calls
 app.use(route(function(router) {
   // get raw documents - support getting with extension
-  router.get('/raw/:id', function(request, response) {
+  router.get('/raw/:id', function(request, response, next) {
     var key = request.params.id.split('.')[0];
     var skipExpire = !!config.documents[key];
     return documentHandler.handleRawGet(key, response, skipExpire);
   });
   // add documents
-  router.post('/documents', function(request, response) {
+  router.post('/documents', function(request, response, next) {
     return documentHandler.handlePost(request, response);
   });
   // get documents
-  router.get('/documents/:id', function(request, response) {
+  router.get('/documents/:id', function(request, response, next) {
     var key = request.params.id.split('.')[0];
     var skipExpire = !!config.documents[key];
     return documentHandler.handleGet(key, response, skipExpire);

spec/document_handler_spec.js

@@ -1,7 +1,3 @@
-/* global describe, it */
-
-var assert = require('assert');
-
 var DocumentHandler = require('../lib/document_handler');
 var Generator = require('../lib/key_generators/random');
 
@@ -12,13 +8,13 @@ describe('document_handler', function() {
     it('should choose a key of the proper length', function() {
       var gen = new Generator();
       var dh = new DocumentHandler({ keyLength: 6, keyGenerator: gen });
-      assert.equal(6, dh.acceptableKey().length);
+      dh.acceptableKey().length.should.equal(6);
     });
 
     it('should choose a default key length', function() {
       var gen = new Generator();
       var dh = new DocumentHandler({ keyGenerator: gen });
-      assert.equal(dh.keyLength, DocumentHandler.defaultKeyLength);
+      dh.keyLength.should.equal(DocumentHandler.defaultKeyLength);
     });
 
   });

spec/redis_document_store_spec.js

@@ -1,12 +1,8 @@
-/* global it, describe, afterEach */
+var RedisDocumentStore = require('../lib/document_stores/redis');
-
-var assert = require('assert');
 
 var winston = require('winston');
 winston.remove(winston.transports.Console);
 
-var RedisDocumentStore = require('../lib/document_stores/redis');
-
 describe('redis_document_store', function() {
 
   /* reconnect to redis on each test */
@@ -23,7 +19,7 @@ describe('redis_document_store', function() {
       var store = new RedisDocumentStore({ expire: 10 });
       store.set('hello1', 'world', function() {
         RedisDocumentStore.client.ttl('hello1', function(err, res) {
-          assert.ok(res > 1);
+          res.should.be.above(1);
           done();
         });
       });
@@ -33,7 +29,7 @@ describe('redis_document_store', function() {
       var store = new RedisDocumentStore({ expire: 10 });
       store.set('hello2', 'world', function() {
         RedisDocumentStore.client.ttl('hello2', function(err, res) {
-          assert.equal(-1, res);
+          res.should.equal(-1);
           done();
         });
       }, true);
@@ -41,9 +37,9 @@ describe('redis_document_store', function() {
 
     it('should not set an expiration when expiration is off', function(done) {
       var store = new RedisDocumentStore({ expire: false });
-      store.set('hello3', 'world', function() {
+      store.set('hello3', 'world', function(worked) {
         RedisDocumentStore.client.ttl('hello3', function(err, res) {
-          assert.equal(-1, res);
+          res.should.equal(-1);
           done();
         });
       });

static/application.css

@@ -42,6 +42,7 @@ textarea {
 	border: 0px;
 	outline: none;
 	font-size: 13px;
+	padding-right: 360px;
   overflow: inherit;
 }
 

static/application.js

@@ -1,5 +1,3 @@
-/* global $, hljs, window, document */
-
 ///// represents a single document
 
 var haste_document = function() {
@@ -44,10 +42,10 @@ haste_document.prototype.load = function(key, callback, lang) {
         value: high.value,
         key: key,
         language: high.language || lang,
-        lineCount: res.data.split('\n').length
+        lineCount: res.data.split("\n").length
       });
     },
-    error: function() {
+    error: function(err) {
       callback(false);
     }
   });
@@ -73,7 +71,7 @@ haste_document.prototype.save = function(data, callback) {
         value: high.value,
         key: res.key,
         language: high.language,
-        lineCount: data.split('\n').length
+        lineCount: data.split("\n").length
       });
     },
     error: function(res) {
@@ -278,7 +276,7 @@ haste.prototype.configureButtons = function() {
       $where: $('#box2 .new'),
       label: 'New',
       shortcut: function(evt) {
-        return evt.ctrlKey && evt.keyCode === 78;
+        return evt.ctrlKey && evt.keyCode === 78  
       },
       shortcutDescription: 'control + n',
       action: function() {
@@ -333,14 +331,14 @@ haste.prototype.configureButton = function(options) {
     }
   });
   // Show the label
-  options.$where.mouseenter(function() {
+  options.$where.mouseenter(function(evt) {
     $('#box3 .label').text(options.label);
     $('#box3 .shortcut').text(options.shortcutDescription || '');
     $('#box3').show();
     $(this).append($('#pointer').remove().show());
   });
   // Hide the label
-  options.$where.mouseleave(function() {
+  options.$where.mouseleave(function(evt) {
     $('#box3').hide();
     $('#pointer').hide();
   });
@@ -373,7 +371,7 @@ $(function() {
       // For browsers like Internet Explorer
       if (document.selection) {
         this.focus();
-        var sel = document.selection.createRange();
+        sel = document.selection.createRange();
         sel.text = myValue;
         this.focus();
       }

test/key_generators/dictionary_spec.js

@@ -1,33 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const fs = require('fs');
-
-const Generator = require('../../lib/key_generators/dictionary');
-
-describe('RandomKeyGenerator', function() {
-  describe('randomKey', function() {
-    it('should throw an error if given no options', () => {
-      assert.throws(() => {
-        new Generator();
-      }, Error);
-    });
-
-    it('should throw an error if given no path', () => {
-      assert.throws(() => {
-        new Generator({});
-      }, Error);
-    });
-
-    it('should return a key of the proper number of words from the given dictionary', () => {
-      const path = '/tmp/haste-server-test-dictionary';
-      const words = ['cat'];
-      fs.writeFileSync(path, words.join('\n'));
-
-      const gen = new Generator({path}, () => {
-        assert.equal('catcatcat', gen.createKey(3));
-      });
-    });
-  });
-});

test/key_generators/phonetic_spec.js

@@ -1,27 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const Generator = require('../../lib/key_generators/phonetic');
-
-const vowels = 'aeiou';
-const consonants = 'bcdfghjklmnpqrstvwxyz';
-
-describe('RandomKeyGenerator', () => {
-  describe('randomKey', () => {
-    it('should return a key of the proper length', () => {
-      const gen = new Generator();
-      assert.equal(6, gen.createKey(6).length);
-    });
-
-    it('should alternate consonants and vowels', () => {
-      const gen = new Generator();
-
-      const key = gen.createKey(3);
-
-      assert.ok(consonants.includes(key[0]));
-      assert.ok(consonants.includes(key[2]));
-      assert.ok(vowels.includes(key[1]));
-    });
-  });
-});

test/key_generators/random_spec.js

@@ -1,19 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const Generator = require('../../lib/key_generators/random');
-
-describe('RandomKeyGenerator', () => {
-  describe('randomKey', () => {
-    it('should return a key of the proper length', () => {
-      const gen = new Generator();
-      assert.equal(6, gen.createKey(6).length);
-    });
-
-    it('should use a key from the given keyset if given', () => {
-      const gen = new Generator({keyspace: 'A'});
-      assert.equal('AAAAAA', gen.createKey(6));
-    });
-  });
-});