version 0.3.2. stop using ./lib.

Makefile

@@ -1,21 +1,21 @@
 REPORTER = spec
 
 lint:
-	./node_modules/.bin/jshint ./lib ./test ./index.js
+	./node_modules/.bin/jshint ./test ./index.js ./util.js
 
 browser-test:
 	$(MAKE) browser-build
 	gnome-open test.html
 
 browser-build-min:
 	@rm -f urlgrey.min.js
-	@./node_modules/.bin/browserify ./lib/urlgrey.js \
+	@./node_modules/.bin/browserify index.js \
 		-s urlgrey | \
 	./node_modules/.bin/uglifyjs > urlgrey.min.js
 
 browser-build:
 	@rm -f urlgrey.js
-	@./node_modules/.bin/browserify ./lib/urlgrey.js \
+	@./node_modules/.bin/browserify index.js \
 		-s urlgrey > urlgrey.js
 
 precommit:
@@ -25,6 +25,7 @@ precommit:
 	echo "Artifacts built!"
 
 test:
+	$(MAKE) lint
 	@NODE_ENV=test ./node_modules/.bin/mocha -b --reporter $(REPORTER)
 
 test-cov:

browser/querystring.js

@@ -22,14 +22,14 @@
 // Query String Utilities
 
 var QueryString = exports;
-var isString = require('../lib/util').isString;
-var isArray = require('../lib/util').isArray;
-var isBoolean = require('../lib/util').isBoolean;
-var isNumber = require('../lib/util').isNumber;
-var isObject = require('../lib/util').isObject;
-var isNull = require('../lib/util').isNull;
-var keys = require('../lib/util').keys;
-var map = require('../lib/util').map;
+var isString = require('../util').isString;
+var isArray = require('../util').isArray;
+var isBoolean = require('../util').isBoolean;
+var isNumber = require('../util').isNumber;
+var isObject = require('../util').isObject;
+var isNull = require('../util').isNull;
+var keys = require('../util').keys;
+var map = require('../util').map;
 
 // If obj.hasOwnProperty has been overridden, then calling
 // obj.hasOwnProperty(prop) will break.

browser/url.js

@@ -26,10 +26,10 @@ if (!String.prototype.trim) {
   };
 }
 
-var isObject = require('../lib/util').isObject;
-var isString = require('../lib/util').isString;
-var keys = require('../lib/util').keys;
-var substr = require('../lib/util').substr;
+var isObject = require('../util').isObject;
+var isString = require('../util').isString;
+var keys = require('../util').keys;
+var substr = require('../util').substr;
 
 exports.parse = urlParse;
 exports.format = urlFormat;