Fix #12

Author: Pieter Colpaert

README.md

@@ -15,10 +15,9 @@ In this case, you can install it globally using `npm install -g gtfs-csv2rdf`
 
 ```bash
 # First argument: path to gtfs
-# Second argument: the version of the feed
-# Third argument: the base URI
-# Forth argument (optional): the requested format (turtle, ntriples or jsonld)
-gtfs-csv2rdf path-to-gtfs.zip 0.1 http://data.gtfs.org/ turtle > gtfsintriples.ttl
+# Second argument: the base URI
+# Third argument (optional): the requested format (turtle (default), ntriples or jsonld)
+gtfs-csv2rdf path-to-gtfs.zip http://data.gtfs.org/sample-feed/0.1/ turtle > gtfsintriples.ttl
 ```
 ### As a nodejs library
 
@@ -48,8 +47,7 @@ var streamWriter = new N3.StreamWriter({ 'gtfs': 'http://vocab.gtfs.org/terms#',
 streamWriter.pipe(process.stdout);
 var options = {
   feedname : feedname,
-  version : "0.1",
-  baseuri : "http://data.gtfs.org/"
+  baseuri : "http://data.example.org/sample-feed/0.1/"
 };
 gtfscsv2rdf(fs.createReadStream(path), streamWriter, options);
 ```

gtfs-csv2rdf

@@ -2,14 +2,14 @@
 /* Pieter Colpaert */
 
 /**
- * This script reads a zipped GTFS archive and maps it into RDF (text/turtle) in a streaming fashion
+ * This script reads a zipped GTFS archive and maps it into RDF (text/turtle, application/ld+json or N-Triples) in a streaming fashion
  */
 
-var fs = require('fs');
-var N3 = require('n3');
-var mapper = require('./lib/gtfs-csv2rdf.js').zipToTriples;
-var toJsonLD = require('./lib/gtfs-csv2rdf.js').toJsonLD;
-var stringify = require('JSONStream').stringify(false);
+var fs = require('fs'),
+    N3 = require('n3'),
+    mapper = require('./lib/gtfs-csv2rdf.js').zipToTriples,
+    toJsonLD = require('./lib/gtfs-csv2rdf.js').toJsonLD,
+    stringify = require('JSONStream').stringify(false);
 
 var die = function (msg) {
   console.log(msg);
@@ -20,22 +20,17 @@ var die = function (msg) {
 var path = "",
     version = "",
     baseuri = "";
+
 if (process.argv[2]) {
   path = process.argv[2];
 }else {
   die("Give a path towards your gtfs feed as a first argument");
 }
 
 if (process.argv[3]) {
-  version = process.argv[3];
-} else {
-  die("Give the version as a second argument");
-}
-
-if (process.argv[4]) {
-  baseuri = process.argv[4];
+  baseuri = process.argv[3].replace(/\/+$/,'');
 } else {
-  die("Give the base uri as a second argument. Don't forget a trailing slash.");
+  die("Give the full base uri as a second argument. We'll append a forward slash ourselves.");
 }
 
 var type = "turtle";

lib/helpers/TransformerPicker.js

@@ -7,12 +7,14 @@ function pickTransformer (filename, options) {
   if (!options) {
     throw 'Options not given. We want a feedname and a version.';
   }
+  
+  if (!options.baseuri) {
+    throw 'Please set baseuri';
+  }
+  
   if (!options.feedname) {
     throw 'Please set feedname';
   }
-  if (!options.version) {
-    throw 'Please set version';
-  }
 
   var gtfsFilenames = {
     'stops.txt' : require('../transformers/StopsTransformer.js'),

lib/helpers/ZipToTriples.js

@@ -15,8 +15,8 @@ function zipStreamToTriples (zipstream, outstream, options) {
   if (!options.feedname) {
     throw "Please set feedname";
   }
-  if (!options.version) {
-    throw "Please set version";
+  if (!options.baseuri) {
+    throw "Please set baseuri";
   }
 
   var lastTransformer = null;

lib/transformers/AgenciesTransformer.js

@@ -7,7 +7,7 @@ var Transform = require('stream').Transform,
 util.inherits(AgenciesTransformer, Transform);
 
 function AgenciesTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
 }

lib/transformers/CalendarDatesTransformer.js

@@ -8,7 +8,7 @@ var Transform = require('stream').Transform,
 util.inherits(CalendarDatesTransformer, Transform);
 
 function CalendarDatesTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
 }

lib/transformers/CalendarTransformer.js

@@ -8,7 +8,7 @@ var Transform = require('stream').Transform,
 util.inherits(CalendarTransformer, Transform);
 
 function CalendarTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
 }

lib/transformers/FareAttributesTransformer.js

@@ -7,7 +7,7 @@ var Transform = require('stream').Transform,
 util.inherits(FareAttributesTransformer, Transform);
 
 function FareAttributesTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
 }

lib/transformers/FareRulesTransformer.js

@@ -7,7 +7,7 @@ var Transform = require('stream').Transform,
 util.inherits(FareRulesTransformer, Transform);
 
 function FareRulesTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
 }

lib/transformers/FeedInfoTransformer.js

@@ -8,7 +8,7 @@ var Transform = require('stream').Transform,
 util.inherits(FeedInfoTransformer, Transform);
 
 function FeedInfoTransformer (options) {
-  this._feedbaseuri = options.baseuri + options.feedname + "/" + options.version ;
+  this._feedbaseuri = options.baseuri;
   this._options = options;
   Transform.call(this, {objectMode : true});
   this._feedcount = 0;