Merge pull request #80 from CleverStack/feature/modules-in-injector

New FCC Models, Service, Controller, Module and Class layers
CleverStack · Jun 7, 2014 · 822e6d6 · 822e6d6
2 parents f254812 + f3cbc5a
commit 822e6d6
Show file tree

Hide file tree

Showing 13 changed files with 930 additions and 337 deletions.
diff --git a/index.js b/index.js
@@ -17,6 +17,14 @@ env.app.configure(function() {
     env.app.use( cors( env.config.cors ) );
 });
 
+// Add some classes for simplicity
+var classes = require( 'classes' );
+injector.instance( 'Class', classes.Class );
+injector.instance( 'Model', classes.Model );
+injector.instance( 'Service', classes.Service );
+injector.instance( 'Controller', classes.Controller );
+injector.instance( 'Module', classes.Module );
+
 // Load all the modules
 env.moduleLoader.loadModules();
 

diff --git a/lib/classes/Class.js b/lib/classes/Class.js
@@ -0,0 +1,5 @@
+var Class = require( 'uberclass' )
+  , EventEmitter = require( 'events' ).EventEmitter
+  , uberUtil = require( 'utils' ).uberUtil;
+
+module.exports = Class.extend( uberUtil.inherits( {}, EventEmitter ) );
diff --git a/lib/classes/Controller.js b/lib/classes/Controller.js
@@ -1,4 +1,4 @@
-var Controller = require('clever-controller');
+var Controller = require( 'clever-controller' );
 
 module.exports = Controller.extend(
 /* @Static */
@@ -9,54 +9,59 @@ module.exports = Controller.extend(
 {
     listAction: function() {
         if ( this.Class.service !== null ) {
-            var query = this.req.query;
-            var options = {};
-            if ( Object.keys( query ).length ) {
-                options.where = query;
-            }
-            this.Class.service.find( options )
-                .then( this.proxy( 'send' ) )
-                .fail( this.proxy( 'handleException' ) );
+            this.Class
+                .service
+                .findAll( this.req.query )
+                .then( this.proxy( 'handleServiceMessage' ) )
+                .catch( this.proxy( 'handleException' ) );
         } else {
             this.next();
         }
     },
 
     getAction: function() {
         if ( this.Class.service !== null ) {
-            this.Class.service.findById( this.req.params.id )
-                .then( this.proxy( 'send' ) )
-                .fail( this.proxy( 'handleException' ) );
+            this.Class
+                .service
+                .findById( this.req.params.id )
+                .then( this.proxy( 'handleServiceMessage' ) )
+                .catch( this.proxy( 'handleException' ) );
         } else {
             this.next();
         }
     },
 
     postAction: function() {
         if ( this.Class.service !== null ) {
-            this.Class.service.create( this.req.body )
-                .then( this.proxy( 'send' ) )
-                .fail( this.proxy( 'handleException' ) );
+            this.Class
+                .service
+                .create( this.req.body )
+                .then( this.proxy( 'handleServiceMessage' ) )
+                .catch( this.proxy( 'handleException' ) );
         } else {
             this.next();
         }
     },
 
     putAction: function() {
         if ( this.Class.service !== null ) {
-            this.Class.service.update( this.req.params.id, this.req.body )
-                .then( this.proxy( 'send' ) )
-                .fail( this.proxy( 'handleException' ) );
+            this.Class
+                .service
+                .update( this.req.params.id, this.req.body )
+                .then( this.proxy( 'handleServiceMessage' ) )
+                .catch( this.proxy( 'handleException' ) );
         } else {
             this.next();
         }
     },
 
     deleteAction: function() {
         if ( this.Class.service !== null ) {
-            this.Class.service.destroy( this.req.params.id )
-                .then( this.proxy( 'send' ) )
-                .fail( this.proxy( 'handleException' ) );
+            this.Class
+                .service
+                .destroy( this.req.params.id )
+                .then( this.proxy( 'handleServiceMessage' ) )
+                .catch( this.proxy( 'handleException' ) );
         } else {
             this.next();
         }