Merge pull request #10 from designfrontier/baldwin

Enforces Number type on xhr.status

Author: designfrontier

Gulpfile.js

@@ -74,15 +74,15 @@ gulp.task('publish', ['generateForPublish'], function(){
 });
 
 gulp.task('test', function (done) {
-  gulp.src(['public/javascripts/action*.js'])
+  gulp.src(['public/javascripts/action*.js', 'src/cjs/*_test.js'])
         .pipe(karma({
             configFile: 'karma.conf.js'
             , action: 'run'
         }));
 });
 
 gulp.task('develop', function (done) {
-  gulp.src(['public/javascripts/action*.js'])
+  gulp.src(['public/javascripts/action*.js', 'src/cjs/*_test.js'])
         .pipe(karma({
             configFile: 'karma.conf.js'
             , action: 'watch'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Action",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "homepage": "https://github.com/designfrontier/Action",
   "authors": [
     "Daniel Sellers <[email protected]>"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "action",
-  "version": "0.6.1",
-  "releaseName": "Antonio Banderas",
+  "version": "0.7.0",
+  "releaseName": "Adam Baldwin",
   "private": true,
   "scripts": {
     "start": "node app.js",

public/javascripts/action.js

@@ -1,5 +1,3 @@
-//TODO routing and pushstate
-//  view rendering on routing events
 (function(){
     'use strict';
 
@@ -296,10 +294,10 @@
                 };
             }
 
-            returnObject.listen('system:trace', function(emitterIDIn){
+            returnObject.listen('system:trace', function(emitterIdIn){
                 var that = this;
 
-                if(that.emitterId === emitterIDIn){
+                if(that.emitterId === emitterIdIn){
                     that.emit('system:addTraced', that);
                 }
             }, returnObject);
@@ -550,38 +548,91 @@
 
         , viewMe : function(objectIn){
             var that = this
-                , newView = that.eventMe(objectIn);
+                , _stateReady = (typeof objectIn.stateReady === 'function')
+                , newView = that.modelMe(objectIn)
+                , children = {};
 
             if(typeof newView.render === 'undefined'){
-                throw 'render is required for a view';
+                that.emit('global:error', new action.Error('required param', 'render() is required for a view', that));
+                return;
             }
 
-            newView.stateReady = function(){
-                newView.render.apply(newView);
+            if(typeof newView.templateId === 'undefined'){
+                that.emit('global:error', new action.Error('required param', 'templateId is required for a view', that));
+                return;
+            }
+
+            if(typeof newView.dataId === 'undefined'){
+                that.emit('global:error', new action.Error('required param', 'dataId is required for a view', that));
+                return;
+            }
+
+            if(typeof newView.viewId === 'undefined'){
+                that.emit('global:error', new action.Error('required param', 'viewId is required for a view', that));
+                return;
+            }
+
+            if(_stateReady){
+                newView.super.stateReady = function(){
+                    newView.render.apply(newView);
+                };
+            } else {
+                newView.stateReady = function(){
+                    newView.render.apply(newView);
+                };
+            }
+
+            newView.super.render = newView.render;
+
+            //TODO: maybe render is no longer required. It defaults to executing the template on the
+            //  data and targeting the element. Instead the template, data and target (or a target elem) 
+            //  events are required.
+
+            newView.render = function(){
+                newView.super.render.apply(newView);
+                newView.emit('rendered:' + newView.viewId);
+
+                Object.getOwnPropertyNames(children).forEach(function (childEvent) {
+                    newView.emit(childEvent, children[childEvent]);
+                });
             };
 
             //require event for the data
-            newView.requiredEvent('data:set:' + newView.dataID, function(dataIn){
-                this.viewData = dataIn;
-            }, newView);
+            newView.requiredEvent('data:set:' + newView.dataId, function(dataIn){
+                this.set(dataIn);
+            }, newView, true);
 
             //required event for the template
-            newView.requiredEvent('template:set:' + newView.templateID, function(templateIn){
+            newView.requiredEvent('template:set:' + newView.templateId, function(templateIn){
                 this.template = templateIn;
-            }, newView);
+            }, newView, true);
+
+            if(typeof newView.targetId !== 'undefined'){
+                newView.requiredEvent('target:set:' + newView.targetId, function(elementIn){
+                    this.element = elementIn;
+                });
+            }
 
             if(typeof newView.destroy === 'undefined'){
                 newView.destroy = function(){
                     //TODO: write this out/figure it out
                 };
             }
+            
+            newView.registerChild = function(eventIn, selectorIn){
+                children[eventIn] = selectorIn;
+            };
+
+            newView.listChildren = function(){
+                return children;
+            };
 
-            newView.listen('state:change', function(stateID){
+            newView.listen('state:change', function(stateId){
                 var that = this;
 
-                if(stateID === that.stateEvent || stateID.replace('/', '') === that.stateEvent){
-                    that.emit('template:get', that.templateID);
-                    that.emit('data:get:' + that.dataID);
+                if(stateId === that.stateEvent || stateId.replace('/', '') === that.stateEvent){
+                    that.emit('template:get', that.templateId);
+                    that.emit('data:get:' + that.dataId);
                 }
             }, newView);
 
@@ -694,8 +745,8 @@
     action = action.eventMe(action);
 
     //this is the template manager event system
-    action.listen('template:get', function(templateID){
-        action.emit('template:set:' + templateID, action.templates[templateID]);
+    action.listen('template:get', function(templateId){
+        action.emit('template:set:' + templateId, action.templates[templateId]);
     });
 
     action.listen('system:addTraced', function(objIn){