3 files changed, 88 insertions, 3 deletions
diff --git a/lib/db/index.js b/lib/db/index.js
index 81c3af2..7bcb9ea 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -27,3 +27,6 @@ db.getRandom = function () {
   }).fetch()
 }
 
+db.createImage = function(url){
+  return new Image({ url: url, shorturl: "" }).save()
+}
+\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index 7a410d0..f4b01f4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -7,12 +7,17 @@ var bodyParser = require('body-parser')
 var cookieParser = require('cookie-parser')
 var path = require('path')
 var ejs = require('ejs')
+
 var multer = require('multer')
+var storage = multer.memoryStorage()
+var multer_upload = multer({ storage: storage })
 
 var app, server
 
 var db = require("./db")
 
+var upload = require("./upload")
+
 var site = module.exports = {}
 site.init = function(){
   app = express()
@@ -22,7 +27,6 @@ site.init = function(){
   app.use(express.static(path.join(__dirname, '../public')))
   app.use(bodyParser.json())
   app.use(bodyParser.urlencoded({ extended: false }))
-  app.use( multer({ dest:'./uploads/' }).single("file") )
   
   app.use(express.query())
 
@@ -48,7 +52,16 @@ site.init = function(){
       res.json(img)
     })
   })
-  app.post("/upload", function(req, res){
-    res.sendStatus(200)
+  app.post("/upload", multer_upload.single('image'), function(req, res){
+		upload.put("image", req.file, {
+			unacceptable: function(err){
+				res.json({ error: err })
+			},
+			success: function(url){
+			  db.createImage(url).then(function(image){
+			    res.json(image)
+			  })
+			}
+		})
   })
 }
 \ No newline at end of file
diff --git a/lib/upload.js b/lib/upload.js
new file mode 100644
index 0000000..f0ea132
--- /dev/null
+++ b/lib/upload.js
@@ -0,0 +1,69 @@
+
+var crypto = require('crypto')
+var knox = require('knox')
+var moment = require('moment')
+
+var s3 = module.exports.s3 = knox.createClient({
+	key: process.env.S3_KEY,
+	secret: process.env.S3_SECRET,
+	bucket: process.env.S3_BUCKET,
+});
+
+var acceptableuploadTypes = {
+	'image/gif': 'gif',
+	'image/jpeg': 'jpg',
+	'image/png': 'png'
+}
+
+module.exports.put = function (key, file, opt) {
+	var fileSize, fileType, filename
+	var err
+	var now = new Date()
+
+	var ts = moment().format('YYYYMMDD')
+
+	var extension = acceptableuploadTypes[file.mimetype]
+	filename = crypto.createHash('md5').update(file.buffer).digest('hex') + "." + extension;
+
+	var remote_path = process.env.S3_DIR + filename
+
+	if (! extension) {
+		err = "Unacceptable filetype"
+	}
+	else if (file.size < 10) {
+		err = "File too small"
+	}
+	else if (file.size > 2097152) { // 2mb limit
+		err = "File too large. Uploads can be a maximum of 2 mb."
+	}
+
+	if (err) {
+		console.error(">>>", err)
+		opt.unacceptable && opt.unacceptable(err)
+		return
+	}
+
+	opt.acceptable && opt.acceptable(err)
+	
+	console.log("upload > ", remote_path)
+	s3.putBuffer(file.buffer, remote_path, {
+		'Content-Length': file.size,
+		'Content-Type': file.mimetype,
+		'x-amz-acl': 'public-read',
+	}, function(err, s3res) {
+		if (err || s3res.statusCode !== 200) {
+			console.error(s3res.statusCode, err)
+			if (s3res && s3res.resume) {
+				s3res.resume()
+			}
+			return
+		}
+
+		var file_url = s3res.url || s3res.req.url		
+
+		opt.success && opt.success(file_url)
+	}).on('error', function(err, s3res){
+		console.error("error", err)
+		s3res && s3res.resume && s3res.resume()
+	})
+}