remove isStream to the common lib.

Author: Bin Chang

lib/common.js

@@ -306,6 +306,13 @@ function formatQueryValue(key, value, options) {
   return [key, value];
 }
 
+function isStream(obj) {
+  return (typeof obj !== 'undefined') &&
+      (typeof a !== 'string') &&
+      (! Buffer.isBuffer(obj)) &&
+      _.isFunction(obj.setEncoding);
+}
+
 exports.normalizeRequestOptions = normalizeRequestOptions;
 exports.isBinaryBuffer = isBinaryBuffer;
 exports.mergeChunks = mergeChunks;
@@ -321,3 +328,5 @@ exports.percentEncode = percentEncode;
 exports.percentDecode = percentDecode;
 exports.matchStringOrRegexp = matchStringOrRegexp;
 exports.formatQueryValue = formatQueryValue;
+exports.isStream = isStream;
+

lib/delayed_body.js

@@ -14,12 +14,7 @@ var Transform = require('stream').Transform;
 var EventEmitter = require('events').EventEmitter;
 var noop = function () {};
 var util = require('util');
-var timers = require('timers');
-
-function isStream(obj) {
-  var is = obj && (typeof a !== 'string') && (! Buffer.isBuffer(obj)) && (typeof obj.setEncoding === 'function');
-  return is;
-}
+var common = require('./common');
 
 if (!Transform) {
   // for barebones compatibility for node < 0.10
@@ -56,7 +51,7 @@ function DelayedBody(ms, body) {
   var data = '';
   var ended = false;
 
-  if (isStream(body)) {
+  if (common.isStream(body)) {
     body.on('data', function (chunk) {
       data += Buffer.isBuffer(chunk) ? chunk.toString() : chunk;
     });
@@ -69,7 +64,7 @@ function DelayedBody(ms, body) {
   }
 
   setTimeout(function () {
-    if (isStream(body) && !ended) {
+    if (common.isStream(body) && !ended) {
       body.once('end', function () {
         self.end(data);
       });

lib/interceptor.js

@@ -99,7 +99,7 @@ Interceptor.prototype.reply = function reply(statusCode, body, headers) {
         if (body && typeof(body) !== 'string' &&
             typeof(body) !== 'function' &&
             !Buffer.isBuffer(body) &&
-            !isStream(body)) {
+            !common.isStream(body)) {
             try {
                 body = stringify(body);
                 if (!this.headers) {
@@ -496,10 +496,3 @@ Interceptor.prototype.socketDelay = function socketDelay(ms) {
     this.socketDelayInMs = ms;
     return this;
 };
-
-function isStream(obj) {
-    return (typeof obj !== 'undefined') &&
-        (typeof a !== 'string') &&
-        (! Buffer.isBuffer(obj)) &&
-        _.isFunction(obj.setEncoding);
-}

lib/request_overrider.js

@@ -44,11 +44,6 @@ function setHeader(request, name, value) {
   }
 }
 
-function isStream(obj) {
-  var is = obj && (typeof obj !== 'string') && (!Buffer.isBuffer(obj)) && (typeof obj.setEncoding === 'function');
-  return is;
-}
-
 //  Sets request headers of the given request. This is needed during both matching phase
 //  (in case header filters were specified) and mocking phase (to correctly pass mocked
 //  request headers).
@@ -317,7 +312,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
       //  of response buffers which should be mocked one by one.
       //  (otherwise decompressions after the first one fails as unzip expects to receive
       //  buffer by buffer and not one single merged buffer)
-      if(common.isContentEncoded(response.headers) && ! isStream(interceptor.body)) {
+      if(common.isContentEncoded(response.headers) && ! common.isStream(interceptor.body)) {
 
         if (interceptor.delayInMs) {
           emitError(new Error('Response delay is currently not supported with content-encoded responses.'));
@@ -400,7 +395,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
           responseBody = new DelayedBody(interceptor.delayInMs, responseBody);
         }
 
-        if (isStream(responseBody)) {
+        if (common.isStream(responseBody)) {
           debug('response body is a stream');
           responseBody.pause();
           responseBody.on('data', function(d) {
@@ -492,7 +487,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
             req.emit('response', response);
           }
 
-          if (isStream(responseBody)) {
+          if (common.isStream(responseBody)) {
             debug('resuming response stream');
             responseBody.resume();
           }