Changeset 448 for cybozu2ical/trunk/lib

Timestamp:

10/16/07 22:14:17 (15 months ago)

Author:

ogawa

Message:

Move rrule handling code to WWW::CybozuOffice?6::Calendar for better factoring.
Update version numbers.

Files:

• cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar.pm (modified) (7 diffs)

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

@@ -11 +11 @@
 use Text::CSV_XS;
 
-our $VERSION = '0.03';
+our $VERSION = '0.20';
 
 sub new {
@@ -223 +223 @@
 @WWW::CybozuOffice6::Calendar::RecurrentEvent::ISA = qw( WWW::CybozuOffice6::Calendar::Event );
 
+sub rrule               { shift->_accessor('rrule',             @_) }
+# for compatibility
 sub frequency           { shift->_accessor('frequency',         @_) }
 sub frequency_value     { shift->_accessor('frequency_value',   @_) }
@@ -244 +246 @@
     return unless $freq && exists $FREQUENCY{$freq};
 
-    $this->{frequency} = $FREQUENCY{$freq};
-    $this->{frequency_value} = $param{freq_value} || 0;
+    # 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;
+    }
 
     # until
@@ -257 +268 @@
             $until->set_time_zone('UTC'); # timezone must be UTC
         }
-        $this->{until} = $until;
-    }
+        $rrule{UNTIL} = $until;
+    }
+
+    $this->{rrule} = \%rrule;
 
     # exdates
@@ -269 +282 @@
     }
 
+    # for compatibility
+    $this->{frequency}       = $FREQUENCY{$freq};
+    $this->{frequency_value} = $param{freq_value} || 0;
+    $this->{until}           = $rrule{UNTIL} if exists $rrule{UNTIL};
+
     1;
 }
@@ -418 +436 @@
 Modified date of the item, or current timestamp.  DateTime object.
 
-=item frequency (string)
+=item rrule (HASHREF of rrule properties)
+
+Assocative list of recurrence rules for the item, which is *roughly*
+based on iCalendar Specification (RFC 2445).
+
+=item exdates (ARRAYREF of DateTime objects)
+
+Excluded dates of the reccurent item.  If the item has no excluded
+dates, this should be "undefined".
+
+=item [obsolete] frequency (string)
 
 Frequency mode of the recurrent item.  Each recurrent items has one
@@ -425 +453 @@
   "YEARLY", "MONTHLY", "WEEKLY", "DAILY", "WEEKDAYS"
 
-=item frequency_value (integer)
+=item [obsolete] frequency_value (integer)
 
 Frequency value of the recurrent item.
 
-=item until (DateTime object)
+=item [obsolete] until (DateTime object)
 
 End date of the recurrence for the recurrent item.  If the recurrence
 continues infinitely, thie value should be "undefined".
 
-=item exdates (Array of DateTime objects)
-
-Excluded dates of the reccurent item.  If the item has no excluded
-dates, this should be "undefined".
-
 =back