Merge branch 'routes'

Author: csainty

app.js

@@ -58,13 +58,11 @@ require('./data/config.js');
 
 // Routes
 
-app.get('/', require('./routes/index.js'));
-app.get('/about', require('./routes/about.js'));
-app.get('/ask', require('./routes/ask.js'));
-app.post('/ask', require('./routes/create.js'));
-app.get('/wat/:id', require('./routes/wat.js'));
-app.get('/search', require('./routes/search.js'));
-app.get('/searchpartial', require('./routes/searchpartial.js'));
+require('./routes/index.js')(app);
+require('./routes/about.js')(app);
+require('./routes/ask.js')(app);
+require('./routes/wat.js')(app);
+require('./routes/search.js')(app);
 
 // Start server
 

routes/about.js

@@ -1,3 +1,7 @@
-module.exports = function (req, res) {
-	res.render('about', { title: 'About | say wat?' });
-};
+var routes = function (app) {
+  app.get('/about', function (req, res) {
+    res.render('about', { title: 'About | say wat?' });
+  });
+};
+
+module.exports = routes;

routes/ask.js

@@ -1,3 +1,52 @@
-module.exports = function (req, res) {
-	res.render('ask', { title: 'Ask Question', phrase: req.query.phrase || '' });
-};
+var mongoose = require('mongoose')
+  , url = require('url')
+  , flow = require('flow')
+  , Wat = mongoose.model('Wat')
+  , User = mongoose.model('User')
+  , routes
+  ;
+
+routes = function (app) {
+  app.get('/ask', function (req, res) {
+    res.render('ask', { title: 'Ask Question', phrase: req.query.phrase || '' });
+  });
+
+  app.post('/ask', function (req, res) {
+    if (!req.body.phrase  || req.body.phrase.length === 0)    { return res.send('No phrase entered'); }
+    if (!req.body.example || req.body.example.sentence === 0) { return res.send('No example entered'); }
+    if (!req.body.region  || req.body.region.length === 0)    { return res.send('No region entered'); }
+
+    var currentUser;
+
+    flow.exec(
+      function () {
+        // User auth is not currently set up, using test data until this is done
+        User.find({ displayName: 'csainty' }, this);
+      },
+      function (err, result) {
+        if (!result) { return res.send('No user found'); }
+
+        currentUser = result[0];
+        Wat.find({ phrase: req.body.phrase }, this);
+      },
+      function (err, result) {
+        if (err) { console.log(err); return res.send('No likey'); }
+        if (result.length !== 0) {
+          return res.send('Someone beat you to it! ' + req.body.phrase + ' has already been asked about.');
+        }
+
+        var newWat = new Wat({
+          _user: currentUser,
+          phrase: req.body.phrase,
+          region: req.body.region,
+          example: req.body.example
+        });
+
+        newWat.save(this);
+      }, function (err, wat) {
+        if (err || !wat) { return res.redirect('/ask'); }
+        res.redirect('/wat/' + wat._id);
+      });
+  });
+};
+module.exports = routes;

routes/create.js

@@ -1,3 +1,7 @@
-module.exports = function (req, res) {
-  res.render('index', { title: 'say wat?', layout: 'typeahead-layout' });
-};
+var routes = function (app) {
+  app.get('/', function (req, res) {
+    res.render('index', { title: 'say wat?', layout: 'typeahead-layout' });
+  });
+};
+
+module.exports = routes;

routes/index.js

@@ -1,18 +1,36 @@
 var mongoose = require('mongoose')
   , url = require('url')
   , Wat = mongoose.model('Wat')
+  , routes
   ;
 
-module.exports = function (req, res) {
-  if (!req.query.q || req.query.q.length === 0) { return res.redirect('/'); }
+routes = function (app) {
+  app.get('/search', function (req, res) {
+    if (!req.query.q || req.query.q.length === 0) { return res.redirect('/'); }
 
-  Wat
-    .find({ phrase: req.query.q })
-    .populate('_user')
-    .run(function (err, results) {
-      if (err) { return res.redirect('/error'); }
-      if (req.accepts('json')) { return res.json(results); }
-      if (results.length === 0) { return res.redirect(url.format({ pathname: '/ask', query: { phrase: req.query.q } })); }
-      res.render('search', { title: 'say wat?', results: results, query: req.query.q });
-    });
-};
+    Wat
+      .find({ phrase: req.query.q })
+      .populate('_user')
+      .run(function (err, results) {
+        if (err) { return res.redirect('/error'); }
+        if (req.accepts('json')) { return res.json(results); }
+        if (results.length === 0) { return res.redirect(url.format({ pathname: '/ask', query: { phrase: req.query.q } })); }
+        res.render('search', { title: 'say wat?', results: results, query: req.query.q });
+      });
+  });
+
+  app.get('/searchpartial', function (req, res) {
+    if (!req.query.q || req.query.q.length === 0) { return res.redirect('/'); }
+
+    Wat
+      .$where('this.phrase.indexOf("' + req.query.q + '") != -1').exec(function (err, results) {
+        if (err) { return res.redirect('/error'); }
+        if (req.accepts('json')) { return res.json(results); }
+        if (results.length === 0) { return res.redirect(url.format({ pathname: '/ask', query: { phrase: req.query.q } })); }
+        res.render('search', { title: 'say wat?', results: results, query: req.query.q });
+      });
+  });
+};
+
+
+module.exports = routes;

routes/search.js

@@ -1,19 +1,24 @@
 var mongoose = require('mongoose')
   , Wat = mongoose.model('Wat')
+  , routes
   ;
 
-module.exports = function (req, res) {
-  if (!req.params.id) { return res.redirect('/'); }
+routes = function (app) {
+  app.get('/wat/:id', function (req, res) {
+    if (!req.params.id) { return res.redirect('/'); }
 
-  Wat
-    .findById(req.params.id)
-    .populate('_user')
-    .populate('answers._user')
-    .run(function (err, wat) {
-      if (err) { return res.redirect('/error'); }
-      if (!wat) { return res.redirect('/'); }
+    Wat
+      .findById(req.params.id)
+      .populate('_user')
+      .populate('answers._user')
+      .run(function (err, wat) {
+        if (err) { return res.redirect('/error'); }
+        if (!wat) { return res.redirect('/'); }
 
-      if (req.accepts('json')) { return res.json(wat); }
-      res.render('wat', { title: 'say wat?', id: req.params.id, wat: wat });
-    });
-};
+        if (req.accepts('json')) { return res.json(wat); }
+        res.render('wat', { title: 'say wat?', id: req.params.id, wat: wat });
+      });
+  });
+};
+
+module.exports = routes;