improve chunker

Author: dignifiedquire

package.json

@@ -53,6 +53,7 @@
     "ipfs-unixfs": "^0.1.4",
     "is-ipfs": "^0.2.0",
     "multihashes": "^0.2.2",
+    "pull-block": "^1.0.0",
     "pull-pushable": "^2.0.1",
     "pull-stream": "^3.4.3",
     "pull-traverse": "^1.0.3",

src/chunker-fixed-size.js

@@ -1,11 +1,7 @@
 'use strict'
 
-const window = require('pull-window')
-const pull = require('pull-stream')
+const block = require('pull-block')
 
 exports = module.exports = function (size) {
-  return pull(
-    pull.flatten(),
-    window.recent(size)
-  )
+  return block(size, {zeroPadding: false})
 }

src/exporters/file.js

@@ -5,7 +5,7 @@ const pull = require('pull-stream')
 
 function extractContent (node) {
   const raw = UnixFS.unmarshal(node.data)
-  return pull.values(raw.data)
+  return pull.values([raw.data])
 }
 
 // Logic to export a single (possibly chunked) unixfs file.

test/test-fixed-size-chunker.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const FixedSizeChunker = require('./../src/chunker-fixed-size')
+const chunker = require('./../src/chunker-fixed-size')
 const fs = require('fs')
 const expect = require('chai').expect
 const path = require('path')
@@ -23,9 +23,10 @@ describe('chunker: fixed size', () => {
 
     pull(
       pull.values([b1, b2, b3]),
-      FixedSizeChunker(256),
+      chunker(256),
       pull.collect((err, chunks) => {
         expect(err).to.not.exists
+        expect(chunks).to.have.length(8)
         chunks.forEach((chunk) => {
           expect(chunk).to.have.length(256)
         })
@@ -36,11 +37,12 @@ describe('chunker: fixed size', () => {
 
   it('256 Bytes chunks', (done) => {
     pull(
-      pull.infinite(() => 1),
+      pull.infinite(() => Buffer([1])),
       pull.take(256 * 12),
-      FixedSizeChunker(256),
+      chunker(256),
       pull.collect((err, chunks) => {
         expect(err).to.not.exists
+        expect(chunks).to.have.length(12)
         chunks.forEach((chunk) => {
           expect(chunk).to.have.length(256)
         })
@@ -53,9 +55,11 @@ describe('chunker: fixed size', () => {
     const KiB256 = 262144
     pull(
       pull.values(rawFile),
-      FixedSizeChunker(KiB256),
+      chunker(KiB256),
       pull.collect((err, chunks) => {
         expect(err).to.not.exists
+
+        expect(chunks).to.have.length(4)
         chunks.forEach((chunk) => {
           expect(chunk).to.have.length(KiB256)
         })
@@ -70,10 +74,13 @@ describe('chunker: fixed size', () => {
 
     pull(
       pull.values(file),
-      FixedSizeChunker(KiB256),
+      chunker(KiB256),
       pull.collect((err, chunks) => {
         expect(err).to.not.exists
+
+        expect(chunks).to.have.length(5)
         let counter = 0
+
         chunks.forEach((chunk) => {
           if (chunk.length < KiB256) {
             counter++