metra_schedule 0.1 → 0.2

data/README.rdoc

@@ -1,6 +1,16 @@
 = metra_schedule: A library to access the Chicago Metra schedule information as Ruby objects.
 
-CURRENTLY ONLY THE UNION PACIFIC NORTHWEST LINE IS SUPPORTED. More coming soon!
+Supported Lines:
+  Union Pacific Northwest => :up_nw
+  Union Pacific North => :up_n
+  North Central Service => :ncs
+  Milwaukee District West => :md_w
+  Union Pacific West => :up_w
+  BNSF Railway => :bnsf
+  Heritage Corrider => :hc
+  Rock Island District => :ri
+  Metra Electric District => :me
+
 
 metra_schedule provides:
 
@@ -53,7 +63,7 @@ train.bike_limit :: Maximum number of bikes per train. nil if no limit.
 
 Current supported lines:
 
-=== Union Pacific Northwest
+=== Union Pacific Northwest => :up_nw
 
 stations: 
   
@@ -81,3 +91,244 @@ stations:
   :mchenry,
   :harvard
 
+
+=== Union Pacific North => :up_n
+
+stations: 
+
+  :ogilve,
+  :clyborn,
+  :ravenswood,
+  :rogers_park,
+  :evanston_main_street,
+  :evanston_davis_street,
+  :evanston_central_street,
+  :wilmette,
+  :kenilworth,
+  :indian_hill,
+  :winnetka,
+  :hubbard_woods,
+  :glencoe,
+  :braeside,
+  :ravinia_park,
+  :ravinia,
+  :highland_park,
+  :highwood,
+  :fort_sheridan,
+  :lake_forest,
+  :lake_bluff,
+  :greate_lakes,
+  :north_chicago,
+  :waukegan,
+  :zion,
+  :winthrop_harbor,
+  :kenosha
+
+
+=== North Central Service => :ncs
+
+stations:
+
+  :union_station,
+  :western_avenue,
+  :river_grove,
+  :franklin_park,
+  :schiller_park,
+  :rosemont,
+  :ohare_transfer,
+  :prospect_heights,
+  :wheeling,
+  :buffalo_grove,
+  :prairie_view,
+  :vernon_hills,
+  :mundelein,
+  :libertyville,
+  :grayslake,
+  :round_lake_beach,
+  :lake_villa,
+  :antioch
+
+
+=== Milwaukee District West => :md_w
+
+stations:
+
+  :union_station,
+  :western_avenue,
+  :grand_cicero,
+  :hanson_park,
+  :galewood,
+  :mars,
+  :mont_clare,
+  :elmwood_park,
+  :river_park,
+  :franklin_park,
+  :mannheim,
+  :bensenville,
+  :wood_dale,
+  :itasca,
+  :medinah,
+  :roselle,
+  :schaumburg,
+  :hanover_park,
+  :bartlett,
+  :national_street,
+  :elgin,
+  :big_timber
+
+
+=== Union Pacific West => :up_w
+
+stations:
+
+  :ogilve,
+  :kedzie,
+  :oak_park,
+  :river_forest,
+  :maywood,
+  :melrose_park,
+  :bellwood,
+  :berkeley,
+  :elmhurst,
+  :villa_park,
+  :lombard,
+  :glen_ellyn,
+  :college_avenue,
+  :wheaton,
+  :winfield,
+  :west_chicago,
+  :geneva,
+  :la_fox,
+  :elburn
+
+
+=== BNSF Railway => :bnsf
+
+stations:
+
+  :union_station,
+  :halsted,
+  :western_avenue,
+  :cicero,
+  :lavergne,
+  :berwyn,
+  :harlem_ave,
+  :riverside,
+  :hollywood,
+  :brookfield,
+  :congress_park,
+  :lagrange_road,
+  :lagrange_stone_avenue,
+  :western_springs,
+  :highlands,
+  :hinsdale,
+  :west_hinsdale,
+  :clarendon_hills,
+  :westmont,
+  :fairview_avenue,
+  :downers_grove_main_street,
+  :belmont,
+  :lisle,
+  :naperville,
+  :route_59,
+  :aurora
+
+
+=== Heritage Corrider => :hc
+
+stations:
+
+  :union_station,
+  :summit,
+  :willow_springs,
+  :lemont,
+  :lockport,
+  :joliet
+
+
+=== Rock Island District => :ri
+
+stations:
+
+  :chicago_lasalle_station,
+  :gresham,
+  :longwood,
+  :washington_heights,
+  :brainerd,
+  :beverly_hills_91_street,
+  :beverly_hills_95_street,
+  :beverly_hills_99_street,
+  :beverly_hills_103_street,
+  :beverly_hills_107_street,
+  :morgan_park_111_street,
+  :morgan_park_115_street,
+  :street_119,
+  :street_123,
+  :prairie_street,
+  :blue_island,
+  :robbins,
+  :midlothian,
+  :oak_forest,
+  :tinley_park,
+  :tinley_park_80_avenue,
+  :hickory_creek,
+  :mokena,
+  :new_lenox,
+  :joliet
+
+ 
+=== Metra Electric District => :me
+
+stations:
+
+  :milennium_station,
+  :van_buren_street,
+  :museum_campus,
+  :street_18,
+  :mccormick_place,
+  :street_27,
+  :street_47,
+  :street_51_53,
+  :street_55_56_57,
+  :street_59,
+  :street_63,
+  :street_75,
+  :street_79,
+  :street_83,
+  :street_87,
+  :street_91,
+  :street_95,
+  :street_103,
+  :street_107,
+  :street_111,
+  :street_115,
+  :riverdale,
+  :ivanhoe,
+  :street_147,
+  :harvey,
+  :hazel_crest,
+  :calumet,
+  :homewood,
+  :flossmoor,
+  :olympia_fields,
+  :street_211,
+  :matteson,
+  :richton_park,
+  :university_park,
+  :stony_island,
+  :bryn_mawr,
+  :south_shore,
+  :windsor_park,
+  :street_79,
+  :street_83,
+  :street_87,
+  :street_93,
+  :state_street,
+  :stewart_ridge,
+  :west_pullman,
+  :racine,
+  :ashland,
+  :burr_oak,
+  :blue_island
+
+

data/lib/metra/parser.rb

@@ -27,12 +27,18 @@ module MetraSchedule
     def seperate_tables
       tables = @html_doc.css('table.schedule')
       @tables = []
-      @tables.push ({:schedule => :weekday, :direction => :inbound, :tables => [tables[0..1]].flatten})
-      @tables.push ({:schedule => :saturday, :direction => :inbound, :tables => [tables[2]].flatten})
-      @tables.push ({:schedule => :sunday, :direction => :inbound, :tables => [tables[3]].flatten})
-      @tables.push ({:schedule => :weekday, :direction => :outbound, :tables => [tables[4..6]].flatten})
-      @tables.push ({:schedule => :saturday, :direction => :outbound, :tables => [tables[7]].flatten})
-      @tables.push ({:schedule => :sunday, :direction => :outbound, :tables => [tables[8]].flatten})
+      @tables.push ({:schedule => :weekday, :direction => :inbound, :tables => [tables[@line[:tables][:weekday_inbound]]].flatten}) \
+        if @line[:tables].has_key?(:weekday_inbound)
+      @tables.push ({:schedule => :saturday, :direction => :inbound, :tables => [tables[@line[:tables][:saturday_inbound]]].flatten}) \
+        if @line[:tables].has_key?(:saturday_inbound)
+      @tables.push ({:schedule => :sunday, :direction => :inbound, :tables => [tables[@line[:tables][:sunday_inbound]]].flatten}) \
+        if @line[:tables].has_key?(:sunday_inbound)
+      @tables.push ({:schedule => :weekday, :direction => :outbound, :tables => [tables[@line[:tables][:weekday_outbound]]].flatten}) \
+        if @line[:tables].has_key?(:weekday_outbound)
+      @tables.push ({:schedule => :saturday, :direction => :outbound, :tables => [tables[@line[:tables][:saturday_outbound]]].flatten}) \
+        if @line[:tables].has_key?(:saturday_outbound)
+      @tables.push ({:schedule => :sunday, :direction => :outbound, :tables => [tables[@line[:tables][:sunday_outbound]]].flatten}) \
+        if @line[:tables].has_key?(:sunday_outbound)
     end
 
     def make_trains

data/lib/metra/train_data.rb

@@ -2,6 +2,7 @@ module MetraSchedule
   module TrainData
     attr_reader :LINES
 
+    ### Stations MUST be listed in outbound direction for the parser to function correctly!
     LINES = {
     :up_nw => {
       :name => "Union Pacific Northwest", 
@@ -30,7 +31,263 @@ module MetraSchedule
         :woodstock,
         :mchenry,
         :harvard
-      ]
+      ],
+      :tables => {:weekday_inbound => 0..1, :saturday_inbound => 2, :sunday_inbound => 3, \
+        :weekday_outbound => 4..6, :saturday_outbound => 7, :sunday_outbound => 8 }
+    },
+    :up_n => {
+      :name => "Union Pacific North",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/up-n/schedule.full.html',
+      :stations => [
+        :ogilve,
+        :clyborn,
+        :ravenswood,
+        :rogers_park,
+        :evanston_main_street,
+        :evanston_davis_street,
+        :evanston_central_street,
+        :wilmette,
+        :kenilworth,
+        :indian_hill,
+        :winnetka,
+        :hubbard_woods,
+        :glencoe,
+        :braeside,
+        :ravinia_park,
+        :ravinia,
+        :highland_park,
+        :highwood,
+        :fort_sheridan,
+        :lake_forest,
+        :lake_bluff,
+        :greate_lakes,
+        :north_chicago,
+        :waukegan,
+        :zion,
+        :winthrop_harbor,
+        :kenosha
+      ],
+      :tables => {:weekday_inbound => 0..2, :saturday_inbound => 3, :sunday_inbound => 4, \
+        :weekday_outbound => 5..7, :saturday_outbound => 8, :sunday_outbound => 9 }
+    },
+    :ncs => {
+      :name => "North Central Service",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/ncs/schedule.full.html',
+      :stations => [
+        :union_station,
+        :western_avenue,
+        :river_grove,
+        :franklin_park,
+        :schiller_park,
+        :rosemont,
+        :ohare_transfer,
+        :prospect_heights,
+        :wheeling,
+        :buffalo_grove,
+        :prairie_view,
+        :vernon_hills,
+        :mundelein,
+        :libertyville,
+        :grayslake,
+        :round_lake_beach,
+        :lake_villa,
+        :antioch
+      ],
+      :tables => {:weekday_inbound => 0, :weekday_outbound => 1 }
+    },
+    :md_w => {
+      :name => "Milwaukee District West",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/md-w/schedule.full.html',
+      :stations => [
+        :union_station,
+        :western_avenue,
+        :grand_cicero,
+        :hanson_park,
+        :galewood,
+        :mars,
+        :mont_clare,
+        :elmwood_park,
+        :river_park,
+        :franklin_park,
+        :mannheim,
+        :bensenville,
+        :wood_dale,
+        :itasca,
+        :medinah,
+        :roselle,
+        :schaumburg,
+        :hanover_park,
+        :bartlett,
+        :national_street,
+        :elgin,
+        :big_timber
+      ],
+      :tables => {:weekday_inbound => 0..1, :saturday_inbound => 2, :sunday_inbound => 3, \
+        :weekday_outbound => 4..5, :saturday_outbound => 6, :sunday_outbound => 7 }
+    },
+    :up_w => {
+      :name => "Union Pacific West",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/up-w/schedule.full.html',
+      :stations => [
+        :ogilve,
+        :kedzie,
+        :oak_park,
+        :river_forest,
+        :maywood,
+        :melrose_park,
+        :bellwood,
+        :berkeley,
+        :elmhurst,
+        :villa_park,
+        :lombard,
+        :glen_ellyn,
+        :college_avenue,
+        :wheaton,
+        :winfield,
+        :west_chicago,
+        :geneva,
+        :la_fox,
+        :elburn
+      ],
+      :tables => {:weekday_inbound => 0..1, :saturday_inbound => 2, :sunday_inbound => 3, \
+        :weekday_outbound => 4..5, :saturday_outbound => 6, :sunday_outbound => 7 }
+    },
+    :bnsf => {
+      :name => "BNSF Railway",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/bnsf/schedule.full.html',
+      :stations => [
+        :union_station,
+        :halsted,
+        :western_avenue,
+        :cicero,
+        :lavergne,
+        :berwyn,
+        :harlem_ave,
+        :riverside,
+        :hollywood,
+        :brookfield,
+        :congress_park,
+        :lagrange_road,
+        :lagrange_stone_avenue,
+        :western_springs,
+        :highlands,
+        :hinsdale,
+        :west_hinsdale,
+        :clarendon_hills,
+        :westmont,
+        :fairview_avenue,
+        :downers_grove_main_street,
+        :belmont,
+        :lisle,
+        :naperville,
+        :route_59,
+        :aurora
+      ],
+      :tables => {:weekday_inbound => 0..2, :saturday_inbound => 3, :sunday_inbound => 4, \
+        :weekday_outbound => 5..7, :saturday_outbound => 8, :sunday_outbound => 9 }
+    },
+    :hc => {
+      :name => "Heritage Corridor",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/hc/schedule.full.html',
+      :stations => [
+        :union_station,
+        :summit,
+        :willow_springs,
+        :lemont,
+        :lockport,
+        :joliet
+      ],
+      :tables => {:weekday_inbound => 0, :weekday_outbound => 1 }
+    },
+    :ri => {
+      :name => "Rock Island District",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/ri/schedule.full.html',
+      :stations => [
+        :chicago_lasalle_station,
+        :gresham,
+        :longwood,
+        :washington_heights,
+        :brainerd,
+        :beverly_hills_91_street,
+        :beverly_hills_95_street,
+        :beverly_hills_99_street,
+        :beverly_hills_103_street,
+        :beverly_hills_107_street,
+        :morgan_park_111_street,
+        :morgan_park_115_street,
+        :street_119,
+        :street_123,
+        :prairie_street,
+        :blue_island,
+        :robbins,
+        :midlothian,
+        :oak_forest,
+        :tinley_park,
+        :tinley_park_80_avenue,
+        :hickory_creek,
+        :mokena,
+        :new_lenox,
+        :joliet
+      ],
+      :tables => {:weekday_inbound => 0..2, :saturday_inbound => 3, :sunday_inbound => 4, \
+        :weekday_outbound => 5..7, :saturday_outbound => 8, :sunday_outbound => 9 }
+    },
+    :me => {
+      :name => "Metra Electric District",
+      :url => 'http://metrarail.com/metra/en/home/maps_schedules/metra_system_map/me/schedule.full.html',
+      :stations => [
+        :milennium_station,
+        :van_buren_street,
+        :museum_campus,
+        :street_18,
+        :mccormick_place,
+        :street_27,
+        :street_47,
+        :street_51_53,
+        :street_55_56_57,
+        :street_59,
+        :street_63,
+        :street_75,
+        :street_79,
+        :street_83,
+        :street_87,
+        :street_91,
+        :street_95,
+        :street_103,
+        :street_107,
+        :street_111,
+        :street_115,
+        :riverdale,
+        :ivanhoe,
+        :street_147,
+        :harvey,
+        :hazel_crest,
+        :calumet,
+        :homewood,
+        :flossmoor,
+        :olympia_fields,
+        :street_211,
+        :matteson,
+        :richton_park,
+        :university_park,
+        :stony_island,
+        :bryn_mawr,
+        :south_shore,
+        :windsor_park,
+        :street_79,
+        :street_83,
+        :street_87,
+        :street_93,
+        :state_street,
+        :stewart_ridge,
+        :west_pullman,
+        :racine,
+        :ashland,
+        :burr_oak,
+        :blue_island
+      ],
+      :tables => {:weekday_inbound => 0..5, :saturday_inbound => 6..9, :sunday_inbound => 10..11, \
+        :weekday_outbound => 12..17, :saturday_outbound => 18..21, :sunday_outbound => 22..23 }
     }
   }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metra_schedule
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Blake Smith