Update build, tidy up a few things, make tests work

Author: garyb

.gitignore

@@ -1,5 +1,8 @@
 /.*
+!/.gitignore
+!/.jscsrc
+!/.jshintrc
+!/.travis.yml
 /bower_components/
 /node_modules/
 /output/
-/tmp/

.jscsrc

@@ -0,0 +1,12 @@
+{
+  "preset": "grunt",
+  "disallowSpacesInAnonymousFunctionExpression": null,
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true,
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInsideObjectBrackets": null,
+  "requireSpacesInsideObjectBrackets": "all",
+  "validateQuoteMarks": "\"",
+  "requireCurlyBraces": null
+}

.jshintrc

@@ -0,0 +1,19 @@
+{
+  "bitwise": true,
+  "eqeqeq": true,
+  "forin": true,
+  "freeze": true,
+  "funcscope": true,
+  "futurehostile": true,
+  "globalstrict": true,
+  "latedef": true,
+  "maxparams": 1,
+  "noarg": true,
+  "nocomma": true,
+  "nonew": true,
+  "notypeof": true,
+  "singleGroups": true,
+  "undef": true,
+  "unused": true,
+  "eqnull": true
+}

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+sudo: false
+node_js:
+  - 0.10
+env:
+  - PATH=$HOME/purescript:$PATH
+install:
+  - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
+  - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
+  - tar -xvf $HOME/purescript.tar.gz -C $HOME/
+  - chmod a+x $HOME/purescript
+  - npm install
+script:
+  - npm run build

README.md

@@ -1,6 +1,10 @@
 # purescript-maps
 
-Purely-functional map data structures
+[![Latest release](http://img.shields.io/bower/v/purescript-maps.svg)](https://github.com/purescript/purescript-maps/releases)
+[![Build Status](https://travis-ci.org/purescript/purescript-maps.svg?branch=master)](https://travis-ci.org/purescript/purescript-maps)
+[![Dependency Status](https://www.versioneye.com/user/projects/55848c1b363861001d000315/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55848c1b363861001d000315)
+
+Purely-functional map data structures.
 
 ## Installation
 

bower.json

@@ -19,27 +19,16 @@
     "bower_components",
     "node_modules",
     "output",
-    "tests",
-    "tmp",
+    "test",
     "bower.json",
-    "Gruntfile.js",
     "package.json"
   ],
-  "devDependencies": {
-    "purescript-quickcheck": "^0.6.0"
-  },
   "dependencies": {
-    "purescript-arrays": "^0.4.0",
-    "purescript-foldable-traversable": "^0.4.0",
-    "purescript-strings": "^0.5.0",
-    "purescript-lists": "^0.7.0",
-    "purescript-math": "^0.2.0",
-    "purescript-maybe": "^0.3.0",
-    "purescript-tuples": "^0.4.0",
-    "purescript-integers": "^0.2.0",
-    "purescript-prelude": "^0.1.0",
-    "purescript-functions": "^0.1.0",
-    "purescript-eff": "^0.1.0",
-    "purescript-st": "^0.1.0"
+    "purescript-lists": "~0.7.0",
+    "purescript-st": "~0.1.0",
+    "purescript-functions": "~0.1.0"
+  },
+  "devDependencies": {
+    "purescript-quickcheck": "~0.6.0"
   }
 }

gulpfile.js

@@ -1,10 +1,13 @@
 {
   "private": true,
+  "scripts": {
+    "postinstall": "pulp dep install",
+    "build": "jshint src && jscs src && pulp test && rimraf docs && pulp docs"
+  },
   "devDependencies": {
-    "gulp": "^3.8.11",
-    "gulp-plumber": "^1.0.0",
-    "gulp-purescript": "^0.5.0-rc.1",
-    "gulp-run": "^1.6.8",
-    "rimraf": "^2.3.3"
+    "jscs": "^1.13.1",
+    "jshint": "^2.8.0",
+    "pulp": "^4.0.2",
+    "rimraf": "^2.4.1"
   }
 }

package.json

@@ -28,14 +28,12 @@ module Data.Map
 import Prelude
 
 import Data.Foldable (foldl, foldMap, foldr, Foldable)
-import Data.Int ()
+import Data.List (List(..), length, nub)
 import Data.Maybe (Maybe(..), maybe, isJust)
 import Data.Monoid (Monoid)
 import Data.Traversable (traverse, Traversable)
 import Data.Tuple (Tuple(..), uncurry)
 
-import Data.List (List(..), length, nub)
-
 -- | `Map k v` represents maps from keys of type `k` to values of type `v`.
 data Map k v
   = Leaf

src/Data/Map.purs

@@ -3,110 +3,131 @@
 
 // module Data.StrMap
 
-exports._copy = function(m) {
+exports._copy = function (m) {
   var r = {};
   for (var k in m) {
-    r[k] = m[k];
+    if (m.hasOwnProperty(k)) {
+      r[k] = m[k];
+    }
   }
   return r;
 };
 
-exports._copyEff = function(m) {
-  return function() {
+exports._copyEff = function (m) {
+  return function () {
     var r = {};
     for (var k in m) {
-      r[k] = m[k];
+      if (m.hasOwnProperty(k)) {
+        r[k] = m[k];
+      }
     }
     return r;
   };
 };
 
 exports.empty = {};
 
-exports.runST = function(f) {
+exports.runST = function (f) {
   return f;
 };
 
-exports._fmapStrMap = function(m0, f) {
+// jshint maxparams: 2
+exports._fmapStrMap = function (m0, f) {
   var m = {};
   for (var k in m0) {
-    m[k] = f(m0[k]);
+    if (m.hasOwnProperty(k)) {
+      m[k] = f(m0[k]);
+    }
   }
   return m;
 };
 
-exports._foldM = function(bind) {
-  return function(f) {
-    return function(mz) {
-      return function(m) {
-        function g(k) {
+// jshint maxparams: 1
+exports._foldM = function (bind) {
+  return function (f) {
+    return function (mz) {
+      return function (m) {
+        function g (k) {
           return function (z) {
             return f(z)(k)(m[k]);
           };
         }
         for (var k in m) {
-          mz = bind(mz)(g(k));
+          if (m.hasOwnProperty(k)) {
+            mz = bind(mz)(g(k));
+          }
         }
         return mz;
       };
     };
   };
 };
 
-exports._foldSCStrMap = function(m, z, f, fromMaybe) {
+// jshint maxparams: 4
+exports._foldSCStrMap = function (m, z, f, fromMaybe) {
   for (var k in m) {
-    var maybeR = f(z)(k)(m[k]);
-    var r = fromMaybe(null)(maybeR);
-    if (r === null) return z;
-    else z = r;
+    if (m.hasOwnProperty(k)) {
+      var maybeR = f(z)(k)(m[k]);
+      var r = fromMaybe(null)(maybeR);
+      if (r === null) return z;
+      else z = r;
+    }
   }
   return z;
 };
 
-exports.all = function(f) {
-  return function(m) {
+// jshint maxparams: 1
+exports.all = function (f) {
+  return function (m) {
     for (var k in m) {
-      if (!f(k)(m[k])) return false;
+      if (m.hasOwnProperty(k) && !f(k)(m[k])) return false;
     }
     return true;
   };
 };
 
-exports.size = function(m) {
+exports.size = function (m) {
   var s = 0;
   for (var k in m) {
-    ++s;
+    if (m.hasOwnProperty(k)) {
+      ++s;
+    }
   }
   return s;
 };
 
-exports._lookup = function(no, yes, k, m) {
+// jshint maxparams: 4
+exports._lookup = function (no, yes, k, m) {
   return k in m ? yes(m[k]) : no;
 };
 
-exports._unsafeDeleteStrMap = function(m, k) {
-   delete m[k];
-   return m;
+// jshint maxparams: 2
+exports._unsafeDeleteStrMap = function (m, k) {
+  delete m[k];
+  return m;
 };
 
-exports._lookupST = function(no, yes, k, m) {
-  return function() {
+// jshint maxparams: 4
+exports._lookupST = function (no, yes, k, m) {
+  return function () {
     return k in m ? yes(m[k]) : no;
-  }
+  };
 };
 
-function _collect(f) {
-  return function(m) {
+function _collect (f) {
+  return function (m) {
     var r = [];
     for (var k in m) {
-      r.push(f(k)(m[k]));
+      if (m.hasOwnProperty(k)) {
+        r.push(f(k)(m[k]));
+      }
     }
     return r;
   };
-};
+}
 
 exports._collect = _collect;
 
-exports.keys = Object.keys || _collect(function(k) {
-  return function() { return k; };
-});
+exports.keys = Object.keys || _collect(function (k) {
+  return function () { return k; };
+});