deprecate .encoding

Author: juliangruber

lib/decode-key.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function decodeKey(key, optionObjects){
-  var encoding = walk(optionObjects, ['keyEncoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'keyEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.decode(key);
 };

lib/decode-value.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function decodeValue(value, optionObjects){
-  var encoding = walk(optionObjects, ['valueEncoding', 'encoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'valueEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.decode(value);
 };

lib/encode-key.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function encodeKey(key, optionObjects){
-  var encoding = walk(optionObjects, ['keyEncoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'keyEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.encode(key);
 };

lib/encode-value.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function encodeValue(value, optionObjects){
-  var encoding = walk(optionObjects, ['valueEncoding', 'encoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'valueEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.encode(value);
 };

lib/key-as-buffer.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function keyAsBuffer(optionObjects){
-  var encoding = walk(optionObjects, ['keyEncoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'keyEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.buffer;
 };

lib/value-as-buffer.js

@@ -2,7 +2,7 @@ var encodings = require('./encodings');
 var walk = require('./walk');
 
 module.exports = function valueAsBuffer(optionObjects){
-  var encoding = walk(optionObjects, ['valueEncoding', 'encoding']) || 'utf8';
+  var encoding = walk(optionObjects, 'valueEncoding') || 'utf8';
   if (typeof encoding == 'string') encoding = encodings[encoding];
   return encoding.buffer;
 };

lib/walk.js

@@ -1,14 +1,8 @@
 
-module.exports = function walk(objects, keys){
+module.exports = function walk(objects, key){
   var value;
-  var key;
-  var object;
   for (var i = objects.length - 1; i >= 0; i--) {
-    object = objects[i];
-    for (var j = keys.length - 1; j >= 0; j--) {
-      key = keys[j];
-      if (object[key]) value = object[key];
-    }
+    if (objects[i][key]) value = objects[i][key];
   }
   return value;
 };

test/walk.js

@@ -4,24 +4,14 @@ var walk = require('../lib/walk');
 test('walk', function(t){
   t.equal(walk(
     [{ keyEncoding: 'utf8' }],
-    ['keyEncoding', 'encoding']
+    'keyEncoding'
   ), 'utf8');
 
   t.equal(walk(
     [{ keyEncoding: 'binary' }, { keyEncoding: 'utf8' }],
-    ['keyEncoding', 'encoding']
+    'keyEncoding'
   ), 'binary');
 
-  t.equal(walk(
-    [{ keyEncoding: 'utf8', encoding: 'buffer' }],
-    ['keyEncoding', 'encoding']
-  ), 'utf8');
-
-  t.equal(walk(
-    [{ encoding: 'utf8' }, { keyEncoding: 'buffer', encoding: 'hex' }],
-    ['keyEncoding', 'encoding']
-  ), 'utf8');
-
   t.end();
 });