Skip to content

Commit

Permalink
fix digest binary + add test for it
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed Jan 24, 2015
1 parent b1135dd commit 36ac130
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
7 changes: 6 additions & 1 deletion bin/digest
Expand Up @@ -3,7 +3,12 @@
var omnivore = require('..');
var path = require('path');

var filepath = path.resolve(__dirname, process.argv[2]);
if (!process.argv[2]) {
console.log('Please provide the path to geodata');
process.exit(1);
}

var filepath = process.argv[2];

omnivore.digest(filepath, function(err, metadata) {
if (err) throw err;
Expand Down
2 changes: 1 addition & 1 deletion index.js
Expand Up @@ -31,7 +31,7 @@ function digest(file, callback) {
*/
function getMetadata(file, callback) {
var metadata = {};
//Get filsize from fs.stats
//Get filesize from fs.stats
fs.stat(file, function(err, stats) {
if (err) return callback(invalid('Error getting stats from file. File might not exist.'));
var filesize = stats['size'];
Expand Down
27 changes: 27 additions & 0 deletions test/digest-bin.test.js
@@ -0,0 +1,27 @@
var tape = require('tape'),
path = require('path'),
fs = require('fs'),
cp = require('child_process');
testData = path.dirname(require.resolve('mapnik-test-data')),
mapnik_omnivore = require('../index.js');

var expectedMetadata_world_merc = JSON.parse(fs.readFileSync(path.resolve('test/fixtures/metadata_world_merc.json')));

tape('[digest bin] should return expected metadata', function(assert) {
var file = path.join(testData,'data/shp/world_merc/world_merc.shp');
var command = path.join(__dirname,"../bin/digest");
command += " " + file;
cp.exec(command,{}, function(err,stdout,stderr) {
if (err) return done(err);
assert.ok(err === null);
try {
assert.deepEqual(JSON.parse(stdout), expectedMetadata_world_merc);
} catch (err) {
console.log(err);
console.log("Expected mapnik-omnivore metadata has changed. Writing new metadata to file.");
fs.writeFileSync(path.resolve('test/fixtures/metadata_world_merc.json'), JSON.stringify(metadata));
}
assert.end();
});
});

0 comments on commit 36ac130

Please sign in to comment.