Changeset 27255 for lang/perl/Net-Google-Spreadsheets

Timestamp:

12/23/08 03:58:10 (4 years ago)

Author:

lopnor

Message:

refactoring

Location:

lang/perl/Net-Google-Spreadsheets/trunk

Files:

• lib/Net/Google/Spreadsheets/Cell.pm (modified) (1 diff)
• lib/Net/Google/Spreadsheets/Row.pm (modified) (1 diff)
• lib/Net/Google/Spreadsheets/Spreadsheet.pm (modified) (2 diffs)
• lib/Net/Google/Spreadsheets/Worksheet.pm (modified) (3 diffs)
• t/04_worksheet.t (modified) (4 diffs)
• t/06_rows.t (modified) (2 diffs)

lang/perl/Net-Google-Spreadsheets/trunk/lib/Net/Google/Spreadsheets/Cell.pm

@@ -22 +22 @@
 after _update_atom => sub {
     my ($self) = @_;
-    my ($elem) = $self->atom->elem->getChildrenByTagNameNS($self->gs->{uri}, 'cell');
+    my ($elem) = $self->atom->elem->getElementsByTagNameNS($self->gs->{uri}, 'cell');
     $self->{row} = $elem->getAttribute('row');
     $self->{col} = $elem->getAttribute('col');

lang/perl/Net-Google-Spreadsheets/trunk/lib/Net/Google/Spreadsheets/Row.pm

@@ -3 +3 @@
 
 extends 'Net::Google::Spreadsheets::Base';
+
+has +content => (
+    isa => 'HashRef',
+    is => 'rw',
+    default => sub { +{} },
+    trigger => sub {$_[0]->update},
+);
+
+after _update_atom => sub {
+    my ($self) = @_;
+    for my $node ($self->atom->elem->getElementsByTagNameNS($self->gsx->{uri}, '*')) {
+        $self->{content}->{$node->localname} = $node->textContent;
+    }
+};
+
+around entry => sub {
+    my ($next, $self) = @_;
+    my $entry = $next->($self);
+    while (my ($key, $value) = each %{$self->{content}}) {
+        $entry->set($self->gsx, $key, $value);
+    }
+    return $entry;
+};
 
 1;

lang/perl/Net-Google-Spreadsheets/trunk/lib/Net/Google/Spreadsheets/Spreadsheet.pm

@@ -9 +9 @@
 has +title => (
     is => 'ro',
-);
-
-has worksheets => (
-    isa => 'ArrayRef[Net::Google::Spreadsheets::Worksheet]',
-    is => 'rw',
-    weaken => 1,
-    default => sub { return [] },
 );
 
@@ -33 +26 @@
     my ($self) = @_;
     $self->{content} = $self->atom->content->elem->getAttribute('src');
-    my $feed = $self->service->feed($self->content);
-    my @new_ws;
-    for my $entry ($feed->entries) {
-        my $ws = Net::Google::Spreadsheets::Worksheet->new(
-            container => $self,
-            atom => $entry,
-        );
-        push @new_ws, $ws;
-        if (my ($orig) = grep {$_->id eq $ws->id} @{$self->worksheets}) {
-            $orig->atom($entry) if $orig->etag ne $ws->etag;
-        } else {
-            push @{$self->worksheets}, $ws;
-        }
-    }
-    $self->worksheets([ grep {my $ws = $_; grep {$ws->id eq $_->id} @new_ws} @{$self->worksheets} ]);
 };
 
+sub worksheets {
+    my ($self, $cond) = @_;
+    return $self->list_contents('Net::Google::Spreadsheets::Worksheet', $cond);
+}
 
 sub add_worksheet {
     my ($self, $args) = @_;
-    my $title = $args->{title} 
-        || "Sheet".(scalar @{$self->worksheets} + 1);
-    my $entry = XML::Atom::Entry->new;
-    $entry->title($title);
-    $entry->set($self->gs, 'colCount', 20);
-    $entry->set($self->gs, 'rowCount', 100);
+    my $entry = Net::Google::Spreadsheets::Worksheet->new->entry;
     my $atom = $self->service->post($self->content, $entry);
-    my $ws = Net::Google::Spreadsheets::Worksheet->new(
+    $self->sync;
+    return Net::Google::Spreadsheets::Worksheet->new(
         container => $self,
         atom => $atom,
     );
-    push @{$self->worksheets}, $ws;
-    return $ws;
 }
 

lang/perl/Net-Google-Spreadsheets/trunk/lib/Net/Google/Spreadsheets/Worksheet.pm

@@ -64 +64 @@
     for ( @args ) {
         my $id = sprintf("%s/R%sC%s",$self->cellsfeed, $_->{row}, $_->{col});
-        my $entry = Net::Google::Spreadsheets::Cell->new(
-            id => $id,
-            editurl => $id,
-            row => $_->{row},
-            col => $_->{col},
-            input_value => $_->{input_value},
-        )->entry;
+        $_->{id} = $id;
+        $_->{editurl} = $id;
+        my $entry = Net::Google::Spreadsheets::Cell->new($_)->entry;
         $entry->set($self->batch, operation => '', {type => 'update'});
         $entry->set($self->batch, id => $id);
@@ -83 +79 @@
         )
     } grep {
-        my ($node) = $_->elem->getChildrenByTagNameNS($self->batch->{uri}, 'status');
+        my ($node) = $_->elem->getElementsByTagNameNS($self->batch->{uri}, 'status');
         $node->getAttribute('code') == 200;
     } $res_feed->entries;
@@ -90 +86 @@
 sub insert_row {
     my ($self, $args) = @_;
-    my $entry = XML::Atom::Entry->new;
-    while (my ($key, $value) = each %{$args}) {
-        $entry->set($self->gsx, $key, $value);
-    }
+    my $entry = Net::Google::Spreadsheets::Row->new(
+        content => $args,
+    )->entry;
     my $atom = $self->service->post($self->content, $entry);
     $self->sync;

lang/perl/Net-Google-Spreadsheets/trunk/t/04_worksheet.t

@@ -25 +25 @@
 }
 {
-    my $ws = $ss->worksheets->[0];
+    my ($ws) = $ss->worksheets;
     isa_ok $ws, 'Net::Google::Spreadsheets::Worksheet';
 }
 {
-    my $before = scalar @{$ss->worksheets};
+    my $before = scalar $ss->worksheets;
     my $ws = $ss->add_worksheet;
     isa_ok $ws, 'Net::Google::Spreadsheets::Worksheet';
-    is scalar @{$ss->worksheets}, $before + 1;
-    ok grep {$_ == $ws} @{$ss->worksheets};
+    is scalar $ss->worksheets, $before + 1;
+    ok grep {$_->id eq $ws->id} $ss->worksheets;
 }
 {
-    my $ws = $ss->worksheets->[-1];
+    my $ws = ($ss->worksheets)[-1];
     my $title = $ws->title . '+add';
     is $ws->title($title), $title;
@@ -43 +43 @@
 }
 {
-    my $ws = $ss->worksheets->[-1];
+    my $ws = ($ss->worksheets)[-1];
     my $etag_before = $ws->etag;
     my $before = $ws->col_count;
@@ -53 +53 @@
 }
 {
-    my $ws = $ss->worksheets->[-1];
+    my $ws = ($ss->worksheets)[-1];
     my $ss_etag_before = $ss->etag;
     my $etag_before = $ws->etag;
@@ -64 +64 @@
 }
 {
-    my $before = scalar @{$ss->worksheets};
-    my $ws = $ss->worksheets->[-1];
+    my $before = scalar $ss->worksheets;
+    my $ws = ($ss->worksheets)[-1];
     ok $ws->delete;
-    is scalar @{$ss->worksheets}, $before - 1;
-    ok ! grep {$_ == $ws} @{$ss->worksheets};
+    is scalar $ss->worksheets, $before - 1;
+    ok ! grep {$_ == $ws} $ss->worksheets;
 }

lang/perl/Net-Google-Spreadsheets/trunk/t/06_rows.t

@@ -22 +22 @@
     my $ss = $service->spreadsheet({title => $title});
     plan skip_all => "test spreadsheet '$title' doesn't exist." unless $ss;
-    plan tests => 6;
+    plan tests => 8;
     $ws = $ss->add_worksheet;
 }
@@ -33 +33 @@
     );
     is scalar $ws->rows, 0;
-    my $row = $ws->insert_row(
-        {
-            name => 'Nobuo Danjou',
-            mail => 'nobuo.danjou@gmail.com',
-            nick => 'lopnor',
-        }
-    );
+    my $value = {
+        name => 'Nobuo Danjou',
+        mail => 'nobuo.danjou@gmail.com',
+        nick => 'lopnor',
+    };
+    my $row = $ws->insert_row($value);
     isa_ok $row, 'Net::Google::Spreadsheets::Row';
+    is_deeply $row->content, $value;
+    my $value2 = {
+        name => 'Kazuhiro Osawa',
+        nick => 'yappo',
+    };
+    $row->content($value2);
+    is_deeply $row->content, $value2;
     is scalar $ws->rows, 1;
     ok $row->delete;