hiccup 0.5.14 → 0.5.15

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.14"
+  VERSION = "0.5.15"
 end

data/test/core_ext_date_test.rb

@@ -2,8 +2,8 @@ require "test_helper"
 
 
 class CoreExtDateTest < ActiveSupport::TestCase
-  
-  
+
+
   test "should correctly identify the nth weekday of the month of a date" do
     assert_equal 1, Date.new(2012, 7, 1).get_nth_wday_of_month
     assert_equal 1, Date.new(2012, 7, 7).get_nth_wday_of_month
@@ -15,7 +15,7 @@ class CoreExtDateTest < ActiveSupport::TestCase
     assert_equal 4, Date.new(2012, 7, 28).get_nth_wday_of_month
     assert_equal 5, Date.new(2012, 7, 29).get_nth_wday_of_month
   end
-  
+
   test "should correctly identify the nth weekday of the month of a date as a string" do
     assert_equal "1 Sunday", Date.new(2012, 7, 1).get_nth_wday_string
     assert_equal "1 Saturday", Date.new(2012, 7, 7).get_nth_wday_string
@@ -27,6 +27,6 @@ class CoreExtDateTest < ActiveSupport::TestCase
     assert_equal "4 Saturday", Date.new(2012, 7, 28).get_nth_wday_string
     assert_equal "5 Sunday", Date.new(2012, 7, 29).get_nth_wday_string
   end
-  
-  
+
+
 end

data/test/duration_ext_test.rb

@@ -3,27 +3,27 @@ require "hiccup/core_ext/duration"
 
 
 class DurationExtTest < ActiveSupport::TestCase
-  
-  
+
+
   def test_active_support_duration_is_working
     assert 1.day.is_a?(ActiveSupport::Duration), "I ran into a problem where the Ruby gem 'god' also added :day to Fixnum and broke ActiveSupport."
   end
-  
-  
+
+
   def test_after_alias
     t = 17.weeks.ago
     [:day, :week, :month, :year].each do |period|
       assert_equal 1.send(period).since(t), 1.send(period).after(t)
     end
   end
-  
-  
+
+
   def test_before_alias
     t = 17.weeks.ago
     [:day, :week, :month, :year].each do |period|
       assert_equal 1.send(period).ago(t), 1.send(period).before(t)
     end
   end
-  
-  
+
+
 end

data/test/enumerable_test.rb

@@ -5,21 +5,21 @@ class EnumerableTest < ActiveSupport::TestCase
   include Hiccup
 
   attr_reader :schedule
-  
-  
-  
+
+
+
   def test_occurs_on_annually
     schedule = Schedule.new({
       :kind => :annually,
       :start_date => Date.new(2009,3,15)})
     assert !schedule.occurs_on(Date.new(1984,3,15)),  "Annual schedule starting 3/15/09 should not occur on 3/15/1984"
-    assert schedule.occurs_on(Date.new(2084,3,15)),   "Annual schedule starting 3/15/09 should occur on 3/15/2084"    
+    assert schedule.occurs_on(Date.new(2084,3,15)),   "Annual schedule starting 3/15/09 should occur on 3/15/2084"
     assert !schedule.occurs_on(Date.new(2011,4,15)),  "Annual schedule starting 3/15/09 should not occur on 4/15/2011"
     assert !schedule.occurs_on(Date.new(2009,3,17)),  "Annual schedule starting 3/15/09 should not occur on 3/17/2009"
-  end 
-  
-  
-  
+  end
+
+
+
   test "annual recurrence with a skip" do
     schedule = Schedule.new({
       :kind => :annually,
@@ -29,7 +29,7 @@ class EnumerableTest < ActiveSupport::TestCase
     actual_dates = schedule.occurrences_between(Date.new(2009, 01, 01), Date.new(2013, 12, 31)).map(&:to_s)
     assert_equal expected_dates, actual_dates
   end
-  
+
   test "annual recurrence with a skip, starting enumeration on an off year" do
     schedule = Schedule.new({
       :kind => :annually,
@@ -38,9 +38,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal "2011-03-04", (schedule.first_occurrence_on_or_after Date.new(2010, 03, 01)).to_s
     assert_equal "2011-03-04", (schedule.first_occurrence_on_or_before Date.new(2012, 03, 01)).to_s
   end
-  
-  
-  
+
+
+
   def test_occurs_on_weekly
     schedule = Schedule.new({
       :kind => :weekly,
@@ -53,7 +53,7 @@ class EnumerableTest < ActiveSupport::TestCase
     assert schedule.occurs_on(Date.new(2009,3,16)),   "MWF schedule starting 3/15/09 should occur on 3/16/2009"
     assert !schedule.occurs_on(Date.new(2009,3,11)),  "MWF schedule starting 3/15/09 should not occur on 3/11/2009"
     assert schedule.occurs_on(Date.new(2009,3,18)),   "MWF schedule starting 3/15/09 should occur on 3/18/2009"
-    
+
     schedule.end_date = Date.new(2009,4,11)
     schedule.ends = true
     assert_equal true, schedule.ends?
@@ -61,9 +61,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert !schedule.occurs_on(Date.new(2009,5,11)),  "MWF schedule starting 3/15/09 and ending 4/11/09 should not occur on 5/11/2009"
     assert !schedule.occurs_on(Date.new(2009,5,20)),  "MWF schedule starting 3/15/09 and ending 4/11/09 should not occur on 5/20/2009"
   end
-  
-  
-  
+
+
+
   def test_weekly_occurrences_during_month
     schedule = Schedule.new({
       :kind => :weekly,
@@ -74,11 +74,11 @@ class EnumerableTest < ActiveSupport::TestCase
     dates = occurrences_during_month(schedule, 2009,7).map {|date| date.day}
     expected_dates = [1,3,6,8,10,13,15,17,20,22,24,27,29,31]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for weekly schedule"
-    
+
     dates = occurrences_during_month(schedule, 2008,7).map {|date| date.day}
     expected_dates = []
     assert_equal expected_dates, dates,                 "occurrences_during_month should generate no occurrences if before start_date"
-    
+
     schedule = Schedule.new({
       :kind => :weekly,
       :weekly_pattern => %w{Monday},
@@ -89,20 +89,20 @@ class EnumerableTest < ActiveSupport::TestCase
     expected_dates = [14,21]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not correctly observe end date for weekly schedule"
   end
-  
+
   test "should keep weekly occurrences during a week together when skipping" do
     schedule = Schedule.new(
       :kind => :weekly,
       :weekly_pattern => %w{Tuesday Thursday},
       :start_date => Date.new(2013, 10, 2), # Wednesday
       :skip => 2)
-    
+
     dates = occurrences_during_month(schedule, 2013, 10).map(&:day)
     assert_equal [3,  15, 17,  29, 31], dates
   end
-  
-  
-  
+
+
+
   def test_monthly_occurrences_during_month
     schedule = Schedule.new({
       :kind => :monthly,
@@ -111,18 +111,18 @@ class EnumerableTest < ActiveSupport::TestCase
     dates = occurrences_during_month(schedule, 2009,12).map {|date| date.day}
     expected_dates = [13,27]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for monthly schedule"
-    
+
     dates = occurrences_during_month(schedule, 2009,2).map {|date| date.day}
     expected_dates = [8,22]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for monthly schedule"
-    
+
     dates = occurrences_during_month(schedule, 1991,7).map {|date| date.day}
     expected_dates = []
     assert_equal expected_dates, dates,                 "occurrences_during_month should generate no occurrences if before start_date"
   end
-  
-  
-  
+
+
+
   def test_no_occurrence
     expected_date = Date.new(2011,3,12)
     schedule = Schedule.new({:kind => :never, :start_date => expected_date})
@@ -130,9 +130,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal expected_dates, schedule.occurrences_between(Date.new(2011,1,1), Date.new(2011,12,31))
     assert schedule.contains?(expected_date)
   end
-  
 
-  
+
+
   context "#n_occurrences_before" do
     setup do
       @schedule = Schedule.new({
@@ -151,10 +151,10 @@ class EnumerableTest < ActiveSupport::TestCase
                         "2009-10-09" ]
       assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
     end
-    
+
     should "return a shorter array if no events exist before the given date" do
       dates = schedule.n_occurrences_before(10, Date.new(2009, 3, 20)).map { |date| date.strftime("%Y-%m-%d") }
-      
+
       expected_dates = ["2009-03-18", "2009-03-16"]
       assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
     end
@@ -204,9 +204,9 @@ class EnumerableTest < ActiveSupport::TestCase
       end
     end
   end
-  
-  
-  
+
+
+
   def test_how_contains_handles_parameter_types
     date = Date.new(1981,4,23)
     schedule = Schedule.new({:kind => :annually, :start_date => date})
@@ -214,9 +214,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert schedule.contains?(date.to_time)
     assert schedule.contains?(date.to_datetime)
   end
-  
-  
-  
+
+
+
   def test_monthly_occurrences
     occurrence = [1, "Wednesday"]
     schedule = Schedule.new({
@@ -226,15 +226,15 @@ class EnumerableTest < ActiveSupport::TestCase
     expected_dates = [[1,5], [2,2], [3,2], [4,6], [5,4], [6,1], [7,6], [8,3], [9,7], [10,5], [11,2], [12,7]]
     expected_dates.map! {|pair| Date.new(2011, *pair)}
     assert_equal expected_dates, schedule.occurrences_between(Date.new(2011,1,1), Date.new(2011,12,31))
-    
+
     (0...(expected_dates.length - 1)).each do |i|
       assert_equal expected_dates[i+1], schedule.next_occurrence_after(expected_dates[i])
       assert_equal expected_dates[i], schedule.first_occurrence_before(expected_dates[i + 1])
     end
   end
-  
-  
-  
+
+
+
   test "should not throw an exception when calculating monthly recurrence and skip causes a guess to be discarded" do
     schedule = Schedule.new({
       :kind => :monthly,
@@ -250,9 +250,9 @@ class EnumerableTest < ActiveSupport::TestCase
       :end_date => Date.new(2012,3,29)})
     schedule.occurrences_between(schedule.start_date, schedule.end_date)
   end
-  
-  
-  
+
+
+
   test "should not predict dates before the beginning of a schedule" do
     schedule = Schedule.new({
       :kind => :weekly,
@@ -265,7 +265,7 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal [], schedule.n_occurrences_before(10, Date.new(2011,1,3))
     assert_equal [], schedule.n_occurrences_on_or_before(10, Date.new(2011,1,2))
   end
-  
+
   test "should predict nonrecurring dates before a date later than them" do
     schedule = Schedule.new({
       :kind => :never,
@@ -273,7 +273,7 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal [Date.new(2011, 1, 3)], schedule.n_occurrences_on_or_before(10, Date.new(2011,1,3))
     assert_equal [], schedule.n_occurrences_on_or_before(10, Date.new(2011,1,2))
   end
-  
+
   test "should not predict dates after the end of a schedule" do
     schedule = Schedule.new({
       :kind => :weekly,
@@ -285,9 +285,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal nil, schedule.first_occurrence_on_or_after(Date.new(2011,2, 1))
     assert_equal [], schedule.occurrences_between(Date.new(2013, 9, 23), Date.new(2013, 9, 30))
   end
-  
-  
-  
+
+
+
   test "all methods should take any kind of date as an argument" do
     schedule = Schedule.new({
       :kind => :weekly,
@@ -298,9 +298,9 @@ class EnumerableTest < ActiveSupport::TestCase
     assert_equal Date.new(2011, 1, 17), schedule.first_occurrence_after(Time.new(2011, 1, 10))
     assert_equal Date.new(2011, 1, 3), schedule.first_occurrence_before(Time.new(2011, 1, 10))
   end
-  
-  
-  
+
+
+
   def test_weekly_recurrence_and_skip
     schedule = Schedule.new({
       :kind => :weekly,
@@ -310,15 +310,15 @@ class EnumerableTest < ActiveSupport::TestCase
     expected_dates = [[1,3], [1,24], [2,14], [3,7], [3,28]]
     expected_dates.map! {|pair| Date.new(2011, *pair)}
     assert_equal expected_dates, schedule.occurrences_between(Date.new(2011,1,1), Date.new(2011,3,31))
-    
+
     (0...(expected_dates.length - 1)).each do |i|
       assert_equal expected_dates[i+1], schedule.next_occurrence_after(expected_dates[i])
       assert_equal expected_dates[i], schedule.first_occurrence_before(expected_dates[i + 1])
     end
   end
-  
-  
-  
+
+
+
   def test_monthly_recurrence_and_skip
     schedule = Schedule.new({
       :kind => :monthly,
@@ -328,15 +328,15 @@ class EnumerableTest < ActiveSupport::TestCase
     expected_dates = [[1,5], [3,2], [5,4], [7,6], [9,7], [11,2]]
     expected_dates.map! {|pair| Date.new(2011, *pair)}
     assert_equal expected_dates, schedule.occurrences_between(Date.new(2011,1,1), Date.new(2011,12,31))
-    
+
     (0...(expected_dates.length - 1)).each do |i|
       assert_equal expected_dates[i+1], schedule.next_occurrence_after(expected_dates[i])
       assert_equal expected_dates[i], schedule.first_occurrence_before(expected_dates[i + 1])
     end
   end
-  
-  
-  
+
+
+
   def test_annual_occurrences_during_month
     schedule = Schedule.new({
       :kind => :annually,
@@ -344,11 +344,11 @@ class EnumerableTest < ActiveSupport::TestCase
     dates = occurrences_during_month(schedule, 1981,4).map {|date| date.day}
     expected_dates = [23]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for annual schedule"
-    
+
     dates = occurrences_during_month(schedule, 1972,4).map {|date| date.day}
     expected_dates = []
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for annual schedule"
-    
+
     dates = occurrences_during_month(schedule, 1984,4).map {|date| date.day}
     expected_dates = [23]
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for annual schedule"
@@ -361,7 +361,7 @@ class EnumerableTest < ActiveSupport::TestCase
     expected_dates = []
     assert_equal expected_dates, dates,                 "occurrences_during_month did not generate expected dates for annual schedule"
   end
-  
+
   test "When there is no 5th weekday of a month, schedule shouldn't crash" do
     start = Date.new(2010,6,1)
     schedule = Schedule.new({
@@ -369,18 +369,18 @@ class EnumerableTest < ActiveSupport::TestCase
       :monthly_pattern => [[5, "Monday"]],
       :start_date => start})
     assert_equal "The fifth Monday of every month", schedule.humanize
-    
+
     # There are not 5 Mondays during June 2010
     assert_nothing_raised do
       assert_equal [], occurrences_during_month(schedule, 2010, 6)
     end
-    
+
     next_fifth_month = Date.new(2010,8,30)
     assert_equal next_fifth_month, schedule.first_occurrence_on_or_after(start)
   end
-  
-  
-  
+
+
+
   def test_first_occurrence_on_or_after
     fifth_sunday = Date.new(2010, 8, 29)
     schedule = Schedule.new({
@@ -388,38 +388,38 @@ class EnumerableTest < ActiveSupport::TestCase
       :monthly_pattern => [[5, "Sunday"]],
       :start_date => fifth_sunday})
     assert_equal "The fifth Sunday of every month", schedule.humanize
-    
+
     assert_equal fifth_sunday, schedule.first_occurrence_on_or_after(fifth_sunday)
     assert schedule.contains?(fifth_sunday)
   end
-  
-  
-  
+
+
+
   def test_february_29
     schedule = Schedule.new({
       :kind => :annually,
       :start_date => Date.new(2008, 2, 29)
     });
-    
+
     assert_equal [Date.new(2010, 2, 28)], occurrences_during_month(schedule, 2010, 2)
     assert_equal [Date.new(2012, 2, 29)], occurrences_during_month(schedule, 2012, 2)
   end
-  
-  
-  
+
+
+
   def test_recurs_on31st
     schedule = Schedule.new({
       :kind => :monthly,
       :monthly_pattern => [31],
       :start_date => Date.new(2008, 2, 29)
     })
-    
+
     assert_equal [Date.new(2010, 1, 31)], occurrences_during_month(schedule, 2010, 1)
     assert_equal [], occurrences_during_month(schedule, 2010, 2)
   end
-  
-  
-  
+
+
+
   context "when a weekly schedule includes October 1582" do
     setup do
       @schedule = Schedule.new(
@@ -427,12 +427,12 @@ class EnumerableTest < ActiveSupport::TestCase
         weekly_pattern: %w{Monday},
         start_date: Date.new(1582, 10, 1))
     end
-    
+
     should "just skip the invalid dates" do
       assert_equal %w{10/01 10/18 10/25}, occurrences_during_month(@schedule, 1582, 10).map { |d| d.strftime("%m/%d") }
     end
   end
-  
+
   context "when a monthly schedule includes October 1582" do
     setup do
       @schedule = Schedule.new(
@@ -440,35 +440,35 @@ class EnumerableTest < ActiveSupport::TestCase
         monthly_pattern: [5, 19],
         start_date: Date.new(1582, 9, 5))
     end
-    
+
     should "just skip the invalid dates" do
       assert_equal %w{10/19}, occurrences_during_month(@schedule, 1582, 10).map { |d| d.strftime("%m/%d") }
     end
   end
-  
+
   context "when a yearly schedule includes October 1582" do
     setup do
       @schedule = Schedule.new(
         kind: :annually,
         start_date: Date.new(1580, 10, 8))
     end
-    
+
     should "just skip the invalid dates" do
       assert_equal [], occurrences_during_month(@schedule, 1582, 10).map { |d| d.strftime("%m/%d") }
     end
   end
-  
-  
-  
+
+
+
   if ENV['PERFORMANCE_TEST']
     test "performance test" do
       n = 1000
-      
+
       # Each of these schedules should describe 52 events
-      
+
       Benchmark.bm(20) do |x|
         x.report("weekly (simple):") do
-          n.times do 
+          n.times do
             Schedule.new(
               :kind => :weekly,
               :weekly_pattern => ["Friday"],
@@ -477,7 +477,7 @@ class EnumerableTest < ActiveSupport::TestCase
           end
         end
         x.report("weekly (complex):") do
-          n.times do 
+          n.times do
             Schedule.new(
               :kind => :weekly,
               :weekly_pattern => ["Monday", "Wednesday", "Friday"],
@@ -520,22 +520,22 @@ class EnumerableTest < ActiveSupport::TestCase
           end
         end
       end
-      
+
     end
   end
-  
-  
-  
+
+
+
 private
-  
-  
-  
+
+
+
   def occurrences_during_month(schedule, year, month)
     date1 = Date.new(year, month, 1)
     date2 = Date.new(year, month, -1)
     schedule.occurrences_between(date1, date2)
   end
-  
-  
-  
+
+
+
 end