amqplib 0.5.1 → 0.5.2

package/test/data.js

@@ -3,7 +3,7 @@
 'use strict';
 
 var C = require('claire');
-
+var Buffer = require('safe-buffer').Buffer;
 var forAll = C.forAll;
 var arb = C.data;
 var transform = C.transform;
@@ -18,7 +18,7 @@ var Undefined = C.Undefined;
 
 // Stub these out so we can use outside tests
 // if (!suite) var suite = function() {}
-// if (!test) var test = function() {} 
+// if (!test) var test = function() {}
 
 // These aren't exported in claire/index. so I could have to reproduce
 // them I guess.
@@ -36,7 +36,7 @@ function rangeInt(name, a, b) {
 }
 
 function toFloat32(i) {
-  var b = new Buffer(4);
+  var b = Buffer.alloc(4);
   b.writeFloatBE(i, 0);
   return b.readFloatBE(0);
 }
@@ -53,6 +53,12 @@ function floatChooser(maxExp) {
   }
 }
 
+function explicitType(t, underlying) {
+    return label(t, transform(function(n) {
+        return {'!': t, value: n};
+    }, underlying));
+}
+
 // FIXME null, byte array, others?
 
 var Octet = rangeInt('octet', 0, 255);
@@ -63,7 +69,7 @@ var ShortStr = label('shortstr',
 
 var LongStr = label('longstr',
                     transform(
-                      function(bytes) { return new Buffer(bytes); },
+                      function(bytes) { return Buffer.from(bytes); },
                       repeat(Octet)));
 
 var UShort = rangeInt('short-uint', 0, 0xffff);
@@ -85,12 +91,27 @@ var Decimal = label('decimal', transform(
     return {'!': 'decimal', value: {places: args[1], digits: args[0]}};
   }, sequence(arb.UInt, Octet)));
 
+// Signed 8 bit int
+var Byte = rangeInt('byte', -128, 127);
+
+// Explicitly typed values
+var ExByte = explicitType('byte', Byte);
+var ExInt8 = explicitType('int8', Byte);
+var ExShort = explicitType('short', Short);
+var ExInt16 = explicitType('int16', Short);
+var ExInt = explicitType('int', Long);
+var ExInt32 = explicitType('int32', Long);
+var ExLong = explicitType('long', LongLong);
+var ExInt64 = explicitType('int64', LongLong);
+
 var FieldArray = label('field-array', recursive(function() {
   return arb.Array(
     arb.Null,
-    LongStr, ShortStr, Octet,
-    UShort, ULong, ULongLong,
-    Short, Long, LongLong,
+    LongStr, ShortStr,
+    Octet, UShort, ULong, ULongLong,
+    Byte, Short, Long, LongLong,
+    ExByte, ExInt8, ExShort, ExInt16,
+    ExInt, ExInt32, ExLong, ExInt64,
     Bit, Float, Double, FieldTable, FieldArray)
 }));
 
@@ -100,7 +121,9 @@ var FieldTable = label('table', recursive(function() {
                  arb.Null,
                  LongStr, ShortStr, Octet,
                  UShort, ULong, ULongLong,
-                 Short, Long, LongLong,
+                 Byte, Short, Long, LongLong,
+                 ExByte, ExInt8, ExShort, ExInt16,
+                 ExInt, ExInt32, ExLong, ExInt64,
                  Bit, Float, Double, FieldArray, FieldTable))
 }));
 
@@ -184,7 +207,7 @@ function method(info) {
 function properties(info) {
   var types = info.args.map(argtype);
   types.unshift(ULongLong); // size
-  var domain = sequence.apply(null, types); 
+  var domain = sequence.apply(null, types);
   var names = info.args.map(name);
   return label(info.name, transform(function(fieldVals) {
     return {id: info.id,

package/test/frame.js

@@ -3,7 +3,7 @@
 var assert = require('assert');
 var succeed = require('./util').succeed;
 var fail = require('./util').fail;
-
+var Buffer = require('safe-buffer').Buffer;
 var connection = require('../lib/connection');
 var Frames = connection.Connection;
 var HEARTBEAT = require('../lib/frame').HEARTBEAT;
@@ -21,7 +21,7 @@ function inputs() {
   return new PassThrough({objectMode: true});
 }
 
-var HB = new Buffer([defs.constants.FRAME_HEARTBEAT,
+var HB = Buffer.from([defs.constants.FRAME_HEARTBEAT,
                      0, 0, // channel 0
                      0, 0, 0, 0, // zero size
                      defs.constants.FRAME_END]);
@@ -51,7 +51,7 @@ suite("Explicit parsing", function() {
       var input = inputs();
       var frames = new Frames(input);
       frames.frameMax = 5; //for the max frame test
-      input.write(new Buffer(bytes));
+      input.write(Buffer.from(bytes));
       frames.step(function(err, frame) {
         if (err != null) done();
         else done(new Error('Was a bogus frame!'));
@@ -166,7 +166,7 @@ var Content = transform(function(args) {
   return {
     method: args[0].fields,
     header: args[1].fields,
-    body: new Buffer(args[2])
+    body: Buffer.from(args[2])
   }
 }, sequence(amqp.methods['BasicDeliver'],
             amqp.properties['BasicProperties'], Body));

package/test/util.js

@@ -107,6 +107,19 @@ function succeed(done) {
   return function() { done(); }
 }
 
+// Produce a callback that will complete the test successfully
+// only if the value is an object, it has the specified
+// attribute, and its value is equals to the expected value
+function succeedIfAttributeEquals(attribute, value, done) {
+  return function(object) {
+    if (object && !(object instanceof Error) && value === object[attribute]) {
+      return done();
+    }
+
+    done(new Error(attribute + " is not equal to " + value));
+  };
+}
+
 // Produce a callback that will fail the test, given either an error
 // (to be used as a failure continuation) or any other value (to be
 // used as a success continuation when failure is expected)
@@ -196,6 +209,7 @@ module.exports = {
   socketPair: socketPair,
   runServer: runServer,
   succeed: succeed,
+  succeedIfAttributeEquals: succeedIfAttributeEquals,
   fail: fail,
   latch: latch,
   completes: completes,

package/.npmignore

@@ -1,9 +0,0 @@
-*~
-scratch
-# do not ignore lib/defs.js, we need that
-# node_modules is ignored anyway
-.travis.yml
-bin/amqp-rabbitmq-0.9.1.json
-bin/generate-defs.js
-etc/
-coverage/