From c2fa914df5334a232c5c03019ecb6ccf7a9a93fb Mon Sep 17 00:00:00 2001
From: Alan Reid <mail@alanreid.com.ar>
Date: Sun, 17 Mar 2013 21:27:37 -0300
Subject: [PATCH] Changed the way controllers access models.

---
 webservice/app.js                   |  5 -----
 webservice/controllers/ideaTypes.js | 13 ++++---------
 webservice/controllers/users.js     | 14 +++++---------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/webservice/app.js b/webservice/app.js
index 2466324..1fc4bbd 100644
--- a/webservice/app.js
+++ b/webservice/app.js
@@ -10,11 +10,6 @@ var server = restify.createServer({
   version: '0.2.0'
 });
 
-// Inject models to each controller
-for(var key in controllers) {
-  controllers[key].models = models;
-}
-
 // Setup Restify server
 require('./conf/restify.js')(restify, server);
 
diff --git a/webservice/controllers/ideaTypes.js b/webservice/controllers/ideaTypes.js
index cc158be..d52b211 100644
--- a/webservice/controllers/ideaTypes.js
+++ b/webservice/controllers/ideaTypes.js
@@ -1,9 +1,9 @@
 
-var IdeaTypesController = {
+var IdeaType = require('../db.js').models.IdeaType;
 
-  list: function(req, res, next) {
+module.exports = {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
+  list: function(req, res, next) {
 
     IdeaType.findAll().success(function(ideaTypes) {
       res.send(ideaTypes);
@@ -13,17 +13,14 @@ var IdeaTypesController = {
 
   count: function(req, res, next) {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
-
     IdeaType.count().success(function(count) {
       res.send(count.toString());
     });
+
   },
 
   show: function(req, res, next) {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
-
     IdeaType.find(parseInt(req.params.id, 10)).success(function(ideaType) {
       res.send(ideaType);
     });
@@ -31,5 +28,3 @@ var IdeaTypesController = {
   }
 
 };
-
-module.exports = IdeaTypesController;
diff --git a/webservice/controllers/users.js b/webservice/controllers/users.js
index e302e19..e2053a7 100644
--- a/webservice/controllers/users.js
+++ b/webservice/controllers/users.js
@@ -1,34 +1,30 @@
 
+var User = require('../db.js').models.User;
 
-var UsersController = {
+module.exports = {
 
   list: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.findAll().success(function(users) {
       res.send(users);
     });
+
   },
 
   count: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.count().success(function(count) {
       res.send(count.toString());
     });
+
   },
 
   show: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.find(parseInt(req.params.id, 10)).success(function(user) {
       res.send(user);
     });
+
   }
 
 };
-
-module.exports = UsersController;