Changeset 10638

Timestamp:

04/28/08 13:36:06 (4 months ago)

Author:

yusukebe

Message:

interface を変更, おそらくこの方が汎用性がある

Location:

lang/perl/WebService-Simple-Google-Chart/trunk

Files:

• example/chart01.pl (modified) (1 diff)
• lib/WebService/Simple/Google/Chart.pm (modified) (3 diffs)
• t/01_basic.t (modified) (1 diff)

lang/perl/WebService-Simple-Google-Chart/trunk/example/chart01.pl

@@ -6 +6 @@
 
 my $chart = WebService::Simple::Google::Chart->new;
-my $data  = { foo => 200, bar => 130, hoge => 70 };
-my $url   = $chart->get_url(
+my $url = $chart->get_url(
     {
-        size => "250x100",
-        type => "p3",
-        data => $data,
-    }
+        chs => "250x100",
+        cht => "p3",
+   },
+    { foo => 200, bar => 130, hoge => 70 }
 );
+
 print $url . "\n";
-#$chart->render_to_file("foo.png");
+$chart->render_to_file("hoge.png");

lang/perl/WebService-Simple-Google-Chart/trunk/lib/WebService/Simple/Google/Chart.pm

@@ -12 +12 @@
 
 sub get_url {
-    my ( $self, $param ) = @_;
-    my ( @label, @value, $data, $total_count );
-    $data        = $param->{data};
-    $total_count = 0;
-    map { $total_count += $data->{$_} } keys %$data;
-    foreach my $key ( keys %{ $param->{data} } ) {
-        push( @label, $key );
-        my $percent = int( $param->{data}->{$key} / $total_count * 100 + 0.5 );
-        push( @value, $percent );
-    }
-    $self->{request_param}->{chs} = $param->{size};
-    $self->{request_param}->{cht} = $param->{type};
-    $self->{request_param}->{chl} = join( "|", @label );
-    $self->{request_param}->{chd} = "t:" . join( ",", @value );
+    my ( $self, $param, $data ) = @_;
+    $self->{request_param} = $param;
+    $self->_set_data_param($data);
     return $self->request_url( $self->{request_param} );
 }
 
 sub render_to_file {
-    my $self  = shift;
-    my $param = shift;
-    my $filename;
-    if ( ref $param eq 'Hash' ) {
-        $self->{request_param} = $param;
+    my ($self,$filename,$param,$data)  = @_;
+    if($param){
+        $self->{request_param} = $param;
+        $self->_set_data_param($data);
     }
-    else {
-        $filename = $param;
-    }
-    $self->SUPER::get( $self->{request_param}, ":content_file" => $filename );
+    $self->SUPER::get( $self->{request_param} , ":content_file" => $filename );
 }
 
-sub _total_value {
-    my ( $self, $data ) = @_;
-    my @values;
-    map { push( @values, $data->{$_} ) } keys %$data;
-    @values = sort { $b <=> $a } @values;
-    return $values[0];
+sub _set_data_param {
+    my ($self, $data) = @_;
+    my ( @label, @value, $total_count );
+    $total_count = 0;
+    map { $total_count += $data->{$_} } keys %$data;
+    foreach my $key ( keys %$data ) {
+        push( @label, $key );
+        my $percent = int( $data->{$key} / $total_count * 100 + 0.5 );
+        push( @value, $percent );
+    }
+    my $data_param = {};
+    $self->{request_param}->{chl} = join( "|", @label );
+    $self->{request_param}->{chd} = "t:" . join( ",", @value );
 }
 
@@ -56 +48 @@
 =head1 NAME
 
-WebService::Simple::Google::Chart - Get Google Chart URL and File
+WebService::Simple::Google::Chart - Get Google Chart URL and image file
 
 =head1 SYNOPSIS
@@ -63 +55 @@
 
   my $chart = WebService::Simple::Google::Chart->new;
-  my $data  = { foo => 200, bar => 130, hoge => 70 };
   my $url   = $chart->get_url(
       {
           size => "250x100",
           type => "p3",
-          data => $data,
-      }
+      },
+      { foo => 200, bar => 130, hoge => 70 },
   );
   print $url;

lang/perl/WebService-Simple-Google-Chart/trunk/t/01_basic.t

@@ -12 +12 @@
 {
     my $chart = WebService::Simple::Google::Chart->new;
-    ok($chart, "object created ok");
-    isa_ok( $chart, "WebService::Simple::Google::Chart", "object isa WebService::Simple::Google::Chart" );
-    my $data  = { foo => 200, bar => 130, hoge => 70 };
-    my $url   = $chart->get_url(
-                            {
-                             size => "250x100",
-                             type => "p3",
-                             data => $data,
-                         }
-                            );
+    ok( $chart, "object created ok" );
+    isa_ok(
+        $chart,
+        "WebService::Simple::Google::Chart",
+        "object isa WebService::Simple::Google::Chart"
+    );
+    my $data = { foo => 200, bar => 130, hoge => 70 };
+    my $url = $chart->get_url(
+        {
+            chs  => "250x100",
+            cht => "p3",
+        },
+        $data
+    );
     my $uri = URI->new($url);
-    ok($uri->query_param("chs") eq "250x100", "chs parameter ok");
-    ok($uri->query_param("cht") eq "p3", "cht parameter ok");
-    ok($uri->query_param("chl") eq "bar|foo|hoge", "chl parameter ok");
-    ok($uri->query_param("chd") eq "t:33,50,18", "chd parameter ok");
+    ok( $uri->query_param("chs") eq "250x100",      "chs parameter ok" );
+    ok( $uri->query_param("cht") eq "p3",           "cht parameter ok" );
+    ok( $uri->query_param("chl") eq "bar|foo|hoge", "chl parameter ok" );
+    ok( $uri->query_param("chd") eq "t:33,50,18",   "chd parameter ok" );
 }