translink 0.0.1 → 1.0.0

data/test/unit/cli_test.rb

@@ -28,33 +28,17 @@ class CLITtest < MiniTest::Unit::TestCase
 
   def test_blank_executes_help_command
     @cli.run ''
-    assert_match /help/, @out.string
+    assert_includes @out.string, 'Usage'
   end
 
   def test_unrecognised_command_executes_help_command
     @cli.run 'unknown'
-    assert_match /help/, @out.string
-  end
-
-  def test_execute_extract_command_with_invalid_uri
-    @cli.run 'extract invalid'
-    assert_match /help/, @out.string
-  end
-
-  def test_execute_extract_command_with_valid_uri
-    file          = File.join TMPDIR, "test_extract_#{Time.now.to_i}.sqlite3"
-    stop_instance = MiniTest::Mock.new.expect(:extract!, nil).expect(:save!, true)
-    stop_class    = MiniTest::Mock.new.expect :all, [stop_instance]
-    @cli.__stop__ = stop_class
-    @cli.run "extract sqlite://#{file}"
-    assert stop_instance.verify
-    assert stop_class.verify
-    assert File.exists?(file), 'Expected file to exist.'
+    assert_includes @out.string, 'Usage'
   end
 
   def test_execute_help_command
     @cli.run 'help'
-    assert_match /help/, @out.string
+    assert_includes @out.string, 'Usage'
   end
 
   def test_execute_scrape_command_with_uri
@@ -73,6 +57,6 @@ class CLITtest < MiniTest::Unit::TestCase
 
   def test_execute_scrape_command_without_date_executes_help_command
     @cli.run 'scrape'
-    assert_match /help/, @out.string
+    assert_includes @out.string, 'Usage'
   end
 end

data/test/unit/crawler_test.rb

@@ -1,42 +1,22 @@
 require 'helper'
 
 class CrawlerTest < MiniTest::Unit::TestCase
-  class Model
-    attr_reader :trip_pages
-
-    def initialize
-      @trip_pages = []
-    end
-
-    def add_service_from_trip_page trip_pages
-      @trip_pages << trip_pages
-    end
-
-    def self.find_or_add_from_route_page route_page
-      instance
-    end
-
-    def self.instance
-      @instance ||= new
-    end
-  end
-
-  def test_initialize
-    assert_equal 'http://localhost', Crawler.new('http://localhost').url.to_s
-  end
-
   def test_crawl
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables').
-      to_return(:status => 200, :body => fixture('sample/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    stub_request(:get, /http:\/\/jp.translink.com.au\/travel-information\/services-and-timetables\/buses\/view-bus-timetable\/\d+\?direction=(In|Out)bound&routeCode=[0-9A-Z]+&timetableDate=\d{4}-\d{2}-\d{2}/).
-      to_return(:status => 200, :body => fixture('sample/route.html'), :headers => {'Content-Type' => 'text/html'})
-    stub_request(:get, /http:\/\/jp.translink.com.au\/travel-information\/services-and-timetables\/trip-details\/\d+\?timetableDate=\d{4}-\d{2}-\d{2}/).
-      to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
-    stub_request(:post, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').
-      to_return(:status => 200, :body => fixture('sample/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    crawler = Crawler.new 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables'
-    crawler.__model__ = Model
-    crawler.crawl Date.today
-    assert_equal 6, Model.instance.trip_pages.size
+    DB.context 'sqlite::memory:', :migrate => true do
+      stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables').
+        to_return(:status => 200, :body => fixture('sample/timetable.html'), :headers => {'Content-Type' => 'text/html'})
+      stub_request(:post, 'http://jp.translink.com.au/travel-information/network-information/timetables').
+        to_return(:status => 200, :body => fixture('sample/timetable.html'), :headers => {'Content-Type' => 'text/html'})
+      stub_request(:get, %r{http://jp.translink.com.au/travel-information/network-information/buses/\w+}).
+        to_return(:status => 200, :body => fixture('sample/route.html'), :headers => {'Content-Type' => 'text/html'})
+      stub_request(:get, %r{http://jp.translink.com.au/travel-information/network-information/service-information/\w+/\d+/\d+/\d+-\d+-\d+}).
+        to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
+      crawler = Crawler.new 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables'
+      crawler.crawl Date.today
+      assert_equal 1, Model::Route.count
+      assert_equal 1, Model::Trip.count
+      assert_equal 27, Model::Stop.count
+      assert_equal 27, Model::StopTime.count
+    end
   end
 end

data/test/unit/model/route_test.rb

@@ -1,35 +1,24 @@
 require 'helper'
 
 class Model::RouteTest < MiniTest::Unit::TestCase
-  def test_add_services_from_trip_pages
-    DB.new 'sqlite::memory:' do
-      trip = Page::Trip::Trip.new.tap do |t|
-        t.stop = Page::Trip::Stop.new 'Illaweena St (Waterstone)', 'Waterstone, Illaweena St far side of Waterbrooke Crt'
-        t.time = DateTime.parse '2011-11-24 23:17:00'
-      end
+  def test_find_or_add_route_from_route_page
+    DB.context 'sqlite::memory:', :migrate => true do
       route_page = MiniTest::Mock.new
-      route_page.expect :code, '130'
-      route_page.expect :name, 'City Buz 130 Via Sunnybank'
-      route_page.expect :translink_id, 1
-      trip_page = MiniTest::Mock.new
-      trip_page.expect :trips, [trip]
-      route_model = Model::Route.find_or_add_from_route_page route_page
-      route_model.add_service_from_trip_page trip_page
-      route_model.add_service_from_trip_page trip_page
-      route_model.add_service_from_trip_page trip_page
-      assert_equal 3, Model::Service.count
-      assert_equal 1, Model::Stop.count
+      route_page.expect :short_name, '130'
+      route_page.expect :long_name, 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson'
+      route_page.expect :route_type, 0
+      assert_equal 0, Model::Route.count
+      assert_equal Model::Route.find_or_add_route_from_route_page(route_page), Model::Route.find_or_add_route_from_route_page(route_page)
+      assert_equal 1, Model::Route.count
     end
   end
 
-  def test_find_or_add_from_route_page
-    DB.new 'sqlite::memory:' do
-      route_page = MiniTest::Mock.new
-      route_page.expect :code, '130'
-      route_page.expect :name, 'City Buz 130 Via Sunnybank'
-      route_page.expect :translink_id, 1
-      assert_equal Model::Route.find_or_add_from_route_page(route_page), Model::Route.find_or_add_from_route_page(route_page)
-      assert_equal 1, Model::Route.count
+  def test_add_trip_from_trip_page
+    DB.context 'sqlite::memory:', :migrate => true do
+      trip_page   = OpenStruct.new :direction => 'outbound', :service_id => 8550, :trip_id => 1712196
+      route_model = Model::Route.new
+      trip_model  = route_model.add_trip_from_trip_page trip_page
+      assert trip_model.saved?
     end
   end
 end

data/test/unit/model/stop_test.rb

@@ -1,37 +1,12 @@
 require 'helper'
 
 class Model::StopTest < MiniTest::Unit::TestCase
-  def test_find_or_add_from_stop
-    DB.new 'sqlite::memory:' do
-      stop = MiniTest::Mock.new
-      stop.expect :name, 'Illaweena St (Waterstone)'
-      stop.expect :summary, 'Waterstone, Illaweena St far side of Waterbrooke Crt'
-      assert_equal Model::Stop.find_or_add_from_stop(stop), Model::Stop.find_or_add_from_stop(stop)
-      assert_equal 1, Model::Stop.count
+  def test_find_or_add_from_stop_page
+    DB.context 'sqlite::memory:', :migrate => true do
+      stop_page = OpenStruct.new :stop_id => 001002, :stop_name => 'Queen Street station, platform A6', :stop_lat => '-27.473648', :stop_lon => '153.018908'
+      assert_equal 0, Model::Stop.count 
+      assert_equal Model::Stop.find_or_add_from_stop_page(stop_page), Model::Stop.find_or_add_from_stop_page(stop_page)
+      assert_equal 1, Model::Stop.count 
     end
   end
-
-  def test_all
-    DB.new 'sqlite::memory:' do
-      Model::Stop.create :name => 'Adelaide St'
-      Model::Stop.create :name => 'Queen St'
-      Model::Stop.create :name => 'Elizabeth St'
-      stops = Model::Stop.all
-      assert_equal ['Adelaide St', 'Queen St', 'Elizabeth St'], stops.map(&:name)
-    end
-  end
-
-  def test_extract!
-    stop               = Model::Stop.new
-    extractor_instance = MiniTest::Mock.new.expect :extract!, stop
-    extractor_class    = MiniTest::Mock.new.expect :new, extractor_instance, [stop]
-    stop.__extractor__ = extractor_class
-    stop.extract!
-    assert extractor_instance.verify
-    assert extractor_class.verify
-  end
-
-  def test__extractor__
-    assert_equal Model::Stop::Extractor, Model::Stop.new.__extractor__
-  end
 end

data/test/unit/model/stop_time_test.rb

@@ -0,0 +1,11 @@
+require 'helper'
+
+class Model::StopTimeTest < MiniTest::Unit::TestCase
+  def test_stop_time_page_with_bang
+    stop_time_page  = OpenStruct.new :arrival_time => '10:00 A.M.', :stop_page => OpenStruct.new, :stop_sequence => 7
+    stop_time_model = Model::StopTime.new
+    stop_time_model.stop_time_page! stop_time_page
+    assert_equal stop_time_page.arrival_time, stop_time_model.arrival_time   
+    assert_equal stop_time_page.stop_sequence, stop_time_model.stop_sequence
+  end
+end

data/test/unit/model/trip_test.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+class Model::TripTest < MiniTest::Unit::TestCase
+  def test_trip_page_with_bang
+    trip_page  = OpenStruct.new :direction => 'outbound', :service_id => 8550, :trip_id => 1712196
+    trip_model = Model::Trip.new
+    trip_model.trip_page! trip_page
+    assert_equal trip_model.direction, trip_page.direction
+    assert_equal trip_model.service_id, trip_page.service_id
+    assert_equal trip_model.trip_id, trip_page.trip_id
+  end
+
+  def test_add_stop_time_from_stop_time_page
+    stop_time_page  = OpenStruct.new :arrival_time => '10:00 A.M.', :stop_page => OpenStruct.new, :stop_sequence => 7
+    trip_model      = Model::Trip.new
+    stop_time_model = trip_model.add_stop_time_from_stop_time_page stop_time_page
+    assert_equal stop_time_model.arrival_time, stop_time_page.arrival_time
+    assert_equal stop_time_model.stop_sequence, stop_time_page.stop_sequence
+  end
+
+  def test_add_stop_times_from_stop_time_pages
+    stop_time_page1  = OpenStruct.new :arrival_time => '10:00 A.M.', :stop_page => OpenStruct.new, :stop_sequence => 7
+    stop_time_page2  = OpenStruct.new :arrival_time => '11:00 A.M.', :stop_page => OpenStruct.new, :stop_sequence => 8
+    trip_model       = Model::Trip.new
+    stop_time_models = trip_model.add_stop_times_from_stop_time_pages [stop_time_page1, stop_time_page2]
+    assert_equal 2, stop_time_models.size
+  end
+end

data/test/unit/page/route_test.rb

@@ -1,41 +1,51 @@
 require 'helper'
 
 class Page::RouteTest < MiniTest::Unit::TestCase
-  def test_code
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
-      to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal '130', Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').code
-  end
-  
   def test_date
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21').
       to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal Date.parse('Monday 14 November 2011'), Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').date
+    assert_equal DateTime.parse('21/06/2012 12:00:00 AM'), Page::Route.new('http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21', 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson').date
   end
-  
-  def test_direction
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
-      to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal 'Inbound', Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').direction
-  end
-  
-  def test_name
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
-      to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal 'City Buz 130 Via Sunnybank', Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').name
+
+  def test_long_name
+    route = Page::Route.new('http://local', 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson')
+    assert_equal 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson', route.long_name
   end
-  
-  def test_translink_id
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
+
+  def test_short_name
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21').
       to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal '1925', Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').translink_id
+    assert_equal '130', Page::Route.new('http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21', 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson').short_name
   end
-  
+
   def test_trip_pages
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21').
       to_return(:status => 200, :body => fixture('verbatim/route.html'), :headers => {'Content-Type' => 'text/html'})
-    trip_pages = Page::Route.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/1925?timetableDate=2011-11-14&direction=Inbound&routeCode=130').trip_pages
-    assert_equal 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14', trip_pages.first.url.to_s
-    assert_equal 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/252074?timetableDate=2011-11-14', trip_pages.last.url.to_s
+    route = Page::Route.new('http://jp.translink.com.au/travel-information/network-information/buses/130/2012-06-21', 'City, Griffith Uni, Sunnybank Hills, Algester, Parkinson')
+    trip_pages = route.trip_pages
+    assert_equal 'http://jp.translink.com.au/travel-information/network-information/service-information/outbound/8904/1891449/2012-06-20', trip_pages.first.url.to_s
+    assert_equal route.date.to_date, trip_pages.first.date 
+    assert_equal 'http://jp.translink.com.au/travel-information/network-information/service-information/inbound/8904/1881543/2012-06-22', trip_pages.last.url.to_s
+    assert_equal route.date.to_date, trip_pages.last.date 
+  end
+end
+
+class Page::RouteTypeTest < MiniTest::Unit::TestCase
+  def test_bus
+    assert_equal 3, Page::Route.new('http://jp.translink.com.au/travel-information/network-information/buses/all-timetables', 'City').route_type
+  end
+
+  def test_ferry
+    assert_equal 4, Page::Route.new('http://jp.translink.com.au/travel-information/network-information/ferries/all-timetables', 'City').route_type 
+  end
+
+  def test_train
+    assert_equal 0, Page::Route.new('http://jp.translink.com.au/travel-information/network-information/trains/richlands', 'City').route_type
+  end
+
+  def test_exception
+    assert_raises Page::Route::UnknownRouteTypeError do
+      Page::Route.new('http://foo', 'City').route_type
+    end
   end
 end

data/test/unit/page/timetable_test.rb

@@ -2,25 +2,27 @@ require 'helper'
 
 class Page::TimetableTest < MiniTest::Unit::TestCase
   def test_page
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').
       to_return(:status => 200, :body => fixture('verbatim/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_instance_of Mechanize::Page, Page::Timetable.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').page
+    assert_instance_of Mechanize::Page, Page::Timetable.new('http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').page
   end
 
   def test_route_pages
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').
       to_return(:status => 200, :body => fixture('verbatim/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    route_pages = Page::Timetable.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').route_pages
-    assert_equal 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/2245?timetableDate=2011-11-14&direction=Outbound&routeCode=100', route_pages.first.url.to_s
-    assert_equal 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/view-bus-timetable/2631?timetableDate=2011-11-14&direction=Inbound&routeCode=LOOP', route_pages.last.url.to_s
+    route_pages = Page::Timetable.new('http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').route_pages
+    assert_equal 'http://jp.translink.com.au/travel-information/network-information/buses/3', route_pages.first.url.to_s
+    assert_equal 'Oxenford, Helensvale, University, Hospital, Southport', route_pages.first.long_name
+    assert_equal 'http://jp.translink.com.au/travel-information/network-information/buses/TX5', route_pages.last.url.to_s
+    assert_equal 'Coomera stn, Dreamworld, Movieworld, Wet\'N Wild, H\'vale stn', route_pages.last.long_name
   end
 
   def test_timetable_page
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables').
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').
       to_return(:status => 200, :body => fixture('verbatim/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    stub_request(:post, 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables').
+    stub_request(:post, 'http://jp.translink.com.au/travel-information/network-information/timetables').
       to_return(:status => 200, :body => fixture('verbatim/timetable.html'), :headers => {'Content-Type' => 'text/html'})
-    timetable_page = Page::Timetable.new('http://jp.translink.com.au/travel-information/services-and-timetables/buses/all-bus-timetables').timetable_page Date.parse('2011-11-27')
-    assert_equal 'http://jp.translink.com.au/travel-information/services-and-timetables/buses/bus-timetables', timetable_page.url.to_s
+    timetable_page = Page::Timetable.new('http://jp.translink.com.au/travel-information/network-information/buses/all-timetables').timetable_page DateTime.parse('2012-06-04')
+    assert_equal 'http://jp.translink.com.au/travel-information/network-information/timetables', timetable_page.url.to_s
   end
 end

data/test/unit/page/trip_test.rb

@@ -2,34 +2,50 @@ require 'helper'
 
 class Page::TripTest < MiniTest::Unit::TestCase
   def test_date
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').
-      to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
-    assert_equal Date.parse('Monday 14 November 2011'), Page::Trip.new('http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').date
+    timestamp = DateTime.now
+    assert_equal timestamp.to_date, Page::Trip.new('http://localhost', timestamp).date
+    date = Date.today
+    assert_equal date, Page::Trip.new('http://localhost', date).date
   end
 
-  def test_stops
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').
-      to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
-    stops = Page::Trip.new('http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').stops
-    assert_equal Page::Trip::Stop.new('Illaweena St (Waterstone)', 'Waterstone, Illaweena St far side of Waterbrooke Crt'), stops.first
-    assert_equal Page::Trip::Stop.new('Queen St Bus Station A6', 'Qsbs Stop A6'), stops.last
+  def test_direction
+    assert_equal 'inbound', Page::Trip.new('http://jp.translink.com.au/travel-information/network-information/service-information/inbound/8550/1704728', Date.today).direction
+    assert_equal 'outbound', Page::Trip.new('http://jp.translink.com.au/travel-information/network-information/service-information/outbound/8550/1712196/2012-05-31', Date.today).direction
+    assert_equal 'counterclockwise', Page::Trip.new('http://jp.translink.com.au/travel-information/network-information/service-information/counterclockwise/8904/1882248/2012-06-25', Date.today).direction
+    assert_equal 'clockwise', Page::Trip.new('http://jp.translink.com.au/travel-information/network-information/service-information/clockwise/8904/1882152/2012-06-25', Date.today).direction
   end
+end
 
-  def test_times
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').
+class Page::TripRequestTest < MiniTest::Unit::TestCase
+  def setup
+    stub_request(:get, 'http://jp.translink.com.au/travel-information/network-information/service-information/outbound/8550/1712196/2012-05-31').
       to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
-    times = Page::Trip.new('http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').times
-    assert_equal DateTime.parse('2011-11-14 05:00 +1000'), times.first
-    assert_equal DateTime.parse('2011-11-14 05:50 +1000'), times.last
   end
 
-  def test_trips
-    stub_request(:get, 'http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').
-      to_return(:status => 200, :body => fixture('verbatim/trip.html'), :headers => {'Content-Type' => 'text/html'})
-    trips = Page::Trip.new('http://jp.translink.com.au/travel-information/services-and-timetables/trip-details/281889?timetableDate=2011-11-14').trips
-    assert_equal Page::Trip::Stop.new('Illaweena St (Waterstone)', 'Waterstone, Illaweena St far side of Waterbrooke Crt'), trips.first.stop
-    assert_equal DateTime.parse('2011-11-14 05:00 +1000'), trips.first.time
-    assert_equal Page::Trip::Stop.new('Queen St Bus Station A6', 'Qsbs Stop A6'), trips.last.stop
-    assert_equal DateTime.parse('2011-11-14 05:50 +1000'), trips.last.time
+  def stub_trip
+    Page::Trip.new('http://jp.translink.com.au/travel-information/network-information/service-information/outbound/8550/1712196/2012-05-31', Date.today)
+  end
+
+  def test_service_id
+    assert_equal '1712196', stub_trip.service_id
+  end
+
+  def test_stop_times
+    stop_page1 = Page::Trip::Stop.new.tap { |s| s.stop_name = 'Queen Street station, platform A6'; s.stop_id = '001002'; s.stop_lat = '-27.470677'; s.stop_lon = '153.024747' }
+    stop_page2 = Page::Trip::Stop.new.tap { |s| s.stop_name = 'Illaweena St at Waterstone'; s.stop_id = '010764'; s.stop_lat = '-27.639463'; s.stop_lon = '153.052551' }
+    stop_times = stub_trip.stop_times
+    stop_time1 = stop_times.first
+    stop_time2 = stop_times.last
+    assert_equal 27, stop_times.size
+    assert_equal 0, stop_time1.stop_sequence
+    assert_equal '11:25 P.M.', stop_time1.arrival_time
+    assert_equal stop_page1, stop_time1.stop_page
+    assert_equal 26, stop_time2.stop_sequence
+    assert_equal '12:14 A.M.', stop_time2.arrival_time
+    assert_equal stop_page2, stop_time2.stop_page
+  end
+
+  def test_trip_id
+    assert_equal '8550', stub_trip.trip_id
   end
 end

data/test/unit/page_test.rb

@@ -6,6 +6,6 @@ class PageTest < MiniTest::Unit::TestCase
   end
   
   def test_agent
-    assert_equal "Translink/#{VERSION} Ruby/#{RUBY_VERSION} (https://github.com/tatey/translink)", Page.new('http://localhost').agent.user_agent
+    assert_equal "Mozilla/5.0 (Translink/#{VERSION} Ruby/#{RUBY_VERSION} (https://github.com/tatey/translink))", Page.new('http://localhost').agent.user_agent
   end
 end

data/translink.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors              = ['Tate Johnson']
   s.email                = ['tate@tatey.com']
   s.homepage             = 'https://github.com/tatey/translink'
-  s.summary              = %q{Scrapes bus stops, routes and service times into a nicely structured database.}
-  s.description          = %q{Scrapes bus stops, routes and service times into a nicely structured database.}
+  s.summary              = %q{Scrapes bus routes, trips, stops and times into a relational database.}
+  s.description          = %q{Scrapes bus routes, trips, stops and times into a relational database.}
 
   s.rubyforge_project = 'translink'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translink
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70250850818120 !ruby/object:Gem::Requirement
+  requirement: &70170271474960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250850818120
+  version_requirements: *70170271474960
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &70250850817300 !ruby/object:Gem::Requirement
+  requirement: &70170271474500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250850817300
+  version_requirements: *70170271474500
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70250850816380 !ruby/object:Gem::Requirement
+  requirement: &70170271474040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250850816380
+  version_requirements: *70170271474040
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70250850815300 !ruby/object:Gem::Requirement
+  requirement: &70170271473580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70250850815300
+  version_requirements: *70170271473580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70250850814000 !ruby/object:Gem::Requirement
+  requirement: &70170271753220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70250850814000
+  version_requirements: *70170271753220
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70250850812500 !ruby/object:Gem::Requirement
+  requirement: &70170271454480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,9 +76,8 @@ dependencies:
         version: 1.7.8
   type: :development
   prerelease: false
-  version_requirements: *70250850812500
-description: Scrapes bus stops, routes and service times into a nicely structured
-  database.
+  version_requirements: *70170271454480
+description: Scrapes bus routes, trips, stops and times into a relational database.
 email:
 - tate@tatey.com
 executables:
@@ -88,6 +87,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -97,13 +97,12 @@ files:
 - doc/schema.png
 - lib/translink.rb
 - lib/translink/cli.rb
-- lib/translink/code.rb
 - lib/translink/crawler.rb
 - lib/translink/db.rb
 - lib/translink/model/route.rb
-- lib/translink/model/service.rb
 - lib/translink/model/stop.rb
-- lib/translink/model/stop/extractor.rb
+- lib/translink/model/stop_time.rb
+- lib/translink/model/trip.rb
 - lib/translink/page.rb
 - lib/translink/page/route.rb
 - lib/translink/page/timetable.rb
@@ -116,12 +115,11 @@ files:
 - test/fixtures/verbatim/trip.html
 - test/helper.rb
 - test/unit/cli_test.rb
-- test/unit/code_test.rb
 - test/unit/crawler_test.rb
 - test/unit/model/route_test.rb
-- test/unit/model/service_test.rb
-- test/unit/model/stop/extractor_test.rb
 - test/unit/model/stop_test.rb
+- test/unit/model/stop_time_test.rb
+- test/unit/model/trip_test.rb
 - test/unit/page/route_test.rb
 - test/unit/page/timetable_test.rb
 - test/unit/page/trip_test.rb
@@ -148,13 +146,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 840536220578175397
+      hash: 3982084261629869304
 requirements: []
 rubyforge_project: translink
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Scrapes bus stops, routes and service times into a nicely structured database.
+summary: Scrapes bus routes, trips, stops and times into a relational database.
 test_files:
 - test/fixtures/sample/route.html
 - test/fixtures/sample/timetable.html
@@ -163,12 +161,11 @@ test_files:
 - test/fixtures/verbatim/trip.html
 - test/helper.rb
 - test/unit/cli_test.rb
-- test/unit/code_test.rb
 - test/unit/crawler_test.rb
 - test/unit/model/route_test.rb
-- test/unit/model/service_test.rb
-- test/unit/model/stop/extractor_test.rb
 - test/unit/model/stop_test.rb
+- test/unit/model/stop_time_test.rb
+- test/unit/model/trip_test.rb
 - test/unit/page/route_test.rb
 - test/unit/page/timetable_test.rb
 - test/unit/page/trip_test.rb