Merge pull request #16 from CleverStack/hotfix/generate-1-0-x

Update generate templates for node-seed 1.0.x

Author: pilsy

templates/backend/controllers/templateController.js

@@ -1,38 +1,11 @@
-/**
- * @doc module
- * @name exampleModule
- * @description
- * This is an example description generated by CleverStack
- */
-
-/**
- * @doc module
- * @name exampleModule.controllers:{{Template}}Controller
- * @description
- * Sets up a controller within CleverStack
- */
-module.exports = function( {{Template}}Service ) {
-    return (require('classes').Controller).extend(
+module.exports = function( Controller, {{Template}}Service ) {
+    return Controller.extend(
+    /** @Class **/
     {
         service: {{Template}}Service
     },
+    /** @Prototype **/
     {
 
-        /**
-         * 'GET/PUT/POST/DELETE /{{_template_}}/custom'
-         */
-        customAction: function() {
-            this.send({
-                message: "Hello from customAction inside {{Template}}Controller"
-            });
-        },
-
-        /**
-         * This function can never be called because it does not have 'Action' on the end of it
-         */
-        hidden: function() {
-            console.log('Hidden function called, this should be impossible');
-            process.exit();
-        }
     });
 }

templates/backend/models/odm/templateModel.js

@@ -0,0 +1,16 @@
+module.exports = function ( Model ) {
+    return Model.extend( "{{Template}}",
+    {
+        type: 'ORM',
+        softDeletable: true,
+        timeStampable: true
+    },
+    {
+        id: {
+            type: Number,
+            primaryKey: true,
+            autoIncrement: true
+        },
+        name: String
+    });
+};

templates/backend/models/orm/templateModel.js

@@ -1,16 +1,5 @@
-var Q = require('q')
-  , BaseService = require( 'services' ).BaseService
-  , {{Template}}Service;
-
-{{Template}}Service = BaseService.extend({
-
-});
-
-module.exports = function( sequelize, ORM{{Template}}Model ) {
-    if ( !{{Template}}Service.instance ) {
-        {{Template}}Service.instance = new {{Template}}Service( sequelize );
-        {{Template}}Service.Model = ORM{{Template}}Model;
-    }
-
-    return {{Template}}Service.instance;
-};
+module.exports = function( Service, {{Template}}Model ) {
+    return Service.extend({
+        model: {{Template}}Model
+    });
+}

templates/backend/models/templateModel.js

@@ -84,20 +84,4 @@ describe ( '/{{_template_}}', function () {
                 } );
         } );
     } );
-
-    describe ( 'GET /{{_template_}}/custom', function () {
-        it ( 'should return valid status', function ( done ) {
-            request ( app )
-                .get ( '/{{_template_}}/custom' )
-                .expect ( 'Content-Type', /json/ )
-                .expect ( 200 )
-                .end ( function ( err, res ) {
-                    if ( err ) return done ( err );
-                    expect ( res.body ).to.eql ( {
-                        message: 'Hello from customAction inside {{Template}}Controller'
-                    } );
-                    done ();
-                } );
-        } );
-    } );
 });

templates/backend/services/templateService.js

@@ -98,17 +98,4 @@ describe ( 'controllers.{{Template}}Controller', function () {
             ctrl.deleteAction();
         } );
     } );
-
-    describe ( '.customAction()', function () {
-        it ( 'should call .send() with valid arguments', function ( done ) {
-            ctrl.send = function ( data ) {
-                expect( data ).to.eql ( {
-                    message: 'Hello from customAction inside {{Template}}Controller'
-                } );
-
-                done ();
-            };
-            ctrl.customAction();
-        } );
-    } );
 });

templates/backend/tests/integration/templateTest.js

@@ -27,9 +27,8 @@ describe( 'Generate backend seed (controllers)', function ( ) {
       expect( fs.existsSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'controllers', 'Testing2Controller.js' ) ) ).to.be.true;
 
       var controller = fs.readFileSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'controllers', 'Testing2Controller.js' ) );
-      expect( controller ).to.match( /module\.exports = function\( Testing2Service \) \{/ );
+      expect( controller ).to.match( /module\.exports = function\( Controller, Testing2Service \) \{/ );
       expect( controller ).to.match( /service: Testing2Service/ );
-      expect( controller ).to.match( /message: "Hello from customAction inside Testing2Controller"/ );
 
       done( err );
     } );

templates/backend/tests/unit/templateTest.js

@@ -24,14 +24,10 @@ describe( 'Generate backend seed (models)', function ( ) {
       expect( stdout ).to.not.match( /already exists within/ );
 
       expect( fs.readdirSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2') ).length ).to.equal( 1 );
-      expect( fs.existsSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'odm', 'Testing2Model.js' ) ) ).to.be.true;
-      expect( fs.existsSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'odm', 'Testing2Model.js' ) ) ).to.be.true;
+      expect( fs.existsSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'Testing2Model.js' ) ) ).to.be.true;
 
-      var odmModel = fs.readFileSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'odm', 'Testing2Model.js' ) );
-      expect( odmModel ).to.match( /return mongoose\.model\('Testing2', ModelSchema\);/ );
-
-      var ormModel = fs.readFileSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'orm', 'Testing2Model.js' ) );
-      expect( ormModel ).to.match( /return sequelize.define\("Testing2", \{/ );
+      var model = fs.readFileSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'models', 'Testing2Model.js' ) );
+      expect( model ).to.match( /return Model\.extend\( "Testing2",/ );
 
       done( err );
     } );

tests/generate/backend/controllers.test.js

@@ -27,10 +27,9 @@ describe( 'Generate backend seed (services)', function ( ) {
       expect( fs.existsSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'services', 'Testing2Service.js' ) ) ).to.be.true;
 
       var service = fs.readFileSync( path.join( assetPath, 'my-new-project', 'backend', 'modules', 'Testing2', 'services', 'Testing2Service.js' ) );
-      expect( service ).to.match( /Testing2Service = BaseService.extend\(\{/ );
-      expect( service ).to.match( /Testing2Service\.instance = new Testing2Service\( sequelize \);/ );
-      expect( service ).to.match( /Testing2Service\.Model = ORMTesting2Model;/ );
-      expect( service ).to.match( /return Testing2Service\.instance;/ );
+      expect( service ).to.match( /module\.exports = function\( Service, Testing2Model \) \{/ );
+      expect( service ).to.match( /return Service\.extend\(\{/ );
+      expect( service ).to.match( /model\: Testing2Model/ );
 
       done( err );
     } );