added search engine

impronunciable · impronunciable · commit 9351e9b0fa8a · 2012-07-20T11:43:01.000-03:00
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "passport": "0.1.x",
     "passport-twitter": "0.1.x",
     "redis": "0.7.x",
-    "connect-redis": "1.4.x"
+    "connect-redis": "1.4.x",
+    "reds": "0.1.x"
   }
 }
diff --git a/public/styles/main.css b/public/styles/main.css
@@ -10,5 +10,5 @@
 
 .projects { margin-top: 20px; }
 
-.project{}
-
+.form-search { margin-top: -15px }
+  .form-search button { margin-left: 20px; }
diff --git a/routes/index.js b/routes/index.js
@@ -1,8 +1,11 @@
 
 var app = module.parent.exports.app
   , passport = require('passport')
+  , reds = require('reds')
   , client = module.parent.exports.client;
 
+var search = reds.createSearch('hhba:search');
+
 var isAuth = function(req, res, next){
   if(req.isAuthenticated()) next();
   else res.redirect('/');
@@ -27,9 +30,7 @@ app.get('/', function(req, res){
 app.get('/dashboard', isAuth, function(req, res){
   client.keys('hhba:projects:*', function(err, keys){
     client.mget(keys, function(err, projects){
-
       projects = projects || [];      
-
       projects = projects.map(function(project){
         return JSON.parse(project);
       });
@@ -50,14 +51,17 @@ app.get('/projects/join/:id', function(req, res){
       } else {
         project.contributors.push(req.user.username);
         client.set('hhba:projects:' + req.params.id, JSON.stringify(project), function(){
+          search.remove(req.params.id, function(){
+            search.index(project.title + ' ' + project.description + ' ' + project.contributors.join(' ')
+            , req.params.id);
+          });
           res.end('1');
         });
       }  
     });
   } 
 });
 
-
 app.get('/projects/leave/:id', function(req, res){
   if(!req.isAuthenticated()){
     res.end('0');
@@ -68,6 +72,10 @@ app.get('/projects/leave/:id', function(req, res){
         project.contributors.splice(project.contributors.indexOf(req.user.username), 1);
         client.set('hhba:projects:' + req.params.id, JSON.stringify(project), function(){
           res.end('2');
+          search.remove(req.params.id, function(){
+            search.index(project.title + ' ' + project.description + ' ' + project.contributors.join(' ')
+            , req.params.id);
+          });
         });
       } else {
         res.end('2');
@@ -90,11 +98,13 @@ app.post('/projects/new', isAuth, function(req, res){
     };
 
     client.set('hhba:projects:' + hash, JSON.stringify(project), function(){
-      res.redirect('back');
+      search.index(project.title + ' ' + project.description + ' ' + project.contributors.join(' ')
+      , hash);
+      res.redirect('/dashboard');
     });
 
   } else {
-    res.redirect('back');
+    res.redirect('/dashboard');
   }
 });
 
@@ -114,7 +124,11 @@ app.post('/projects/edit/:id', isAuth, isOwner, function(req, res){
       project.description = req.body.description;
 
       client.set('hhba:projects:' + req.params.id, JSON.stringify(project), function(){
-        res.redirect('back');
+        search.remove(req.params.id, function(){
+          search.index(project.title + ' ' + project.description + ' ' + project.contributors.join(' ')
+          , req.params.id);
+        });
+        res.redirect('/dashboard');
       });
     });
   } else {
@@ -124,7 +138,24 @@ app.post('/projects/edit/:id', isAuth, isOwner, function(req, res){
 
 app.get('/projects/remove/:id', isAuth, isOwner, function(req, res){
   client.del('hhba:projects:' + req.params.id, function(err){
-    res.redirect('back');
+    res.redirect('/dashboard');
+    search.remove(req.params.id);
+  });
+});
+
+app.get('/search', isAuth, function(req, res){
+  search
+  .query(req.query.q)
+  .end(function(err, ids){
+    ids = ids.map(function(id){ return 'hhba:projects:' + id; });
+    client.mget(ids, function(err, projects){
+      console.log(projects);
+      projects = projects || [];
+      projects = projects.map(function(project){
+        return JSON.parse(project);
+      });
+      res.render('dashboard', {projects: projects, user: req.user});
+    });
   });
 });
 
diff --git a/views/dashboard.jade b/views/dashboard.jade
@@ -6,7 +6,12 @@ block content
     .span4
       h1 Projects
 
-    .span2.offset6
+    .span4
+      form.well.form-search(action="/search", method="get")
+        input.input-medium.search-query(type="text", name="q")
+        button.btn(type="submit") Search
+
+    .span2.offset2
       a.newProject.btn.btn-primary(href="#newProject", data-toggle="modal") New project
 
   .row.projects

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`"passport": "0.1.x",`
`12`	`12`	`"passport-twitter": "0.1.x",`
`13`	`13`	`"redis": "0.7.x",`
`14`		`- "connect-redis": "1.4.x"`
	`14`	`+ "connect-redis": "1.4.x",`
	`15`	`+ "reds": "0.1.x"`
`15`	`16`	`}`
`16`	`17`	`}`