Changeset 503 for cybozu2ical/trunk/lib

Timestamp:

08/28/08 01:56:21 (4 months ago)

Author:

ogawa

Message:

Stop using Class::Accessor::Fast.
Support recurrent events for Cybozu Office 7.

Location:

cybozu2ical/trunk/lib/WWW

Files:

• CybozuOffice6/Calendar.pm (modified) (6 diffs)
• CybozuOffice7/Calendar.pm (modified) (1 diff)

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

@@ -4 +4 @@
 use strict;
 use warnings;
-
-use base qw( Class::Accessor::Fast );
 
 use Carp;
@@ -23 +21 @@
 }
 
-__PACKAGE__->mk_accessors(qw( url host username userid password ua 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;
+    $this->{$key} = shift if @_;
+    $this->{$key};
+}
 
 sub request {
@@ -138 +148 @@
 package WWW::CybozuOffice6::Calendar::Event;
 
-use base qw( Class::Accessor::Fast );
-
 sub new {
     my $class = shift;
@@ -151 +159 @@
 }
 
-__PACKAGE__->mk_accessors(qw( id start end summary description created modified is_full_day 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;
+    $this->{$key} = shift if @_;
+    $this->{$key};
+}
 
 sub parse {
@@ -207 +229 @@
 package WWW::CybozuOffice6::Calendar::RecurrentEvent;
 
-use base qw( Class::Accessor::Fast WWW::CybozuOffice6::Calendar::Event );
-
-__PACKAGE__->mk_accessors(qw( rrule frequency frequency_value until ));
+use base qw( WWW::CybozuOffice6::Calendar::Event );
+
+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 exdates {
@@ -241 +267 @@
 
     # until
-    if ($param{until_date} =~ m!^(\d+)/(\d+)/(\d+)$!) {
+    if ($param{until_date} =~ m!^(\d+)/(\d+)/(\d+)$! || $param{until_date} =~ m!^da\.(\d+)\.(\d+)\.(\d+)$!) {
         my %args = (year => $1, month => $2, day => $3);
         my $until;

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

@@ -105 +105 @@
 
         my %param;
-        @param{qw(id created start_date end_date start_time end_time abbrev summary description)} = @fields[0,1,8..11,12..14];
+        @param{qw(id created freq freq_value start_date end_date start_time end_time abbrev summary description)} = @fields[0,1,4,5,8..11,12..14];
 
         $param{time_zone} = $this->{time_zone} || 'Asia/Tokyo';
 
-        my $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
+        my $item;
+        if (!$param{freq}) {
+            $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);
+        }
 
         next unless $item;