WIP: move to latest ipfs-repo

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "lint": "standard",
     "coverage": "istanbul cover --print both -- _mocha tests/test-*/index.js",
-    "test": "npm run test:node",
+    "test": "npm run test:node && npm run test:browser",
     "test:node": "mocha tests/test-*/index.js",
     "test:browser": "karma start karma.conf.js",
     "test:core": "mocha tests/test-core/index.js",
@@ -35,10 +35,11 @@
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
     "async": "^1.5.2",
-    "binary-loader": "0.0.1",
     "brfs": "^1.4.3",
+    "buffer-loader": "0.0.1",
     "chai": "^3.4.1",
     "fs-blob-store": "^5.2.1",
+    "idb-plus-blob-store": "^1.0.0",
     "istanbul": "^0.4.1",
     "json-loader": "^0.5.4",
     "karma": "^0.13.19",
@@ -54,7 +55,6 @@
     "ncp": "^2.0.0",
     "nexpect": "^0.5.0",
     "pre-commit": "^1.1.2",
-    "raw-loader": "^0.5.1",
     "rimraf": "^2.4.4",
     "standard": "^5.4.1",
     "transform-loader": "^0.2.3",
@@ -66,7 +66,7 @@
     "bs58": "^3.0.0",
     "debug": "^2.2.0",
     "hapi": "^12.0.0",
-    "ipfs-repo": "^0.4.1",
+    "ipfs-repo": "^0.5.0",
     "ipfs-merkle-dag": "vijayee/js-ipfs-merkle-dag",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",

src/ipfs-core/default-repo/browser.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const localStorage = require('local-storage-blob-store')
+const localStorage = require('idb-plus-blob-store')
 const IPFSRepo = require('ipfs-repo')
 
 const options = {

tests/test-core/browser.js

@@ -1,38 +1,44 @@
 /* globals describe, before */
 
-// const expect = require('chai').expect
 const async = require('async')
-const store = require('local-storage-blob-store')
+const store = require('idb-plus-blob-store')
 const _ = require('lodash')
 
-var repoContext = require.context('binary!../repo-example', true)
+const repoContext = require.context('buffer!./../repo-example', true)
 
-describe('core', function () {
-  before(function (done) {
-    window.localStorage.clear()
+const idb = window.indexedDB ||
+        window.mozIndexedDB ||
+        window.webkitIndexedDB ||
+        window.msIndexedDB
+
+idb.deleteDatabase('ipfs')
+idb.deleteDatabase('ipfs/blocks')
 
+describe('IPFS Repo Tests on the Browser', function () {
+  before(function (done) {
     var repoData = []
     repoContext.keys().forEach(function (key) {
       repoData.push({
         key: key.replace('./', ''),
-        value: new Buffer(require('binary!./../repo-example/' + key.replace('./', '')), 'binary')
+        value: repoContext(key)
       })
     })
 
-    var mainBlob = store('ipfs')
-    var blocksBlob = store('ipfs/')
+    const mainBlob = store('ipfs')
+    const blocksBlob = store('ipfs/blocks')
 
     async.eachSeries(repoData, (file, cb) => {
       if (_.startsWith(file.key, 'datastore/')) {
         return cb()
       }
 
-      const blob = _.startsWith(file.key, 'blocks/')
-        ? blocksBlob
-        : mainBlob
+      const blocks = _.startsWith(file.key, 'blocks/')
+      const blob = blocks ? blocksBlob : mainBlob
+
+      const key = blocks ? file.key.replace(/^blocks\//, '') : file.key
 
       blob.createWriteStream({
-        key: file.key
+        key: key
       }).end(file.value, cb)
     }, done)
   })

tests/test-core/test-block.js

@@ -12,15 +12,13 @@ const isNode = !global.window
 
 const fileA = isNode
   ? fs.readFileSync(process.cwd() + '/tests/repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data')
-  : new Buffer(require('binary!./../repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data'), 'binary')
+  : require('buffer!./../repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data')
 
-// console.log('=>', fileA)
-// console.log('=>', fileA.length)
-
-describe('block', () => {
+// TODO use arrow funtions again when https://github.com/webpack/webpack/issues/1944 is fixed
+describe('block', function () {
   var ipfs
 
-  it('get', done => {
+  it('get', function (done) {
     ipfs = new IPFS()
     const b58mh = 'QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'
     const mh = new Buffer(base58.decode(b58mh))
@@ -61,7 +59,7 @@ describe('block', () => {
     })
   })
 
-  it('stat', done => {
+  it('stat', function (done) {
     const mh = new Buffer(base58
         .decode('QmVtU7ths96fMgZ8YSZAbKghyieq7AjxNdcqyVzxTt3qVe'))
     ipfs.block.stat(mh, (err, stats) => {