scrubbing design

3 files changed, 14 insertions, 19 deletions

diff --git a/lib/db/bookshelf.js b/lib/db/bookshelf.js
index 69157cc..1a2f609 100644
--- a/lib/db/bookshelf.js
+++ b/lib/db/bookshelf.js
@@ -6,13 +6,10 @@ var knex = require('knex')({
     password : process.env.DB_PASS,
     database : process.env.DB_NAME,
     charset  : 'utf8',
-    typecast : function (field, next) {
-      console.log(field.type)
-      if (field.type == 'BLOB') {
-        return field.string()
-      }
-      return next()
-    }
+    pool: {
+      min: 2,
+      max: 4
+    },
   }
 })
 
diff --git a/lib/db/index.js b/lib/db/index.js
index 7bcb9ea..75ee2ad 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -28,5 +28,5 @@ db.getRandom = function () {
 }
 
 db.createImage = function(url){
-  return new Image({ url: url, shorturl: "" }).save()
-}
\ No newline at end of file
+  return new Image({ url: url }).save()
+}
diff --git a/lib/index.js b/lib/index.js
index 11c8a11..a53dc34 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -21,42 +21,40 @@ var upload = require("./upload")
 var site = module.exports = {}
 site.init = function(){
   app = express()
-  app.set('view engine', 'ejs')
-  app.set('views', path.join(__dirname, '../views'))
-  app.use(express.static(path.join(__dirname, '../public')))
+  app.use('/p', express.static(path.join(__dirname, '../public')))
   app.use(bodyParser.json())
   app.use(bodyParser.urlencoded({ extended: false }))
-  
+
   app.use(express.query())
 
   server = http.createServer(app).listen(process.env.PORT, function () {
-    console.log('LuCkYPLoP listening at http://5.k:%s', server.address().port)
+    console.log('plop listening at http://5.k:%s', server.address().port)
   })
 
   app.get("/p/:id", function(req, res){
     res.sendFile("index.html", {root: './public'})
   })
-  app.get("/get/random", function(req, res){
+  app.get("/p/get/random", function(req, res){
     db.getRandom().then(function(img){
       res.json(img)
     })
   })
-  app.get("/get/latest", function(req, res){
+  app.get("/p/get/latest", function(req, res){
     db.getLatest().then(function(img){
       res.json(img)
     })
   })
-  app.get("/get/:id/hotlink", function(req, res){
+  app.get("/p/get/:id/hotlink", function(req, res){
     db.getImage(req.params.id).then(function(img){
       res.redirect(img.url)
     })
   })
-  app.get("/get/:id", function(req, res){
+  app.get("/p/get/:id", function(req, res){
     db.getImage(req.params.id).then(function(img){
       res.json(img)
     })
   })
-  app.post("/upload", multer_upload.single('image'), function(req, res){
+  app.post("/p/upload", multer_upload.single('image'), function(req, res){
 		upload.put("image", req.file, {
 			unacceptable: function(err){
 				res.json({ error: err })