Added jsonp support

Closes #47

Procfile

@@ -0,0 +1 @@
+web: node server.js

README.md

@@ -134,7 +134,6 @@ forward on GETs.
 
 All of which are optional except `type` with very logical default values.
 
-
 ## Author
 
 John Crepezzi <john.crepezzi@gmail.com>
@@ -143,7 +142,7 @@ 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

about.md

@@ -38,7 +38,8 @@ right now.
 
 ## 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
 

config.js

@@ -1,6 +1,6 @@
 {
 
-  "host": "localhost",
+  "host": "0.0.0.0",
   "port": 7777,
 
   "keyLength": 10,
@@ -25,7 +25,7 @@
 
   "storage": {
     "type": "redis",
-    "host": "localhost",
+    "host": "0.0.0.0",
     "port": 6379,
     "db": 2,
     "expire": 2592000

lib/document_handler.js

@@ -15,12 +15,23 @@ var DocumentHandler = function(options) {
 DocumentHandler.defaultKeyLength = 10;
 
 // Handle retrieving a document
-DocumentHandler.prototype.handleGet = function(key, response, skipExpire) {
+DocumentHandler.prototype.handleGet = function(key, callback, response, skipExpire) {
   this.store.get(key, function(ret) {
     if (ret) {
       winston.verbose('retrieved document', { key: key });
+      var responseData = JSON.stringify({ data: ret, key: key });
+      if (callback) {
+        if (callback.match(/^[a-z0-9]+$/i)) {
+          response.writeHead(200, { 'content-type': 'application/javascript' });
+          response.end(callback + '(' + responseData + ');');
+        } else {
+          response.writeHead(400, { 'content-type': 'application/json' });
+          response.end(JSON.stringify({ message: 'invalid callback function name' }));
+        }
+      } else {
         response.writeHead(200, { 'content-type': 'application/json' });
-      response.end(JSON.stringify({ data: ret, key: key }));
+        response.end(responseData);
+      }
     }
     else {
       winston.warn('document not found', { key: key });

lib/document_stores/redis.js

@@ -8,9 +8,13 @@ var winston = require('winston');
 // 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);
   }
 };
@@ -25,7 +29,7 @@ RedisDocumentStore.connect = function(options) {
     if (err) {
       winston.error(
         'error connecting to redis index ' + index,
-        { error: err.message }
+        { error: err }
       );
       process.exit(1);
     }

package.json

@@ -1,52 +1,47 @@
 {
-
   "name": "haste",
-	"version": "0.0.1",
+  "version": "0.1.0",
-
   "private": true,
-
+  "description": "Private Pastebin Server",
-	"description": "Private Paste",
+  "keywords": [
-
+    "paste",
-	"keywords": [ "paste", "pastebin" ],
+    "pastebin"
-
+  ],
   "author": {
     "name": "John Crepezzi",
     "email": "john.crepezzi@gmail.com",
     "url": "http://seejohncode.com/"
   },
-
   "main": "haste",
-
   "dependencies": {
-		"winston": "*",
+    "winston": "0.6.2",
-    "connect": "< 2",
+    "connect": "1.9.2",
-    "uglify-js": "*"
+    "redis-url": "0.1.0",
+    "redis": "0.8.1",
+    "uglify-js": "1.3.3"
   },
-
   "devDependencies": {
     "mocha": "*",
     "should": "*"
   },
-
   "bundledDependencies": [],
-
   "engines": {
-		"node": "*"
+    "node": "0.8.10",
+    "npm": "1.1.49"
   },
-
   "bin": {
     "haste-server": "./server.js"
   },
-
+  "files": [
-	"files": [ "server.js", "lib", "static" ],
+    "server.js",
-
+    "lib",
+    "static"
+  ],
   "directories": {
     "lib": "./lib"
   },
-
   "scripts": {
     "start": "node server.js",
     "test": "mocha -r should spec/*"
   }
-
 }

server.js

@@ -8,9 +8,9 @@ var connect = require('connect');
 var DocumentHandler = require('./lib/document_handler');
 
 // Load the configuration and set some defaults
-var config = JSON.parse(fs.readFileSync('config.js', 'utf8'));
+var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
-config.port = config.port || 7777;
+config.port = process.env.PORT || config.port || 7777;
-config.host = config.host || 'localhost';
+config.host = process.env.HOST || config.host || 'localhost';
 
 // Set up the logger
 if (config.logging) {
@@ -34,8 +34,18 @@ if (!config.storage) {
 if (!config.storage.type) {
   config.storage.type = 'file';
 }
-var Store = require('./lib/document_stores/' + config.storage.type);
+
-var preferredStore = new Store(config.storage);
+var Store, preferredStore;
+
+if (process.env.REDISTOGO_URL) {
+  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) {
@@ -60,21 +70,19 @@ if (config.recompressStaticAssets) {
 }
 
 // Send the static documents into the preferred store, skipping expirations
+var path, data;
 for (var name in config.documents) {
-  var path = config.documents[name];
+  path = config.documents[name];
-  fs.readFile(path, 'utf8', function(err, data) {
+  data = fs.readFileSync(path, 'utf8');
-    if (data && !err) {
+  winston.info('loading static document', { name: name, path: path });
+  if (data) {
     preferredStore.set(name, data, function(cb) {
-        winston.info('loaded static document', { name: name, path: path });
+      winston.debug('loaded static document', { success: cb });
     }, true);
   }
   else {
-      winston.warn(
+    winston.warn('failed to load static document', { name: name, path: path });
-        'failed to load static document',
-        { name: name, path: path }
-      );
   }
-  });
 }
 
 // Pick up a key generator
@@ -108,8 +116,10 @@ connect.createServer(
     // get documents
     app.get('/documents/:id', function(request, response, next) {
       var skipExpire = !!config.documents[request.params.id];
+      var parsedUrl = url.parse(request.url, true);
       return documentHandler.handleGet(
         request.params.id,
+        parsedUrl.query.callback,
         response,
         skipExpire
       );

static/application.css

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

static/application.js

@@ -168,7 +168,7 @@ haste.extensionMap = {
   lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
   vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
   diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
-  md: 'markdown', txt: '', coffee: 'coffee'
+  md: 'markdown', txt: '', coffee: 'coffee', json: 'javascript'
 };
 
 // Look up the extension preferred for a type
@@ -308,9 +308,9 @@ haste.prototype.configureButtons = function() {
       $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));
       }

static/solarized_dark.css

@@ -17,6 +17,8 @@ pre .lisp .string,
 pre .javadoc {
   color: #586e75;
   font-style: italic;
+  display: inline-block;
+  line-height: 1em;
 }
 
 pre .keyword,