Changeset 17807 for lang

Timestamp:

08/18/08 01:06:51 (5 years ago)

Author:

lopnor

Message:

lang/perl/Google-Chart: multiple marker support. not tested well yet.

Location:

lang/perl/Google-Chart/trunk

Files:

• lib/Google/Chart/Color.pm (modified) (1 diff)
• lib/Google/Chart/Grid.pm (modified) (1 diff)
• lib/Google/Chart/Marker.pm (modified) (6 diffs)
• t/02_marker.t (modified) (2 diffs)

lang/perl/Google-Chart/trunk/lib/Google/Chart/Color.pm

@@ -28 +28 @@
 subtype 'Google::Chart::Color::Data'
     => as 'Str'
-    => where { /^[a-f0-9]{6}/i }
+    => where { /^[a-f0-9]{6}$/i }
 ;
 

lang/perl/Google-Chart/trunk/lib/Google/Chart/Grid.pm

@@ -51 +51 @@
 sub parameter_value {
     my $self = shift;
-    return join(',', 
-        $self->x_step_size,
-        $self->y_step_size,
-        $self->line_length,
-        $self->blank_length,
-    );
+    return join(',', map { $self->$_ } qw(x_step_size y_step_size line_length blank_length));
 }
 

lang/perl/Google-Chart/trunk/lib/Google/Chart/Marker.pm

@@ -4 +4 @@
 use Moose;
 use Moose::Util::TypeConstraints;
-use Google::Chart::Types;
-use Google::Chart::Color;
 
 use constant parameter_name => 'chm';
@@ -11 +9 @@
 with 'Google::Chart::QueryComponent::Simple';
 
-enum 'Google::Chart::Marker::Type' => (
+has 'markerset' => (
+    is => 'rw',
+    isa => 'ArrayRef[Google::Chart::Marker::Item]',
+    required => 1,
+    default => sub { 
+        [ Google::Chart::Marker::Item->new ] ;
+    }
+);
+
+__PACKAGE__->meta->make_immutable;
+
+no Moose;
+
+sub BUILDARGS {
+    my $self = shift;
+    my @markerset;
+    my @markerargs;
+    my %args;
+
+    if (@_ == 1 && ref $_[0] eq 'ARRAY') {
+        @markerargs = @{$_[0]};
+    } else {
+        %args = @_;
+        my $arg = delete $args{markerset};
+        if (ref $arg eq 'ARRAY') {
+            @markerargs = @{ $arg };
+        } elsif (ref $arg eq 'HASH') {
+            @markerargs = ( $arg );
+        }
+    }
+
+
+    @markerargs = ( {} ) unless @markerargs;
+
+    foreach my $marker ( @markerargs ) {
+        if (! blessed $marker) {
+            $marker = Google::Chart::Marker::Item->new($marker)
+        }
+        push @markerset, $marker;
+    }
+
+    return { %args, markerset => \@markerset };
+}
+
+sub parameter_value {
+    my $self = shift;
+    return join ('|',
+        map {$_->as_string} @{$self->markerset}
+    );
+}
+
+package # hide from PAUSE
+    Google::Chart::Marker::Item;
+use Moose;
+use Moose::Util::TypeConstraints;
+use Google::Chart::Types;
+use Google::Chart::Color;
+
+coerce 'Google::Chart::Marker::Item'
+    => from 'HashRef'
+    => via {
+        Google::Chart::Marker::Item->new(%{$_});
+    }
+;
+
+coerce 'Google::Chart::Marker::Item'
+    => from 'ArrayRef'
+    => via {
+        Google::Chart::Marker::Item->new(%{$_});
+    }
+;
+
+enum 'Google::Chart::Marker::Item::Type' => (
     'a', # arrow
     'c', # corrs
@@ -26 +96 @@
 has 'marker_type' => (
     is => 'rw',
-    isa => 'Google::Chart::Marker::Type',
+    isa => 'Google::Chart::Marker::Item::Type',
     required => 1,
     default => 'o'
@@ -35 +105 @@
     isa => 'Google::Chart::Color::Data',
     required => 1,
-    default => '000000',
+    default => '333333',
 );
 
@@ -54 +124 @@
 has 'size' => (
     is => 'rw',
-    isa => 'Int',
+    isa => 'Num',
     required => 1,
     default => 5,
@@ -66 +136 @@
 );
 
+__PACKAGE__->meta->make_immutable;
+
 no Moose;
 
-sub parameter_value {
+sub as_string {
     my $self = shift;
 

lang/perl/Google-Chart/trunk/t/02_marker.t

@@ -1 +1 @@
 use strict;
-use Test::More (tests => 10);
+use Test::More (tests => 13);
 
 BEGIN
@@ -11 +11 @@
     ok($marker);
     isa_ok($marker, "Google::Chart::Marker");
-    is( $marker->marker_type, 'o' );
-    is( $marker->color, "000000" );
-    is( $marker->dataset, 0 );
-    is( $marker->datapoint, -1 );
-    is( $marker->size, 5 );
-    is( $marker->priority, 0 );
 
-    is( $marker->as_query, "chm=o%2C000000%2C0%2C-1%2C5%2C0" );
+    is( $marker->as_query, "chm=o%2C333333%2C0%2C-1%2C5%2C0" );
 }
+
+{
+    my $data = Google::Chart::Marker::Item->new(
+        marker_type => 'h',
+        color => '999999',
+        datapoint => '0.3',
+        size => '0.5',
+    );
+    ok($data);
+    isa_ok($data, 'Google::Chart::Marker::Item');
+    is ($data->as_string, 'h,999999,0,0.3,0.5,0');
+}
+
+{
+    my $marker = Google::Chart::Marker->new(
+        markerset =>  [ {
+            marker_type => 'h',
+            color => '999999',
+            datapoint => 0.3,
+            size => 0.5,
+        } ]
+    );
+    ok($marker);
+    isa_ok($marker, "Google::Chart::Marker");
+
+    is( $marker->as_query, "chm=h%2C999999%2C0%2C0.3%2C0.5%2C0" );
+}
+{
+    my $marker = Google::Chart::Marker->new(
+        markerset =>  {
+            marker_type => 'h',
+            color => '999999',
+            datapoint => 0.3,
+            size => 0.5,
+        }
+    );
+    ok($marker);
+    isa_ok($marker, "Google::Chart::Marker");
+
+    is( $marker->as_query, "chm=h%2C999999%2C0%2C0.3%2C0.5%2C0" );
+}