Test reorg

.travis.yml

@@ -5,6 +5,3 @@ node_js:
   - "0.11"
   - "0.10"
   - "iojs"
-before_install: npm install -g grunt-cli
-install: npm install
-#before_script: grunt test

index.js

@@ -14,7 +14,7 @@ function dbfRowHeader(buffer){
 	var offset = 32;
 	while(true){
 		out.push({
-			name : String.fromCharCode.apply(this,(new Uint8Array(buffer,offset,10))).replace(/\0|\s+$/g,''),
+			name : String.fromCharCode.apply(this,(new Uint8Array(buffer,offset,11))).replace(/\0|\s+$/g,''),
 			dataType : String.fromCharCode(data.getUint8(offset+11)),
 			len : data.getUint8(offset+16),
 			decimal : data.getUint8(offset+17)

package.json

@@ -4,7 +4,7 @@
   "description": "The DBF parsing component of shapefile-js",
   "main": "index.js",
   "scripts": {
-    "test": "grunt"
+    "test": "jshint index.js && mocha -R spec test/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -20,10 +20,8 @@
     "url": "https://github.com/calvinmetcalf/parseDBF/issues"
   },
   "devDependencies": {
-    "grunt-mocha-test": "~0.7.0",
-    "grunt": "~0.4.1",
-    "grunt-contrib-jshint": "~0.6.4",
-    "mocha": "~1.13.0",
-    "chai": "~1.8.0"
+    "chai": "^2.3.0",
+    "jshint": "^2.7.0",
+    "mocha": "^2.2.5"
   }
 }

test/basic.test.js

@@ -1,5 +1,8 @@
 var fs = require('fs');
-var out = require('./data/watershed');
+var basic = require('./data/watershed');
+var char11 = require('./data/watershed-11chars');
+var specialChar = require('./data/watershed-specialCharacters');
+
 var dbf = require('../');
 require('chai').should();
 function toArrayBuffer(buffer) {
@@ -10,14 +13,32 @@ function toArrayBuffer(buffer) {
     }
     return ab;
 }
-describe('basic',function(){
+describe('dbf',function(){
 	it('should work',function(done){
 		fs.readFile('./test/data/watershed.dbf',function(err,data){
 			if(err){
 				return done(err);
 			}
-			dbf(toArrayBuffer(data)).should.deep.equal(out);
+			dbf(toArrayBuffer(data)).should.deep.equal(basic);
 			done();
 		});
 	});
-});
+  it('should handle 11 charicter field names',function(done){
+		fs.readFile('./test/data/watershed-11chars.dbf',function(err,data){
+			if(err){
+				return done(err);
+			}
+			dbf(toArrayBuffer(data)).should.deep.equal(char11);
+			done();
+		});
+	});
+  it('should handle spetial charicters',function(done){
+    fs.readFile('./test/data/watershed-specialCharacters.dbf',function(err,data){
+      if(err){
+        return done(err);
+      }
+      dbf(toArrayBuffer(data)).should.deep.equal(specialChar);
+      done();
+    });
+  });
+});

test/data/watershed-11chars.js

@@ -0,0 +1,165 @@
+module.exports = [ { DWM_NAME: 'BUZZARDS BAY',
+    DWM_CODE: '95',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 1100426424.93,
+    SHAPE_LEN: 680071.913919 },
+  { DWM_NAME: 'CAPE COD',
+    DWM_CODE: '96',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 913978642.943,
+    SHAPE_LEN: 802211.67478 },
+  { DWM_NAME: 'MERRIMACK',
+    DWM_CODE: '84',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 728159472.653,
+    SHAPE_LEN: 330783.925198 },
+  { DWM_NAME: 'DEERFIELD',
+    DWM_CODE: '33',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 897643472.911,
+    SHAPE_LEN: 162416.647504 },
+  { DWM_NAME: 'CONNECTICUT',
+    DWM_CODE: '34',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1733946880.89,
+    SHAPE_LEN: 418239.123507 },
+  { DWM_NAME: 'NASHUA',
+    DWM_CODE: '81',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1154375570.89,
+    SHAPE_LEN: 220748.885051 },
+  { DWM_NAME: 'SHAWSHEEN',
+    DWM_CODE: '83',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 202238731.243,
+    SHAPE_LEN: 124382.780229 },
+  { DWM_NAME: 'IPSWICH',
+    DWM_CODE: '92',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 402321528.158,
+    SHAPE_LEN: 194368.060063 },
+  { DWM_NAME: 'CONCORD (SuAsCo)',
+    DWM_CODE: '82',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1034986406.42,
+    SHAPE_LEN: 207648.657121 },
+  { DWM_NAME: 'WESTFIELD',
+    DWM_CODE: '32',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1337870479.81,
+    SHAPE_LEN: 309269.019544 },
+  { DWM_NAME: 'HOUSATONIC',
+    DWM_CODE: '21',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1295634364.97,
+    SHAPE_LEN: 254658.861254 },
+  { DWM_NAME: 'CHARLES',
+    DWM_CODE: '72',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 804337278.228,
+    SHAPE_LEN: 249234.107364 },
+  { DWM_NAME: 'BLACKSTONE',
+    DWM_CODE: '51',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 868716081.064,
+    SHAPE_LEN: 247406.544661 },
+  { DWM_NAME: 'FARMINGTON',
+    DWM_CODE: '31',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 403208864.827,
+    SHAPE_LEN: 174077.861519 },
+  { DWM_NAME: 'FRENCH',
+    DWM_CODE: '42',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 245240661.27,
+    SHAPE_LEN: 95630.237872 },
+  { DWM_NAME: 'SOUTH COASTAL',
+    DWM_CODE: '94',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 623318341.503,
+    SHAPE_LEN: 348638.121478 },
+  { DWM_NAME: 'QUINEBAUG',
+    DWM_CODE: '41',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 398412533.969,
+    SHAPE_LEN: 155488.644205 },
+  { DWM_NAME: 'TAUNTON',
+    DWM_CODE: '62',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1371098117.82,
+    SHAPE_LEN: 339730.645372 },
+  { DWM_NAME: 'TEN MILE',
+    DWM_CODE: '52',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 125924435.756,
+    SHAPE_LEN: 84146.6302256 },
+  { DWM_NAME: 'NARRAGANSETT BAY (SHORE)',
+    DWM_CODE: '53',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 150006557.671,
+    SHAPE_LEN: 63312.1134996 },
+  { DWM_NAME: 'ISLANDS',
+    DWM_CODE: '97',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 412340033.574,
+    SHAPE_LEN: 443601.354619 },
+  { DWM_NAME: 'CHICOPEE',
+    DWM_CODE: '36',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 1868726700.74,
+    SHAPE_LEN: 336390.398831 },
+  { DWM_NAME: 'MILLERS',
+    DWM_CODE: '35',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 805953097.126,
+    SHAPE_LEN: 208548.57714 },
+  { DWM_NAME: 'BOSTON HARBOR: Mystic',
+    DWM_CODE: '71',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 169490600.488,
+    SHAPE_LEN: 104702.983458 },
+  { DWM_NAME: 'BOSTON HARBOR: Weymouth & Weir',
+    DWM_CODE: '74',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 230274616.059,
+    SHAPE_LEN: 205749.368678 },
+  { DWM_NAME: 'BOSTON HARBOR: Neponset',
+    DWM_CODE: '73',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 302273378.57,
+    SHAPE_LEN: 164291.649994 },
+  { DWM_NAME: 'NORTH COASTAL',
+    DWM_CODE: '93',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 444012782.854,
+    SHAPE_LEN: 481586.96927 },
+  { DWM_NAME: 'PARKER',
+    DWM_CODE: '91',
+    DRAINAGE910: 'river and coastal',
+    SHAPE_AREA: 210671196.057,
+    SHAPE_LEN: 223674.642474 },
+  { DWM_NAME: 'BOSTON HARBOR (Proper)',
+    DWM_CODE: '70',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 58322330.1896,
+    SHAPE_LEN: 192742.092623 },
+  { DWM_NAME: 'MOUNT HOPE BAY (SHORE)',
+    DWM_CODE: '61',
+    DRAINAGE910: 'coastal',
+    SHAPE_AREA: 140721349.355,
+    SHAPE_LEN: 130978.457315 },
+  { DWM_NAME: 'HUDSON: Bashbish',
+    DWM_CODE: '13',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 39802182.4217,
+    SHAPE_LEN: 41431.5176318 },
+  { DWM_NAME: 'HUDSON: Hoosic',
+    DWM_CODE: '11',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 430987849.282,
+    SHAPE_LEN: 108535.221012 },
+  { DWM_NAME: 'HUDSON: Kinderhook',
+    DWM_CODE: '12',
+    DRAINAGE910: 'river',
+    SHAPE_AREA: 56596528.9263,
+    SHAPE_LEN: 55533.0776528 } ];