Merge branch 'release/1.0.0'

Author: Denis Rechkunov

README.md

@@ -2,14 +2,17 @@
 [![NPM](https://nodei.co/npm/catberry-uhr.png)](https://nodei.co/npm/catberry-uhr/)
 
 ##Description
-Catberry's modules run both at server and browser and it is very useful to have universal http(s) request implementation.
+Catberry's modules run both at server and in browser and it is very useful to 
+have universal http(s) request implementation.
 
-It has one interface and different implementations on server and browser.
+It has one interface and different implementations at server and in browser.
 
-At server it uses node's "http.request" or "https.request" (depend on specified protocol in URL).
-At browser it uses jQuery AJAX implementation.
+At server it uses node's "http.request" or "https.request" 
+(depend on specified protocol in URL).
+At browser it uses native XmlHttpRequest.
 
-This module was developed using [HTTP/1.1v2 RFC 2616](http://www.w3.org/Protocols/rfc2616).
+This module was developed using [HTTP/1.1v2 RFC 2616]
+(http://www.w3.org/Protocols/rfc2616).
 
 It supports:
 
@@ -72,6 +75,7 @@ Options support:
 
 ```javascript
 {
+	method: 'GET',
 	timeout: 30000,
 	headers: {
 		Cookie: 'name=value'
@@ -88,7 +92,7 @@ In callback you always receive:
 
 * Error (if it has happened)
 * Status object with HTTP status code, status text and response headers
-* Response body as plain text
+* Response body as plain text or object (depends on Content-Type in response headers)
 
 Status object looks like this:
 
@@ -106,38 +110,10 @@ Status object looks like this:
 ```
 
 ##Usage
-To use this module you must register its components into catberry's [Service Locator](https://github.com/pragmadash/catberry-locator) like this:
+If you are using [Catberry Framework](https://github.com/pragmadash/catberry)
+it is already included and registered in Service Locator.
 
-In server.js
-
-```javascript
-var uhr = require('catberry-uhr'),
-	catberry = require('catberry'),
-	config = require('./config-server'),
-	app = connect();
-	cat = catberry.create(config);
-
-// register UHR components
-uhr.registerOnServer(cat.locator);
-
-app.use(cat.getMiddleware());
-...
-```
-
-In client.js
-
-```javascript
-var uhr = require('catberry-uhr'),
-	catberry = require('catberry'),
-	config = require('./config-client'),
-	cat = catberry.create(config);
-
-// register localization components in locator
-uhr.registerOnClient(cat.locator);
-
-```
-
-And then you can just inject $uhr into you module and use like this:
+You can just inject $uhr into you module and use like this:
 
 ```javascript
 function Module($uhr) {
@@ -167,11 +143,16 @@ Module.prototype.render(placeholderName, args, callback) {
 ```
 
 ##Contribution
-If you have found a bug, please create pull request with mocha unit-test which reproduces it or describe all details in issue if you can not implement test.
-If you want to propose some improvements just create issue or pull request but please do not forget to use **npm test** to be sure that you code is awesome.
+If you have found a bug, please create pull request with [mocha]
+(https://www.npmjs.org/package/mocha) unit-test which reproduces it or describe 
+all details in issue if you can not implement test. If you want to propose some 
+improvements just create issue or pull request but please do not forget to use 
+`npm test` to be sure that your code is awesome.
 
-All changes should satisfy this [Code Style Guide](https://github.com/pragmadash/catberry/blob/master/docs/code-style.md).
+All changes should satisfy this [Code Style Guide]
+(docs/code-style-guide.md).
 
-Also your changes should be covered by unit tests using [mocha](https://www.npmjs.org/package/mocha).
+Also your changes should be covered by unit tests using [mocha]
+(https://www.npmjs.org/package/mocha).
 
-Denis Rechkunov <denis.rechkunov@gmail.com>
+Denis Rechkunov <denis.rechkunov@gmail.com>

index.js

@@ -30,7 +30,8 @@
 
 'use strict';
 
-var ServerUHR = require('./lib/server/UHR'),
+var /**no-client-bundle**/
+	ServerUHR = require('./lib/server/UHR'),
 	ClientUHR = require('./lib/client/UHR');
 
 module.exports = {
@@ -39,12 +40,6 @@ module.exports = {
 	 * @param {ServiceLocator} locator Catberry's service locator.
 	 */
 	registerOnServer: function (locator) {
-
-		// WARNING!!!
-		// we must do that at server TO NOT include this module into
-		// client-bundle
-		locator.registerInstance('serverModulePath', './lib/server/UHR');
-
 		var config = locator.resolve('config');
 		locator.register('uhr', ServerUHR, config, true);
 	},

lib/UHRBase.js

@@ -62,9 +62,7 @@ UHRBase.DEFAULT_GENERAL_HEADERS = {
 	Accept: UHRBase.TYPES.JSON + '; q=0.7, ' +
 		UHRBase.TYPES.HTML + '; q=0.2, ' +
 		UHRBase.TYPES.PLAIN_TEXT + '; q=0.1',
-	Pragma: 'no-cache',
 	'Accept-Charset': UHRBase.CHARSET + '; q=1',
-	'Cache-Control': 'no-cache',
 	'X-Requested-With': 'Catberry UHR'
 };
 
@@ -149,6 +147,7 @@ UHRBase.prototype.delete = function (url, options, callback) {
  * @param {Object} parameters Request parameters.
  * @param {Function?} callback Callback on finish
  * with error, status object and data.
+ * @return {Object} Request object with abort method.
  */
 UHRBase.prototype.request = function (parameters, callback) {
 	callback = callback || dummy;
@@ -161,7 +160,7 @@ UHRBase.prototype.request = function (parameters, callback) {
 	} else {
 		parameters.data = this._getDataToSend(parameters);
 	}
-	this._doRequest(parameters, callback);
+	return this._doRequest(parameters, callback);
 };
 
 /**
@@ -260,11 +259,49 @@ UHRBase.prototype._createHeaders = function (parameterHeaders) {
  * @param {Object} parameters Request parameters.
  * @param {Function<Error, Object, string>?} callback Callback on finish
  * with error, status object and data.
+ * @return {Object} Request object with abort method.
  * @protected
  * @abstract
  */
 UHRBase.prototype._doRequest = function (parameters, callback) {
+	return {
+		abort: dummy
+	};
+};
 
+/**
+ * Converts response data according content type.
+ * @param {string} contentType HTTP content type.
+ * @param {string} responseData Data from response.
+ * @returns {string|Object} Converted data.
+ */
+UHRBase.prototype.convertResponse = function (contentType, responseData) {
+	contentType = typeof(contentType) === 'string' ?
+		contentType :
+		UHRBase.TYPES.PLAIN_TEXT;
+	var typeAndParameters = contentType.split(';'),
+		type = String(typeAndParameters[0]).toLowerCase();
+
+	switch (type) {
+		case UHRBase.TYPES.JSON:
+			var json;
+			try {
+				json = JSON.parse(responseData);
+			} catch (e) {
+				// nothing to do
+			}
+			return json || {};
+		case UHRBase.TYPES.URL_ENCODED:
+			var object;
+			try {
+				object = querystring.parse(responseData);
+			} catch (e) {
+				// nothing to do
+			}
+			return object || {};
+		default:
+			return responseData;
+	}
 };
 
 /**

lib/client/UHR.js

@@ -33,6 +33,7 @@
 module.exports = UHR;
 
 var UHRBase = require('../UHRBase'),
+	url = require('url'),
 	util = require('util');
 
 util.inherits(UHR, UHRBase);
@@ -42,67 +43,116 @@ var NON_SAFE_HEADERS = {
 	'accept-charset': true
 };
 
+var ERROR_CONNECTION = 'Connection error',
+	ERROR_TIMEOUT = 'Request timeout',
+	ERROR_ABORTED = 'Request aborted';
+
 /**
  * Creates new instance of client-side HTTP(S) request implementation.
- * @param {jQuery} $jQuery jQuery library to use AJAX.
+ * @param {Window} $window Current window object.
  * @constructor
  */
-function UHR($jQuery) {
+function UHR($window) {
 	UHRBase.call(this);
-	this.$ = $jQuery;
+	this.window = $window;
 }
 
 /**
- * Current instance of jQuery.
- * @type {jQuery}
+ * Current instance of window.
+ * @type {Window}
  */
-UHR.prototype.$ = null;
+UHR.prototype.window = null;
 
 /**
  * Does request with specified parameters using protocol implementation.
  * @param {Object} parameters Request parameters.
  * @param {Function} callback Callback on finish.
+ * @return {Object} Request object with abort method.
  * @protected
  */
 UHR.prototype._doRequest = function (parameters, callback) {
 	try {
-		var ajaxParameters = Object.create(parameters);
-		ajaxParameters.headers = this._createHeaders(parameters.headers);
-		ajaxParameters.type = parameters.method;
-
-		if (parameters.headers['Content-Type']) {
-			ajaxParameters.contentType = parameters.headers['Content-Type'];
-		}
+		var self = this,
+			xhrParameters = Object.create(parameters),
+			urlInfo = url.parse(parameters.url);
+		xhrParameters.headers = this._createHeaders(parameters.headers);
 
-		Object.keys(ajaxParameters.headers)
+		Object.keys(xhrParameters.headers)
 			.forEach(function (name) {
 				if (NON_SAFE_HEADERS.hasOwnProperty(name.toLowerCase())) {
-					delete ajaxParameters.headers[name];
+					delete xhrParameters.headers[name];
 				}
 			});
 
-		this.$.ajax(ajaxParameters)
-			.done(function (data, textStatus, jqXHR) {
-				callback(null, getStatusObject(jqXHR), data);
-			})
-			.fail(function (jqXHR, textStatus, errorThrown) {
-				callback(errorThrown, getStatusObject(jqXHR));
+		if (xhrParameters.data.length > 0 && (
+			xhrParameters.method === UHRBase.METHODS.GET ||
+			xhrParameters.method === UHRBase.METHODS.DELETE)) {
+			xhrParameters.url +=
+				(!urlInfo.search || urlInfo.search.length === 0 ? '?' : '&') +
+				xhrParameters.data;
+		}
+
+		var requestError = null,
+			loginAndPass = String(urlInfo.auth || '').split(':'),
+			xhr = new this.window.XMLHttpRequest();
+
+		xhr.onabort = function () {
+			requestError = new Error(ERROR_ABORTED);
+		};
+		xhr.ontimeout = function () {
+			requestError = new Error(ERROR_TIMEOUT);
+		};
+		xhr.onerror = function () {
+			requestError = new Error(xhr.statusText || ERROR_CONNECTION);
+		};
+		xhr.onloadend = function () {
+			xhr.onloadend = null;
+
+			var statusObject = getStatusObject(xhr),
+				content = self.convertResponse(
+					statusObject.headers['content-type'],
+					xhr.responseText);
+			callback(requestError, statusObject, content);
+		};
+
+		xhr.open(xhrParameters.method, xhrParameters.url, true,
+			loginAndPass[0],
+			loginAndPass[1]);
+		xhr.timeout = xhrParameters.timeout;
+
+		Object.keys(xhrParameters.headers)
+			.forEach(function (headerName) {
+				xhr.setRequestHeader(headerName,
+					xhrParameters.headers[headerName]);
 			});
 
+		xhr.send(xhrParameters.data);
+
+		return {
+			abort: xhr.abort
+		};
 	} catch (e) {
-		callback(e);
+		callback(e, getStatusObject(), '');
 	}
 };
 
 /**
  * Gets state object for specified jQuery XHR object.
- * @param {Object} jqXHR jQuery XHR object.
+ * @param {Object?} xhr XHR object.
  * @returns {{code: number, text: string, headers: Object}} Status object.
  */
-function getStatusObject(jqXHR) {
+function getStatusObject(xhr) {
 	var headers = {};
 
-	jqXHR
+	if (!xhr) {
+		return {
+			code: 0,
+			text: '',
+			headers: headers
+		};
+	}
+
+	xhr
 		.getAllResponseHeaders()
 		.split('\n')
 		.forEach(function (header) {
@@ -120,8 +170,8 @@ function getStatusObject(jqXHR) {
 		});
 
 	return {
-		code: jqXHR.status,
-		text: jqXHR.statusText,
+		code: xhr.status,
+		text: xhr.statusText,
 		headers: headers
 	};
 }