Changeset 504

Timestamp:

08/28/08 02:04:02 (3 months ago)

Author:

ogawa

Message:

Beautify code by perltidy.

Location:

cybozu2ical/trunk

Files:

• cybozu2ical (modified) (8 diffs)
• lib/WWW/CybozuOffice6/Calendar.pm (modified) (12 diffs)
• lib/WWW/CybozuOffice7/Calendar.pm (modified) (2 diffs)

cybozu2ical/trunk/cybozu2ical

@@ -22 +22 @@
 ###
 *Data::ICal::Property::_value_as_string = sub {
-    my $self = shift;
-    my $key = shift;
-    my $value = defined($self->value()) ? $self->value() : '';
-    
-    unless ($self->vcal10) {
+    my $self  = shift;
+    my $key   = shift;
+    my $value = defined( $self->value() ) ? $self->value() : '';
+
+    unless ( $self->vcal10 ) {
         my $lc_key = lc($key);
         $value =~ s/\\/\\/gs;
-        $value =~ s/\Q;/\\;/gs unless ($lc_key eq 'rrule' || $lc_key eq 'exdate');
-        $value =~ s/,/\\,/gs unless ($lc_key eq 'rrule' || $lc_key eq 'exdate');
+        $value =~ s/\Q;/\\;/gs
+          unless ( $lc_key eq 'rrule' || $lc_key eq 'exdate' );
+        $value =~ s/,/\\,/gs
+          unless ( $lc_key eq 'rrule' || $lc_key eq 'exdate' );
         $value =~ s/\n/\\n/gs;
         $value =~ s/\\N/\\N/gs;
@@ -43 +45 @@
 ###
 sub to_icaldate {
-    my($dt, $is_full_day) = @_;
-    $is_full_day ?
-        $dt->ymd('') :
-        $dt->ymd('') . 'T' . $dt->hms('') . ($dt->time_zone->is_utc ? 'Z' : '');
+    my ( $dt, $is_full_day ) = @_;
+    $is_full_day
+      ? $dt->ymd('')
+      : $dt->ymd('') . 'T'
+      . $dt->hms('')
+      . ( $dt->time_zone->is_utc ? 'Z' : '' );
 }
 
 sub encode_string {
-    my($enc, $text) = @_;
-    if ($enc eq 'ncr') {
-        $text =~ s/(\P{ASCII})/sprintf("&#%d;", ord($1))/eg;
-    } else {
-        $text = encode($enc, $text);
+    my ( $enc, $text ) = @_;
+    if ( $enc eq 'ncr' ) {
+        $text =~ s/(\P{ASCII})/sprintf("&#%d;", ord($1))/eg;
+    }
+    else {
+        $text = encode( $enc, $text );
     }
     $text;
@@ -62 +67 @@
     my $file = shift;
     my $yaml;
-    if (eval('require YAML::Tiny')) {
-        ($yaml) = YAML::Tiny::LoadFile($file);
-    } elsif (eval('require YAML')) {
-        ($yaml) = YAML::LoadFile($file);
+    if ( eval('require YAML::Tiny') ) {
+        ($yaml) = YAML::Tiny::LoadFile($file);
+    }
+    elsif ( eval('require YAML') ) {
+        ($yaml) = YAML::LoadFile($file);
     }
     if ($@) {
-        die "Faild to read yaml file: $@";
+        die "Faild to read yaml file: $@";
     }
     $yaml;
@@ -79 +85 @@
 # Handle command-line options
 my %opt = (
-    conf                        => 'config.yaml',
-    'compat-google-calendar'    => 0,
+    conf                     => 'config.yaml',
+    'compat-google-calendar' => 0,
 );
-GetOptions(\%opt,
-           'output=s',
-           'conf=s',
-           'compat-google-calendar',
-           'debug',
-           'input-csv=s',
-           'output-csv=s',
-           'help',
-       ) or pod2usage(2);
+GetOptions( \%opt, 'output=s', 'conf=s', 'compat-google-calendar', 'debug',
+    'input-csv=s', 'output-csv=s', 'help', )
+  or pod2usage(2);
 pod2usage(1) if $opt{help};
 
 # Read configuration file
-my $cfg = read_yaml($opt{conf});
+my $cfg = read_yaml( $opt{conf} );
 my $time_zone = $cfg->{time_zone} || 'Asia/Tokyo';
 
@@ -103 +103 @@
     calscale => 'GREGORIAN',
     method   => 'PUBLISH',
-    $cfg->{calname} ? ('X-WR-CALNAME' => $cfg->{calname}) : (),
+    $cfg->{calname} ? ( 'X-WR-CALNAME' => $cfg->{calname} ) : (),
     'X-WR-TIMEZONE' => $time_zone
 );
 
 # Obtain Cybozu Office 6/7 Calendar items
-my $cal_class = $cfg->{cybozu_version} == 7 ?
-    'WWW::CybozuOffice7::Calendar' : 'WWW::CybozuOffice6::Calendar';
+my $cal_class =
+  $cfg->{cybozu_version} == 7
+  ? 'WWW::CybozuOffice7::Calendar'
+  : 'WWW::CybozuOffice6::Calendar';
 eval "use $cal_class;";
 my $cal = $cal_class->new(%$cfg);
 
-if ($opt{'input-csv'}) {
-    $cal->read_from_csv_file($opt{'input-csv'})
-        or die "Failed to read CSV file: $opt{'input-csv'}";
-} else {
+if ( $opt{'input-csv'} ) {
+    $cal->read_from_csv_file( $opt{'input-csv'} )
+      or die "Failed to read CSV file: $opt{'input-csv'}";
+}
+else {
     $cal->request()
-        or die "Failed to get Cybozu Office 6 Calendar";
+      or die "Failed to get Cybozu Office 6 Calendar";
 }
 
 # Output the calendar CSV for debugging
-if ($opt{'output-csv'}) {
+if ( $opt{'output-csv'} ) {
     local *FH;
     open FH, ">$opt{'output-csv'}" or die "Failed to write $opt{'output-csv'}";
@@ -130 +133 @@
 
 # For each items, generate an 'event entry' and append it to the calendar
-for my $item ($cal->get_items()) {
+for my $item ( $cal->get_items() ) {
     my $vevent = Data::ICal::Entry::Event->new();
-    my %args = (
-        summary     => decode_utf8($item->summary),
-        description => decode_utf8($item->description),
-        created     => to_icaldate($item->created),
-        dtstamp     => to_icaldate($item->modified),
-        url         => $cal->url . '?page=ScheduleView&EID=' . $item->id,
+    my %args   = (
+        summary     => decode_utf8( $item->summary ),
+        description => decode_utf8( $item->description ),
+        created     => to_icaldate( $item->created ),
+        dtstamp     => to_icaldate( $item->modified ),
+        url         => $cal->url . '?page=ScheduleView&EID=' . $item->id,
     );
 
-    $args{comment} = decode_utf8($item->comment)
-        if $opt{debug} && $item->comment;
-
-    if ($item->is_full_day) {
-        $args{dtstart} = [ to_icaldate($item->start, 1), { VALUE => 'DATE' } ];
-        $args{dtend}   = [ to_icaldate($item->end,   1), { VALUE => 'DATE' } ];
-    } else {
-        $args{dtstart} = [ to_icaldate($item->start, 0), { TZID => $time_zone } ];
-        $args{dtend}   = [ to_icaldate($item->end,   0), { TZID => $time_zone } ];
+    $args{comment} = decode_utf8( $item->comment )
+      if $opt{debug} && $item->comment;
+
+    if ( $item->is_full_day ) {
+        $args{dtstart} =
+          [ to_icaldate( $item->start, 1 ), { VALUE => 'DATE' } ];
+        $args{dtend} = [ to_icaldate( $item->end, 1 ), { VALUE => 'DATE' } ];
+    }
+    else {
+        $args{dtstart} =
+          [ to_icaldate( $item->start, 0 ), { TZID => $time_zone } ];
+        $args{dtend} = [ to_icaldate( $item->end, 0 ), { TZID => $time_zone } ];
     }
 
     # handle frequency
-    if ($item->can('rrule')) {
-        # rrule
-        my %rrule = %{$item->rrule};
-        $rrule{UNTIL} = to_icaldate($rrule{UNTIL}, $item->is_full_day)
-            if $rrule{UNTIL};
-        $rrule{WKST} = 'SU'
-            if $opt{'compat-google-calendar'};
-
-        my @rrule_list;
-        for (qw(FREQ COUNT INTERVAL BYMONTH BYMONTHDAY WKST BYDAY UNTIL)) {
-            push @rrule_list, $_ . '=' . $rrule{$_}
-                if exists $rrule{$_};
-        }
-        $args{rrule} = join ';', @rrule_list;
-
-        # exdate
-        if ($item->exdates) {
-            if ($item->is_full_day) {
-                my $exdate = join ',', map { to_icaldate($_, 1) } $item->exdates;
-                $args{exdate} = [ $exdate, { VALUE => 'DATE' } ];
-            } else {
-                my $exdate = join ',', map { to_icaldate($_, 0) } $item->exdates;
-                $args{exdate} = [ $exdate, { TZID => $time_zone } ];
-            }
-        }
+    if ( $item->can('rrule') ) {
+
+        # rrule
+        my %rrule = %{ $item->rrule };
+        $rrule{UNTIL} = to_icaldate( $rrule{UNTIL}, $item->is_full_day )
+          if $rrule{UNTIL};
+        $rrule{WKST} = 'SU'
+          if $opt{'compat-google-calendar'};
+
+        my @rrule_list;
+        for (qw(FREQ COUNT INTERVAL BYMONTH BYMONTHDAY WKST BYDAY UNTIL)) {
+            push @rrule_list, $_ . '=' . $rrule{$_}
+              if exists $rrule{$_};
+        }
+        $args{rrule} = join ';', @rrule_list;
+
+        # exdate
+        if ( $item->exdates ) {
+            if ( $item->is_full_day ) {
+                my $exdate = join ',',
+                  map { to_icaldate( $_, 1 ) } $item->exdates;
+                $args{exdate} = [ $exdate, { VALUE => 'DATE' } ];
+            }
+            else {
+                my $exdate = join ',',
+                  map { to_icaldate( $_, 0 ) } $item->exdates;
+                $args{exdate} = [ $exdate, { TZID => $time_zone } ];
+            }
+        }
 
     }
@@ -189 +199 @@
 # Generate a 'timezone entry' and append it to the calendar
 my $vtimezone = Data::ICal::Entry::TimeZone->new();
-$vtimezone->add_properties(tzid => $time_zone);
+$vtimezone->add_properties( tzid => $time_zone );
 
 # probably we need to support the Daylight Saving Time, but not yet supported.
 my $standard = Data::ICal::Entry::TimeZone::Standard->new();
-my $std = DateTime->new(year => 1970, month => 1, day => 1,
-                        hour => 0, minute => 0, second => 0,
-                        time_zone => $time_zone);
-my $offset = DateTime::TimeZone::offset_as_string($std->offset) || '+0900';
+my $std      = DateTime->new(
+    year      => 1970,
+    month     => 1,
+    day       => 1,
+    hour      => 0,
+    minute    => 0,
+    second    => 0,
+    time_zone => $time_zone
+);
+my $offset = DateTime::TimeZone::offset_as_string( $std->offset ) || '+0900';
 my $tzname = $cfg->{tzname} || 'JST';
 
@@ -210 +226 @@
 
 # Outputs the calendar as a string
-my $text = encode_string($cfg->{output_encoding} || 'utf8', $vcalendar->as_string);
-if ($opt{output}) {
+my $text =
+  encode_string( $cfg->{output_encoding} || 'utf8', $vcalendar->as_string );
+if ( $opt{output} ) {
     local *FH;
     open FH, ">$opt{output}" or die "Failed to write $opt{output}";
     print FH $text;
     close FH;
-} else {
+}
+else {
     print $text;
 }

cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar.pm

@@ -14 +14 @@
 
 sub new {
-    my($class, %param) = @_;
-    $param{url} ||= delete $param{cybozu_url};
-    $param{host} ||= URI->new($param{url})->host;
-    $param{ua} ||= LWP::UserAgent->new();
+    my ( $class, %param ) = @_;
+    $param{url}  ||= delete $param{cybozu_url};
+    $param{host} ||= URI->new( $param{url} )->host;
+    $param{ua}   ||= LWP::UserAgent->new();
     bless \%param, $class;
 }
 
-sub url                 { shift->_accessor('url',               @_) }
-sub host                { shift->_accessor('host',              @_) }
-sub username            { shift->_accessor('username',          @_) }
-sub userid              { shift->_accessor('userid',            @_) }
-sub password            { shift->_accessor('password',          @_) }
-sub ua                  { shift->_accessor('ua',                @_) }
-sub input_encoding      { shift->_accessor('input_encoding',    @_) }
+sub url            { shift->_accessor( 'url',            @_ ) }
+sub host           { shift->_accessor( 'host',           @_ ) }
+sub username       { shift->_accessor( 'username',       @_ ) }
+sub userid         { shift->_accessor( 'userid',         @_ ) }
+sub password       { shift->_accessor( 'password',       @_ ) }
+sub ua             { shift->_accessor( 'ua',             @_ ) }
+sub input_encoding { shift->_accessor( 'input_encoding', @_ ) }
+
 sub _accessor {
     my $this = shift;
-    my $key = shift;
+    my $key  = shift;
     $this->{$key} = shift if @_;
     $this->{$key};
@@ -38 +39 @@
     my $this = shift;
 
-    my $res = $this->{ua}->post($this->{url} . '?page=SyncCalendar', {
-        _System    => 'login',
-        _Login     => 1,
-        csv        => 1,
-        notimecard => 1,
-        defined $this->{username} ? (_Account => $this->{username}) : (),
-        defined $this->{userid}   ? (_Id      => $this->{userid}  ) : (),
-        Password   => $this->{password} || '',
-    });
+    my $res = $this->{ua}->post(
+        $this->{url} . '?page=SyncCalendar',
+        {
+            _System    => 'login',
+            _Login     => 1,
+            csv        => 1,
+            notimecard => 1,
+            defined $this->{username} ? ( _Account => $this->{username} ) : (),
+            defined $this->{userid}   ? ( _Id      => $this->{userid} )   : (),
+            Password => $this->{password} || '',
+        }
+    );
     confess 'Failed to access Cybozu Office 6: ' . $res->status_line
-        unless $res->is_success;
+      unless $res->is_success;
 
     my $content = $res->content;
-    from_to($content, $this->{input_encoding} || 'shiftjis', 'utf8');
-    my @lines = grep /^\d+,ts\.\d+,/, split(/\r?\n/, $content);
+    from_to( $content, $this->{input_encoding} || 'shiftjis', 'utf8' );
+    my @lines = grep /^\d+,ts\.\d+,/, split( /\r?\n/, $content );
     $this->{response} = \@lines;
 
@@ -65 +69 @@
     my @lines;
     while (<FH>) {
-        chomp; push @lines, $_;
+        chomp;
+        push @lines, $_;
     }
     close(FH);
@@ -82 +87 @@
 
     my $csv;
-    if (eval('require Text::CSV_XS')) {
-        $csv = Text::CSV_XS->new({ binary => 1 });
-    } elsif (eval('require Text::CSV')) {
-        $csv = Text::CSV->new();
-    } else {
-        confess 'Text::CSV_XS or Text::CSV package is required';
+    if ( eval('require Text::CSV_XS') ) {
+        $csv = Text::CSV_XS->new( { binary => 1 } );
+    }
+    elsif ( eval('require Text::CSV') ) {
+        $csv = Text::CSV->new();
+    }
+    else {
+        confess 'Text::CSV_XS or Text::CSV package is required';
     }
 
     my @items;
-    for my $line ($this->response) {
-        $csv->parse($line)
-            or confess 'Failed to parse CSV input';
-        my @fields = $csv->fields;
-        my $num_fields = @fields - 1;
-        next if $num_fields < 13;
-        $fields[1] =~ s/^ts\.//; # remove rubbish
-
-        # Cybozu Calendar CSV Format
-        #      GENERIC     | RECCURENT
-        # [ 0] id?         | id?
-        # [ 1] created     | created
-        # [ 2] <BLANK>     x start_date / end_date
-        # [ 3] start_date  x initial start_date?
-        # [ 4] end_date    x until_date
-        # [ 5] start_time  | start_time
-        # [ 6] end_time    | end_time
-        # [ 7] <BLANK>     | freq
-        # [ 8] <BLANK>     | freq_value
-        # [ 9] ???         | ???
-        # [10] ???         | ???
-        # [11] abbrev      | abbrev
-        # [12] summary     | summary
-        # [13] description | description
-
-        my %param;
-        @param{qw(id created start_time end_time freq freq_value abbrev summary description)} = @fields[0,1,5..8,11..13];
-        $param{time_zone} = $this->{time_zone} || 'Asia/Tokyo';
-
-        my $item;
-        if (!$param{freq}) {
-            @param{qw(start_date end_date)} = @fields[3,4];
-            $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
-        } else {
-            @param{qw(start_date end_date until_date)} = @fields[2,2,4];
-            if ($num_fields > 13) {
-                my @exdates = @fields[14..$num_fields];
-                $param{exdates} = \@exdates;
-            }
-            my $freq = $param{freq};
-            if ($freq =~ /^[1-5]$/) {
-                $param{freq} = 'm';
-                my @week_str = ('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
-                $param{freq_value} = $freq . $week_str[$param{freq_value}];
-            }
-            $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
-        }
-
-        next unless $item;
-        $item->comment($line); # save the CSV line as for debug info.
-        push @items, $item;
+    for my $line ( $this->response ) {
+        $csv->parse($line)
+          or confess 'Failed to parse CSV input';
+        my @fields     = $csv->fields;
+        my $num_fields = @fields - 1;
+        next if $num_fields < 13;
+        $fields[1] =~ s/^ts\.//;    # remove rubbish
+
+        # Cybozu Calendar CSV Format
+        #      GENERIC     | RECCURENT
+        # [ 0] id?         | id?
+        # [ 1] created     | created
+        # [ 2] <BLANK>     x start_date / end_date
+        # [ 3] start_date  x initial start_date?
+        # [ 4] end_date    x until_date
+        # [ 5] start_time  | start_time
+        # [ 6] end_time    | end_time
+        # [ 7] <BLANK>     | freq
+        # [ 8] <BLANK>     | freq_value
+        # [ 9] ???         | ???
+        # [10] ???         | ???
+        # [11] abbrev      | abbrev
+        # [12] summary     | summary
+        # [13] description | description
+
+        my %param;
+        @param{
+            qw(id created start_time end_time freq freq_value abbrev summary description)
+          } = @fields[ 0, 1, 5 .. 8, 11 .. 13 ];
+        $param{time_zone} = $this->{time_zone} || 'Asia/Tokyo';
+
+        my $item;
+        if ( !$param{freq} ) {
+            @param{qw(start_date end_date)} = @fields[ 3, 4 ];
+            $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
+        }
+        else {
+            @param{qw(start_date end_date until_date)} = @fields[ 2, 2, 4 ];
+            if ( $num_fields > 13 ) {
+                my @exdates = @fields[ 14 .. $num_fields ];
+                $param{exdates} = \@exdates;
+            }
+            my $freq = $param{freq};
+            if ( $freq =~ /^[1-5]$/ ) {
+                $param{freq} = 'm';
+                my @week_str = ( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
+                $param{freq_value} = $freq . $week_str[ $param{freq_value} ];
+            }
+            $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
+        }
+
+        next unless $item;
+        $item->comment($line);    # save the CSV line as for debug info.
+        push @items, $item;
     }
     wantarray ? @items : $items[0];
@@ -150 +160 @@
 sub new {
     my $class = shift;
-    my $self = {
-        is_full_day => 0,
-        modified => DateTime->now,
+    my $self  = {
+        is_full_day => 0,
+        modified    => DateTime->now,
     };
     bless $self, $class;
@@ -159 +169 @@
 }
 
-sub id          { shift->_accessor('id',                @_) }
-sub start       { shift->_accessor('start',             @_) }
-sub end         { shift->_accessor('end',               @_) }
-sub summary     { shift->_accessor('summary',           @_) }
-sub description { shift->_accessor('description',       @_) }
-sub created     { shift->_accessor('created',           @_) }
-sub modified    { shift->_accessor('modified',          @_) }
-sub is_full_day { shift->_accessor('is_full_day',       @_) }
-sub comment     { shift->_accessor('comment',           @_) }
+sub id          { shift->_accessor( 'id',          @_ ) }
+sub start       { shift->_accessor( 'start',       @_ ) }
+sub end         { shift->_accessor( 'end',         @_ ) }
+sub summary     { shift->_accessor( 'summary',     @_ ) }
+sub description { shift->_accessor( 'description', @_ ) }
+sub created     { shift->_accessor( 'created',     @_ ) }
+sub modified    { shift->_accessor( 'modified',    @_ ) }
+sub is_full_day { shift->_accessor( 'is_full_day', @_ ) }
+sub comment     { shift->_accessor( 'comment',     @_ ) }
+
 sub _accessor {
     my $this = shift;
-    my $key = shift;
+    my $key  = shift;
     $this->{$key} = shift if @_;
     $this->{$key};
@@ -176 +187 @@
 
 sub parse {
-    my($this, %param) = @_;
-
-    $this->{id} = $param{id} || '0';
+    my ( $this, %param ) = @_;
+
+    $this->{id}        = $param{id}        || '0';
     $this->{time_zone} = $param{time_zone} || 'Asia/Tokyo';
 
-    my $start = $this->to_datetime($param{start_date}, $param{start_time});
-    my $end   = $this->to_datetime($param{end_date},   $param{end_time});
+    my $start = $this->to_datetime( $param{start_date}, $param{start_time} );
+    my $end   = $this->to_datetime( $param{end_date},   $param{end_time} );
     return unless $start && $end;
 
     # (start_time == empty) => A full-day event
     # (start_time != empty) && (end_time == empty) => A malformed event
-    if ($param{start_time} eq ':') {
-        $start = $start->truncate(to => 'day');
-        $end   = $end->add(days => 1)->truncate(to => 'day');
-        $this->{is_full_day} = 1;
-    } elsif ($param{end_time} eq ':') {
-        $end   = $start->clone->add(minutes => 10);
+    if ( $param{start_time} eq ':' ) {
+        $start = $start->truncate( to => 'day' );
+        $end = $end->add( days => 1 )->truncate( to => 'day' );
+        $this->{is_full_day} = 1;
+    }
+    elsif ( $param{end_time} eq ':' ) {
+        $end = $start->clone->add( minutes => 10 );
     }
     $this->{start} = $start;
     $this->{end}   = $end;
 
-    $this->{created} = DateTime->from_epoch(epoch => $param{created} || 0);
-
-    my $summary = ($param{abbrev} ? $param{abbrev} . ': ' : '') . $param{summary};
+    $this->{created} = DateTime->from_epoch( epoch => $param{created} || 0 );
+
+    my $summary =
+      ( $param{abbrev} ? $param{abbrev} . ': ' : '' ) . $param{summary};
     $this->{summary} = $summary;
     $this->{description} = $param{description} || $summary;
@@ -208 +221 @@
 sub to_datetime {
     my $this = shift;
-    my($ymd, $hms) = @_;
+    my ( $ymd, $hms ) = @_;
 
     my %args;
-    return unless $ymd && ($ymd =~ m!^(\d+)/(\d+)/(\d+)$! || $ymd =~ m!^da\.(\d+)\.(\d+)\.(\d+)$!);
-    @args{qw(year month day)} = ($1, $2, $3);
-
-    if ($hms && $hms ne ':') {
-        return unless $hms =~ m!^(\d+):(\d+)(?:\:?(\d+)?)$!;
-        @args{qw(hour minute second)} = ($1, $2, $3 || 0);
-        @args{qw(hour minute second)} = (23, 59, 59) if $args{hour} > 23;
-    } else {
-        @args{qw(hour minute second)} = (0, 0, 0);
+    return
+      unless $ymd
+          && (   $ymd =~ m!^(\d+)/(\d+)/(\d+)$!
+              || $ymd =~ m!^da\.(\d+)\.(\d+)\.(\d+)$! );
+    @args{qw(year month day)} = ( $1, $2, $3 );
+
+    if ( $hms && $hms ne ':' ) {
+        return unless $hms =~ m!^(\d+):(\d+)(?:\:?(\d+)?)$!;
+        @args{qw(hour minute second)} = ( $1, $2, $3 || 0 );
+        @args{qw(hour minute second)} = ( 23, 59, 59 ) if $args{hour} > 23;
+    }
+    else {
+        @args{qw(hour minute second)} = ( 0, 0, 0 );
     }
 
@@ -231 +248 @@
 use base qw( WWW::CybozuOffice6::Calendar::Event );
 
-sub rrule               { shift->_accessor('rrule',             @_) }
+sub rrule { shift->_accessor( 'rrule', @_ ) }
+
 # for compatibility
-sub frequency           { shift->_accessor('frequency',         @_) }
-sub frequency_value     { shift->_accessor('frequency_value',   @_) }
-sub until               { shift->_accessor('until',             @_) }
+sub frequency       { shift->_accessor( 'frequency',       @_ ) }
+sub frequency_value { shift->_accessor( 'frequency_value', @_ ) }
+sub until           { shift->_accessor( 'until',           @_ ) }
 
 sub exdates {
@@ -244 +262 @@
 }
 
-our %FREQUENCY = ( y => 'YEARLY', m => 'MONTHLY', w => 'WEEKLY',
-                   d => 'DAILY', n => 'WEEKDAYS' );
+our %FREQUENCY = (
+    y => 'YEARLY',
+    m => 'MONTHLY',
+    w => 'WEEKLY',
+    d => 'DAILY',
+    n => 'WEEKDAYS'
+);
+
 sub parse {
-    my($this, %param) = @_;
+    my ( $this, %param ) = @_;
     $this->SUPER::parse(%param);
 
@@ -256 +280 @@
     # rrule
     my %rrule = ();
-    if ($FREQUENCY{$freq} eq 'WEEKDAYS') {
-        %rrule = ( FREQ => 'WEEKLY', BYDAY => 'MO,TU,WE,TH,FR' );
-    } else {
-        %rrule = ( FREQ => $FREQUENCY{$freq} );
-    }
-    if ($param{freq_value} =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/) {
-        $rrule{BYDAY} = $param{freq_value};
-        $rrule{INTERVAL} = 1;
+    if ( $FREQUENCY{$freq} eq 'WEEKDAYS' ) {