Merge pull request #291 from j3parker/s3-document-store

Add an Amazon S3 document store
Document the IAM permissions
2020-02-27 11:39:12 -05:00 · 2019-07-08 16:59:04 +01:00 · 2019-06-28 19:25:49 +01:00 · 2019-04-05 17:30:42 -04:00 · 2018-09-19 10:38:34 -04:00 · 2018-09-19 10:37:34 -04:00
34 changed files with 1565 additions and 428 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -0,0 +1,2 @@
+**/*.min.js
+config.js
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -0,0 +1,25 @@
+{
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}
--- a/1
+++ b/1
@ -0,0 +1 @@
+web: node server.js
--- a/README.md
+++ b/README.md
@ -1,6 +1,9 @@
 # Haste

-Haste is an open-source pastebin software written in node.js, which is easily installable in any network.  It can be backed by either redis or filesystem, and has a very easy adapter interface for other stores.  A publicly available version can be found at [hastebin.com](http://hastebin.com)
+Haste is an open-source pastebin software written in node.js, which is easily
+installable in any network.  It can be backed by either redis or filesystem,
+and has a very easy adapter interface for other stores.  A publicly available
+version can be found at [hastebin.com](http://hastebin.com)

 Major design objectives:

@ -8,11 +11,14 @@ Major design objectives:
 * Be really simple
 * Be easy to set up and use

-Haste works really well with a little utility called haste-client, allowing you to do things like:
+Haste works really well with a little utility called
+[haste-client](https://github.com/seejohnrun/haste-client), allowing you
+to do things like:

 `cat something | haste`

-which will output a URL to share containing the contents of `cat something`'s STDOUT
+which will output a URL to share containing the contents of `cat something`'s
+STDOUT.  Check the README there for more details and usages.

 ## Tested Browsers

@ -32,13 +38,24 @@ which will output a URL to share containing the contents of `cat something`'s ST
 * `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 none)
+* `maxLength` - maximum length of a paste (default 400000)
 * `staticMaxAge` - max age for static assets (86400)
-* `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.
+* `recompressStaticAssets` - 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)
 * `logging` - logging preferences
 * `keyGenerator` - key generator options (see below)
+* `rateLimits` - settings for rate limiting (see below)
+
+## Rate Limiting
+
+When present, the `rateLimits` option enables built-in rate limiting courtesy
+of `connect-ratelimit`.  Any of the options supported by that library can be
+used and set in `config.json`.
+
+See the README for [connect-ratelimit](https://github.com/dharmafly/connect-ratelimit)
+for more information!

 ## Key Generation

@ -48,7 +65,7 @@ Attempts to generate phonetic keys, similar to `pwgen`

 ``` json
 {
-	"type": "phonetic"
+  "type": "phonetic"
 }
 ```

@ -58,49 +75,167 @@ Generates a random key

 ``` json
 {
-	"type": "random",
+  "type": "random",
  "keyspace": "abcdef"
 }
 ```

-The _optional_ keySpace argument is a string of acceptable characters for the key.
+The _optional_ keySpace argument is a string of acceptable characters
+for the key.

 ## Storage

 ### File

-To use file storage (the default) change the storage section in `config.js` to something like:
+To use file storage (the default) change the storage section in `config.js` to
+something like:

 ``` json
 {
-	"path": "./data",
-	"type": "file"
+  "path": "./data",
+  "type": "file"
 }
 ```

-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

-To use redis storage you must install the redis package in npm globall using
+To use redis storage you must install the `redis` package in npm, and have
+`redis-server` running on the machine.

-`npm install redis --global`
+`npm install redis`

 Once you've done that, your config section should look like:

 ``` json
 {
-	"type": "redis",
-	"host": "localhost",
-	"port": 6379,
-	"db": 2
+  "type": "redis",
+  "host": "localhost",
+  "port": 6379,
+  "db": 2
 }
 ```

-You can also set an `expire` option to the number of seconds to expire keys in.  This is off by default, but will constantly kick back expirations on each view or post.
+You can also set an `expire` option to the number of seconds to expire keys in.
+This is off by default, but will constantly kick back expirations on each view
+or post.

 All of which are optional except `type` with very logical default values.

+If your Redis server is configured for password authentification, use the `password` field.
+
+### Postgres
+
+To use postgres storage you must install the `pg` package in npm
+
+`npm install pg`
+
+Once you've done that, your config section should look like:
+
+``` json
+{
+  "type": "postgres",
+  "connectionUrl": "postgres://user:password@host:5432/database"
+}
+```
+
+You can also just set the environment variable for `DATABASE_URL` to your database connection url.
+
+You will have to manually add a table to your postgres database:
+
+`create table entries (id serial primary key, key varchar(255) not null, value text not null, expiration int, unique(key));`
+
+You can also set an `expire` option to the number of seconds to expire keys in.
+This is off by default, but will constantly kick back expirations on each view
+or post.
+
+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
+
+`npm install memcached`
+
+Once you've done that, your config section should look like:
+
+``` json
+{
+  "type": "memcached",
+  "host": "127.0.0.1",
+  "port": 11211
+}
+```
+
+You can also set an `expire` option to the number of seconds to expire keys in.
+This behaves just like the redis expirations, but does not push expirations
+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>
@ -109,15 +244,28 @@ John Crepezzi <john.crepezzi@gmail.com>

 (The MIT License)

-Copyright © 2011 John Crepezzi
+Copyright © 2011-2012 John Crepezzi

-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:
+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 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
+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

 ### Other components:

 * jQuery: MIT/GPL license
 * highlight.js: Copyright © 2006, Ivan Sagalaev
+* highlightjs-coffeescript: WTFPL - Copyright © 2011, Dmytrii Nagirniak
--- a/TODO.md
+++ b/TODO.md
@ -1 +0,0 @@
-* add feedback for errors to UI - esp. too long
--- a/about.md
+++ b/about.md
@ -1,49 +1,56 @@
 # Haste

 Sharing code is a good thing, and it should be _really_ easy to do it.
-A lot of times, I want to show you something I'm seeing - and that's where we use pastebins.
+A lot of times, I want to show you something I'm seeing - and that's where we
+use pastebins.

-Haste is the prettiest, easist to use pastebin ever made.
+Haste is the prettiest, easiest to use pastebin ever made.

 ## Basic Usage

-Type what you want me to see, click "Save", and then copy the URL.  Send that URL
-to someone and they'll see what you see.
+Type what you want me to see, click "Save", and then copy the URL.  Send that
+URL to someone and they'll see what you see.

 To make a new entry, click "New" (or type 'control + n')

 ## From the Console

-Most of the time I want to show you some text, its coming from my current console session.
-We should make it really easy to take code from the console and send it to people.
+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` # http://hastebin.com/1238193
+`cat something | haste` # https://hastebin.com/1238193

-You can even take this a step further, and cut out the last step of copying the URL with:
+You can even take this a step further, and cut out the last step of copying the
+URL with:

 * osx: `cat something | haste | pbcopy`
 * linux: `cat something | haste | xsel`
+* windows: check out [WinHaste](https://github.com/ajryan/WinHaste)

-After running that, the STDOUT output of `cat something` will show up at a URL which has
-been conveniently copied to your clipboard.
+After running that, the STDOUT output of `cat something` will show up at a URL
+which has been conveniently copied to your clipboard.

-That's all there is to that, and you can install it with `gem install haste` right now.
+That's all there is to that, and you can install it with `gem install haste`
+right now.
  * osx: you will need to have an up to date version of Xcode
  * linux: you will need to have rubygems and ruby-devel installed

 ## Duration

-Pastes will stay for 30 days from their last view.
+Pastes will stay for 30 days from their last view.  They may be removed earlier
+and without notice.

 ## Privacy

-While the contents of hastebin.com are not directly crawled by any search robot that
-obeys "robots.txt", there should be no great expectation of privacy.  Post things at your
-own risk. Not responsible for any loss of data or removed pastes.
+While the contents of hastebin.com are not directly crawled by any search robot
+that obeys "robots.txt", there should be no great expectation of privacy.  Post
+things at your own risk. Not responsible for any loss of data or removed
+pastes.

 ## Open Source

-Haste can easily be installed behind your network, and its all open source!
+Haste can easily be installed behind your network, and it's all open source!

 * [haste-client](https://github.com/seejohnrun/haste-client)
 * [haste-server](https://github.com/seejohnrun/haste-server)
--- a/config.js
+++ b/config.js
@ -1,6 +1,6 @@
 {

-  "host": "localhost",
+  "host": "0.0.0.0",
  "port": 7777,

  "keyLength": 10,
@ -23,11 +23,19 @@
    "type": "phonetic"
  },

+  "rateLimits": {
+    "categories": {
+      "normal": {
+        "totalRequests": 500,
+        "every": 60000
+      }
+    }
+  },
+
  "storage": {
-    "type": "redis",
-    "host": "localhost",
-    "port": 6379,
-    "db": 2,
+    "type": "memcached",
+    "host": "127.0.0.1",
+    "port": 11211,
    "expire": 2592000
  },

--- a/lib/document_handler.js
+++ b/lib/document_handler.js
@ -1,4 +1,5 @@
 var winston = require('winston');
+var Busboy = require('busboy');

 // For handling serving stored documents

@ -35,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' });
+      response.writeHead(200, { 'content-type': 'text/plain; charset=UTF-8' });
      response.end(ret);
    }
    else {
@ -47,28 +48,29 @@ DocumentHandler.prototype.handleRawGet = function(key, response, skipExpire) {
 };

 // Handle adding a new Document
-DocumentHandler.prototype.handlePost = function(request, response) {
+DocumentHandler.prototype.handlePost = function (request, response) {
  var _this = this;
  var buffer = '';
  var cancelled = false;
-  request.on('data', function(data) {
-    if (!buffer) {
-      response.writeHead(200, { 'content-type': 'application/json' });
-    } 
-    buffer += data.toString();
+
+  // What to do when done
+  var onSuccess = function () {
+    // Check length
    if (_this.maxLength && buffer.length > _this.maxLength) {
      cancelled = true;
      winston.warn('document >maxLength', { maxLength: _this.maxLength });
      response.writeHead(400, { 'content-type': 'application/json' });
-      response.end(JSON.stringify({ message: 'Document exceeds maximum length.' }));
+      response.end(
+        JSON.stringify({ message: 'Document exceeds maximum length.' })
+      );
+      return;
    }
-  });
-  request.on('end', function(end) {
-    if (cancelled) return;
-    _this.chooseKey(function(key) {
-      _this.store.set(key, buffer, function(res) {
+    // And then save if we should
+    _this.chooseKey(function (key) {
+      _this.store.set(key, buffer, function (res) {
        if (res) {
          winston.verbose('added document', { key: key });
+          response.writeHead(200, { 'content-type': 'application/json' });
          response.end(JSON.stringify({ key: key }));
        }
        else {
@ -78,17 +80,42 @@ DocumentHandler.prototype.handlePost = function(request, response) {
        }
      });
    });
-  });
-  request.on('error', function(error) {
-    winston.error('connection error: ' + error.message);
-    response.writeHead(500, { 'content-type': 'application/json' });
-    response.end(JSON.stringify({ message: 'Connection error.' }));
-  });
+  };
+
+  // If we should, parse a form to grab the data
+  var ct = request.headers['content-type'];
+  if (ct && ct.split(';')[0] === 'multipart/form-data') {
+    var busboy = new Busboy({ headers: request.headers });
+    busboy.on('field', function (fieldname, val) {
+      if (fieldname === 'data') {
+        buffer = val;
+      }
+    });
+    busboy.on('finish', function () {
+      onSuccess();
+    });
+    request.pipe(busboy);
+  // Otherwise, use our own and just grab flat data from POST body
+  } else {
+    request.on('data', function (data) {
+      buffer += data.toString();
+    });
+    request.on('end', function () {
+      if (cancelled) { return; }
+      onSuccess();
+    });
+    request.on('error', function (error) {
+      winston.error('connection error: ' + error.message);
+      response.writeHead(500, { 'content-type': 'application/json' });
+      response.end(JSON.stringify({ message: 'Connection error.' }));
+      cancelled = true;
+    });
+  }
 };

-// Get a random key that hasn't been already used
+// Keep choosing keys until one isn't taken
 DocumentHandler.prototype.chooseKey = function(callback) {
-  var key = this.keyGenerator.createKey(this.keyLength);
+  var key = this.acceptableKey();
  var _this = this;
  this.store.get(key, function(ret) {
    if (ret) {
@ -96,7 +123,11 @@ DocumentHandler.prototype.chooseKey = function(callback) {
    } else {
      callback(key);
    }
-  }); 
+  }, true); // Don't bump expirations when key searching
+};
+
+DocumentHandler.prototype.acceptableKey = function() {
+  return this.keyGenerator.createKey(this.keyLength);
 };

 module.exports = DocumentHandler;
--- a/lib/document_stores/amazon-s3.js
+++ b/lib/document_stores/amazon-s3.js
@ -0,0 +1,56 @@
+/*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;
--- a/lib/document_stores/file.js
+++ b/lib/document_stores/file.js
@ -1,7 +1,7 @@
 var fs = require('fs');
+var crypto = require('crypto');

 var winston = require('winston');
-var hashlib = require('hashlib');

 // For storing in files
 // options[type] = file
@ -12,19 +12,28 @@ var FileDocumentStore = function(options) {
  this.expire = options.expire;
 };

-// Save data in a file, key as md5 - since we don't know what we could be passed here
+// Generate md5 of a string
+FileDocumentStore.md5 = function(str) {
+  var md5sum = crypto.createHash('md5');
+  md5sum.update(str);
+  return md5sum.digest('hex');
+};
+
+// Save data in a file, key as md5 - since we don't know what we could
+// be passed here
 FileDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
  try {
    var _this = this;
    fs.mkdir(this.basePath, '700', function() {
-      fs.writeFile(_this.basePath + '/' + hashlib.md5(key), data, 'utf8', function(err) {
+      var fn = _this.basePath + '/' + FileDocumentStore.md5(key);
+      fs.writeFile(fn, data, 'utf8', function(err) {
        if (err) {
          callback(false);
        }
        else {
          callback(true);
          if (_this.expire && !skipExpire) {
-            winston.warn('file store cannot set expirations on keys'); 
+            winston.warn('file store cannot set expirations on keys');
          }
        }
      });
@ -37,14 +46,15 @@ FileDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
 // Get data from a file from key
 FileDocumentStore.prototype.get = function(key, callback, skipExpire) {
  var _this = this;
-  fs.readFile(this.basePath + '/' + hashlib.md5(key), 'utf8', function(err, data) {
+  var fn = this.basePath + '/' + FileDocumentStore.md5(key);
+  fs.readFile(fn, 'utf8', function(err, data) {
    if (err) {
      callback(false);
    }
    else {
      callback(data);
      if (_this.expire && !skipExpire) {
-        winston.warn('file store cannot set expirations on keys'); 
+        winston.warn('file store cannot set expirations on keys');
      }
    }
  });
--- a/lib/document_stores/memcached.js
+++ b/lib/document_stores/memcached.js
@ -0,0 +1,52 @@
+const memcached = require('memcached');
+const winston = require('winston');
+
+class MemcachedDocumentStore {
+
+  // Create a new store with options
+  constructor(options) {
+    this.expire = options.expire;
+
+    const host = options.host || '127.0.0.1';
+    const port = options.port || 11211;
+    const url = `${host}:${port}`;
+    this.connect(url);
+  }
+
+  // Create a connection
+  connect(url) {
+    this.client = new memcached(url);
+
+    winston.info(`connecting to memcached on ${url}`);
+
+    this.client.on('failure', function(error) {
+      winston.info('error connecting to memcached', {error});
+    });
+  }
+
+  // Save file in a key
+  set(key, data, callback, skipExpire) {
+    this.client.set(key, data, skipExpire ? 0 : this.expire, (error) => {
+      callback(!error);
+    });
+  }
+
+  // Get a file from a key
+  get(key, callback, skipExpire) {
+    this.client.get(key, (error, data) => {
+      callback(error ? false : data);
+
+      // Update the key so that the expiration is pushed forward
+      if (!skipExpire) {
+        this.set(key, data, (updateSucceeded) => {
+          if (!updateSucceeded) {
+            winston.error('failed to update expiration on GET', {key});
+          }
+        }, skipExpire);
+      }
+    });
+  }
+
+}
+
+module.exports = MemcachedDocumentStore;
--- a/lib/document_stores/postgres.js
+++ b/lib/document_stores/postgres.js
@ -0,0 +1,79 @@
+/*global require,module,process*/
+
+var postgres = require('pg');
+var winston = require('winston');
+
+// create table entries (id serial primary key, key varchar(255) not null, value text not null, expiration int, unique(key));
+
+// A postgres document store
+var PostgresDocumentStore = function (options) {
+  this.expireJS = options.expire;
+  this.connectionUrl = process.env.DATABASE_URL || options.connectionUrl;
+};
+
+PostgresDocumentStore.prototype = {
+
+  // Set a given key
+  set: function (key, data, callback, skipExpire) {
+    var now = Math.floor(new Date().getTime() / 1000);
+    var that = this;
+    this.safeConnect(function (err, client, done) {
+      if (err) { return callback(false); }
+      client.query('INSERT INTO entries (key, value, expiration) VALUES ($1, $2, $3)', [
+        key,
+        data,
+        that.expireJS && !skipExpire ? that.expireJS + now : null
+      ], function (err) {
+        if (err) {
+          winston.error('error persisting value to postgres', { error: err });
+          return callback(false);
+        }
+        callback(true);
+        done();
+      });
+    });
+  },
+
+  // Get a given key's data
+  get: function (key, callback, skipExpire) {
+    var now = Math.floor(new Date().getTime() / 1000);
+    var that = this;
+    this.safeConnect(function (err, client, done) {
+      if (err) { return callback(false); }
+      client.query('SELECT id,value,expiration from entries where KEY = $1 and (expiration IS NULL or expiration > $2)', [key, now], function (err, result) {
+        if (err) {
+          winston.error('error retrieving value from postgres', { error: err });
+          return callback(false);
+        }
+        callback(result.rows.length ? result.rows[0].value : false);
+        if (result.rows.length && that.expireJS && !skipExpire) {
+          client.query('UPDATE entries SET expiration = $1 WHERE ID = $2', [
+            that.expireJS + now,
+            result.rows[0].id
+          ], function (err) {
+            if (!err) {
+              done();
+            }
+          });
+        } else {
+          done();
+        }
+      });
+    });
+  },
+
+  // A connection wrapper
+  safeConnect: function (callback) {
+    postgres.connect(this.connectionUrl, function (err, client, done) {
+      if (err) {
+        winston.error('error connecting to postgres', { error: err });
+        callback(err);
+      } else {
+        callback(undefined, client, done);
+      }
+    });
+  }
+
+};
+
+module.exports = PostgresDocumentStore;
--- a/lib/document_stores/redis.js
+++ b/lib/document_stores/redis.js
@ -1,6 +1,5 @@
 var redis = require('redis');
 var winston = require('winston');
-var hashlib = require('hashlib');

 // For storing in redis
 // options[type] = redis
@ -9,9 +8,13 @@ var hashlib = require('hashlib');
 // options[db] - The db to use (default 0)
 // options[expire] - The time to live for each key set (default never)

-var RedisDocumentStore = function(options) {
+var RedisDocumentStore = function(options, client) {
  this.expire = options.expire;
-  if (!RedisDocumentStore.client) {
+  if (client) {
+    winston.info('using predefined redis client');
+    RedisDocumentStore.client = client;
+  } else if (!RedisDocumentStore.client) {
+    winston.info('configuring redis');
    RedisDocumentStore.connect(options);
  }
 };
@ -22,9 +25,21 @@ RedisDocumentStore.connect = function(options) {
  var port = options.port || 6379;
  var index = options.db || 0;
  RedisDocumentStore.client = redis.createClient(port, host);
-  RedisDocumentStore.client.select(index, function(err, reply) {
+  // authenticate if password is provided
+  if (options.password) {
+    RedisDocumentStore.client.auth(options.password);
+  }
+
+  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, { error: err.message });
+      winston.error(
+        'error connecting to redis index ' + index,
+        { error: err }
+      );
      process.exit(1);
    }
    else {
@ -36,7 +51,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, reply) {
+  RedisDocumentStore.client.set(key, data, function(err) {
    if (err) {
      callback(false);
    }
@ -52,7 +67,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, reply) {
+    RedisDocumentStore.client.expire(key, this.expire, function(err) {
      if (err) {
        winston.error('failed to set expiry on key: ' + key);
      }
@ -68,7 +83,7 @@ RedisDocumentStore.prototype.get = function(key, callback, skipExpire) {
      _this.setExpiration(key);
    }
    callback(err ? false : reply);
-  }); 
+  });
 };

 module.exports = RedisDocumentStore;
--- a/lib/document_stores/rethinkdb.js
+++ b/lib/document_stores/rethinkdb.js
@ -0,0 +1,46 @@
+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;
--- a/lib/key_generators/dictionary.js
+++ b/lib/key_generators/dictionary.js
@ -0,0 +1,32 @@
+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;
+  }
+
+};
--- a/lib/key_generators/phonetic.js
+++ b/lib/key_generators/phonetic.js
@ -1,32 +1,27 @@
 // Draws inspiration from pwgen and http://tools.arantius.com/password
-var PhoneticKeyGenerator = function(options) {
-  // No options
+
+const randOf = (collection) => {
+  return () => {
+    return collection[Math.floor(Math.random() * collection.length)];
+  };
 };

-// Generate a phonetic key
-PhoneticKeyGenerator.prototype.createKey = function(keyLength) {
-  var text = '';
-  for (var i = 0; i < keyLength; i++) {
-    text += (i % 2 == 0) ? this.randConsonant() : this.randVowel();
+// Helper methods to get an random vowel or consonant
+const randVowel = randOf('aeiou');
+const randConsonant = randOf('bcdfghjklmnpqrstvwxyz');
+
+module.exports = class PhoneticKeyGenerator {
+
+  // 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;
  }
-  return text;
+
 };
-
-PhoneticKeyGenerator.consonants = 'bcdfghjklmnpqrstvwxy';
-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;
--- a/lib/key_generators/random.js
+++ b/lib/key_generators/random.js
@ -1,14 +1,20 @@
-var RandomKeyGenerator = function(options) {
-  this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-};
+module.exports = class RandomKeyGenerator {

-// Generate a random key
-RandomKeyGenerator.prototype.createKey = function(keyLength) {
-  var text = '';
-  for (var i = 0; i < keyLength; i++) {
-    text += this.keyspace.charAt(Math.floor(Math.random() * this.keyspace.length));
+  // Initialize a new generator with the given keySpace
+  constructor(options = {}) {
+    this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
  }
-  return text;
-};

-module.exports = RandomKeyGenerator;
+  // Generate a key of the given length
+  createKey(keyLength) {
+    var text = '';
+
+    for (var i = 0; i < keyLength; i++) {
+      const index = Math.floor(Math.random() * this.keyspace.length);
+      text += this.keyspace.charAt(index);
+    }
+
+    return text;
+  }
+
+};
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,548 @@
+{
+  "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
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -1,52 +1,51 @@
 {
-
-	"name": "haste",
-	"version": "0.0.1",
-
-	"private": true,
-
-	"description": "Private Paste",
-
-	"keywords": [ "paste", "pastebin" ],
-
-	"author": {
-		"name": "John Crepezzi",
-		"email": "john.crepezzi@gmail.com",
-		"url": "http://seejohncode.com/"
-	},
-
-	"main": "haste",
-
-	"dependencies": {
-		"winston": "*",
-    "hashlib": "*",
-    "connect": "*",
-    "uglify-js": "*"
-	},
-
-	"devDependencies": {
-    "jasmine-node": "*"
+  "name": "haste",
+  "version": "0.1.0",
+  "private": true,
+  "description": "Private Pastebin Server",
+  "keywords": [
+    "paste",
+    "pastebin"
+  ],
+  "author": {
+    "name": "John Crepezzi",
+    "email": "john.crepezzi@gmail.com",
+    "url": "http://seejohncode.com/"
  },
-
-	"bundledDependencies": [],
-
-	"engines": {
-		"node": "*"
-	},
-
-	"bin": {
-		"haste-server": "./server.js"
-	},
-
-	"files": [ "server.js", "lib", "static" ],
-
-	"directories": {
-		"lib": "./lib"
-	},
-
-	"scripts": {
-		"start": "node server.js",
-    "test": "jasmine-node spec"
-	}
-
+  "main": "haste",
+  "dependencies": {
+    "connect-ratelimit": "0.0.7",
+    "connect-route": "0.1.5",
+    "connect": "3.4.1",
+    "st": "1.1.0",
+    "winston": "0.6.2",
+    "redis-url": "0.1.0",
+    "redis": "0.8.1",
+    "uglify-js": "3.1.6",
+    "busboy": "0.2.4",
+    "pg": "4.1.1"
+  },
+  "devDependencies": {
+    "mocha": "^4.0.1"
+  },
+  "bundledDependencies": [],
+  "engines": {
+    "node": "8.1.4",
+    "npm": "5.2.0"
+  },
+  "bin": {
+    "haste-server": "./server.js"
+  },
+  "files": [
+    "server.js",
+    "lib",
+    "static"
+  ],
+  "directories": {
+    "lib": "./lib"
+  },
+  "scripts": {
+    "start": "node server.js",
+    "test": "mocha --recursive"
+  }
 }
--- a/server.js
+++ b/server.js
@ -1,22 +1,28 @@
 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');
+var connect_st = require('st');
+var connect_rate_limit = require('connect-ratelimit');

 var DocumentHandler = require('./lib/document_handler');

 // Load the configuration and set some defaults
-var config = JSON.parse(fs.readFileSync('config.js', 'utf8'));
-config.port = config.port || 7777;
-config.host = config.host || 'localhost';
+var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
+config.port = process.env.PORT || config.port || 7777;
+config.host = process.env.HOST || config.host || 'localhost';

 // Set up the logger
 if (config.logging) {
  try {
    winston.remove(winston.transports.Console);
-  } catch(er) { }
+  } catch(e) {
+    /* was not present */
+  }
+
  var detail, type;
  for (var i = 0; i < config.logging.length; i++) {
    detail = config.logging[i];
@ -34,42 +40,48 @@ if (!config.storage) {
 if (!config.storage.type) {
  config.storage.type = 'file';
 }
-var Store = require('./lib/' + config.storage.type + '_document_store');
-var preferredStore = new Store(config.storage);
+
+var Store, preferredStore;
+
+if (process.env.REDISTOGO_URL && config.storage.type === 'redis') {
+  var redisClient = require('redis-url').connect(process.env.REDISTOGO_URL);
+  Store = require('./lib/document_stores/redis');
+  preferredStore = new Store(config.storage, redisClient);
+}
+else {
+  Store = require('./lib/document_stores/' + config.storage.type);
+  preferredStore = new Store(config.storage);
+}

 // 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 i = 0; i < list.length; i++) {
-    var item = list[i];
-    var orig_code, ast;
+  for (var j = 0; j < list.length; j++) {
+    var item = list[j];
    if ((item.indexOf('.js') === item.length - 3) && (item.indexOf('.min.js') === -1)) {
-      dest = item.substring(0, item.length - 3) + '.min' + 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');
+      var dest = item.substring(0, item.length - 3) + '.min' + item.substring(item.length - 3);
+      var orig_code = fs.readFileSync('./static/' + item, 'utf8');
+
+      fs.writeFileSync('./static/' + dest, uglify.minify(orig_code).code, 'utf8');
      winston.info('compressed ' + item + ' into ' + dest);
    }
  }
 }

 // Send the static documents into the preferred store, skipping expirations
+var path, data;
 for (var name in config.documents) {
-  var path = config.documents[name];
-  fs.readFile(path, 'utf8', function(err, data) {
-    if (data && !err) {
-      preferredStore.set(name, data, function(cb) {
-        winston.info('loaded static document', { name: name, path: path });
-      }, true);
-    }
-    else {
-      winston.warn('failed to load static document', { name: name, path: path });
-    }
-  });
+  path = config.documents[name];
+  data = fs.readFileSync(path, 'utf8');
+  winston.info('loading static document', { name: name, path: path });
+  if (data) {
+    preferredStore.set(name, data, function(cb) {
+      winston.debug('loaded static document', { success: cb });
+    }, true);
+  }
+  else {
+    winston.warn('failed to load static document', { name: name, path: path });
+  }
 }

 // Pick up a key generator
@ -86,38 +98,58 @@ var documentHandler = new DocumentHandler({
  keyGenerator: keyGenerator
 });

-// Set the server up with a static cache
-connect.createServer(
-  // First look for api calls
-  connect.router(function(app) {
-    // get raw documents - support getting with extension
-    app.get('/raw/:id', function(request, response, next) {
-      var skipExpire = !!config.documents[request.params.id];
-      var key = request.params.id.split('.')[0];
-      return documentHandler.handleRawGet(key, response, skipExpire);
-    });
-    // add documents 
-    app.post('/documents', function(request, response, next) {
-      return documentHandler.handlePost(request, response);
-    });
-    // get documents
-    app.get('/documents/:id', function(request, response, next) {
-      var skipExpire = !!config.documents[request.params.id];
-      return documentHandler.handleGet(request.params.id, response, skipExpire);
-    });
-  }),
-  // Otherwise, static
-  connect.staticCache(),
-  connect.static(__dirname + '/static', { maxAge: config.staticMaxAge }),
-  // Then we can loop back - and everything else should be a token,
-  // so route it back to /index.html
-  connect.router(function(app) {
-    app.get('/:id', function(request, response, next) {
-      request.url = request.originalUrl = '/index.html';
-      next();
-    });
-  }),
-  connect.static(__dirname + '/static', { maxAge: config.staticMaxAge })
-).listen(config.port, config.host);
+var app = connect();
+
+// Rate limit all requests
+if (config.rateLimits) {
+  config.rateLimits.end = true;
+  app.use(connect_rate_limit(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) {
+    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) {
+    return documentHandler.handlePost(request, response);
+  });
+  // get documents
+  router.get('/documents/:id', function(request, response) {
+    var key = request.params.id.split('.')[0];
+    var skipExpire = !!config.documents[key];
+    return documentHandler.handleGet(key, response, skipExpire);
+  });
+}));
+
+// Otherwise, try to match static files
+app.use(connect_st({
+  path: __dirname + '/static',
+  content: { maxAge: config.staticMaxAge },
+  passthrough: true,
+  index: false
+}));
+
+// Then we can loop back - and everything else should be a token,
+// so route it back to /
+app.use(route(function(router) {
+  router.get('/:id', function(request, response, next) {
+    request.sturl = '/';
+    next();
+  });
+}));
+
+// And match index
+app.use(connect_st({
+  path: __dirname + '/static',
+  content: { maxAge: config.staticMaxAge },
+  index: 'index.html'
+}));
+
+http.createServer(app).listen(config.port, config.host);

 winston.info('listening on ' + config.host + ':' + config.port);
--- a/spec/document_handler_spec.js
+++ b/spec/document_handler_spec.js
@ -1,19 +0,0 @@
-var DocumentHandler = require('../lib/document_handler');
-
-describe('document_handler', function() {
-
-  describe('randomKey', function() {
-
-    it('should choose a key of the proper length', function() {
-      var dh = new DocumentHandler({ keyLength: 6 });
-      expect(dh.randomKey().length).toBe(6);
-    });
-
-    it('should choose a default key length', function() {
-      var dh = new DocumentHandler();
-      expect(dh.keyLength).toBe(DocumentHandler.defaultKeyLength);
-    });
-
-  });
-
-});
--- a/spec/redis_document_store_spec.js
+++ b/spec/redis_document_store_spec.js
@ -1,89 +0,0 @@
-var RedisDocumentStore = require('../lib/redis_document_store');
-
-var winston = require('winston');
-winston.remove(winston.transports.Console);
-
-describe('redis_document_store', function() {
-
-  /* reconnect to redis on each test */
-  afterEach(function() {
-    if (RedisDocumentStore.client) {
-      RedisDocumentStore.client.quit();
-      RedisDocumentStore.client = false;
-    }
-  });
-  
-  describe('set', function() {
-
-    it('should be able to set a key and have an expiration set', function() {
-      var store = new RedisDocumentStore({ expire: 10 });
-      runs(function() {
-        var _this = this;
-        store.set('hello1', 'world', function(worked) {
-          _this.result = worked; 
-        });
-      });
-      waitsFor(function() {
-        return typeof(this.result) === 'boolean';
-      });
-      runs(function() {
-        var _this = this;
-        RedisDocumentStore.client.ttl('hello1', function(err, res) {
-          expect(res).toBeGreaterThan(1);
-          _this.done = true;
-        });
-      });
-      waitsFor(function() {
-        return this.done;
-      });
-    });
-
-    it('should not set an expiration when told not to', function() {
-      var store = new RedisDocumentStore({ expire: 10 });
-      runs(function() {
-        var _this = this;
-        store.set('hello2', 'world', function(worked) {
-          _this.result = worked; 
-        }, true);
-      });
-      waitsFor(function() {
-        return typeof(this.result) === 'boolean';
-      });
-      runs(function() {
-        var _this = this;
-        RedisDocumentStore.client.ttl('hello2', function(err, res) {
-          expect(res).toBe(-1);
-          _this.done = true;
-        });
-      });
-      waitsFor(function() {
-        return this.done;
-      });
-    });
-
-    it('should not set an expiration when expiration is off', function() {
-      var store = new RedisDocumentStore({ expire: false });
-      runs(function() {
-        var _this = this;
-        store.set('hello3', 'world', function(worked) {
-          _this.result = worked; 
-        });
-      });
-      waitsFor(function() {
-        return typeof(this.result) === 'boolean';
-      });
-      runs(function() {
-        var _this = this;
-        RedisDocumentStore.client.ttl('hello3', function(err, res) {
-          expect(res).toBe(-1);
-          _this.done = true;
-        });
-      });
-      waitsFor(function() {
-        return this.done;
-      });
-    });
-
-  });
-
-});
--- a/static/application.css
+++ b/static/application.css
@ -42,6 +42,7 @@ textarea {
 	border: 0px;
 	outline: none;
 	font-size: 13px;
+  overflow: inherit;
 }

 #box code {
@ -147,6 +148,7 @@ textarea {
 #box2 .function.twitter { background-position: -153px top; }
 #box2 .function.enabled.twitter { background-position: -153px center; }
 #box2 .function.enabled.twitter:hover { background-position: -153px bottom; }
+#box2 .button-picture{ border-width: 0; font-size: inherit; }

 #messages {
 	position:fixed;
@ -166,3 +168,4 @@ textarea {
 #messages li.error {
 	background:rgba(102,8,0,0.8);
 }
+
--- a/static/application.js
+++ b/static/application.js
@ -1,3 +1,5 @@
+/* global $, hljs, window, document */
+
 ///// represents a single document

 var haste_document = function() {
@ -42,10 +44,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(err) {
+    error: function() {
      callback(false);
    }
  });
@ -62,6 +64,7 @@ haste_document.prototype.save = function(data, callback) {
    type: 'post',
    data: data,
    dataType: 'json',
+    contentType: 'application/json; charset=utf-8',
    success: function(res) {
      _this.locked = true;
      _this.key = res.key;
@ -70,7 +73,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) {
@ -165,9 +168,10 @@ haste.extensionMap = {
  rb: 'ruby', py: 'python', pl: 'perl', php: 'php', scala: 'scala', go: 'go',
  xml: 'xml', html: 'xml', htm: 'xml', css: 'css', js: 'javascript', vbs: 'vbscript',
  lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
-  vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
+  vala: 'vala', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
  diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
-  md: 'markdown', txt: ''
+  md: 'markdown', txt: '', coffee: 'coffee', json: 'javascript',
+  swift: 'swift'
 };

 // Look up the extension preferred for a type
@ -274,7 +278,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() {
@ -300,16 +304,16 @@ haste.prototype.configureButtons = function() {
      },
      shortcutDescription: 'control + shift + r',
      action: function() {
-        window.open('/raw/' + _this.doc.key);
+        window.location.href = '/raw/' + _this.doc.key;
      }
    },
    {
      $where: $('#box2 .twitter'),
      label: 'Twitter',
      shortcut: function(evt) {
-        return _this.options.twitter && _this.doc.locked && evt.ctrlKey && evt.keyCode == 84;
+        return _this.options.twitter && _this.doc.locked && evt.shiftKey && evt.ctrlKey && evt.keyCode == 84;
      },
-      shortcutDescription: 'control + t',
+      shortcutDescription: 'control + shift + t',
      action: function() {
        window.open('https://twitter.com/share?url=' + encodeURI(window.location.href));
      }
@ -329,14 +333,14 @@ haste.prototype.configureButton = function(options) {
    }
  });
  // Show the label
-  options.$where.mouseenter(function(evt) {
+  options.$where.mouseenter(function() {
    $('#box3 .label').text(options.label);
    $('#box3 .shortcut').text(options.shortcutDescription || '');
    $('#box3').show();
    $(this).append($('#pointer').remove().show());
  });
  // Hide the label
-  options.$where.mouseleave(function(evt) {
+  options.$where.mouseleave(function() {
    $('#box3').hide();
    $('#pointer').hide();
  });
@ -369,7 +373,7 @@ $(function() {
      // For browsers like Internet Explorer
      if (document.selection) {
        this.focus();
-        sel = document.selection.createRange();
+        var sel = document.selection.createRange();
        sel.text = myValue;
        this.focus();
      }
--- a/static/application.min.js
+++ b/static/application.min.js
--- a/static/function-icons.png
+++ b/static/function-icons.png
--- a/static/highlight.min.js
+++ b/static/highlight.min.js
--- a/static/index.html
+++ b/static/index.html
@ -3,11 +3,11 @@
 	<head>

 		<title>hastebin</title>
-
+		<meta charset="utf-8" />
 		<link rel="stylesheet" type="text/css" href="solarized_dark.css"/>
 		<link rel="stylesheet" type="text/css" href="application.css"/>

-		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
+		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 		<script type="text/javascript" src="highlight.min.js"></script>
 		<script type="text/javascript" src="application.min.js"></script>

@ -47,11 +47,11 @@
 				<a href="/about.md" class="logo"></a>
 			</div>
 			<div id="box2">
-				<div class="save function"></div>
-				<div class="new function"></div>
-				<div class="duplicate function"></div>
-				<div class="raw function"></div>
-				<div class="twitter function"></div>
+				<button class="save function button-picture">Save</button>
+				<button class="new function button-picture">New</button>
+				<button class="duplicate function button-picture">Duplicate & Edit</button>
+				<button class="raw function button-picture">Just Text</button>
+				<button class="twitter function button-picture">Twitter</button>
 			</div>
 			<div id="box3" style="display:none;">
 				<div class="label"></div>
@ -60,7 +60,7 @@
 		</div>

 		<div id="linenos"></div>
-		<pre id="box" style="display:none;" tabindex="0"><code></code></pre>
+		<pre id="box" style="display:none;" class="hljs" tabindex="0"><code></code></pre>
 		<textarea spellcheck="false" style="display:none;"></textarea>

 	</body>
--- a/static/solarized_dark.css
+++ b/static/solarized_dark.css
@ -4,95 +4,81 @@ Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmai

 */

-pre code {
-  display: block; padding: 0.5em;
-  background: #002b36; color: #92a0a0;
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #002b36;
+  color: #839496;
 }

-pre .comment,
-pre .template_comment,
-pre .diff .header,
-pre .doctype,
-pre .lisp .string,
-pre .javadoc {
+.hljs-comment,
+.hljs-quote {
  color: #586e75;
-  font-style: italic;
 }

-pre .keyword,
-pre .css .rule .keyword,
-pre .winutils,
-pre .javascript .title,
-pre .method,
-pre .addition,
-pre .css .tag,
-pre .lisp .title {
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
  color: #859900;
 }

-pre .number,
-pre .command,
-pre .string,
-pre .tag .value,
-pre .phpdoc,
-pre .tex .formula,
-pre .regexp,
-pre .hexcolor {
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
  color: #2aa198;
 }

-pre .title,
-pre .localvars,
-pre .function .title,
-pre .chunk,
-pre .decorator,
-pre .builtin,
-pre .built_in,
-pre .lisp .title,
-pre .identifier,
-pre .title .keymethods,
-pre .id,
-pre .header {
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
  color: #268bd2;
 }

-pre .tag .title,
-pre .rules .property,
-pre .django .tag .keyword {
-  font-weight: bold;
-}
-
-pre .attribute,
-pre .variable,
-pre .instancevar,
-pre .lisp .body,
-pre .smalltalk .number,
-pre .constant,
-pre .class .title,
-pre .parent,
-pre .haskell .label {
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
  color: #b58900;
 }

-pre .preprocessor,
-pre .pi,
-pre .shebang,
-pre .symbol,
-pre .diff .change,
-pre .special,
-pre .keymethods,
-pre .attr_selector,
-pre .important,
-pre .subst,
-pre .cdata {
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
  color: #cb4b16;
 }

-pre .deletion {
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
  color: #dc322f;
 }

-pre .tex .formula,
-pre .code {
+.hljs-formula {
  background: #073642;
 }
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
--- a/test/document_handler_spec.js
+++ b/test/document_handler_spec.js
@ -0,0 +1,26 @@
+/* global describe, it */
+
+var assert = require('assert');
+
+var DocumentHandler = require('../lib/document_handler');
+var Generator = require('../lib/key_generators/random');
+
+describe('document_handler', function() {
+
+  describe('randomKey', 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);
+    });
+
+    it('should choose a default key length', function() {
+      var gen = new Generator();
+      var dh = new DocumentHandler({ keyGenerator: gen });
+      assert.equal(dh.keyLength, DocumentHandler.defaultKeyLength);
+    });
+
+  });
+
+});
--- a/test/key_generators/dictionary_spec.js
+++ b/test/key_generators/dictionary_spec.js
@ -0,0 +1,33 @@
+/* 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));
+      });
+    });
+  });
+});
--- a/test/key_generators/phonetic_spec.js
+++ b/test/key_generators/phonetic_spec.js
@ -0,0 +1,27 @@
+/* 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]));
+    });
+  });
+});
--- a/test/key_generators/random_spec.js
+++ b/test/key_generators/random_spec.js
@ -0,0 +1,19 @@
+/* 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));
+    });
+  });
+});
--- a/test/redis_document_store_spec.js
+++ b/test/redis_document_store_spec.js
@ -0,0 +1,54 @@
+/* global it, describe, afterEach */
+
+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 */
+  afterEach(function() {
+    if (RedisDocumentStore.client) {
+      RedisDocumentStore.client.quit();
+      RedisDocumentStore.client = false;
+    }
+  });
+
+  describe('set', function() {
+
+    it('should be able to set a key and have an expiration set', function(done) {
+      var store = new RedisDocumentStore({ expire: 10 });
+      store.set('hello1', 'world', function() {
+        RedisDocumentStore.client.ttl('hello1', function(err, res) {
+          assert.ok(res > 1);
+          done();
+        });
+      });
+    });
+
+    it('should not set an expiration when told not to', function(done) {
+      var store = new RedisDocumentStore({ expire: 10 });
+      store.set('hello2', 'world', function() {
+        RedisDocumentStore.client.ttl('hello2', function(err, res) {
+          assert.equal(-1, res);
+          done();
+        });
+      }, true);
+    });
+
+    it('should not set an expiration when expiration is off', function(done) {
+      var store = new RedisDocumentStore({ expire: false });
+      store.set('hello3', 'world', function() {
+        RedisDocumentStore.client.ttl('hello3', function(err, res) {
+          assert.equal(-1, res);
+          done();
+        });
+      });
+    });
+
+  });
+
+});
Author	SHA1	Message	Date
John Crepezzi	9b0a5ff0a3	Merge pull request #291 from j3parker/s3-document-store Add an Amazon S3 document store	2020-02-27 11:39:12 -05:00
Jacob Parker	1fff48568f	Document the IAM permissions	2019-07-08 16:59:04 +01:00
Jacob Parker	b4c666fbcf	Add an Amazon S3 document store	2019-06-28 19:25:49 +01:00
John Crepezzi	b866c33c93	Merge pull request #173 from sebastiansterk/master removed padding for #box for correct view	2019-04-05 17:30:42 -04:00
John Crepezzi	f3838ab4a8	Merge pull request #251 from seejohnrun/handle-redis-disconnect Handle redis error and re-establish connection	2018-09-19 10:38:34 -04:00
John Crepezzi	bf2b1c957a	Handle redis error and re-establish connection	2018-09-19 10:37:34 -04:00
John Crepezzi	ee1c1c0856	Merge pull request #231 from seejohnrun/ensure-raw-utf8 Added charset to raw content type	2018-07-12 14:26:05 -04:00
John Crepezzi	b087ac8dd1	Added charset to raw content type Closes #230	2018-07-12 14:25:27 -04:00
John Crepezzi	d922667f56	Merge pull request #221 from PassTheMayo/patch-1 Fixed unnecessary logging when document not found	2018-04-30 19:45:16 -04:00
Jacob Gunther	5f6fefa7a6	Fixed unnecessary logging when document not found	2018-04-30 16:40:28 -05:00
John Crepezzi	faa7e679ca	Merge pull request #216 from PassTheMayo/master Fixed RethinkDB document store	2018-04-16 11:53:28 -04:00
Jacob Gunther	cd3bf26dbe	Use local method for md5	2018-04-16 10:52:53 -05:00
Jacob Gunther	830dc1bc43	Use uploads table	2018-04-15 23:16:39 -05:00
Jacob Gunther	dc0f151a7f	Fixed bug in RethinkDB document store and use classes	2018-04-15 23:16:08 -05:00
John Crepezzi	7f625e22f7	Merge pull request #203 from seejohnrun/rewrite_memcached Rewrite the memcached client	2018-04-13 16:10:42 -04:00
John Crepezzi	528b7b07a8	Merge pull request #215 from Razzeee/patch-1 Update docs to real defaults	2018-04-09 13:08:36 -04:00
Razzeee	2b81e67ce7	Update docs to real defaults	2018-04-09 19:05:21 +02:00
John Crepezzi	827e7b51b5	Rewrite the memcached client * Update syntax to ES6 * Use `memcached` instead of `memcache` * Fix restrictions where expirations weren't pushed forward on GET * Fix a bug where we were unnecessarily bumping expirations on key search Closes #201	2018-02-16 09:52:44 -05:00
John Crepezzi	ad7702aaf4	Merge pull request #194 from szepeviktor/patch-1 Change to HTTPS in about.md	2018-01-22 10:30:12 -05:00
Viktor Szépe	f5fbc8d19e	Change to HTTPS in about.md Please also change the repo URL here on GitHub	2018-01-22 14:51:15 +01:00
John Crepezzi	0a8923bf12	Merge pull request #192 from C0rn3j/master Add note about paste expiration, cosmetic fixes.	2017-12-30 20:24:01 -05:00
Martin	4d572a2ec0	convert relative path to absolute	2017-12-30 17:11:29 +01:00
Martin	d9a53d3e6e	Add note about paste expiration, cosmetic fixes.	2017-12-29 20:42:11 +01:00
John Crepezzi	8da37ea5de	Merge pull request #190 from PassTheMayo/patch-1 Oh noes! I didn't even notice that I had a typo...	2017-12-11 10:51:12 -05:00
Jacob Gunther	ff0fccd6c2	Oh noes! I didn't even notice that I had a typo...	2017-12-11 09:50:50 -06:00
John Crepezzi	63c4576633	Merge pull request #189 from PassTheMayo/master Added RethinkDB storage option & fixed config to use proper JSON	2017-12-11 10:46:45 -05:00
Jacob Gunther	b31d143bcd	Revert config.js to previous state	2017-12-11 09:45:37 -06:00
Jacob Gunther	0d8aec8d61	Oops, forgot to fix that file name	2017-12-11 09:44:23 -06:00
Jacob Gunther	1f9fdd205d	Undid changes to server.js	2017-12-11 09:28:27 -06:00
Jacob Gunther	cdd0cf3739	Fixed requested changes to RethinkDB handler	2017-12-11 09:27:44 -06:00
PassTheMayo	ba5c6b8d16	Added RethinkDB storage option & fixed config to use proper JSON	2017-12-09 18:34:00 -06:00
John Crepezzi	cfef588283	Merge pull request #181 from seejohnrun/simplify_uglify Upgrade uglify and simplify usage	2017-10-31 21:20:23 -04:00
John Crepezzi	318c5f7ba6	Upgrade uglify and simplify usage - Upgrade to the most recent version of uglify - Use the `UglifyJS.minify(code)` helper which does exactly what we want	2017-10-31 21:19:22 -04:00
John Crepezzi	ee03e7cd78	Merge pull request #180 from seejohnrun/es6_generators ES6 generators	2017-10-31 21:11:32 -04:00
John Crepezzi	3b6934e348	Phonetic key generator to es6 and add some tests	2017-10-31 21:10:25 -04:00
John Crepezzi	f161cc33b4	Added tests and converted dictionary key generator to es6	2017-10-31 20:55:59 -04:00
John Crepezzi	40f1f2588e	Update some es6	2017-10-31 20:55:51 -04:00
John Crepezzi	e4e025f67e	Convert random generator to es6 and add some specs for it directly	2017-10-31 20:40:43 -04:00
John Crepezzi	e12805a8aa	Merge pull request #179 from seejohnrun/upgrade_testing Upgrade testing libraries	2017-10-31 20:04:37 -04:00
John Crepezzi	e76c845f16	Upgrade testing libraries - Upgrade mocha - Remove should due to limited usage and old style (at least by rspec standards) - Move spec -> test which is the default - Update tests accordingly for the above	2017-10-31 20:03:30 -04:00
John Crepezzi	072418695e	Merge pull request #178 from seejohnrun/upgrade_highlight Upgrade highlight.js	2017-10-31 19:49:20 -04:00
John Crepezzi	584b66bc66	Upgrade highlight.js	2017-10-31 19:48:55 -04:00
Sebastian Sterk	f8db455f74	removed padding for #box for correct view	2017-10-13 15:13:04 +02:00
John Crepezzi	f19c5d1049	Fix typo in README Closes #165	2017-08-03 11:45:51 +00:00
John Crepezzi	c5b859ec98	Bump node engine version & fix asset compression on start	2017-07-11 21:13:33 -04:00
John Crepezzi	2ee93a7409	Merge pull request #160 from seejohnrun/complete_eslint Fix eslint	2017-06-26 12:38:57 -04:00
John Crepezzi	bf1dbb68b8	Fix eslint	2017-06-26 12:38:17 -04:00
John Crepezzi	cf28e23d8e	Merge pull request #159 from seejohnrun/add_eslint Added eslint and fixed an issue from #158	2017-06-26 12:29:10 -04:00
John Crepezzi	5939dec185	Added eslint and fixed an issue from #158	2017-06-26 12:19:36 -04:00
John Crepezzi	3ed1d775ac	Merge pull request #158 from KlasafGeijerstam/master Added dictionary key generator	2017-06-26 12:11:44 -04:00
John Crepezzi	87b1c76aaf	One more	2017-06-26 12:11:19 -04:00
John Crepezzi	4599203bdf	A few style nit-picks	2017-06-26 12:10:57 -04:00
Klas af Geijerstam	d66bc9a6c4	Removed unused lines	2017-06-26 18:09:13 +02:00
Klas af Geijerstam	80f0618736	Updated dictionary.js Now expects a newline separated dictionary, supports both \n and \n\r	2017-06-26 18:03:18 +02:00
Klas af Geijerstam	ac2bceefbb	Added missing )	2017-06-26 17:42:24 +02:00
Klas af Geijerstam	dbf4f6b5dd	Removed usage of random-js Replaced random-js with vanilla JS random	2017-06-26 17:39:32 +02:00
Klas af Geijerstam	8e9205cecc	Update dictionary.js	2017-06-26 17:37:04 +02:00
Klas af Geijerstam	e54a860172	Added dictionary.js A key generator that uses a dictionary to create its keys	2017-06-26 17:17:52 +02:00
John Crepezzi	5a8697cdd8	Fix typo in about.md	2017-05-02 17:32:34 -04:00
John Crepezzi	091ea973a8	Merge pull request #138 from Wohlstand/patch-2 Added a note about Redis's password field	2017-04-21 07:51:23 -04:00
John Crepezzi	939b7221ab	Merge pull request #146 from seejohnrun/dont_expire_static_documents Don't expire static documents on raw read	2017-01-28 11:58:12 -05:00
John Crepezzi	934aaf7f51	Don't expire static documents on raw read	2017-01-28 11:57:25 -05:00
Vitaly Novichkov	930e21ccb7	Added a note about Redis's password field	2016-11-06 02:25:51 +04:00
John Crepezzi	eb5c8eef6a	Merge pull request #135 from seejohnrun/horizontal_scroll_fix Fix horizontal scroll overflow	2016-09-30 10:40:15 -05:00
John Crepezzi	03dd611a86	Fix horizontal scroll overflow Caused by highlight.js upgrade	2016-09-30 09:57:46 -05:00
John Crepezzi	f24376b192	Merge pull request #129 from Wohlstand/patch-1 Fix working error under Firefox	2016-09-19 09:36:56 -04:00
Vitaly Novichkov	eea359d0ec	Update index.html Short charset command better for HTML5	2016-09-13 15:11:20 +04:00
John Crepezzi	af9a71549b	Upgrade highlight.js Also adds swift support Closes #69	2016-09-12 20:10:15 -04:00
John Crepezzi	3178676fba	Merge pull request #131 from seejohnrun/update_doc Update documentation to mention redis-server	2016-08-22 13:23:11 -04:00
John Crepezzi	3bdfab8219	Update documentation to mention redis-server	2016-08-22 13:22:49 -04:00
John Crepezzi	a3a24d9765	Merge pull request #127 from Gwemox/master Compatibility with screen reader	2016-08-17 14:03:13 -04:00
Vitaly Novichkov	8afb53e77e	Fix working error under Firefox On some computers because undeclared charset, highlight.min.js parsing incorrectly while some charsets (For example, Cyrillic-1251) are toggled. Problem is going away when I manually toggling Europan or UTF-8 charset.	2016-08-03 14:15:58 +04:00
Thibault Buathier	d6d9cf40f9	Compatibility with screen reader	2016-07-30 16:15:53 +02:00
Thibault Buathier	1010a142e2	Compatibility with screen reader	2016-07-30 16:15:26 +02:00
John Crepezzi	0209375865	Revert "Added cloudron external provider" This reverts commit `00a9d9c312`.	2016-03-12 13:09:28 -05:00
John Crepezzi	00a9d9c312	Added cloudron external provider	2016-03-12 13:07:58 -05:00
John Crepezzi	6835eef468	Merge pull request #109 from seejohnrun/rate_limiting Added user-configurable rate limiting	2016-03-10 11:44:57 -10:00
John Crepezzi	4626fd9c8d	Merge pull request #81 from pangeacake/master Add postgres information to README.md	2016-03-06 19:06:04 -05:00
John Crepezzi	fbb6e63c37	Added a note to the README	2016-03-06 16:34:33 -05:00
John Crepezzi	84c909a5db	Added user-configurable rate limiting	2016-03-06 16:20:40 -05:00
John Crepezzi	45e19bc7cc	fix indentation	2015-12-27 12:59:59 -05:00
John Crepezzi	233bc6ff16	Merge pull request #77 from abn/redis-auth Support authentication for redis store if password provided	2015-12-27 12:58:24 -05:00
PangeaCake	360b325ced	Smaller typo	2015-01-07 14:30:12 -08:00
PangeaCake	e93f98112b	Add `pg` as dependency and update node version One of the dependencies seemed to be broken with the previous node version, but this node version worked perfectly	2015-01-07 14:27:46 -08:00
PangeaCake	05cb051bc8	Tiny fix	2015-01-07 14:25:43 -08:00
PangeaCake	031cdd738a	Add postgres information to README.md	2015-01-07 14:24:50 -08:00
Arun Babu Neelicattu	c92ab077c0	Support authentication for redis store if password provided	2014-11-21 23:17:19 +10:00
John Crepezzi	6c31389327	Merge pull request #64 from lidl/master Make table creation comment a one-liner.	2014-07-16 07:54:00 -04:00
lidl	a8d4f3c300	Make table creation comment a one-liner.	2014-06-27 18:40:05 -04:00
John Crepezzi	ab029eae2f	Added postgres adapter	2014-06-09 16:50:43 -04:00
John Crepezzi	447d0aae76	PG basis	2014-06-09 14:48:35 -04:00
John Crepezzi	4870158430	Merge branch 'master' of github.com:seejohnrun/haste-server	2014-04-21 14:17:09 -04:00
John Crepezzi	0471b059a0	Support a form-data POST API Closes #54	2014-04-21 14:16:23 -04:00
John Crepezzi	5bbe50b481	Merge pull request #59 from jomo/phonetic Phonetic key improvements	2014-04-15 11:00:49 -04:00
JonApps	bda2749879	oops 🍺	2014-03-25 02:23:31 +01:00
JonApps	028aa96b13	phonetic keys can begin with vowel + added missing \'z\' to consontants	2014-03-25 02:20:05 +01:00
John Crepezzi	2deda5b68a	Merge pull request #56 from joeykrim/patch-1 Small typo	2014-02-27 19:26:31 -05:00
joeykrim	ee7098457e	Small typo Changed "its all open source" to "it's all open source"	2014-02-27 17:57:37 -05:00
John Crepezzi	7a08960414	Merge branch 'master' of github.com:seejohnrun/haste-server	2013-11-24 11:54:34 -05:00
John Crepezzi	89909747f1	Don't depend on err.message for redis errors [#49 ]	2013-11-24 11:54:01 -05:00
John Crepezzi	202e695e07	Remove GA from index.html on Master	2013-10-31 08:44:33 -04:00
John Crepezzi	48e8e79659	Remove support from README	2013-08-13 13:06:37 -04:00
John Crepezzi	abb49f2cf3	update about.md	2013-03-12 21:59:10 -04:00
John Crepezzi	d1cd2a5213	Proper	2013-01-11 10:00:35 -08:00
John Crepezzi	27317844e0	Remove nl	2013-01-11 09:57:10 -08:00
John Crepezzi	ee74e2fa90	Merge branch 'production' of github.com:seejohnrun/haste-server into production	2012-12-29 18:15:45 -05:00
John Crepezzi	5d8bd2e6f8	Merge branch 'master' into production	2012-12-29 18:15:32 -05:00
John Crepezzi	cd4c7aeab8	Merge pull request #37 from naftis/patch-1 Bugfix to solarized_dark.css	2012-12-28 07:10:36 -08:00
naftis	e37c3cf1b9	Bugfix to solarized_dark.css Fixed bug with font-style: italic and WebKit. WebKit makes line-height bigger, when italic is used.	2012-12-28 16:11:21 +02:00
John Crepezzi	8858bab985	Merge branch 'master' into production	2012-12-23 10:54:15 -05:00
John Crepezzi	afb0c332cc	Added shift modifier to twitter shortcut Closes #29	2012-12-23 10:53:53 -05:00
John Crepezzi	82c58c5c0c	Merge branch 'master' into production	2012-12-19 08:18:14 -05:00
John Crepezzi	46bdd27431	Fix for type name ;) Closes #28	2012-12-19 08:17:52 -05:00
John Crepezzi	1adfba1a37	Merge branch 'master' into production	2012-12-19 08:13:36 -05:00
John Crepezzi	54e55b1b0d	Added JSON to extension map (JS) Closes #28	2012-12-19 08:12:08 -05:00
John Crepezzi	08d37cc7f7	Added support section	2012-10-22 14:40:52 -04:00
John Crepezzi	aa781957e8	Update Copyright	2012-09-27 13:46:27 -04:00
John Crepezzi	c00477c93c	Update Copyright	2012-09-27 13:46:09 -04:00
John Crepezzi	035f09ac05	GA	2012-09-27 13:43:53 -04:00
John Crepezzi	36e00bb29e	Remove 'localhost' references	2012-09-27 12:03:52 -04:00
John Crepezzi	10623873e8	Allow host setting by ENV	2012-09-27 12:01:00 -04:00
John Crepezzi	e536ba1019	Move to an available npm version	2012-09-27 11:56:49 -04:00
John Crepezzi	85fc36d710	Update npm version	2012-09-27 11:56:15 -04:00
John Crepezzi	5d5ae164f3	Set up node engine version	2012-09-27 11:54:40 -04:00
John Crepezzi	79309c75df	Bump version to 0.1.0	2012-09-27 11:51:15 -04:00
John Crepezzi	4b58c8d356	Added more loggin	2012-09-27 11:50:56 -04:00
John Crepezzi	8f0d6260b0	change how redistogo install works	2012-09-27 11:50:12 -04:00
John Crepezzi	93a83a35da	Logging	2012-09-27 11:47:23 -04:00
John Crepezzi	4efc5d47d9	Allow redistogo	2012-09-27 11:46:53 -04:00
John Crepezzi	ff8ef54e34	Procfile	2012-09-27 11:38:14 -04:00
John Crepezzi	814a49812a	Update server config path	2012-09-19 14:28:52 -04:00
John Crepezzi	e0610bc1be	Fix multiple document loading Closes #32	2012-08-13 11:33:20 -04:00
John Crepezzi	962976c204	Pad the right	2012-06-22 15:33:07 -04:00
John Crepezzi	16080bdc16	Update description - preparing for npm push	2012-04-21 23:49:39 -04:00
John Crepezzi	20ce741341	Fix indentation	2012-04-07 23:51:48 -04:00
John Crepezzi	13bb094fb3	Revert "Refactor frontend" This reverts commit `1950cc8db0`.	2012-03-19 18:17:39 -04:00
John Crepezzi	b43a55ffda	Merge pull request #25 from zaeleus/backbone Refactor frontend	2012-03-19 15:11:08 -07:00
John Crepezzi	45cbdcce70	Force down connect version	2012-03-02 14:07:59 -05:00
Michael Macias	1950cc8db0	Refactor frontend * restructured JavaScript using backbone.js * replaced highlight.js with CodeMirror for its editor * added CodeMirror Solarized (dark) theme based on Ethan Schoonover's solarized.vim * changed `POST /document` to accept real JSON * cleaned up template and stylesheet	2012-02-18 02:40:56 -06:00
John Crepezzi	90cfe0ec57	Upgrade jquery to 1.7.1	2012-02-07 17:52:48 -05:00
John Crepezzi	87e28548b9	Explicitly set encoding Closes #24	2012-02-07 17:52:31 -05:00
John Crepezzi	ca9d4c18f7	Added a note on WinHaste to about.md	2012-01-27 09:47:56 -05:00
John Crepezzi	f147c05ff1	Add more detail to README.md	2012-01-27 09:46:24 -05:00
John Crepezzi	7a2851aeeb	Merge branch 'master' of github.com:seejohnrun/haste-server	2012-01-24 22:29:38 -05:00
John Crepezzi	ef96704f2c	Basic coffeescript highlighting From https://github.com/dnagir/highlightjs-coffeescript Closes #2	2012-01-24 22:28:58 -05:00
John Crepezzi	8b7ac341e7	FileDocumentStore fix Closes #20	2012-01-24 00:01:38 -05:00
John Crepezzi	713914aecd	Merge pull request #18 from tfausak/patch-1 Fix typo in about.md ("easist" -> "easiest").	2012-01-23 19:27:24 -08:00
Taylor Fausak	36e7a43c14	Fix typo in about.md ("easist" -> "easiest").	2012-01-23 20:12:33 -06:00
John Crepezzi	047a686248	Open raw in same window	2012-01-23 11:40:09 -05:00
John Crepezzi	347ba57ad3	Merge branch 'raw_icon'	2012-01-23 11:38:36 -05:00
Brian Dawson	d2bd78956b	Merge branch 'master' of github.com:seejohnrun/haste-server Conflicts: static/function-icons.png	2012-01-22 23:42:41 -05:00
Brian Dawson	1fe81d2447	update function icons	2012-01-22 23:41:40 -05:00
John Crepezzi	f37d1ad401	Clean up some code and move document stores into subfolder	2012-01-21 15:19:55 -05:00
John Crepezzi	483fce891d	Added memcached support	2012-01-17 14:43:33 -05:00
John Crepezzi	6e4c087319	Remove hashlib dependency and switch to mocha for testing	2012-01-13 11:17:15 -05:00
				`@ -1 +0,0 @@`
				`* add feedback for errors to UI - esp. too long`