Implements the buffer response handler as Buffer instead of String.

Author: SaltwaterC

CHANGELOG.md

@@ -17,7 +17,7 @@
  * Changed the internal structure of the library.
  * Deprecates query.call() in favor of query.request() for the query APIs.
  * Deprecates s3.putObject() in favor of s3.putFile().
- * Implements new GET response handlers: buffer - returns the response argument as the response body itself; stream - returns the HTTPS response itself which implements node.js's Readable Stream interface.
+ * Implements new GET response handlers: buffer - the response contains a buffer key with the buffer contents; stream - returns the HTTPS response itself which implements node.js's Readable Stream interface.
  * Adds a new s3.putStream() helper for PUT'ing streams to S3.
  * Adds a new s3.putBuffer() helper for PUT'ing buffers to S3.
  * Unit testing coverage.

lib/Buffer.toByteArray.js

@@ -0,0 +1,9 @@
+/**
+ * Buffer.toByteArray() - Returns an array of bytes from the Buffer argument
+ * @param buffer
+ */
+if ( ! Buffer.prototype.toByteArray) {
+	Buffer.prototype.toByteArray = function () {
+		return Array.prototype.slice.call(this, 0);
+	};
+}

lib/object.watch.js renamed to lib/Object.watch.js

@@ -11,7 +11,8 @@ var qs = require('querystring');
 var Stream = require('stream').Stream;
 
 /* the internally used modules */
-require('./object.watch.js');
+require('./Object.watch.js');
+require('./Buffer.toByteArray.js')
 var cfg = require('./config.js');
 var tools = require('./tools.js');
 
@@ -91,7 +92,7 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 			break;
 		}
 	}
-	var data = '';
+	var data = [];
 	if (handler != 'xml' && handler != 'buffer' && handler != 'stream' && handler != null) {
 		try {
 			if ( ! handler.file) {
@@ -134,7 +135,7 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 	var aborted = false;
 	var request = https.request(options, function (response) {
 		var parseXml = function (data) {
-			libxml2js(data, function (error, result) {
+			libxml2js(new Buffer(data).toString(), function (error, result) {
 				if (response.statusCode != 200) {
 					error = new Error('API error with HTTP Code: ' + response.statusCode);
 					error.headers = response.headers;
@@ -180,16 +181,16 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 						case 'xml':
 						case 'buffer':
 						case 'stream':
-							data += chunk;
+							data = data.concat(chunk.toByteArray());
 						break;
 						case null:
 							if (response.statusCode != 200 && response.statusCode != 204) {
-								data += chunk;
+								data = data.concat(chunk.toByteArray());
 							}
 						break;
 						default:
 							if (response.statusCode != 200) {
-								data += chunk;
+								data = data.concat(chunk.toByteArray());
 							} else {
 								try {
 									file.write(chunk);
@@ -213,7 +214,7 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 							if (response.statusCode == 200) {
 								callback(null, {
 									headers: response.headers,
-									buffer: data
+									buffer: new Buffer(data)
 								});
 							} else {
 								parseXml(data);

lib/internals.js

@@ -20,7 +20,7 @@ s3.putStream(path, buffer, false, {'content-type': 'text/plain'}, function (err,
 		callbacks.get = true;
 		assert.ifError(err);
 		assert.deepEqual(res.headers['content-type'], 'text/plain');
-		assert.deepEqual(res.buffer, 'bar\n');
+		assert.deepEqual(res.buffer.toString(), 'bar\n');
 		s3.del(path, function (err) {
 			callbacks.del = true;
 			assert.ifError(err);

tests/s3-put-buffer.js

@@ -18,7 +18,7 @@ s3.putFile(path, './data/foo.txt', false, {}, function (err, res) {
 		callbacks.get = true;
 		assert.ifError(err);
 		assert.deepEqual(res.headers['content-type'], 'text/plain');
-		assert.deepEqual(res.buffer, 'bar\n');
+		assert.deepEqual(res.buffer.toString(), 'bar\n');
 		s3.del(path, function (err) {
 			callbacks.del = true;
 			assert.ifError(err);

tests/s3-put-file-special-chars.js

@@ -20,7 +20,7 @@ s3.putStream(path, stream, false, {'content-length': 4, 'content-type': 'text/pl
 		callbacks.get = true;
 		assert.ifError(err);
 		assert.deepEqual(res.headers['content-type'], 'text/plain');
-		assert.deepEqual(res.buffer, 'bar\n');
+		assert.deepEqual(res.buffer.toString(), 'bar\n');
 		s3.del(path, function (err) {
 			callbacks.del = true;
 			assert.ifError(err);