ierail 0.4.0 → 0.5.0

data/fixtures/vcr_cassettes/westbound.yml

@@ -25,64 +25,76 @@ http_interactions:
       Server:
       - ''
       Date:
-      - Sat, 19 Apr 2014 18:10:55 GMT
+      - Mon, 05 Oct 2015 20:06:37 GMT
       Content-Length:
-      - '4266'
+      - '5152'
     body:
       encoding: UTF-8
       string: "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<ArrayOfObjStationData
         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"
-        xmlns=\"http://api.irishrail.ie/realtime/\">\r\n  <objStationData>\r\n    <Servertime>2014-04-19T19:10:55.677</Servertime>\r\n
-        \   <Traincode>E826 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
-        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>19:10:55</Querytime>\r\n
-        \   <Traindate>19 Apr 2014</Traindate>\r\n    <Origin>Bray</Origin>\r\n    <Destination>Malahide</Destination>\r\n
-        \   <Origintime>18:25</Origintime>\r\n    <Destinationtime>19:32</Destinationtime>\r\n
-        \   <Status>En Route</Status>\r\n    <Lastlocation>Departed Dublin Connolly</Lastlocation>\r\n
-        \   <Duein>16</Duein>\r\n    <Late>1</Late>\r\n    <Exparrival>19:25</Exparrival>\r\n
-        \   <Expdepart>19:26</Expdepart>\r\n    <Scharrival>19:25</Scharrival>\r\n
-        \   <Schdepart>19:25</Schdepart>\r\n    <Direction>Northbound</Direction>\r\n
+        xmlns=\"http://api.irishrail.ie/realtime/\">\r\n  <objStationData>\r\n    <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n
+        \   <Traincode>E829 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
+        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>21:06:38</Querytime>\r\n
+        \   <Traindate>05 Oct 2015</Traindate>\r\n    <Origin>Greystones</Origin>\r\n
+        \   <Destination>Malahide</Destination>\r\n    <Origintime>20:00</Origintime>\r\n
+        \   <Destinationtime>21:20</Destinationtime>\r\n    <Status>En Route</Status>\r\n
+        \   <Lastlocation>Departed Clontarf Road</Lastlocation>\r\n    <Duein>12</Duein>\r\n
+        \   <Late>6</Late>\r\n    <Exparrival>21:17</Exparrival>\r\n    <Expdepart>21:18</Expdepart>\r\n
+        \   <Scharrival>21:12</Scharrival>\r\n    <Schdepart>21:12</Schdepart>\r\n
+        \   <Direction>Northbound</Direction>\r\n    <Traintype>DART</Traintype>\r\n
+        \   <Locationtype>S</Locationtype>\r\n  </objStationData>\r\n  <objStationData>\r\n
+        \   <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n    <Traincode>E830
+        </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n    <Stationcode>GRGRD</Stationcode>\r\n
+        \   <Querytime>21:06:38</Querytime>\r\n    <Traindate>05 Oct 2015</Traindate>\r\n
+        \   <Origin>Greystones</Origin>\r\n    <Destination>Malahide</Destination>\r\n
+        \   <Origintime>20:30</Origintime>\r\n    <Destinationtime>21:50</Destinationtime>\r\n
+        \   <Status>En Route</Status>\r\n    <Lastlocation>Arrived Blackrock</Lastlocation>\r\n
+        \   <Duein>36</Duein>\r\n    <Late>1</Late>\r\n    <Exparrival>21:41</Exparrival>\r\n
+        \   <Expdepart>21:42</Expdepart>\r\n    <Scharrival>21:41</Scharrival>\r\n
+        \   <Schdepart>21:41</Schdepart>\r\n    <Direction>Northbound</Direction>\r\n
         \   <Traintype>DART</Traintype>\r\n    <Locationtype>S</Locationtype>\r\n
-        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2014-04-19T19:10:55.677</Servertime>\r\n
-        \   <Traincode>E827 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
-        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>19:10:55</Querytime>\r\n
-        \   <Traindate>19 Apr 2014</Traindate>\r\n    <Origin>Bray</Origin>\r\n    <Destination>Malahide</Destination>\r\n
-        \   <Origintime>18:55</Origintime>\r\n    <Destinationtime>20:05</Destinationtime>\r\n
-        \   <Status>En Route</Status>\r\n    <Lastlocation>Arrived Glenageary</Lastlocation>\r\n
-        \   <Duein>47</Duein>\r\n    <Late>1</Late>\r\n    <Exparrival>19:57</Exparrival>\r\n
-        \   <Expdepart>19:57</Expdepart>\r\n    <Scharrival>19:56</Scharrival>\r\n
-        \   <Schdepart>19:56</Schdepart>\r\n    <Direction>Northbound</Direction>\r\n
+        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n
+        \   <Traincode>E831 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
+        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>21:06:38</Querytime>\r\n
+        \   <Traindate>05 Oct 2015</Traindate>\r\n    <Origin>Greystones</Origin>\r\n
+        \   <Destination>Malahide</Destination>\r\n    <Origintime>21:00</Origintime>\r\n
+        \   <Destinationtime>22:20</Destinationtime>\r\n    <Status>En Route</Status>\r\n
+        \   <Lastlocation>Departed Greystones</Lastlocation>\r\n    <Duein>66</Duein>\r\n
+        \   <Late>1</Late>\r\n    <Exparrival>22:11</Exparrival>\r\n    <Expdepart>22:12</Expdepart>\r\n
+        \   <Scharrival>22:11</Scharrival>\r\n    <Schdepart>22:11</Schdepart>\r\n
+        \   <Direction>Northbound</Direction>\r\n    <Traintype>DART</Traintype>\r\n
+        \   <Locationtype>S</Locationtype>\r\n  </objStationData>\r\n  <objStationData>\r\n
+        \   <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n    <Traincode>E130
+        </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n    <Stationcode>GRGRD</Stationcode>\r\n
+        \   <Querytime>21:06:38</Querytime>\r\n    <Traindate>05 Oct 2015</Traindate>\r\n
+        \   <Origin>Malahide</Origin>\r\n    <Destination>Greystones</Destination>\r\n
+        \   <Origintime>21:00</Origintime>\r\n    <Destinationtime>22:20</Destinationtime>\r\n
+        \   <Status>En Route</Status>\r\n    <Lastlocation>Departed Portmarnock</Lastlocation>\r\n
+        \   <Duein>2</Duein>\r\n    <Late>1</Late>\r\n    <Exparrival>21:08</Exparrival>\r\n
+        \   <Expdepart>21:08</Expdepart>\r\n    <Scharrival>21:06</Scharrival>\r\n
+        \   <Schdepart>21:07</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
         \   <Traintype>DART</Traintype>\r\n    <Locationtype>S</Locationtype>\r\n
-        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2014-04-19T19:10:55.677</Servertime>\r\n
-        \   <Traincode>E227 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
-        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>19:10:55</Querytime>\r\n
-        \   <Traindate>19 Apr 2014</Traindate>\r\n    <Origin>Malahide</Origin>\r\n
-        \   <Destination>Bray</Destination>\r\n    <Origintime>19:15</Origintime>\r\n
-        \   <Destinationtime>20:24</Destinationtime>\r\n    <Status>No Information</Status>\r\n
-        \   <Lastlocation />\r\n    <Duein>12</Duein>\r\n    <Late>0</Late>\r\n    <Exparrival>19:21</Exparrival>\r\n
-        \   <Expdepart>19:22</Expdepart>\r\n    <Scharrival>19:21</Scharrival>\r\n
-        \   <Schdepart>19:22</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
+        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n
+        \   <Traincode>E131 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
+        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>21:06:38</Querytime>\r\n
+        \   <Traindate>05 Oct 2015</Traindate>\r\n    <Origin>Malahide</Origin>\r\n
+        \   <Destination>Greystones</Destination>\r\n    <Origintime>21:30</Origintime>\r\n
+        \   <Destinationtime>22:50</Destinationtime>\r\n    <Status>No Information</Status>\r\n
+        \   <Lastlocation />\r\n    <Duein>31</Duein>\r\n    <Late>0</Late>\r\n    <Exparrival>21:36</Exparrival>\r\n
+        \   <Expdepart>21:37</Expdepart>\r\n    <Scharrival>21:36</Scharrival>\r\n
+        \   <Schdepart>21:37</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
         \   <Traintype>DART</Traintype>\r\n    <Locationtype>S</Locationtype>\r\n
-        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2014-04-19T19:10:55.677</Servertime>\r\n
-        \   <Traincode>E228 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
-        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>19:10:55</Querytime>\r\n
-        \   <Traindate>19 Apr 2014</Traindate>\r\n    <Origin>Malahide</Origin>\r\n
-        \   <Destination>Bray</Destination>\r\n    <Origintime>19:45</Origintime>\r\n
-        \   <Destinationtime>20:54</Destinationtime>\r\n    <Status>No Information</Status>\r\n
-        \   <Lastlocation />\r\n    <Duein>42</Duein>\r\n    <Late>0</Late>\r\n    <Exparrival>19:51</Exparrival>\r\n
-        \   <Expdepart>19:52</Expdepart>\r\n    <Scharrival>19:51</Scharrival>\r\n
-        \   <Schdepart>19:52</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
-        \   <Traintype>DART</Traintype>\r\n    <Locationtype>S</Locationtype>\r\n
-        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2014-04-19T19:10:55.677</Servertime>\r\n
-        \   <Traincode>E229 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
-        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>19:10:55</Querytime>\r\n
-        \   <Traindate>19 Apr 2014</Traindate>\r\n    <Origin>Malahide</Origin>\r\n
-        \   <Destination>Bray</Destination>\r\n    <Origintime>20:15</Origintime>\r\n
-        \   <Destinationtime>21:24</Destinationtime>\r\n    <Status>No Information</Status>\r\n
-        \   <Lastlocation />\r\n    <Duein>72</Duein>\r\n    <Late>0</Late>\r\n    <Exparrival>20:21</Exparrival>\r\n
-        \   <Expdepart>20:22</Expdepart>\r\n    <Scharrival>20:21</Scharrival>\r\n
-        \   <Schdepart>20:22</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
+        \ </objStationData>\r\n  <objStationData>\r\n    <Servertime>2015-10-05T21:06:38.783</Servertime>\r\n
+        \   <Traincode>E710 </Traincode>\r\n    <Stationfullname>Clongriffin</Stationfullname>\r\n
+        \   <Stationcode>GRGRD</Stationcode>\r\n    <Querytime>21:06:38</Querytime>\r\n
+        \   <Traindate>05 Oct 2015</Traindate>\r\n    <Origin>Malahide</Origin>\r\n
+        \   <Destination>Dublin Connolly</Destination>\r\n    <Origintime>22:10</Origintime>\r\n
+        \   <Destinationtime>22:35</Destinationtime>\r\n    <Status>No Information</Status>\r\n
+        \   <Lastlocation />\r\n    <Duein>71</Duein>\r\n    <Late>0</Late>\r\n    <Exparrival>22:16</Exparrival>\r\n
+        \   <Expdepart>22:17</Expdepart>\r\n    <Scharrival>22:16</Scharrival>\r\n
+        \   <Schdepart>22:17</Schdepart>\r\n    <Direction>Southbound</Direction>\r\n
         \   <Traintype>DART</Traintype>\r\n    <Locationtype>S</Locationtype>\r\n
         \ </objStationData>\r\n</ArrayOfObjStationData>"
     http_version: 
-  recorded_at: Sat, 19 Apr 2014 18:10:57 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Mon, 05 Oct 2015 20:06:37 GMT
+recorded_with: VCR 2.9.3

data/ierail.gemspec

@@ -2,19 +2,22 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'ierail'
-  s.version     = '0.4.0'
+  s.version     = '0.5.0'
   s.date        = Date.today.to_s
   s.summary     = "Irish Rail Train Schedule and Status API"
   s.description = "Irish Rail Train Schedule and Status API"
   s.authors     = ["Oisin Hurley", "Gary Rafferty", "Michael Dever"]
-  s.email       = 'oi.sin@nis.io'
+  s.email       = 'oisin.hurley@gmail.com'
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'http://rubygems.org/gems/ierail'
-  s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1'
-  s.add_runtime_dependency 'rest-client', '~> 1.6', '>= 1.6.7'
-  s.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.1'
-  s.add_runtime_dependency 'tzinfo', '~> 1.1', '>= 1.1.0'
-  s.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.0'
-  s.add_development_dependency 'webmock', '~> 1.17', '>= 1.17.4'
-  s.add_development_dependency 'timecop', '~> 0.6', '>= 0.6.2'
+  s.licenses    = ['BSD-2-Clause']
+  s.required_ruby_version = ">=3.3.0"
+  s.add_runtime_dependency 'json', "~> 2", ">= 2.12.2"
+  s.add_runtime_dependency 'rest-client', "~> 2", ">= 2.1.0"
+  s.add_runtime_dependency 'nokogiri', "~> 1", ">= 1.18.8"
+  s.add_runtime_dependency 'tzinfo', "~> 2", ">= 2.0.6"
+  s.add_development_dependency 'vcr', "~> 6", ">= 6.3.1"
+  s.add_development_dependency 'webmock', "~> 3", ">= 3.25.1"
+  s.add_development_dependency 'timecop', "~> 0", ">= 0.9.10"
+  s.add_development_dependency 'minitest', "~> 5", ">= 5.25.5"
 end

data/lib/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Array
   #Filters elements, collecting those
   #whose times are before _time_
@@ -13,8 +15,8 @@ class Array
     select {|t| t.arrival[:expected] >= query_time }
   end
 
-  # The 'in' is just sugar really, saving the 
-  # programmer from doing a trivial computation 
+  # The 'in' is just sugar really, saving the
+  # programmer from doing a trivial computation
   # over and over again in their code.
   def in time
     select { |t| t.due_in <= time }

data/lib/ierail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require 'nokogiri'
 require 'uri'
@@ -10,19 +12,21 @@ require 'train_movement'
 require 'core_ext'
 
 class IERail
-  
+
   URL = "http://api.irishrail.ie/realtime/realtime.asmx"
-  
+
   class IERailGet < Nokogiri::XML::SAX::Document
-    
+
     attr_reader :result
-    
+
     def initialize(url, array_name, object_name)
-      @ws_url = URI.encode(url)
+      @ws_url = url.gsub(' ', '%20')
       @ws_array_name = array_name.downcase
       @ws_object_name = object_name.downcase
+      @result = nil
+      @current = nil
     end
-      
+
     def response
       unless @result
         parser = Nokogiri::XML::SAX::Parser.new(self)
@@ -31,27 +35,27 @@ class IERail
       @result
     end
 
-    def start_document 
+    def start_document
       @result = []
     end
-    
+
     def characters string
-      string.strip!
-      @result.last[@current] << string unless string.empty?
+      str = string.strip
+      @result.last[@current] << str unless str.empty?
     end
-    
+
     def start_element name, attrs = []
       case name.downcase
-        when @ws_object_name 
+        when @ws_object_name
           @result << Hash.new
         when @ws_array_name
           ;
         else
-          @current = name          
-          @result.last[@current] = ""
+          @current = name
+          @result.last[@current] = String.new("")
       end
     end
-    
+
     def end_element name
       if @current && @result.last[@current].empty?
         @result.last.delete(@current)
@@ -59,7 +63,7 @@ class IERail
       @current = nil
     end
   end
-  
+
   # Get ALL the stations!
   # Returns array of Station objects, and each object responds to
   # {
@@ -72,10 +76,10 @@ class IERail
   #
   def stations
     ier = IERailGet.new("getAllStationsXML?", "arrayofobjstation", "objstation")
-    
+
     ier.response.map { |s| Station.new(s) }
   end
-  
+
   # Get ALL the trains! That are on the go at the moment.
   # Returns array of Train objects, and each object responds to
   #  {
@@ -90,10 +94,10 @@ class IERail
   #
   def trains
     ier = IERailGet.new("getCurrentTrainsXML?", "arrayofobjtrainpositions", "objtrainpositions")
-    
+
     ier.response.map { |t| Train.new(t) }
   end
-  
+
   # Get train information for a particular station, by station name. This gives data on trains thru that station
   # Returns array of StationData objects, and each object responds to
   # {
@@ -122,21 +126,21 @@ class IERail
   #
   def station(name)
     ier = IERailGet.new("getStationDataByNameXML?StationDesc=#{name}", "arrayofobjstationdata", "objstationdata")
-    
+
     ier.response.map { |sd| StationData.new(sd) }
   end
-  
-  # Get train information for a particular station, by station name, within the time period in minutes from now. 
+
+  # Get train information for a particular station, by station name, within the time period in minutes from now.
   # This gives data on trains thru that station.
   # Returns array of StationData objects, and each obj looks like the one for IERail#station
   # Will return an empty array if no information.
   #
   def station_times(name, mins)
     ier = IERailGet.new("getStationDataByNameXML_withNumMins?StationDesc=#{name}&NumMins=#{mins}", "arrayofobjstationdata", "objstationdata")
-    
+
     ier.response.map { |sd| StationData.new(sd) }
   end
-  
+
   # Get the movements of a particular train, by train code, on a date.
   #  If no date is supplied assume train has run/is running today.
   #
@@ -153,10 +157,10 @@ class IERail
   #
   def train_movements(code, date=Time.now)
     ier = IERailGet.new("getTrainMovementsXML?TrainId=#{code}&TrainDate=#{date.strftime("%d/%m/%Y")}", "ArrayOfObjTrainMovements", "ObjTrainMovements")
-    
+
     ier.response.map{ |tm| TrainMovement.new(tm) }
   end
-  
+
   # Find station codes and descriptions using a partial string to match the station name
   # Returns an array of Structs that each respond to
   # {
@@ -168,8 +172,11 @@ class IERail
   #
   def find_station(partial)
     ier = IERailGet.new("getStationsFilterXML?StationText=#{partial}", "ArrayOfObjStationFilter", "objStationFilter")
-    Struct.new("Station", :name, :description, :code)
-    
+
+    unless defined?(Struct::Station)
+        Struct.new("Station", :name, :description, :code)
+    end
+
     ier.response.map do |st|
        Struct::Station.new(st['StationDesc_sp'],
                            st['StationDesc'],
@@ -189,7 +196,7 @@ class IERail
       direction = name.to_s.split('_').first.capitalize
 
       ier = IERailGet.new("getStationDataByNameXML?StationDesc=#{args.first}", "arrayofobjstationdata", "objstationdata")
-     
+
       ier.response.select { |sd| sd['Direction'] == direction }.map { |sd| StationData.new(sd) }
     end
   end

data/lib/station.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Station
   attr_reader :description, :code, :id
 

data/lib/station_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class StationData
   attr_reader :server_time, :train_code, :station_name, :station_code,
               :status, :last_location, :due_in, :minutes_late, :minutes_early,
@@ -33,8 +35,16 @@ class StationData
     is_departure_station        = @station_name.eql?(@origin)
     is_terminating_station      = @station_name.eql?(@destination)
 
+    one_day = 86400
+
     @expected_arrival           = is_departure_station ? @origin_time : Time.parse(hash['Exparrival'])
     @expected_departure         = is_terminating_station ? @destination_time : Time.parse(hash['Expdepart'])
+
+    # The API returns expected arr/dep times as HH:MM, if this time has crossed midnight, we parse it as being
+    # earlier 'today'; this then throws off the before/after filters. Use the server time as a sanity check.
+    @expected_arrival = @expected_arrival + one_day if @expected_arrival < @server_time
+    @expected_departure = @expected_departure + one_day if @expected_departure < @server_time
+
     @scheduled_arrival          = is_departure_station ? @origin_time + off_schedule_minutes : Time.parse(hash['Scharrival'])
     @scheduled_departure        = is_terminating_station ? @destination_time + off_schedule_minutes : Time.parse(hash['Schdepart'])
     @direction                  = hash['Direction']

data/lib/train.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Train
   attr_reader :status, :code, :date, :message, :direction
 

data/lib/train_movement.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class TrainMovement
-  
+
   attr_reader :location_full_name
 
   def initialize hash
     @train_code          = hash['TrainCode']
     @train_date          = Time.parse hash['TrainDate']
-    @location_code       = hash['LocationCode'] 
+    @location_code       = hash['LocationCode']
     @location_full_name  = hash['LocationFullName']
     @location_order      = hash['LocationOrder'].to_i
     @location_type       = hash['LocationType']
@@ -19,7 +21,7 @@ class TrainMovement
     @arrival             = arrival_time.nil? ? @expected_arrival : Time.parse(arrival_time)
     @departure           = departure_time.nil? ? @expected_departure : Time.parse(departure_time)
   end
-  
+
   def location
     {code: @location_code, name: @location_full_name, stop_number: @location_order, type: @location_type}
   end
@@ -27,11 +29,11 @@ class TrainMovement
   def arrival
     {scheduled: @scheduled_arrival, expected: @expected_arrival, actual: @arrival}
   end
-  
+
   def departure
     {scheduled: @scheduled_departure, expected: @expected_departure, actual: @departure}
   end
-  
+
   def train
     {code: @train_code, date: @train_date, origin: @train_origin}
   end

data/test/unit/helper.rb

@@ -1,13 +1,13 @@
 require 'simplecov'
-require 'coveralls'
 require 'tzinfo'
 require 'vcr'
 require 'timecop'
-require 'time'
+require 'date'
 require 'minitest/autorun'
 require 'ierail'
 
-def get_original_time(t)
+def helper_get_original_time(t)
+  t = Time.now if t.nil?
   @when = Time.parse(t.to_s)
   if TZInfo::Timezone.get('Europe/Dublin').current_period.dst?
     unless @when.zone == 'IST'
@@ -16,12 +16,17 @@ def get_original_time(t)
   else
     @when -= @when.utc_offset
   end
-  
+
   @when
 end
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+def helper_get_thirty_mins
+  thirty_mins = Time.now + (60 * 30)
+  " #{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter
+])
+
 SimpleCov.start

data/test/unit/ierail.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 $:.unshift(File.join(File.dirname(__FILE__), '..','..', 'lib'))
 
 require_relative 'helper'
 
-class IERailTest < MiniTest::Unit::TestCase
+class IERailTest < Minitest::Test
   def setup
     @ir = IERail.new
 
@@ -14,7 +15,7 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_that_the_train_directions_are_correct
     VCR.use_cassette('northbound') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         northbound_train = @ir.northbound_from('Dublin Connolly').sample
@@ -22,7 +23,7 @@ class IERailTest < MiniTest::Unit::TestCase
       end
     end
     VCR.use_cassette('northbound') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         southbound_train = @ir.southbound_from('Dublin Connolly').sample
@@ -33,7 +34,7 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_that_an_empty_array_is_returned_when_no_data
     VCR.use_cassette('westbound') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         nonexistant = @ir.westbound_from('Clongriffin')
@@ -44,42 +45,33 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_that_the_before_time_constraint_works
     VCR.use_cassette('northbound') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
-
+      time = helper_get_original_time(cassette.originally_recorded_at)
       Timecop.freeze(time || Time.now) do
-        #Thirty minutes from now
-        thirty_mins = Time.now + (60 * 30)
-        time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
-        before_train = @ir.southbound_from('Dublin Connolly').before(time).sample
-        assert before_train.expected_departure <= thirty_mins
+        before_train = @ir.southbound_from('Dublin Connolly').before(helper_get_thirty_mins()).sample
+        assert before_train.expected_arrival.to_i - before_train.server_time.to_i  < (30 * 60)
       end
     end
   end
 
   def test_that_the_after_time_constraint_works
     VCR.use_cassette('southbound') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
-
+      time = helper_get_original_time(cassette.originally_recorded_at)
       Timecop.freeze(time || Time.now) do
-        #Thirty minutes from now
-        thirty_mins = Time.now + (60 * 30)
-        time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
-        after_train = @ir.southbound_from('Dublin Connolly').after(time).sample
-        assert after_train.expected_departure >= thirty_mins
+        after_train = @ir.southbound_from('Dublin Connolly').after(helper_get_thirty_mins()).sample
+        assert after_train.expected_arrival.to_i - after_train.server_time.to_i  >= (30 * 60)
       end
     end
   end
 
   def test_that_the_in_constraint_works
     VCR.use_cassette('southbound_from') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         mins = 30
         thirty_mins = Time.now + (60 * mins)
         time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
         southbounds = @ir.southbound_from('Dublin Connolly')
-
         before_train = southbounds.before(time)
 
         in_half_an_hour = southbounds.in(mins)
@@ -93,7 +85,7 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_station_times
     VCR.use_cassette('station_times') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         station_data = @ir.station_times('Dublin Connolly',30).sample
@@ -104,7 +96,7 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_find_station
     VCR.use_cassette('find_station') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         station = @ir.find_station('Dublin Connolly').sample
@@ -115,7 +107,7 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_that_station_times_returns_station_data
     VCR.use_cassette('station_times') do |cassette|
-      time = get_original_time(cassette.originally_recorded_at)
+      time = helper_get_original_time(cassette.originally_recorded_at)
 
       Timecop.freeze(time || Time.now) do
         train = @ir.station_times('Dublin Connolly', 30).sample #random train in next 30 mins
@@ -125,10 +117,10 @@ class IERailTest < MiniTest::Unit::TestCase
   end
 
   def test_that_station_times_equivalent_to_in
-    VCR.use_cassette('station_times') do |cassette|
+    VCR.use_cassette('station_times') do
       trains = @ir.station_times('Dublin Connolly', 30)
 
-      VCR.use_cassette('station') do |cassette|
+      VCR.use_cassette('station') do
         in_half_an_hour = @ir.station('Dublin Connolly').in(30)
 
         assert_equal trains.count, in_half_an_hour.count
@@ -140,7 +132,7 @@ class IERailTest < MiniTest::Unit::TestCase
   end
 
   def test_that_found_station_is_a_struct_with_name_description_code
-    VCR.use_cassette('find_station') do |cassette|
+    VCR.use_cassette('find_station') do
       station = @ir.find_station('Dublin Connolly').sample
       assert_equal station.class, Struct::Station
       refute_nil station.name

data/test/unit/station.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..','..', 'lib'))
 
 require_relative 'helper'
 
-class StationTest < MiniTest::Unit::TestCase
+class StationTest < Minitest::Test
   def setup
     ir = IERail.new
 

data/test/unit/station_data.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..','..', 'lib'))
 
 require_relative 'helper'
 
-class StationDataTest < MiniTest::Unit::TestCase
+class StationDataTest < Minitest::Test
   def setup
     ir = IERail.new
     
@@ -29,10 +29,6 @@ class StationDataTest < MiniTest::Unit::TestCase
     refute_empty @station_data.code
   end
 
-  def test_that_there_is_a_query_time
-    refute_nil @station_data.query_time
-  end
-
   def test_that_there_is_a_status
     refute_empty @station_data.status
   end

data/test/unit/train.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..','..', 'lib'))
 
 require_relative 'helper'
 
-class TrainTest < MiniTest::Unit::TestCase
+class TrainTest < Minitest::Test
   def setup
     ir = IERail.new