Bug #97318 for DateTime-Event-ICal: Broken handling of hourly, minutely, and secondly frequency with bymonth or bymonthday

Okay, here's a quick patch that handles a couple of the issues. I don't think it's a complete fix, but it's a start. On Thu Jul 17 13:23:19 2014, HANENKAMP wrote: Show quoted text

diff --git a/lib/DateTime/Event/ICal.pm b/lib/DateTime/Event/ICal.pm index a79cc3f..41941dc 100644 --- a/lib/DateTime/Event/ICal.pm +++ b/lib/DateTime/Event/ICal.pm @@ -598,7 +598,16 @@ sub recur { if ( exists $args{bymonthday} || exists $args{bymonth} ) { - $by_month_day = _yearly_recurrence($dtstart, \%args); + my %by = %args; + $by{byhour} = $args_backup{byhour} if $args_backup{byhour}; + $by{byhour} = [ 0 .. 23 ] if $args{freq} eq 'hourly'; + $by{byminute} = $args_backup{byminute} if $args_backup{byminute}; + $by{byminute} = [ 0 .. 59 ] if $args{freq} eq 'minutely'; + $by{bysecond} = $args_backup{bysecond} if $args_backup{bysecond}; + $by{bysecond} = [ 0 .. 59 ] if $args{freq} eq 'secondly'; + $by_month_day = _yearly_recurrence($dtstart, \%by); + delete $args{bymonthday}; + delete $args{bymonth}; } my $by_week_day; @@ -606,7 +615,16 @@ sub recur { if ( exists $args{byday} || exists $args{byweekno} ) { - $by_week_day = _weekly_recurrence($dtstart, \%args); + my %by = %args; + $by{byhour} = $args_backup{byhour} if $args_backup{byhour}; + $by{byhour} = [ 0 .. 23 ] if $args{freq} eq 'hourly'; + $by{byminute} = $args_backup{byminute} if $args_backup{byminute}; + $by{byminute} = [ 0 .. 59 ] if $args{freq} eq 'minutely'; + $by{bysecond} = $args_backup{bysecond} if $args_backup{bysecond}; + $by{bysecond} = [ 0 .. 59 ] if $args{freq} eq 'secondly'; + $by_week_day = _weekly_recurrence($dtstart, \%by); + delete $args{byday}; + delete $args{byweekno}; } my $by_hour; diff --git a/t/06hms-byetc.t b/t/06hms-byetc.t new file mode 100644 index 0000000..1455c3b --- /dev/null +++ b/t/06hms-byetc.t @@ -0,0 +1,101 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +use DateTime; +use DateTime::Event::ICal; +use DateTime::Span; +use Test::More; + +my $dt20140101 = DateTime->new( + year => 2014, month => 1, day => 1, hour => 0, minute => 0, second => 0, +); + +my $dt20140404a4 = DateTime->new( + year => 2014, month => 4, day => 4, hour => 4, minute => 0, second => 0, +); + +my $dt20140101a9 = $dt20140101->clone->set( hour => 9 ); + +my @test_cases = ( + { + name => 'Every 4 minutes of the 4th hour of the 4th of April', + start => $dt20140101, + recurrence => { + freq => 'minutely', + interval => 4, + byhour => [ 4 ], + bymonth => [ 4 ], + bymonthday => [ 4 ], + }, + expect => [ + map { $dt20140404a4->clone->set( minute => $_ ) } + map { $_ * 4 } 0 .. 14 + ], + }, + { + name => 'Every 20 minutes in January from 9:00 to 10:00', + start => $dt20140101a9, + recurrence => { + freq => 'minutely', + interval => 20, + bymonth => [ 1 ], + byday => [ qw( su mo tu we th fr sa ) ], + byhour => [ 9 ], + }, + expect => [ + map { ( + $_->clone->set( minute => 0 ), + $_->clone->set( minute => 20 ), + $_->clone->set( minute => 40 ), + ) } + map { $dt20140101a9->clone->set( day => $_ ) } 1 .. 31 + ], + }, + { + name => 'Every 8 hours on January 10th through 12th', + start => $dt20140101, + recurrence => { + freq => 'hourly', + interval => 8, + bymonth => [ 1 ], + bymonthday => [ 10, 11, 12 ], + }, + expect => [ + map { ( + $_->clone->set( hour => 0 ), + $_->clone->set( hour => 8 ), + $_->clone->set( hour => 16 ), + ) } map { $dt20140101->clone->set( day => $_ ) } 10 .. 12 + ], + }, +); + +my $test_count = 0; +$test_count += @{ $_->{expect} } for @test_cases; + +plan tests => $test_count; + +my $span = DateTime::Span->new( + start => DateTime->new( + year => 2014, month => 1, day => 1, hour => 0, minute => 0, second => 0, + ), + end => DateTime->new( + year => 2014, month => 12, day => 31, hour => 23, minute => 59, second => 59, + ), +); + +for my $case (@test_cases) { + my $set = DateTime::Event::ICal->recur( + dtstart => $case->{start}, + %{ $case->{recurrence} }, + ); + + my @all_expected = @{ $case->{expect} }; + my $iter = $set->iterator( span => $span ); + while (my $got = $iter->next) { + my $expected = shift @all_expected; + is($got, $expected, "$case->{name}: $expected matches"); + } + fail("$case->{name}: $_ matches") for @all_expected; +}