Use dignified.js

vijayee · Apr 8, 2016 · fc3cdf2 · fc3cdf2
1 parent 805aa79
commit fc3cdf2
Show file tree

Hide file tree

Showing 51 changed files with 37 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,5 +31,8 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 /node_modules
 **/*.log
-tests/repo-just-for-test*
-/tests/blocks
+test/repo-just-for-test*
+/test/blocks
+
+dist
+lib
diff --git a/karma.conf.js b/karma.conf.js
diff --git a/package.json b/package.json
@@ -4,25 +4,29 @@
   "description": "A JavaScript implementations of the IPFS MerkleDAG implementations (protobufs)",
   "main": "./src/index.js",
   "scripts": {
-    "test": "npm run test:node && npm run test:browser",
-    "test:node": "mocha tests/index.js",
-    "test:browser": "karma start --single-run=true karma.conf.js",
-    "lint": "standard"
+    "lint": "dignified-lint",
+    "build": "dignified-build",
+    "test": "dignified-test",
+    "test:node": "dignified-test node",
+    "test:browser": "dignified-test browser",
+    "release": "dignified-release"
   },
   "pre-commit": [
     "lint",
     "test"
   ],
   "author": "Vijayee Kulkaa <vijayee.kulkaa@hushmail.com>",
   "contributors": [
-    "David Dias <daviddias@ipfs.io>"
+    "David Dias <daviddias@ipfs.io>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>"
   ],
   "license": "ISC",
   "repository": {
     "type": "git",
     "url": "https://github.com/vijayee/js-ipfs-merkle-dag.git"
   },
   "dependencies": {
+    "detect-node": "^2.0.3",
     "ipfs-blocks": "^0.1.0",
     "is-ipfs": "^0.2.0",
     "multihashing": "^0.2.0",
@@ -31,29 +35,16 @@
   },
   "devDependencies": {
     "async": "^1.5.2",
-    "brfs": "^1.4.3",
     "bs58": "^3.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
+    "dignified.js": "github:dignifiedquire/dignified.js",
     "fs-blob-store": "^5.2.1",
     "idb-plus-blob-store": "^1.0.0",
     "ipfs-repo": "^0.5.3",
-    "json-loader": "^0.5.4",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-cli": "^0.1.2",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-mocha": "^0.2.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.24",
-    "karma-webpack": "^1.7.0",
     "lodash": "^4.6.1",
-    "mocha": "^2.4.5",
     "ncp": "^2.0.0",
     "pre-commit": "^1.1.2",
-    "rimraf": "^2.5.0",
-    "standard": "^6.0.8",
-    "transform-loader": "^0.2.3",
-    "webpack": "^2.0.7-beta"
+    "rimraf": "^2.5.0"
   }
 }
diff --git a/src/dag-node.js b/src/dag-node.js
@@ -1,3 +1,5 @@
+'use strict'
+
 var util = require('./util')
 var protobuf = require('protocol-buffers')
 var stable = require('stable')

diff --git a/src/dag-service-batch.js b/src/dag-service-batch.js
@@ -1,3 +1,5 @@
+'use strict'
+
 var Block = require('ipfs-blocks').Block
 
 exports = module.exports = Batch

diff --git a/src/dag-service.js b/src/dag-service.js
@@ -1,3 +1,5 @@
+'use strict'
+
 const DAGNode = require('./dag-node').DAGNode
 const Block = require('ipfs-blocks').Block
 const isIPFS = require('is-ipfs')
@@ -70,8 +72,9 @@ function DAGService (blockService) {
       nodeStack.push(node)
 
       var keys = []
+      var link
       for (var i = 0; i < node.links.length; i++) {
-        var link = node.links[i]
+        link = node.links[i]
         keys.push(link.hash)
       }
       linkStack = linkStack.concat(keys)
@@ -81,13 +84,14 @@ function DAGService (blockService) {
       if (next) {
         this.getRecursive(next, callback, linkStack, nodeStack)
       } else {
+        const compare = (hash) => (node) => {
+          node.multihash().equals(hash)
+        }
         for (var k = 0; k < nodeStack.length; k++) {
           var current = nodeStack[k]
           for (var j = 0; j < current.links.length; j++) {
             link = current.links[j]
-            var index = nodeStack.findIndex((node) => {
-              return node.multihash().equals(link.hash)
-            })
+            var index = nodeStack.findIndex(compare(link.hash))
             if (index !== -1) {
               link.node = nodeStack[index]
             }

diff --git a/src/index.js b/src/index.js
@@ -1,3 +1,5 @@
+'use strict'
+
 exports.DAGNode = require('./dag-node.js').DAGNode
 exports.DAGLink = require('./dag-node.js').DAGLink
 exports.DAGService = require('./dag-service.js')

diff --git a/src/util.js b/src/util.js
@@ -1,7 +1,10 @@
+'use strict'
+
 var multihashing = require('multihashing')
+var isNode = require('detect-node')
 
 exports = module.exports
 
 // Hash is the global IPFS hash function. uses multihash SHA2_256, 256 bits
-exports.hash = (data) => { return multihashing(data, 'sha2-256') }
-exports.isBrowser = () => { return !!global.window }
+exports.hash = (data) => multihashing(data, 'sha2-256')
+exports.isBrowser = () => !isNode
diff --git a/tests/browser.js → test/browser.js b/tests/browser.js → test/browser.js
diff --git a/...55d25f3042c22501e41d1246e7a1e9d3d8ec.data → ...55d25f3042c22501e41d1246e7a1e9d3d8ec.data b/...55d25f3042c22501e41d1246e7a1e9d3d8ec.data → ...55d25f3042c22501e41d1246e7a1e9d3d8ec.data
diff --git a/...cf095c1d219356cdf538ffce705a52d5738d.data → ...cf095c1d219356cdf538ffce705a52d5738d.data b/...cf095c1d219356cdf538ffce705a52d5738d.data → ...cf095c1d219356cdf538ffce705a52d5738d.data
diff --git a/...a3b310512d7767a9abfbd7a928a85e977173.data → ...a3b310512d7767a9abfbd7a928a85e977173.data b/...a3b310512d7767a9abfbd7a928a85e977173.data → ...a3b310512d7767a9abfbd7a928a85e977173.data
diff --git a/...b0d3be3528fbbcc814feb7f2fbf71ca06162.data → ...b0d3be3528fbbcc814feb7f2fbf71ca06162.data b/...b0d3be3528fbbcc814feb7f2fbf71ca06162.data → ...b0d3be3528fbbcc814feb7f2fbf71ca06162.data
diff --git a/...0e64383755a8c5163ba3c053c3b65777ed16.data → ...0e64383755a8c5163ba3c053c3b65777ed16.data b/...0e64383755a8c5163ba3c053c3b65777ed16.data → ...0e64383755a8c5163ba3c053c3b65777ed16.data
diff --git a/...aa787e820fe98dbf68131bf70e796693d373.data → ...aa787e820fe98dbf68131bf70e796693d373.data b/...aa787e820fe98dbf68131bf70e796693d373.data → ...aa787e820fe98dbf68131bf70e796693d373.data
diff --git a/...cadfda3d8bc7d2f8cdf302aa51dae8dae9da.data → ...cadfda3d8bc7d2f8cdf302aa51dae8dae9da.data b/...cadfda3d8bc7d2f8cdf302aa51dae8dae9da.data → ...cadfda3d8bc7d2f8cdf302aa51dae8dae9da.data
diff --git a/...23c2d96a9f70b5fd8b1d513f8c5b69dcaed4.data → ...23c2d96a9f70b5fd8b1d513f8c5b69dcaed4.data b/...23c2d96a9f70b5fd8b1d513f8c5b69dcaed4.data → ...23c2d96a9f70b5fd8b1d513f8c5b69dcaed4.data
diff --git a/...32be52c56d99c5966b65e0111239f098bbef.data → ...32be52c56d99c5966b65e0111239f098bbef.data b/...32be52c56d99c5966b65e0111239f098bbef.data → ...32be52c56d99c5966b65e0111239f098bbef.data
diff --git a/...f9fccbf5fa0106df39556b3b411ea4121a6f.data → ...f9fccbf5fa0106df39556b3b411ea4121a6f.data b/...f9fccbf5fa0106df39556b3b411ea4121a6f.data → ...f9fccbf5fa0106df39556b3b411ea4121a6f.data
diff --git a/...81e88d2c710099738ccbd6964075730194ba.data → ...81e88d2c710099738ccbd6964075730194ba.data b/...81e88d2c710099738ccbd6964075730194ba.data → ...81e88d2c710099738ccbd6964075730194ba.data
diff --git a/...346a644605d7614dca53cd3a59f7385a8abb.data → ...346a644605d7614dca53cd3a59f7385a8abb.data b/...346a644605d7614dca53cd3a59f7385a8abb.data → ...346a644605d7614dca53cd3a59f7385a8abb.data
diff --git a/...f28fa9367ee167c312e6d65a2e02e81ab815.data → ...f28fa9367ee167c312e6d65a2e02e81ab815.data b/...f28fa9367ee167c312e6d65a2e02e81ab815.data → ...f28fa9367ee167c312e6d65a2e02e81ab815.data
diff --git a/...8af3d10e1a497971629c07606bfdb812303d.data → ...8af3d10e1a497971629c07606bfdb812303d.data b/...8af3d10e1a497971629c07606bfdb812303d.data → ...8af3d10e1a497971629c07606bfdb812303d.data
diff --git a/...2a72b057d1c7f2e682d0776a5363e2cca974.data → ...2a72b057d1c7f2e682d0776a5363e2cca974.data b/...2a72b057d1c7f2e682d0776a5363e2cca974.data → ...2a72b057d1c7f2e682d0776a5363e2cca974.data
diff --git a/...ced761633aca6704ba01a9be55934d95e5f1.data → ...ced761633aca6704ba01a9be55934d95e5f1.data b/...ced761633aca6704ba01a9be55934d95e5f1.data → ...ced761633aca6704ba01a9be55934d95e5f1.data
diff --git a/...6cfa9a7ae5533f8e997cdab2ebadd7506340.data → ...6cfa9a7ae5533f8e997cdab2ebadd7506340.data b/...6cfa9a7ae5533f8e997cdab2ebadd7506340.data → ...6cfa9a7ae5533f8e997cdab2ebadd7506340.data
diff --git a/...5cf3497a7845ee8f94456ccf4d1d2f6602b5.data → ...5cf3497a7845ee8f94456ccf4d1d2f6602b5.data b/...5cf3497a7845ee8f94456ccf4d1d2f6602b5.data → ...5cf3497a7845ee8f94456ccf4d1d2f6602b5.data
diff --git a/...0f1e4947cff8e422610996e609dbcb976598.data → ...0f1e4947cff8e422610996e609dbcb976598.data b/...0f1e4947cff8e422610996e609dbcb976598.data → ...0f1e4947cff8e422610996e609dbcb976598.data
diff --git a/...2f687a00c638bcb580feae06452e0c1f20b4.data → ...2f687a00c638bcb580feae06452e0c1f20b4.data b/...2f687a00c638bcb580feae06452e0c1f20b4.data → ...2f687a00c638bcb580feae06452e0c1f20b4.data
diff --git a/...6baef91c7dc345e73d049ab570abe10dfbb9.data → ...6baef91c7dc345e73d049ab570abe10dfbb9.data b/...6baef91c7dc345e73d049ab570abe10dfbb9.data → ...6baef91c7dc345e73d049ab570abe10dfbb9.data
diff --git a/...edca90b68053c00b3004b7f0accbe1e8eedf.data → ...edca90b68053c00b3004b7f0accbe1e8eedf.data b/...edca90b68053c00b3004b7f0accbe1e8eedf.data → ...edca90b68053c00b3004b7f0accbe1e8eedf.data
diff --git a/...fdadf9d45666c3be122a2efb5db93c1d5fa6.data → ...fdadf9d45666c3be122a2efb5db93c1d5fa6.data b/...fdadf9d45666c3be122a2efb5db93c1d5fa6.data → ...fdadf9d45666c3be122a2efb5db93c1d5fa6.data
diff --git a/...e72a83e80f9c7bca1abcaa42298a57a33ff5.data → ...e72a83e80f9c7bca1abcaa42298a57a33ff5.data b/...e72a83e80f9c7bca1abcaa42298a57a33ff5.data → ...e72a83e80f9c7bca1abcaa42298a57a33ff5.data
diff --git a/...e8710bd97eafcce5380a127dcc5ea32a887f.data → ...e8710bd97eafcce5380a127dcc5ea32a887f.data b/...e8710bd97eafcce5380a127dcc5ea32a887f.data → ...e8710bd97eafcce5380a127dcc5ea32a887f.data
diff --git a/...b92427ae41e4649b934ca495991b7852b855.data → ...b92427ae41e4649b934ca495991b7852b855.data b/...b92427ae41e4649b934ca495991b7852b855.data → ...b92427ae41e4649b934ca495991b7852b855.data
diff --git a/...e72dc99d23a391d3db5e1e42d00527241671.data → ...e72dc99d23a391d3db5e1e42d00527241671.data b/...e72dc99d23a391d3db5e1e42d00527241671.data → ...e72dc99d23a391d3db5e1e42d00527241671.data
diff --git a/...b49e3772f8949dacec55d099e3e17ac851c3.data → ...b49e3772f8949dacec55d099e3e17ac851c3.data b/...b49e3772f8949dacec55d099e3e17ac851c3.data → ...b49e3772f8949dacec55d099e3e17ac851c3.data
diff --git a/...1317afc9f967abe2aa05e7c641f7bbe98a37.data → ...1317afc9f967abe2aa05e7c641f7bbe98a37.data b/...1317afc9f967abe2aa05e7c641f7bbe98a37.data → ...1317afc9f967abe2aa05e7c641f7bbe98a37.data
diff --git a/...07def07b0db2f018808620eb30b980e94011.data → ...07def07b0db2f018808620eb30b980e94011.data b/...07def07b0db2f018808620eb30b980e94011.data → ...07def07b0db2f018808620eb30b980e94011.data
diff --git a/...8b95dd29d31eac6433af0fb6fcd83dd80778.data → ...8b95dd29d31eac6433af0fb6fcd83dd80778.data b/...8b95dd29d31eac6433af0fb6fcd83dd80778.data → ...8b95dd29d31eac6433af0fb6fcd83dd80778.data
diff --git a/tests/example-repo/config → test/example-repo/config b/tests/example-repo/config → test/example-repo/config
diff --git a/tests/example-repo/datastore/000002.ldb → test/example-repo/datastore/000002.ldb b/tests/example-repo/datastore/000002.ldb → test/example-repo/datastore/000002.ldb
diff --git a/tests/example-repo/datastore/000005.ldb → test/example-repo/datastore/000005.ldb b/tests/example-repo/datastore/000005.ldb → test/example-repo/datastore/000005.ldb
diff --git a/tests/example-repo/datastore/CURRENT → test/example-repo/datastore/CURRENT b/tests/example-repo/datastore/CURRENT → test/example-repo/datastore/CURRENT
diff --git a/tests/example-repo/datastore/LOCK → test/example-repo/datastore/LOCK b/tests/example-repo/datastore/LOCK → test/example-repo/datastore/LOCK
diff --git a/tests/example-repo/datastore/LOG → test/example-repo/datastore/LOG b/tests/example-repo/datastore/LOG → test/example-repo/datastore/LOG
diff --git a/tests/example-repo/datastore/LOG.old → test/example-repo/datastore/LOG.old b/tests/example-repo/datastore/LOG.old → test/example-repo/datastore/LOG.old
diff --git a/tests/example-repo/datastore/MANIFEST-000007 → test/example-repo/datastore/MANIFEST-000007 b/tests/example-repo/datastore/MANIFEST-000007 → test/example-repo/datastore/MANIFEST-000007
diff --git a/tests/example-repo/version → test/example-repo/version b/tests/example-repo/version → test/example-repo/version
diff --git a/tests/merkle-dag-tests.js → test/merkle-dag-tests.js b/tests/merkle-dag-tests.js → test/merkle-dag-tests.js
diff --git a/tests/index.js → test/node.js b/tests/index.js → test/node.js
@@ -7,8 +7,8 @@ const expect = require('chai').expect
 const IPFSRepo = require('ipfs-repo')
 
 describe('node test blocks', () => {
-  const repoExample = process.cwd() + '/tests/example-repo'
-  const repoTests = process.cwd() + '/tests/repo-just-for-test' + Date.now()
+  const repoExample = process.cwd() + '/test/example-repo'
+  const repoTests = process.cwd() + '/test/repo-just-for-test' + Date.now()
 
   before((done) => {
     ncp(repoExample, repoTests, (err) => {