Add buffer import to simplify browser builds (#405)

Author: JAForbes

etc/browser/lib/crypto.js

@@ -12,6 +12,9 @@
  *
  */
 
+var buffer = require('buffer');
+var Buffer = buffer.Buffer;
+
 function createHash(algorithm) {
   if (algorithm !== 'md5') {
     throw new Error('only md5 is supported in the browser');

lib/containers.js

@@ -15,11 +15,12 @@
 
 var types = require('./types'),
     utils = require('./utils'),
+    buffer = require('buffer'),
     stream = require('stream'),
     util = require('util'),
     zlib = require('zlib');
 
-
+var Buffer = buffer.Buffer;
 var OPTS = {namespace: 'org.apache.avro.file'};
 
 var LONG_TYPE = types.Type.forSchema('long', OPTS);

lib/index.js

@@ -14,10 +14,13 @@ var containers = require('./containers'),
     specs = require('./specs'),
     types = require('./types'),
     utils = require('./utils'),
+    buffer = require('buffer'),
     fs = require('fs'),
     util = require('util');
 
 
+var Buffer = buffer.Buffer;
+
 /** Parse a schema and return the corresponding type or service. */
 function parse(any, opts) {
   var schemaOrProtocol = specs.read(any);

lib/services.js

@@ -16,10 +16,12 @@
 
 var types = require('./types'),
     utils = require('./utils'),
+    buffer = require('buffer'),
     events = require('events'),
     stream = require('stream'),
     util = require('util');
 
+var Buffer = buffer.Buffer;
 
 // A few convenience imports.
 var Tap = utils.Tap;

lib/types.js

@@ -18,6 +18,8 @@ var utils = require('./utils'),
     buffer = require('buffer'), // For `SlowBuffer`.
     util = require('util');
 
+var Buffer = buffer.Buffer;
+var SlowBuffer = buffer.SlowBuffer;
 
 // Convenience imports.
 var Tap = utils.Tap;
@@ -46,7 +48,7 @@ var TYPES = {
 var RANDOM = new utils.Lcg();
 
 // Encoding tap (shared for performance).
-var TAP = new Tap(new buffer.SlowBuffer(1024));
+var TAP = new Tap(new SlowBuffer(1024));
 
 // Currently active logical type, used for name redirection.
 var LOGICAL_TYPE = null;
@@ -451,7 +453,7 @@ Type.isType = function (/* any, [prefix] ... */) {
 
 Type.__reset = function (size) {
   debug('resetting type buffer to %d', size);
-  TAP.buf = new buffer.SlowBuffer(size);
+  TAP.buf = new SlowBuffer(size);
 };
 
 Object.defineProperty(Type.prototype, 'branchName', {

lib/utils.js

@@ -7,9 +7,12 @@
 
 /** Various utilities used across this library. */
 
+var buffer = require('buffer');
 var crypto = require('crypto');
 var util = require('util');
 
+var Buffer = buffer.Buffer; 
+
 // Shared buffer pool for all taps.
 var POOL = new BufferPool(4096);
 

test/test_containers.js

@@ -6,9 +6,11 @@ var containers = require('../lib/containers'),
     types = require('../lib/types'),
     utils = require('../lib/utils'),
     assert = require('assert'),
+    buffer = require('buffer'),
     stream = require('stream');
 
 
+var Buffer = buffer.Buffer;
 var BLOCK_TYPE = containers.BLOCK_TYPE;
 var Block = BLOCK_TYPE.recordConstructor;
 var HEADER_TYPE = containers.HEADER_TYPE;

test/test_index.js

@@ -10,9 +10,11 @@ var index = require('../lib'),
     services = require('../lib/services'),
     types = require('../lib/types'),
     assert = require('assert'),
+    buffer = require('buffer'),
     path = require('path'),
     tmp = require('tmp');
 
+var Buffer = buffer.Buffer;
 
 var DPATH = path.join(__dirname, 'dat');
 

test/test_types.js

@@ -5,9 +5,12 @@
 var types = require('../lib/types'),
     utils = require('../lib/utils'),
     assert = require('assert'),
+    buffer = require('buffer'),
     util = require('util');
 
 
+var Buffer = buffer.Buffer;
+
 var LogicalType = types.builtins.LogicalType;
 var Tap = utils.Tap;
 var Type = types.Type;