mmb-seasonal 0.0.2 → 0.0.3

data/README

@@ -7,10 +7,10 @@ require 'seasonal'
 
 holidays = Seasonal::Calendar.new
 
-holidays.push(Seasonal::Event.new(
-  'Merry Christmas', 'America/New_York', 'dec 25'))
-holidays.push(Seasonal::Event.new(
-  "April Fool's Day", 'America/New_York', 'apr 1'))
+holidays.push(Seasonal::Event.new('Merry Christmas', 'America/New_York',
+  :start => 'dec 25 00:00', :end => 'dec 25 23:59:59'))
+holidays.push(Seasonal::Event.new("April Fool's Day", 'America/New_York',
+  :start => 'apr 1 00:00', :end => 'apr 1 23:59:59'))
 
 holidays.going_on { |e| puts e.payload }
 
@@ -20,14 +20,25 @@ require 'seasonal'
 
 colors = Seasonal::Calendar.new
 
-colors.push(Seasonal::Event.new(
-  '#ff0000', 'America/New_York', nil, '9:00am', nil, '10:00am'))
+colors.push(Seasonal::Event.new('#ff0000', 'America/New_York',
+  :start => '9:00am', :end => '10:00am'))
 
 color = '#000000'
 colors.going_on { |e| color = e.payload }
 
 puts "<p style=\"background-color : #{color}\">test</p>"
 
+Example (sale ends Jul 10):
+
+require 'seasonal'
+
+sales = Seasonal::Calendar.new
+
+sales.push(Seasonal::Event.new('Everything on sale', 'America/New_York',
+  :end => 'jul 10 2009'))
+
+sales.going_on { |e| puts e.payload }
+
 Each event has an attached payload which can be any object.
 
 Uses the flexible time parsing of Time.parse to be easy to use and the

data/lib/seasonal.rb

@@ -8,50 +8,46 @@ module Seasonal
   class Event
     attr_accessor :payload
     attr_accessor :zone
-    attr_accessor :start_date
-    attr_accessor :start_time
-    attr_accessor :end_date
-    attr_accessor :end_time
-
-    def initialize(payload, zone, start_date, start_time=nil, end_date=nil,
-      end_time=nil)
-      if end_time.nil?
-        if start_time.nil?
-          end_time = '23:59:59'
-        else
-          if end_date.nil?
-            end_time = start_time
-          else
-            end_time = '23:59:59'
-          end
-        end
-      end
-
-      start_time = '00:00:00' if start_time.nil?
-
-      end_date = start_date if end_date.nil?
+    attr_accessor :start
+    attr_accessor :ennd
 
+    def initialize(payload, zone, options={})
       @payload = payload
       @zone = zone
-      @start_date = start_date
-      @end_date = end_date
-      @start_time = start_time
-      @end_time = end_time
+      @start = options[:start]
+      @ennd = options[:end]
     end
 
-    def start
-      tz = TZInfo::Timezone.get(zone)
-      tz.local_to_utc(Time.parse("#{start_date} #{start_time}"))
+    def start_utc
+      unless start.nil?
+        tz = TZInfo::Timezone.get(zone)
+        tz.local_to_utc(Time.parse(start))
+      end
     end
 
-    def ennd
-      tz = TZInfo::Timezone.get(zone)
-      tz.local_to_utc(Time.parse("#{end_date} #{end_time}"))
+    def end_utc
+      unless ennd.nil?
+        tz = TZInfo::Timezone.get(zone)
+        tz.local_to_utc(Time.parse(ennd))
+      end
     end
 
     def going_on?(test_time=Time.now)
-      # puts "#{start} - #{ennd}"
-      test_time >= start and test_time <= ennd
+      # puts "#{start_utc} - #{end_utc}"
+      if start_utc.nil?
+        if end_utc.nil?
+          result = false
+        else
+          result = test_time <= end_utc
+        end
+      else
+        if end_utc.nil?
+          result = test_time >= start_utc
+        else
+          result = (test_time >= start_utc and test_time <= end_utc)
+        end
+      end
+      result
     end
 
   end

data/seasonal.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "seasonal"
-  s.version  = "0.0.2"
-  s.date     = "2008-11-07"
+  s.version  = "0.0.3"
+  s.date     = "2008-11-10"
   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,101 +6,53 @@ require 'test/unit'
 
 class SeasonalTest < Test::Unit::TestCase
 
-  def test_start_date
-    e = Seasonal::Event.new(nil, 'America/New_York', 'jan 1')
+  def test_none
+    e = Seasonal::Event.new(nil, 'America/New_York')
 
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year - 1, 12, 30, 23, 59, 59)))
-
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 1, 1, 17, 0, 0)))
-
-    assert_equal(false, e.going_on?(Time.utc(Time.now.utc.year, 1, 2, 5, 0, 0)))
-  end
-
-  def test_start_date_end_time
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'feb 22', nil, nil, '5:00pm')
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 2, 22, 4, 59, 59)))
-
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 2, 22, 13, 0, 0)))
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 2, 22, 22, 0, 1)))
+    assert_equal(false, e.going_on?)
   end
 
-  def test_start_date_end_date
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'mar 3 2003', nil, 'mar 5 2003')
-
-    assert_equal(false, e.going_on?(Time.utc(2003, 3, 3, 4, 59, 59)))
+  def test_end
+    es = 'mar 17'
+    ennd = Time.parse(es).utc
 
-    assert(e.going_on?(Time.utc(2003, 3, 4, 0, 0, 0)))
+    e = Seasonal::Event.new(nil, 'America/New_York', :end => es)
 
-    assert_equal(false, e.going_on?(Time.utc(2003, 3, 6, 5, 0, 0)))
+    assert(e.going_on?(ennd - 1))
+    assert(e.going_on?(ennd))
+    assert_equal(false, e.going_on?(ennd + 1))
   end
 
-  def test_start_date_end_date_end_time
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'apr 20', nil, 'may 1', '00:00')
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 4, 20, 3, 59, 59)))
+  def test_start
+    ss = 'jan 2'
+    start = Time.parse(ss).utc
 
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 5, 1, 0, 0, 0)))
+    e = Seasonal::Event.new(nil, 'America/New_York', :start => ss)
 
-    assert_equal(false, e.going_on?(Time.utc(Time.now.utc.year, 5, 2, 0, 0, 0)))
+    assert_equal(false, e.going_on?(start - 1))
+    assert(e.going_on?(start))
+    assert(e.going_on?(start + 1))
   end
 
-  def test_start_date_start_time
-    e = Seasonal::Event.new(nil, 'America/New_York', 'may 10', '10:00am')
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 5, 10, 13, 59, 59)))
-
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 5, 10, 14, 0, 0)))
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 5, 10, 14, 0, 1)))
-  end
-
-  def test_start_date_start_time_end_time
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'june 22', '10:00am', nil, '10:30am')
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 6, 22, 13, 59, 59)))
-
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 6, 22, 14, 15, 0)))
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 6, 22, 14, 30, 1)))
-  end
-
-  def test_start_date_start_time_end_date
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'july 4', '11:00pm', 'jul 5')
-
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 7, 5, 2, 59, 59)))
-
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 7, 5, 15, 0, 0)))
-
-    assert_equal(false, e.going_on?(Time.utc(Time.now.utc.year, 7, 6, 4, 0, 0)))
-  end
+  def test_start_end
+    ss = 'aug 29'
+    es = 'sep 1'
+    start = Time.parse(ss).utc
+    ennd = Time.parse(es).utc
 
-  def test_start_date_start_time_end_date_end_time
-    e = Seasonal::Event.new(nil,
-      'America/New_York', 'aug 19', '1:00pm', 'aug 21', '2:00pm')
+    e = Seasonal::Event.new(nil, 'America/New_York', :start => ss, :end => es)
 
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 8, 19, 16, 59, 59)))
+    assert_equal(false, e.going_on?(start - 1))
 
-    assert(e.going_on?(Time.utc(Time.now.utc.year, 8, 20, 15, 0, 0)))
+    if start <= ennd
+      assert(e.going_on?(start))
+      assert(e.going_on?(ennd))
+    else
+      assert_equal(false, e.going_on?(start))
+      assert_equal(false, e.going_on?(ennd))
+    end
 
-    assert_equal(false,
-      e.going_on?(Time.utc(Time.now.utc.year, 8, 21, 18, 0, 1)))
+    assert_equal(false, e.going_on?(ennd + 1))
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmb-seasonal
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -08:00
+date: 2008-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency