[Pkg-javascript-commits] [node-create-hash] 16/40: use cipher-base

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-create-hash.

commit 585485867b94d991412acc8cc16a781122d4f4b7
Author: Calvin Metcalf <calvin.metcalf at gmail.com>
Date:   Sat Sep 26 17:10:37 2015 -0400

    use cipher-base
---
 browser.js   | 60 +++++++++++-------------------------------------------------
 package.json |  1 +
 2 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/browser.js b/browser.js
index 29673a8..c71f73f 100644
--- a/browser.js
+++ b/browser.js
@@ -4,81 +4,43 @@ var md5 = require('./md5')
 var rmd160 = require('ripemd160')
 var sha = require('sha.js')
 
-var Transform = require('stream').Transform
+var Base = require('cipher-base')
 
 function HashNoConstructor(hash) {
-  Transform.call(this)
+  Base.call(this, 'digest')
 
   this._hash = hash
   this.buffers = []
 }
 
-inherits(HashNoConstructor, Transform)
+inherits(HashNoConstructor, Base)
 
-HashNoConstructor.prototype._transform = function (data, _, next) {
+HashNoConstructor.prototype._update = function (data) {
   this.buffers.push(data)
-
-  next()
-}
-
-HashNoConstructor.prototype._flush = function (next) {
-  this.push(this.digest())
-  next()
 }
 
-HashNoConstructor.prototype.update = function (data, enc) {
-  if (typeof data === 'string') {
-    data = new Buffer(data, enc)
-  }
-
-  this.buffers.push(data)
-  return this
-}
-
-HashNoConstructor.prototype.digest = function (enc) {
+HashNoConstructor.prototype._final = function () {
   var buf = Buffer.concat(this.buffers)
   var r = this._hash(buf)
   this.buffers = null
 
-  return enc ? r.toString(enc) : r
+  return r
 }
 
 function Hash(hash) {
-  Transform.call(this)
+  Base.call(this, 'digest')
 
   this._hash = hash
 }
 
-inherits(Hash, Transform)
-
-Hash.prototype._transform = function (data, enc, next) {
-  if (enc) data = new Buffer(data, enc)
+inherits(Hash, Base)
 
+Hash.prototype._update = function (data) {
   this._hash.update(data)
-
-  next()
 }
 
-Hash.prototype._flush = function (next) {
-  this.push(this._hash.digest())
-  this._hash = null
-
-  next()
-}
-
-Hash.prototype.update = function (data, enc) {
-  if (typeof data === 'string') {
-    data = new Buffer(data, enc)
-  }
-
-  this._hash.update(data)
-  return this
-}
-
-Hash.prototype.digest = function (enc) {
-  var outData = this._hash.digest()
-
-  return enc ? outData.toString(enc) : outData
+Hash.prototype._final = function () {
+  return this._hash.digest()
 }
 
 module.exports = function createHash (alg) {
diff --git a/package.json b/package.json
index 97ad34d..e3b11bb 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "tape": "^3.0.3"
   },
   "dependencies": {
+    "cipher-base": "^1.0.0",
     "inherits": "^2.0.1",
     "ripemd160": "^1.0.0",
     "sha.js": "^2.3.6"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-create-hash.git