ierail 0.3.2 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZmNzc1ZDRiZGIwMjkzZDc2Mjc1N2Y4MDM1MDhjNGZjMTRiNGFmZA==
+    M2I4ZmZhZmU5MDM4N2Y0YzQyYTIxZDFjMTFmOWYxZDEyMzkyNmQ2Yg==
   data.tar.gz: !binary |-
-    Y2I0NWVhZDU0M2E3YTAwMWNjOTc2YmJlYzNhMDVmMjc4YzM3MTZlOA==
+    OGZhZTJjMDA5NzQ4NjhhOWVjZGM3NTc3YjgyOTFiZTdhOGVlNGI0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjkwOWVmNTE2YzQ3NTEzZTQ0ZDhlNTliYzdmYWM1M2MyYjFjNDZjNTM2MDQy
-    OWRlYzFkZGMxZWY3NTRmYTU0ZWNmYTc3OGExNGZiNzIxNTY2YjBiYjk4ZDBj
-    NDJjMDg1NjM4N2IwODBlNjcwNDE5YjM2OTAzYmI0Y2EyMDM5ZTU=
+    ZjQ1NjY0NmVmY2QxMmE2MjcwZmE0ZjIxYjAzMmM4ZTA3NTY1MDI5MGQ4ODlj
+    MDljZGFkZTcwMTkyMzgzNDVlNjkxYTQ0YTZhMTE3NzQwMTQ4NjViNWE4MWFk
+    NTQxMDQzMmI1ZDQyYjMwM2M3NDQzNjZhNWJmZDRlMDRjM2ZlY2E=
   data.tar.gz: !binary |-
-    ZTg1OTI0NTdiMmU1MGEzMzk5NmI0YjM3NTlhMDMzNjlhYzIwM2M2ZTFmMWMz
-    ZTE3MTA1YWJiZjAxNTRmNDhhZGU5MGQ0MWRmNjUzOWUxMDBlOWI0YjczOGMx
-    ZjcxYmZhMzFmZGY1ZDdlYWZhZGJmNTYxYjgxZTRhOTg2MTdjNTQ=
+    ZDIzZjI2MTA3Y2M1ZThkYzNhOWVkNWQ2YTFjY2VmMjcwNmJlZmJlOTc0M2Zi
+    NzQwYzY3ZTA2NWFlZWUyZDE5NjY4MmI0ZDAwMmU1ZGQ5MDQ2NmFlNDBiNDVl
+    ZGRmNTgwNmVmNDE5MDE0NWEwNGYwNDMxYTFiOWIyODUyZDhmOWE=

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    ierail (0.3)
+    ierail (0.3.3)
       json (~> 1.7.7)
       nokogiri (~> 1.5.0)
       rest-client (~> 1.6.7)
+      tzinfo (~> 0.3.37)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +29,7 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     thor (0.18.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/ierail.gemspec

@@ -1,6 +1,8 @@
+require 'date'
+
 Gem::Specification.new do |s|
   s.name        = 'ierail'
-  s.version     = '0.3.2'
+  s.version     = '0.3.4'
   s.date        = Date.today.to_s
   s.summary     = "Irish Rail Train Schedule and Status API"
   s.description = "Irish Rail Train Schedule and Status API"
@@ -11,4 +13,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri', '~> 1.5.0'
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'json', '~> 1.7.7'
+  s.add_dependency 'tzinfo', '~> 0.3.37'
 end

data/lib/core_ext.rb

@@ -2,20 +2,21 @@ class Array
   #Filters elements, collecting those
   #whose times are before _time_
   def before time
-    select {|t| Time.parse(t.expdepart) <= Time.parse(time) }
+    select {|t| t.expdepart <= Time.parse(time) }
   end
 
   #Filters elements, collecting those
   #whose times are after _time_
   def after time
-    select {|t| Time.parse(t.expdepart) >= Time.parse(time) }
+    select {|t| t.expdepart >= Time.parse(time) }
   end
 
   # The 'in' is just sugar really, saving the 
   # programmer from doing a trivial computation 
   # over and over again in their code.
   def in time
-    future_time = Time.now + (time * 60)
-    before "#{future_time.hour}:#{future_time.min}"
+    select { |t|
+      ((t.expdepart - t.query_time ) / 60) < time
+    }
   end
 end

data/lib/station_data.rb

@@ -8,20 +8,20 @@ class StationData
     @traincode        = hash['Traincode']
     @station_name     = hash['Stationfullname']
     @station_code     = hash['Stationcode']
-    @query_time       = hash['Querytime']
+    @query_time       = Time.parse(hash['Querytime'])
     @train_date       = hash['Traindate']
     @origin           = hash['Origin']
     @destination      = hash['Destination']
-    @origin_time      = hash['Origintime']
-    @destination_time = hash['Destinationtime']
+    @origin_time      = Time.parse hash['Origintime']
+    @destination_time = Time.parse hash['Destinationtime']
     @status           = hash['Status']
     @last_location    = hash['Lastlocation']
     @duein            = hash['Duein']
     @late             = hash['Late']
-    @exparrival       = hash['Exparrival']
-    @expdepart        = hash['Expdepart']
-    @scharrival       = hash['Scharrival']
-    @schdepart        = hash['Schdepart']
+    @exparrival       = Time.parse hash['Exparrival']
+    @expdepart        = Time.parse hash['Expdepart']
+    @scharrival       = Time.parse hash['Scharrival']
+    @schdepart        = Time.parse hash['Schdepart']
     @direction        = hash['Direction']
     @train_type       = hash['Traintype']
   end

data/test/unit/ierail.rb

@@ -4,10 +4,21 @@ require_relative 'helper'
 
 require 'minitest/autorun'
 require 'ierail'
+require 'tzinfo'
 
 class IERailTest < MiniTest::Unit::TestCase
   def setup
     @ir = IERail.new
+
+    @now = Time.now
+
+    if TZInfo::Timezone.get('Europe/Dublin').current_period.dst?
+      unless @now.zone == 'IST'
+        @now -= @now.utc_offset - 3600
+      end
+    else
+      @now -= @now.utc_offset
+    end
   end
 
   def test_that_the_train_directions_are_correct
@@ -24,23 +35,23 @@ class IERailTest < MiniTest::Unit::TestCase
 
   def test_that_the_before_time_constraint_works
     #Thirty minutes from now
-    thirty_mins = Time.now + 60*30
+    thirty_mins = @now + (60 * 30)
     time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
     before_train = @ir.southbound_from('Malahide').before(time).sample
-    assert Time.parse(before_train.expdepart) <= thirty_mins
+    assert before_train.expdepart <= thirty_mins
   end
 
   def test_that_the_after_time_constraint_works
     #Thirty minutes from now
-    thirty_mins = Time.now + 60*30
+    thirty_mins = @now + (60 * 30)
     time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
     after_train = @ir.southbound_from('Malahide').after(time).sample
-    assert Time.parse(after_train.expdepart) >= thirty_mins
+    assert after_train.expdepart >= thirty_mins
   end
 
   def test_that_the_in_constraint_works
     mins = 30
-    thirty_mins = Time.now + 60 * mins
+    thirty_mins = @now + (60 * mins)
     time = "#{thirty_mins.hour}:#{thirty_mins.min}" # "HH:MM"
     before_train = @ir.southbound_from('Malahide').before(time)
 

data/test/unit/station_data.rb

@@ -33,7 +33,7 @@ class StationDataTest < MiniTest::Unit::TestCase
   end
 
   def test_that_there_is_a_query_time
-    refute_empty @station_data.query_time
+    refute_nil @station_data.query_time
   end
 
   def test_that_there_is_a_train_date
@@ -46,7 +46,7 @@ class StationDataTest < MiniTest::Unit::TestCase
   
   def test_that_there_is_an_origin_name_and_time
     refute_empty @station_data.origin[:name]
-    refute_empty @station_data.origin[:time]
+    refute_nil @station_data.origin[:time]
   end
 
   def test_that_destination_method_returns_a_hash
@@ -55,7 +55,7 @@ class StationDataTest < MiniTest::Unit::TestCase
 
   def test_that_there_is_a_destination_name_and_time
     refute_empty @station_data.destination[:name]
-    refute_empty @station_data.destination[:time]
+    refute_nil @station_data.destination[:time]
   end
 
   def test_that_arrival_method_returns_a_hash
@@ -63,8 +63,8 @@ class StationDataTest < MiniTest::Unit::TestCase
   end
 
   def test_that_there_is_an_arrival_sched_and_exp
-    refute_empty @station_data.arrival[:scheduled]
-    refute_empty @station_data.arrival[:expected]
+    refute_nil @station_data.arrival[:scheduled]
+    refute_nil @station_data.arrival[:expected]
   end
 
   def test_that_departure_method_returns_a_hash
@@ -72,8 +72,8 @@ class StationDataTest < MiniTest::Unit::TestCase
   end
 
   def test_that_there_is_a_departure_sched_and_exp
-    refute_empty @station_data.departure[:scheduled]
-    refute_empty @station_data.departure[:expected]
+    refute_nil @station_data.departure[:scheduled]
+    refute_nil @station_data.departure[:expected]
   end
 
   def test_that_it_responds_to_late?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ierail
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Oisin Hurley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -53,6 +53,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.37
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.37
 description: Irish Rail Train Schedule and Status API
 email: oi.sin@nis.io
 executables: []