Working on storing model definitions and adding model tests

Author: diegocard

dist/air.js

@@ -186,6 +186,20 @@ air.each(['post', 'put', 'delete'], function(method){
     };
 });
 
+// JSONP requests
+air.jsonp = function(url, callback) {
+    var callbackName = 'air_jsonp_callback_' + Math.round(100000 * Math.random());
+    window[callbackName] = function(data) {
+        delete window[callbackName];
+        document.body.removeChild(script);
+        callback(data);
+    };
+
+    var script = document.createElement('script');
+    script.src = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'callback=' + callbackName;
+    document.body.appendChild(script);
+};
+
 // Serialize an array of form elements or a set of
 // key/values into a query string
 air.param = function(obj) {
@@ -292,6 +306,7 @@ air.App = function(name, options) {
     this.routes = this.options.routes || [];
     this.controllers = this.options.controllers || {};
     this.views = this.options.views || {};
+    this.modelDefinitions = this.options.models || {};
 };
 
 air.App.prototype.controller = function(name, methods) {
@@ -328,6 +343,15 @@ air.App.prototype.init = function() {
     this.router.init();
 };
 
+air.App.prototype.model = function(name, params) {
+    if (!params) {
+        return new air.Model(name, this.modelDefinitions[name]);
+    } else {
+        /* Store the model definition if needed */
+        this.modelDefinitions[name] = params;
+    }
+};
+
 // Router
 // ------
 air.Router = function(appName, routes) {

dist/air.min.js

@@ -792,7 +792,7 @@ <h2 id="model">Model</h2>
             split = value.split(<span class="hljs-string">' '</span>);
             httpMethod = split[<span class="hljs-number">0</span>];
             url = split[<span class="hljs-number">1</span>];
-            self[property] = <span class="hljs-keyword">this</span>.endpointMethod(httpMethod, url);
+            self[property] = self.endpointMethod(httpMethod, url);
         }
     });
 };</pre></div></div>

docs/air.html

@@ -6,6 +6,7 @@ air.App = function(name, options) {
     this.routes = this.options.routes || [];
     this.controllers = this.options.controllers || {};
     this.views = this.options.views || {};
+    this.modelDefinitions = this.options.models || {};
 };
 
 air.App.prototype.controller = function(name, methods) {
@@ -41,3 +42,12 @@ air.App.prototype.init = function() {
     this.router = new air.Router(this.name, this.routes);
     this.router.init();
 };
+
+air.App.prototype.model = function(name, params) {
+    if (!params) {
+        return new air.Model(name, this.modelDefinitions[name]);
+    } else {
+        /* Store the model definition if needed */
+        this.modelDefinitions[name] = params;
+    }
+};

src/App.js

@@ -146,6 +146,20 @@ air.each(['post', 'put', 'delete'], function(method){
     };
 });
 
+// JSONP requests
+air.jsonp = function(url, callback) {
+    var callbackName = 'air_jsonp_callback_' + Math.round(100000 * Math.random());
+    window[callbackName] = function(data) {
+        delete window[callbackName];
+        document.body.removeChild(script);
+        callback(data);
+    };
+
+    var script = document.createElement('script');
+    script.src = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'callback=' + callbackName;
+    document.body.appendChild(script);
+};
+
 // Serialize an array of form elements or a set of
 // key/values into a query string
 air.param = function(obj) {