Fixed usage of legacy buffer write operations

Author: christkv

lib/cursor.js

@@ -773,7 +773,8 @@ Cursor.prototype._read = function(n) {
       }
 
       // Emit end event
-      return self.emit('end');
+      self.emit('end');
+      return self.emit('finish');
     }
 
     // If we provided a transformation method

lib/gridfs/chunk.js

@@ -32,11 +32,12 @@ var Chunk = function(file, mongoObject, writeConcern) {
   if(mongoObjectFinal.data == null) {
   } else if(typeof mongoObjectFinal.data == "string") {
     var buffer = new Buffer(mongoObjectFinal.data.length);
-    buffer.write(mongoObjectFinal.data, 0, 'binary');
+    buffer.write(mongoObjectFinal.data, 0, mongoObjectFinal.data.length, 'binary');
     this.data = new Binary(buffer);
   } else if(Array.isArray(mongoObjectFinal.data)) {
     var buffer = new Buffer(mongoObjectFinal.data.length);
-    buffer.write(mongoObjectFinal.data.join(''), 0, 'binary');
+    var data = mongoObjectFinal.data.join('');
+    buffer.write(data, 0, data.length, 'binary');
     this.data = new Binary(buffer);
   } else if(mongoObjectFinal.data._bsontype === 'Binary') {
     this.data = mongoObjectFinal.data;
@@ -58,7 +59,7 @@ var Chunk = function(file, mongoObject, writeConcern) {
  *     will contain a reference to this object.
  */
 Chunk.prototype.write = function(data, callback) {
-  this.data.write(data, this.internalPosition);
+  this.data.write(data, this.internalPosition, data.length, 'binary');
   this.internalPosition = this.data.length();
   if(callback != null) return callback(null, this);
   return this;

lib/gridfs/grid_store.js

@@ -1085,8 +1085,8 @@ GridStore.exist = function(db, fileIdObject, rootCollection, options, callback)
       : {'_id':fileIdObject};    // Attempt to locate file
 
     // We have a specific query
-    if(fileIdObject != null 
-      && typeof fileIdObject == 'object' 
+    if(fileIdObject != null
+      && typeof fileIdObject == 'object'
       && Object.prototype.toString.call(fileIdObject) != '[object RegExp]') {
       query = fileIdObject;
     }
@@ -1365,7 +1365,7 @@ GridStoreStream.prototype.pipe = function(destination) {
     });
   } else {
     self.totalBytesToRead = self.gs.length - self.gs.position;
-    self._pipe.apply(self, [destination]);    
+    self._pipe.apply(self, [destination]);
   }
 }
 
@@ -1393,7 +1393,7 @@ GridStoreStream.prototype._read = function(n) {
       if(self.totalBytesToRead <= 0) {
         self.endCalled = true;
       }
-    });    
+    });
   }
 
   // Set read length

test/functional/collection_tests.js

@@ -86,8 +86,6 @@ exports.shouldAccessToCollections = {
                       if(collection.collectionName == "does_not_exist") found_does_not_exist = true;
                     });
 
-                    console.dir(collections)
-
                     test.ok(found_spiderman);
                     test.ok(found_mario);
                     test.ok(!found_does_not_exist);