metra_schedule 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/metra/extensions/time_extension.rb

@@ -3,7 +3,20 @@ module MetraSchedule
     module TimeExtension
       def to_today
         if self.hour >= 0 and self.hour <= 2 # Midnight to 2AM counts as the same day
-          Time.local(Time.now.year, Time.now.month, Time.now.day+1, self.hour, self.min, self.sec)
+          if Time.now.month >= 12 and Time.now.day >= 31 #Dec 31st, can't overflow the months to 13
+            year = Time.now.year + 1
+            month = 1
+            day = 1
+          elsif Time.now.day >= 31 #Any 31st of the month, can't overflow days to 32
+            year = Time.now.year
+            month = Time.now.month + 1
+            day = 1
+          else #Otherwise just increment our day
+            year = Time.now.year
+            day = Time.now.day + 1
+            month = Time.now.month
+          end
+          Time.local(year, month, day, self.hour, self.min, self.sec)
         else
           Time.local(Time.now.year, Time.now.month, Time.now.day, self.hour, self.min, self.sec)
         end

data/metra_schedule.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metra_schedule}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Smith"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-03-31}
   s.description = %q{metra_schedule provides a ruby object interface to the Chicago metra train schedule}
   s.email = %q{blakesmith0@gmail.com}
   s.extra_rdoc_files = [

data/test/unit/test_time_extension.rb

@@ -10,9 +10,42 @@ class TestTimeExtension < Test::Unit::TestCase
   end
 
   def test_to_today_midnight_inclusive
+    Timecop.freeze(2009, 8, 28, 9, 30, 45)
     sample = Time.local(2009, 5, 5, 0, 30, 45)
     today = Time.now
-    expected = Time.local(today.year, today.month, today.day+1, sample.hour, sample.min, sample.sec)
+    expected = Time.local(2009, 8, 29, 0, 30, 45)
+    assert_equal(expected, sample.to_today)
+  end
+
+  def test_to_today_on_31st
+    Timecop.freeze(2010, 3, 31, 9, 30, 45)
+    sample = Time.local(2009, 5, 5, 0, 30, 45)
+    today = Time.now
+    expected = Time.local(2010, 4, 1, 0, 30, 45)
+    assert_equal(expected, sample.to_today)
+  end
+
+  def test_to_today_on_31st_in_dec_after_midnight
+    Timecop.freeze(2010, 12, 31, 9, 30, 45)
+    sample = Time.local(2009, 5, 5, 0, 30, 45)
+    today = Time.now
+    expected = Time.local(2011, 1, 1, 0, 30, 45)
+    assert_equal(expected, sample.to_today)
+  end
+
+  def test_to_today_in_dec_after_midnight
+    Timecop.freeze(2010, 12, 21, 9, 30, 45)
+    sample = Time.local(2009, 5, 5, 0, 30, 45)
+    today = Time.now
+    expected = Time.local(2010, 12, 22, 0, 30, 45)
+    assert_equal(expected, sample.to_today)
+  end
+
+  def test_to_today_in_dec_before_midnight
+    Timecop.freeze(2010, 12, 21, 9, 30, 45)
+    sample = Time.local(2009, 5, 5, 11, 30, 45)
+    today = Time.now
+    expected = Time.local(2010, 12, 21, 11, 30, 45)
     assert_equal(expected, sample.to_today)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metra_schedule
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Blake Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -06:00
+date: 2010-03-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency