From 5968e555f5b70c52108a2166930a3aea2154ed02 Mon Sep 17 00:00:00 2001
From: Pablo Vallejo <pabloninety@gmail.com>
Date: Wed, 30 Apr 2014 21:45:09 -0500
Subject: [PATCH] Add 'Post' request method tests.

---
 bower.json           |  2 +-
 gillie.js            |  5 ++-
 gillie.min.js        |  4 +--
 package.json         |  2 +-
 tests/environment.js | 19 ++++++++++
 tests/index.html     |  5 +--
 tests/model-view.js  |  3 +-
 tests/requests.js    | 84 ++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 tests/environment.js
 create mode 100644 tests/requests.js

diff --git a/bower.json b/bower.json
index 0a02242..369ade1 100644
--- a/bower.json
+++ b/bower.json
@@ -9,7 +9,7 @@
   "authors": [
     "Pablo Vallejo <pabloninety@gmail.com>"
   ],
-  "description": "Lightweight JavaScript framework inspired in Backbone",
+  "description": "Lightweight JavaScript MVC framework inspired in Backbone",
   "keywords": [
     "javascript",
     "framework",
diff --git a/gillie.js b/gillie.js
index b0f2350..af7f261 100644
--- a/gillie.js
+++ b/gillie.js
@@ -12,7 +12,7 @@
     var
 
         // Gillie version
-        version = '0.2.0'
+        version = '0.2.1'
 
     ,   initializing = false
     ,   fnTest = /xyz/.test( function(){ xyz; }) ? /\b_super\b/ : /.*/
@@ -307,8 +307,7 @@
                     return optional ? match : modelVar || match;
                 });
 
-                // Use `route` as full URL if its contains
-                // `http:|https:`.
+                // Use `route` as full URL if its contains `http:` or `https:`.
                 return (/^(\/\/|http:|https:).*/.test( route )) ?
                    route : ( this.url ? this.url + route :
                        window.location.href + '/' + route );
diff --git a/gillie.min.js b/gillie.min.js
index 636c3c9..122c749 100644
--- a/gillie.min.js
+++ b/gillie.min.js
@@ -1,5 +1,5 @@
 /*!
-* Gillie JavaScript Library 0.2.0
+* Gillie JavaScript Library 0.2.1
 * http://pablovallejo.github.io/gillie
 */
-!function(a,b){var c=!1,d=/xyz/.test(function(){})?/\b_super\b/:/.*/,e=function(){},f=function(b){return a.each([].slice.call(arguments,1),function(a,c){if(c)for(var d in c)b[d]=c[d]}),b},g=e.Events={on:function(a,b,c){if(!i(this,"on",a,[b,c])||!b)return this;this._events||(this._events={});var d=this._events[a]||(this._events[a]=[]);return d.push({callback:b,context:c,ctx:c||this}),this},trigger:function(a){if(!this._events)return this;var b=[].slice.call(arguments,1);if(!i(this,"trigger",a,b))return this;var c=this._events[a];return c&&j(c,b),this}},h=/\s+/,i=function(a,b,c,d){if(c){if("object"==typeof c){for(var e in c)a[b].apply(a,[e,c[e]].concat(d));return!1}if(h.test(c)){for(var f=c.split(h),g=0,i=f.length;i>g;g++)a[b].apply(a,[f[g]].concat(d));return!1}return!0}},j=function(a,b){var c,d=-1,e=a.length,f=b[0],g=b[1],h=b[2];switch(b.length){case 0:for(;++d<e;)(c=a[d]).callback.call(c.ctx);return;case 1:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f);return;case 2:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f,g);return;case 3:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f,g,h);return;default:for(;++d<e;)(c=a[d]).callback.apply(c.ctx,b)}},k={on:"listenTo"};a.each(k,function(a,b){g[b]=function(b,c,d){var e=this._listeners||(this._listeners={}),f=b._listenerId||(b._listenerId=w("l"));return e[f]=b,"object"==typeof c&&(d=this),b[a](c,d,this),this}});var l=e.Handler=function(){this.initialize&&this.initialize.apply(this,arguments),this.delegateEvents()},m=/^(\S+)\s*(.*)$/;f(l.prototype,g,{bind:function(a,b){return function(){return a.apply(b,arguments)}},delegateEvents:function(b){if(!b&&!(b=this.events))return this;for(var c in b){var d=b[c];if(d=this[b[c]]){var e=c.match(m),f=e[1],g=e[2],h=this.el||document;d=this.bind(d,this),""===g?a(h).on(f,d):a(h).on(f,g,d)}}return this}});var n=e.Model=function(b){var c,d=b||{};this.cid=w("c"),this.attributes={},(c=this.defaults)&&(d=a.extend({},c,d)),this.attributes=d,this.initialize&&this.initialize()},o=/(\(\?)?:\w+/g;f(n.prototype,g,{set:function(a,b,c){var d,e,f,g;if(null==a)return this;"object"==typeof a?(e=a,c=b):(e={})[a]=b,c||(c={}),g=c.unset,f=this.attributes;for(d in e)b=e[d],g?delete f[d]:f[d]=b;return this},get:function(a){return this.attributes[a]},unset:function(a,b){return this.set(a,void 0,f({},b,{unset:!0}))},toJSON:function(){return a.extend({},this.attributes)},buildRequestUrl:function(a){var c,d,a,e=this;return a=a.replace(o,function(a,b){return c=a.replace(":",""),d=e.get(c),b?a:d||a}),/^(\/\/|http:|https:).*/.test(a)?a:this.url?this.url+a:b.location.href+"/"+a},sync:function(){return e.sync.apply(this,arguments)}});var p=[["Get","read"],["Post","create"],["Put","update"],["Delete","delete"],["Patch","patch"]],q={};a.each(p,function(a,b){q[b[0]]=function(a,c,d){d=d?d:{};var e,f=this,g=d.success;return d.success=function(a){g&&g(f,a,d),f.trigger(c,f,a,d)},d.url=this.buildRequestUrl(a),e=this.sync(b[1],this,d)}}),f(n.prototype,q);var r=e.View=function(){this.initialize&&this.initialize()};f(r.prototype,g),e.sync=function(b,c,d){var f=t[b],g={type:f,dataType:"json"};d.url||(g.url=c.url),null!=d.data||!c||"create"!==b&&"update"!==b&&"patch"!==b||(g.contentType="application/json",g.data=JSON.stringify(d.attrs||c.toJSON())),"GET"!==g.type&&(g.processData=!1),"PATCH"===g.type&&s&&(g.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")});var h=d.xhr=e.ajax(a.extend(g,d));return c.trigger("request",c,h,d),h};var s=!("undefined"==typeof b||!b.ActiveXObject||b.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent),t={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return a.ajax.apply(a,arguments)};var u=function(a){function b(){c||f.apply(this,arguments)}var e=this.prototype,f=this;c=!0;var g=new this;c=!1;for(var h in a)g[h]="function"==typeof a[h]&&"function"==typeof e[h]&&d.test(a[h])?function(a,b){return function(){var c=this._super;this._super=e[a];var d=b.apply(this,arguments);return this._super=c,d}}(h,a[h]):a[h];return b.prototype=g,b.prototype.constructor=b,b.extend=arguments.callee,b},v=0,w=function(a){var b=++v+"";return a?a+b:b};e.Handler.extend=e.Model.extend=e.View.extend=u,b.Gillie=e}(jQuery,this);
\ No newline at end of file
+!function(a,b){var c=!1,d=/xyz/.test(function(){})?/\b_super\b/:/.*/,e=function(){},f=function(b){return a.each([].slice.call(arguments,1),function(a,c){if(c)for(var d in c)b[d]=c[d]}),b},g=e.Events={on:function(a,b,c){if(!i(this,"on",a,[b,c])||!b)return this;this._events||(this._events={});var d=this._events[a]||(this._events[a]=[]);return d.push({callback:b,context:c,ctx:c||this}),this},trigger:function(a){if(!this._events)return this;var b=[].slice.call(arguments,1);if(!i(this,"trigger",a,b))return this;var c=this._events[a];return c&&j(c,b),this}},h=/\s+/,i=function(a,b,c,d){if(c){if("object"==typeof c){for(var e in c)a[b].apply(a,[e,c[e]].concat(d));return!1}if(h.test(c)){for(var f=c.split(h),g=0,i=f.length;i>g;g++)a[b].apply(a,[f[g]].concat(d));return!1}return!0}},j=function(a,b){var c,d=-1,e=a.length,f=b[0],g=b[1],h=b[2];switch(b.length){case 0:for(;++d<e;)(c=a[d]).callback.call(c.ctx);return;case 1:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f);return;case 2:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f,g);return;case 3:for(;++d<e;)(c=a[d]).callback.call(c.ctx,f,g,h);return;default:for(;++d<e;)(c=a[d]).callback.apply(c.ctx,b)}},k={on:"listenTo"};a.each(k,function(a,b){g[b]=function(b,c,d){var e=this._listeners||(this._listeners={}),f=b._listenerId||(b._listenerId=w("l"));return e[f]=b,"object"==typeof c&&(d=this),b[a](c,d,this),this}});var l=e.Handler=function(){this.initialize&&this.initialize.apply(this,arguments),this.delegateEvents()},m=/^(\S+)\s*(.*)$/;f(l.prototype,g,{bind:function(a,b){return function(){return a.apply(b,arguments)}},delegateEvents:function(b){if(!b&&!(b=this.events))return this;for(var c in b){var d=b[c];if(d=this[b[c]]){var e=c.match(m),f=e[1],g=e[2],h=this.el||document;d=this.bind(d,this),""===g?a(h).on(f,d):a(h).on(f,g,d)}}return this}});var n=e.Model=function(b){var c,d=b||{};this.cid=w("c"),this.attributes={},(c=this.defaults)&&(d=a.extend({},c,d)),this.attributes=d,this.initialize&&this.initialize()},o=/(\(\?)?:\w+/g;f(n.prototype,g,{set:function(a,b,c){var d,e,f,g;if(null==a)return this;"object"==typeof a?(e=a,c=b):(e={})[a]=b,c||(c={}),g=c.unset,f=this.attributes;for(d in e)b=e[d],g?delete f[d]:f[d]=b;return this},get:function(a){return this.attributes[a]},unset:function(a,b){return this.set(a,void 0,f({},b,{unset:!0}))},toJSON:function(){return a.extend({},this.attributes)},buildRequestUrl:function(a){var c,d,a,e=this;return a=a.replace(o,function(a,b){return c=a.replace(":",""),d=e.get(c),b?a:d||a}),/^(\/\/|http:|https:).*/.test(a)?a:this.url?this.url+a:b.location.href+"/"+a},sync:function(){return e.sync.apply(this,arguments)}});var p=[["Get","read"],["Post","create"],["Put","update"],["Delete","delete"],["Patch","patch"]],q={};a.each(p,function(a,b){q[b[0]]=function(a,c,d){d=d?d:{};var e,f=this,g=d.success;return d.success=function(a){g&&g(f,a,d),f.trigger(c,f,a,d)},d.url=this.buildRequestUrl(a),e=this.sync(b[1],this,d)}}),f(n.prototype,q);var r=e.View=function(){this.initialize&&this.initialize()};f(r.prototype,g),e.sync=function(b,c,d){var f=t[b],g={type:f,dataType:"json"};d.url||(g.url=c.url),null!=d.data||!c||"create"!==b&&"update"!==b&&"patch"!==b||(g.contentType="application/json",g.data=JSON.stringify(d.attrs||c.toJSON())),"GET"!==g.type&&(g.processData=!1),"PATCH"===g.type&&s&&(g.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")});var h=d.xhr=e.ajax(a.extend(g,d));return c.trigger("request",c,h,d),h};var s=!("undefined"==typeof b||!b.ActiveXObject||b.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent),t={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return a.ajax.apply(a,arguments)};var u=function(a){function b(){c||f.apply(this,arguments)}var e=this.prototype,f=this;c=!0;var g=new this;c=!1;for(var h in a)g[h]="function"==typeof a[h]&&"function"==typeof e[h]&&d.test(a[h])?function(a,b){return function(){var c=this._super;this._super=e[a];var d=b.apply(this,arguments);return this._super=c,d}}(h,a[h]):a[h];return b.prototype=g,b.prototype.constructor=b,b.extend=arguments.callee,b},v=0,w=function(a){var b=++v+"";return a?a+b:b};e.Handler.extend=e.Model.extend=e.View.extend=u,b.Gillie=e}(jQuery,this);
diff --git a/package.json b/package.json
index d0d5079..bf4b069 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gillie",
   "title": "Gillie",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "JavaScript MVC Microframework",
   "homepage": "http://pablovallejo.github.io/gillie",
   "directories": {
diff --git a/tests/environment.js b/tests/environment.js
new file mode 100644
index 0000000..df32adb
--- /dev/null
+++ b/tests/environment.js
@@ -0,0 +1,19 @@
+/**
+ * Test environment setup
+ */
+(function() {
+
+	// Setup config variables on test start
+	QUnit.testStart(function() {
+
+		var env = this.config.current.testEnvironment;
+
+		// Capture Gillie.ajax arguments for comparison.
+		// Adapted from https://github.com/jashkenas/backbone/blob/master/test/environment.js#L23
+		Gillie.ajax = function( settings ) {
+			env.ajaxSettings = settings;
+		}
+
+	});
+
+})();
diff --git a/tests/index.html b/tests/index.html
index 7be7da3..0582837 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -8,10 +8,11 @@
         <script src="vendor/qunit.js"></script>
         <script src="vendor/utilities.js"></script>
         <script src="../gillie.js"></script>
+        <script src="environment.js"></script>
         <script src="events.js"></script>
         <script src="handler.js"></script>
-        <script src="model-view-controller.js"></script>
         <script src="inheritance.js"></script>
+        <script src="requests.js"></script>
     </head>
     <body>
 
@@ -22,4 +23,4 @@
 
         </div>
     </div>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/model-view.js b/tests/model-view.js
index 5fbc745..12b1993 100644
--- a/tests/model-view.js
+++ b/tests/model-view.js
@@ -1,5 +1,5 @@
 /**
-* General Gillie tests
+* Tests for model and view
 */
 
 $( document ).ready( function() {
@@ -101,7 +101,6 @@ $( document ).ready( function() {
     });
 
 
-
     test( 'Set and unset', 4, function() {
 
         var m = new Gillie.Model({ id: 'id', foo: 1, bar: 2, baz: 3 });
diff --git a/tests/requests.js b/tests/requests.js
new file mode 100644
index 0000000..e0eaf7f
--- /dev/null
+++ b/tests/requests.js
@@ -0,0 +1,84 @@
+/**
+ * Request Tests
+ */
+
+$(document).ready(function(){
+
+	// Model
+	var person;
+	Person = Gillie.Model.extend({
+
+		// Base URL
+		url: 'http://myapi.io'
+	});
+
+	// Requests
+	//----------------
+	module('Gillie requests', {
+
+		setup: function() {
+
+			// Create a new person
+			person = new Person({
+				name: 'Fonzie',
+				age: 40
+			});
+		}
+	});
+
+	// Test Model.Post method
+	test( 'Model.Post', function() {
+
+		// Save user
+		person.Post( '/person' );
+
+		// Get data
+		var data = JSON.parse( this.ajaxSettings.data );
+
+		// Test equality
+		equal( this.ajaxSettings.type, 'POST' );
+		equal( this.ajaxSettings.dataType, 'json' );
+		equal( this.ajaxSettings.url, 'http://myapi.io/person' );
+		equal( data.name, person.get( 'name' ) );
+		equal( data.age, person.get( 'age' ) );
+
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL http', function() {
+
+		// Save user
+		person.Post( 'http://otherapi.io/person' );
+
+		// Get data
+		var data = JSON.parse( this.ajaxSettings.data );
+
+		// Test equality
+		equal( this.ajaxSettings.type, 'POST' );
+		equal( this.ajaxSettings.dataType, 'json' );
+		equal( this.ajaxSettings.url, 'http://otherapi.io/person' );
+		equal( data.name, person.get( 'name' ) );
+		equal( data.age, person.get( 'age' ) );
+
+		console.log( this.ajaxSettings );
+
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL https', function() {
+
+		// Save user
+		person.Post( 'https://otherapi.io/person' );
+		equal( this.ajaxSettings.url, 'https://otherapi.io/person' );
+	});
+
+	// Test Model.Post passing a complete URL
+	test( 'Model.Post full URL not https or http', function() {
+
+		// Save user
+		person.Post( 'ttps://otherapi.io/person' );
+		equal( this.ajaxSettings.url, 'http://myapi.iottps://otherapi.io/person' );
+
+	});
+
+});