mmb-seasonal 0.0.6 → 0.0.7

data/lib/seasonal.rb

@@ -37,6 +37,36 @@ module Seasonal
       end
     end
 
+    def has_year(s)
+      p = Time.parse(s)
+      p.eql?(Time.parse(s + ' ' + (p.year + 1).to_s))
+    end
+
+    def is_yearly_range
+      !start.nil? and !has_year(start) and !ennd.nil? and !has_year(ennd)
+    end
+
+    def change_year(time, new_year)
+      Time.utc(new_year, time.utc.month, time.utc.day, time.utc.hour,
+        time.utc.min, time.utc.sec, time.utc.usec)
+    end
+
+    def going_on_yearly_range(test_time)
+      if is_yearly_range
+        start_shifted = change_year(start_utc, test_time.utc.year)
+        end_shifted = change_year(end_utc, test_time.utc.year)
+        if (end_utc < start_utc)
+          start_shifted_prev = change_year(start_shifted,
+            start_shifted.year - 1)
+          end_shifted_next = change_year(end_shifted, end_shifted.year + 1)
+          ((start_shifted_prev <= test_time and test_time <= end_shifted) or
+            (start_shifted <= test_time and test_time <= end_shifted_next))
+        else
+          (start_shifted <= test_time and test_time <= end_shifted)
+        end
+      end
+    end
+
     def going_on?(test_time=Time.now)
       # puts "#{start_utc} - #{end_utc}"
       if start_utc.nil?
@@ -49,7 +79,10 @@ module Seasonal
         if end_utc.nil?
           result = test_time >= start_utc
         else
-          result = (test_time >= start_utc and test_time <= end_utc)
+          result = going_on_yearly_range(test_time)
+          if result.nil?
+            result = (start_utc <= test_time and test_time <= end_utc)
+          end
         end
       end
       result

data/seasonal.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "seasonal"
-  s.version  = "0.0.6"
-  s.date     = "2009-01-14"
+  s.version  = "0.0.7"
+  s.date     = "2009-01-15"
   s.summary  = "create logic based on defined date and time events"
   s.email    = "matthewm@boedicker.org"
   s.homepage = "http://github.com/mmb/seasonal"

data/test/seasonal_test.rb

@@ -6,46 +6,77 @@ require 'test/unit'
 
 class SeasonalTest < Test::Unit::TestCase
 
+  def setup
+    @zone = 'America/New_York'
+    @tz = TZInfo::Timezone.get(@zone)
+  end
+
   def test_event_none
     e = Seasonal::Event.new(nil, 'America/New_York')
 
-    assert_equal(false, e.going_on?)
+    assert(!e.going_on?)
   end
 
   def test_event_start
     ss = 'jan 2'
-    start = Time.parse(ss).utc
+    start = @tz.local_to_utc(Time.parse(ss))
 
-    e = Seasonal::Event.new(nil, 'America/New_York', :start => ss)
+    e = Seasonal::Event.new(nil, @zone, :start => ss)
 
-    assert_equal(false, e.going_on?(start - 1))
+    assert(!e.going_on?(start - 1))
     assert(e.going_on?(start))
     assert(e.going_on?(start + 1))
   end
 
   def test_event_end
     es = 'mar 17'
-    ennd = Time.parse(es).utc
+    ennd = @tz.local_to_utc(Time.parse(es))
 
-    e = Seasonal::Event.new(nil, 'America/New_York', :end => es)
+    e = Seasonal::Event.new(nil, @zone, :end => es)
 
     assert(e.going_on?(ennd - 1))
     assert(e.going_on?(ennd))
-    assert_equal(false, e.going_on?(ennd + 1))
+    assert(!e.going_on?(ennd + 1))
   end
 
   def test_event_start_end
     ss = 'aug 29'
     es = 'sep 1'
-    start = Time.parse(ss).utc
-    ennd = Time.parse(es).utc
+    start = @tz.local_to_utc(Time.parse(ss))
+    ennd = @tz.local_to_utc(Time.parse(es))
+
+    e = Seasonal::Event.new(nil, @zone, :start => ss, :end => es)
+
+    assert(!e.going_on?(start - 1))
+    assert(e.going_on?(start))
+    assert(e.going_on?(ennd))
+    assert(!e.going_on?(ennd + 1))
+  end
+
+  def test_event_start_end_crosses_year_boundary
+    ss = 'dec 31'
+    es = 'jan 1'
+    start = @tz.local_to_utc(Time.parse(ss))
+    ennd = @tz.local_to_utc(Time.parse(es))
 
-    e = Seasonal::Event.new(nil, 'America/New_York', :start => ss, :end => es)
+    e = Seasonal::Event.new(nil, @zone, :start => ss, :end => es)
 
-    assert_equal(false, e.going_on?(start - 1))
+    assert(!e.going_on?(start - 1))
     assert(e.going_on?(start))
     assert(e.going_on?(ennd))
-    assert_equal(false, e.going_on?(ennd + 1))
+    assert(!e.going_on?(ennd + 1))
+  end
+
+  def test_event_start_end_crosses_year_boundary_other_year
+    e = Seasonal::Event.new(nil, @zone, :start => 'nov 6', :end => 'feb 28')
+
+    assert(!e.going_on?(Time.parse('10/15/1978')))
+    assert(e.going_on?(Time.parse('12/25/1979')))
+    assert(!e.going_on?(Time.parse('5/14/1980')))
+
+    assert(!e.going_on?(Time.parse('8/1/2012')))
+    assert(e.going_on?(Time.parse('11/26/2015')))
+    assert(!e.going_on?(Time.parse('4/1/2020')))
   end
 
   def test_calendar_going_on

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmb-seasonal
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency