Merge pull request ipfs#30 from dignifiedquire/dignified

Use dignified.js

Author: daviddias

.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

karma.conf.js

@@ -2,27 +2,34 @@
   "name": "ipfs-merkle-dag",
   "version": "0.3.0",
   "description": "A JavaScript implementations of the IPFS MerkleDAG implementations (protobufs)",
-  "main": "./src/index.js",
+  "main": "lib/index.js",
+  "jsnext: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",
+    "coverage": "dignified-coverage"
   },
   "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": {
+    "bs58": "^3.0.0",
+    "detect-node": "^2.0.3",
     "ipfs-blocks": "^0.1.0",
     "is-ipfs": "^0.2.0",
     "multihashing": "^0.2.0",
@@ -31,29 +38,15 @@
   },
   "devDependencies": {
     "async": "^1.5.2",
-    "brfs": "^1.4.3",
-    "bs58": "^3.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
+    "dignified.js": "^1.0.0",
     "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"
   }
 }

package.json

@@ -1,3 +1,5 @@
+'use strict'
+
 var util = require('./util')
 var protobuf = require('protocol-buffers')
 var stable = require('stable')

src/dag-node.js

@@ -1,3 +1,5 @@
+'use strict'
+
 var Block = require('ipfs-blocks').Block
 
 exports = module.exports = Batch

src/dag-service-batch.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]
             }

src/dag-service.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')

src/index.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

src/util.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) => {