Changed to use io.socket._request to support headers

Zeroto · Jul 28, 2014 · 2eb4c1c · 2eb4c1c
1 parent 788ded4
commit 2eb4c1c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/dist/maps/z-sails.min.js.map b/dist/maps/z-sails.min.js.map
diff --git a/dist/z-sails.js b/dist/z-sails.js
@@ -34,7 +34,14 @@
 			}
 			else
 			{
-				$window.io.socket[methodLowercase](url, angular.fromJson(post), function(data, jwr){
+				// build request options
+				var options = {
+					method: methodLowercase,
+					url: url,
+					headers: headers,
+					data: angular.fromJson(post)
+				};
+				$window.io.socket._request(options, function(data, jwr){
 					if (zsails.useFallback && jwr.statusCode != 200)
 					{
 						$httpXHRBackend(method, url, post, callback, headers, timeout, withCredentials, responseType);

diff --git a/dist/z-sails.min.js b/dist/z-sails.min.js
diff --git a/src/z-sails.js b/src/z-sails.js
@@ -34,7 +34,14 @@
 			}
 			else
 			{
-				$window.io.socket[methodLowercase](url, angular.fromJson(post), function(data, jwr){
+				// build request options
+				var options = {
+					method: methodLowercase,
+					url: url,
+					headers: headers,
+					data: angular.fromJson(post)
+				};
+				$window.io.socket._request(options, function(data, jwr){
 					if (zsails.useFallback && jwr.statusCode != 200)
 					{
 						$httpXHRBackend(method, url, post, callback, headers, timeout, withCredentials, responseType);

diff --git a/test/z-sails.js b/test/z-sails.js
@@ -17,10 +17,7 @@ describe("z-sails", function(){
 
 		// set up the mock socket
 		socket = {
-			get: function(_, _, cb){cb(null, {statusCode: 404, headers: null})},
-			post: function(_, _, cb){cb(null, {statusCode: 404, headers: null})},
-			put: function(_, _, cb){cb(null, {statusCode: 404, headers: null})},
-			delete: function(_, _, cb){cb(null, {statusCode: 404, headers: null})},
+			_request: function(_, cb){cb(null, {statusCode: 404, headers: null})},
 		}
 
 		$window.io = {
@@ -40,7 +37,6 @@ describe("z-sails", function(){
 		$http({url: '/template.html', method: 'GET'})
 			.finally(function(){
 				expect($httpXHRBackend).toHaveBeenCalled();
-				expect($httpXHRBackend.calls.count()).toEqual(1);
 				done();
 			});
 
@@ -52,11 +48,10 @@ describe("z-sails", function(){
 		zSails.useFileCheck = true;
 		zSails.useFallback = false;
 
-		spyOn(socket, "get").and.callThrough();
+		spyOn(socket, "_request").and.callThrough();
 
 		$http({url: '/resource', method: 'GET'}).finally(function(){
-			expect(socket.get).toHaveBeenCalled();
-			expect(socket.get.calls.count()).toEqual(1);
+			expect(socket._request).toHaveBeenCalled();
 			done();
 		});
 
@@ -68,10 +63,10 @@ describe("z-sails", function(){
 		zSails.useFileCheck = false;
 		zSails.useFallback = true;
 
-		spyOn(socket, "get").and.callThrough();
+		spyOn(socket, "_request").and.callThrough();
 
 		$http({url: '/template.html', method: 'GET'}).finally(function(){
-			expect(socket.get).toHaveBeenCalled();
+			expect(socket._request).toHaveBeenCalled();
 			expect($httpXHRBackend).toHaveBeenCalled();
 			done();
 		});
@@ -84,10 +79,10 @@ describe("z-sails", function(){
 		zSails.useFileCheck = true;
 		zSails.useFallback = true;
 
-		spyOn(socket, "get").and.callThrough();
+		spyOn(socket, "_request").and.callThrough();
 
 		$http({url: '/resource', method: 'GET'}).finally(function(){
-			expect(socket.get).toHaveBeenCalled();
+			expect(socket._request).toHaveBeenCalled();
 			expect($httpXHRBackend).toHaveBeenCalled();
 			done();
 		});