X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lib%2FHTML%2FCalendarMonth%2FDateTool%2FDateTime.pm;h=a0b98b315f6df9be60bcaa6022bd534e031c2f07;hb=f3ef12e10123e46a0db95d820bb77f6e6d3225c7;hp=f6e366d0b3fad6ec3428e93c516ec8a2976c0cdb;hpb=50065656489ae7e83457ab2c12b6d174186339d7;p=deb_pkgs%2Flibhtml-calendarmonth-perl.git

diff --git a/lib/HTML/CalendarMonth/DateTool/DateTime.pm b/lib/HTML/CalendarMonth/DateTool/DateTime.pm
index f6e366d..a0b98b3 100644
--- a/lib/HTML/CalendarMonth/DateTool/DateTime.pm
+++ b/lib/HTML/CalendarMonth/DateTool/DateTime.pm
@@ -1,15 +1,15 @@
 package HTML::CalendarMonth::DateTool::DateTime;
+BEGIN {
+  $HTML::CalendarMonth::DateTool::DateTime::VERSION = '1.25';
+}
 
 # Interface to DateTime
 
 use strict;
+use warnings;
 use Carp;
 
-use vars qw(@ISA $VERSION);
-
-@ISA = qw(HTML::CalendarMonth::DateTool);
-
-$VERSION = '0.01';
+use base qw( HTML::CalendarMonth::DateTool );
 
 use DateTime;
 
@@ -24,7 +24,7 @@ sub dow1st_and_lastday {
 
 sub day_epoch {
   my($self, $day, $month, $year) = @_;
-  $day || croak "Day required.\n";
+  $day || croak "day required.\n";
   $month ||= $self->month;
   $year  ||= $self->year;
   my $dt = $self->_new_dt($year, $month, $day);
@@ -33,17 +33,18 @@ sub day_epoch {
 
 sub dow {
   my($self, $day, $month, $year) = @_;
-  $day || croak "Day required.\n";
+  $day || croak "day required.\n";
   $month ||= $self->month;
   $year  ||= $self->year;
   my $dt = $self->_new_dt($year, $month, $day);
-  $dt->dow;
+  # convert from 1..7, starting with Mon, to 0..6, starting with Sun
+  $dt->dow % 7;
 }
 
 sub add_days {
   my($self, $delta, $day, $month, $year) = @_;
-  $delta || croak "Delta (in days) required.\n";
-  $day   || croak "Day required.\n";
+  defined $delta || croak "delta (in days) required.\n";
+  $day   || croak "day required.\n";
   $month ||= $self->month;
   $year  ||= $self->year;
   my $dt = $self->_new_dt($year, $month, $day);
@@ -53,7 +54,7 @@ sub add_days {
 
 sub week_of_year {
   my($self, $day, $month, $year) = @_;
-  $day || croak "Day required.\n";
+  $day || croak "day required.\n";
   $month ||= $self->month;
   $year  ||= $self->year;
   my $dt = $self->_new_dt($year, $month, $day);
@@ -77,7 +78,7 @@ sub _new_dt {
 sub _last_dom_dt {
   my $self = shift;
   my($year, $month) = @_;
-  $year && $month or croak "Year and month required.\n";
+  $year && $month or croak "year and month required.\n";
   DateTime->last_day_of_month(year => $year, month => $month);
 }