Changeset 518 for cybozu2ical/trunk/lib

Timestamp:

09/01/08 19:33:58 (4 months ago)

Author:

ogawa

Message:

Use accessors instead of directly accessing object fields.
Modify Event constructors' parameters so as to be subjected to Cybozu scripting.

Location:

cybozu2ical/trunk/lib/WWW/CybozuOffice6

Files:

• Calendar/Event.pm (modified) (3 diffs)
• Calendar/RecurrentEvent.pm (modified) (4 diffs)
• CalendarDriver/ApiCalendar.pm (modified) (2 diffs)
• CalendarDriver/SyncCalendar.pm (modified) (1 diff)

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

@@ -19 +19 @@
 
 __PACKAGE__->mk_accessors(
-    qw( id start end summary description created modified is_full_day comment )
+    qw( id start end summary description created time_zone modified is_full_day comment )
 );
 
@@ -25 +25 @@
     my ( $this, %param ) = @_;
 
-    $this->{id}        = $param{id}        || '0';
-    $this->{time_zone} = $param{time_zone} || 'Asia/Tokyo';
+    $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{set_date}, $param{set_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 ':' ) {
+    # (set_time == empty) => A full-day event
+    # (set_time != empty) && (end_time == empty) => A malformed event
+    if ( $param{set_time} eq ':' ) {
         $start = $start->truncate( to => 'day' );
         $end = $end->add( days => 1 )->truncate( to => 'day' );
-        $this->{is_full_day} = 1;
+        $this->is_full_day(1);
     }
     elsif ( $param{end_time} eq ':' ) {
         $end = $start->clone->add( minutes => 10 );
     }
-    $this->{start} = $start;
-    $this->{end}   = $end;
+    $this->start($start);
+    $this->end($end);
 
-    $this->{created} = DateTime->from_epoch( epoch => $param{created} || 0 );
+    $param{timestamp} =~ s/^ts\.//;    # remove rubbish
+    $this->created( DateTime->from_epoch( epoch => $param{timestamp} || 0 ) );
 
     my $summary =
-      ( $param{abbrev} ? $param{abbrev} . ': ' : '' ) . $param{summary};
-    $this->{summary} = $summary;
-    $this->{description} = $param{description} || $summary;
+      ( $param{event} ? $param{event} . ': ' : '' ) . $param{detail};
+    $this->summary($summary);
+    $this->description( $param{memo} || $summary );
     1;
 }
@@ -75 +76 @@
     }
 
-    $args{time_zone} = $this->{time_zone};
+    $args{time_zone} = $this->time_zone;
 
     DateTime->new(%args);

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

@@ -23 +23 @@
     n => 'WEEKDAYS'
 );
+our @WEEK_STRING = ( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
 
 sub parse {
@@ -28 +29 @@
     $this->SUPER::parse(%param);
 
-    # frequency
-    my $freq = $param{freq};
-    return unless $freq && exists $FREQUENCY{$freq};
+    my ( $type, $day ) = ( $param{type}, $param{day} );
+    return
+      unless defined $type
+          && ( $type =~ /^[1-5]$/ || exists $FREQUENCY{$type} );
+
+    ( $type, $day ) = ( 'm', $type . $WEEK_STRING[$day] )
+      if $type =~ /^[1-5]$/;
 
     # rrule
     my %rrule = ();
-    if ( $FREQUENCY{$freq} eq 'WEEKDAYS' ) {
+    if ( $FREQUENCY{$type} eq 'WEEKDAYS' ) {
         %rrule = ( FREQ => 'WEEKLY', BYDAY => 'MO,TU,WE,TH,FR' );
     }
     else {
-        %rrule = ( FREQ => $FREQUENCY{$freq} );
+        %rrule = ( FREQ => $FREQUENCY{$type} );
     }
-    if ( $param{freq_value} =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/ ) {
-        $rrule{BYDAY}    = $param{freq_value};
+    if ( $param{day} =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/ ) {
+        $rrule{BYDAY}    = $day;
         $rrule{INTERVAL} = 1;
     }
@@ -51 +56 @@
         my %args = ( year => $1, month => $2, day => $3 );
         my $until;
-        if ( $this->{is_full_day} ) {
+        if ( $this->is_full_day ) {
             $until = $this->to_datetime( $param{until_date}, ':' );
         }
         else {
-            $until = $this->{end}->clone->set(%args);
+            $until = $this->end->clone->set(%args);
             $until->set_time_zone('UTC');    # timezone must be UTC
         }
@@ -61 +66 @@
     }
 
-    $this->{rrule} = \%rrule;
+    $this->rrule( \%rrule );
 
     # exdates
-    if ( defined $param{exdates} ) {
+    if ( defined $param{exception} ) {
         my @exdates;
-        for ( @{ $param{exdates} } ) {
-            push @exdates, $this->to_datetime( $_, $param{start_time} );
+        for ( @{ $param{exception} } ) {
+            push @exdates, $this->to_datetime( $_, $param{set_time} );
         }
-        $this->{exdates} = \@exdates;
+        $this->exdates( \@exdates );
     }
 
     # for compatibility
-    $this->{frequency}       = $FREQUENCY{$freq};
-    $this->{frequency_value} = $param{freq_value} || 0;
-    $this->{until}           = $rrule{UNTIL} if exists $rrule{UNTIL};
+    $this->frequency( $FREQUENCY{$type} );
+    $this->frequency_value( $day || 0 );
+    $this->until( $rrule{UNTIL} ) if exists $rrule{UNTIL};
 
     1;

cybozu2ical/trunk/lib/WWW/CybozuOffice6/CalendarDriver/ApiCalendar.pm

@@ -86 +86 @@
         my $num_fields = @fields - 1;
         next if $num_fields < 14;
-        $fields[1] =~ s/^ts\.//;    # remove rubbish
 
         # Cybozu Calendar CSV Format
@@ -107 +106 @@
         my %param;
         @param{
-            qw(id created freq freq_value start_date end_date start_time end_time abbrev summary description)
+            qw(id timestamp type day set_date end_date set_time end_time event detail memo)
           } = @fields[ 0, 1, 4, 5, 8 .. 11, 12 .. 14 ];
 
         $param{time_zone} = $cal->{time_zone} || 'Asia/Tokyo';
 
+        if ( $num_fields > 14 ) {
+            my @exception = @fields[ 14 .. $num_fields ];
+            $param{exception} = \@exception;
+        }
+
         my $item;
-        if ( !$param{freq} ) {
+        if ( !$param{type} ) {
             $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
         }
         else {
             @param{qw(end_date until_date)} = @fields[ 8, 9 ];
-            if ( $num_fields > 14 ) {
-                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);
         }

cybozu2ical/trunk/lib/WWW/CybozuOffice6/CalendarDriver/SyncCalendar.pm

@@ -50 +50 @@
         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
+        # [ 0] ID
+        # [ 1] TimeStamp
         # [ 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
+        # [ 3] SetDate     x initial start_date?
+        # [ 4] EndDate     x until_date
+        # [ 5] SetTime
+        # [ 6] Endtime
+        # [ 7] <BLANK>     | TypeOmit
+        # [ 8] <BLANK>     | Day
+        # [ 9] Private
+        # [10] Banner
+        # [11] Event
+        # [12] Detail
+        # [13] Memo
 
         my %param;
-        @param{
-            qw(id created start_time end_time freq freq_value abbrev summary description)
+        @param{ qw(id timestamp set_time end_time type day event detail memo)
           } = @fields[ 0, 1, 5 .. 8, 11 .. 13 ];
+
         $param{time_zone} = $cal->{time_zone} || 'Asia/Tokyo';
 
+        if ( $num_fields > 14 ) {
+            my @exception = @fields[ 14 .. $num_fields ];
+            $param{exception} = \@exception;
+        }
+
         my $item;
-        if ( !$param{freq} ) {
-            @param{qw(start_date end_date)} = @fields[ 3, 4 ];
+        if ( !$param{type} ) {
+            @param{qw(set_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} ];
-            }
+            @param{qw(set_date end_date until_date)} = @fields[ 2, 2, 4 ];
             $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
         }