examples/gonetrains @@ -32,7 +32,8 @@ iSeptaAdapter.prototype = { error: function() { self.loading = false; }, success: function(response) { var listings = $(response).find("ol li a"); - self.trains = $.map(listings, function(listing) { return self.parse(listing); }); + self.trains = []; + $.each(listings, function() { self.parse(this); }); self.finish_loading(); } }); @@ -40,15 +41,20 @@ iSeptaAdapter.prototype = { } }, + train_is_gone: function(listing) { + return listing.find('.gone').length; + }, + parse: function(listing) { var listing = $(listing); console.debug("Creating train from listing: " + listing.html()); var trainLink = listing.attr('href').match(/trains\/(\d+)/); - if (trainLink) { + if (trainLink && !this.train_is_gone(listing)) { + console.log(listing.html()); var number = trainLink[1]; var line = listing.find('span.num').html(); var departure_time = listing.find('.d-time').text().replace(/^\s+/, ''); - return new Train(number, line, departure_time); + this.trains.push(new Train(number, line, departure_time)); } }, iSepta Train View.dcproj/project.wdgt/isepta_adapter.js @@ -22,7 +22,7 @@ Date.parse = function(iSeptaTime) { if (iSeptaTime instanceof Date) { return iSeptaTime; } else { - var parts = iSeptaTime.match(/(\d+):(\d+) (AM|PM)/); + var parts = iSeptaTime.match(/(\d+):(\d+)\s+(AM|PM)/); if (parts[1] < 12 && parts[3] == 'PM') { parts[1] = parseInt(parts[1], 10) + 12; } else if (parts[1] == 12 && parts[3] == 'AM') { iSepta Train View.dcproj/project.wdgt/mydate.js @@ -30,7 +30,9 @@ Screw.Unit(function () { ' <span class="a-time"> 6:28 <small>PM</small></span>' + ' <small class="rte"></small>' + '</a>'); - var train = iSeptaAdapter.prototype.parse(html_listing); + var adapter = new iSeptaAdapter(); + adapter.parse(html_listing); + var train = adapter.trains[0]; expect(train.number).to(equal, 4656); expect(train.line).to(equal, 'r6'); expect(train.departure_time()).to(equal, '6:02 PM'); @@ -56,6 +58,14 @@ Screw.Unit(function () { adapter.load_trains(); }); + it("should skip any trains labeled 'Gone'", function(me) { + var adapter = new iSeptaAdapter("../examples/gonetrains"); + signal(me).when(adapter).triggers('ready', function() { + expect(adapter.trains.length).to(equal, 1); + }); + adapter.load_trains(); + }); + describe("with no trains available", function() { it("should refresh data every 30 minutes", function(me) { var adapter = new iSeptaAdapter("../examples/notrains"); test/isepta_adapter_spec.js @@ -2,13 +2,13 @@ Screw.Unit(function () { describe('A Train', function() { var train; before(function() { - train = new Train(123, "R6", "8:51 AM"); + train = new Train(123, "R6", "11:38 PM"); }); it("should store it's number, downcased line and departure time as given", function() { expect(train.number).to(equal, 123); expect(train.line).to(equal, "r6"); - expect(train.departure_time()).to(equal, "8:51 AM"); + expect(train.departure_time()).to(equal, "11:38 PM"); }); it("should know if it has already departed", function() { test/train_spec.js 7cb70225ded3ef440e36d161be35339ed9cce888 Mat Schaffer mat.schaffer@gmail.com http://github.com/matschaffer/isepta-train-view.wdgt/commit/2df276b538e8e163a11568bc44ad6be1e10ca8d9 2df276b538e8e163a11568bc44ad6be1e10ca8d9 2009-07-07T06:22:48-07:00 2009-07-07T06:22:48-07:00 Updated to handle isepta.org updates. Specifically handling the "Gone" trains and what seems to be some special whitespace in the time fields. 28887d6fb9a079c1cda8591feee9625bfda1d8d7 Mat Schaffer mat.schaffer@gmail.com