Changeset 16175 for lang

Timestamp:

07/24/08 14:52:58 (5 years ago)

Author:

daisuke

Message:

Fix up Role dependency for those that needs p_name and p_value, and those that don't

Location:

lang/perl/Google-Chart/branches/moose/lib/Google/Chart

Files:

• Axis.pm (modified) (1 diff)
• Data.pm (modified) (1 diff)
• Marker.pm (modified) (1 diff)
• QueryComponent.pm (modified) (1 diff)
• Size.pm (modified) (1 diff)
• Type.pm (modified) (1 diff)
• Type/Bar.pm (modified) (1 diff)
• Type/Line.pm (modified) (1 diff)
• Type/Pie.pm (modified) (3 diffs)
• Type/QRcode.pm (modified) (1 diff)
• Type/Radar.pm (modified) (1 diff)
• Type/ScatterPlot.pm (modified) (1 diff)
• Type/Simple.pm (added)
• Type/SparkLine.pm (modified) (1 diff)
• Type/Venn.pm (modified) (1 diff)

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Axis.pm

@@ -6 +6 @@
 use Google::Chart::Axis::Item;
 use URI::Escape;
-
-use constant parameter_name => '';
-use constant parameter_value => '';
 
 with 'Google::Chart::QueryComponent';

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Data.pm

@@ -3 +3 @@
 package Google::Chart::Data;
 use Moose::Role;
+
 use constant parameter_name => 'chd';
 
-with 'Google::Chart::QueryComponent';
+with 'Google::Chart::QueryComponent::Simple';
 
 has 'dataset' => (

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Marker.pm

@@ -8 +8 @@
 use constant parameter_name => 'chm';
 
-with 'Google::Chart::QueryComponent';
+with 'Google::Chart::QueryComponent::Simple';
 
 enum 'Google::Chart::Marker::Type' => (

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/QueryComponent.pm

@@ -3 +3 @@
 package Google::Chart::QueryComponent;
 use Moose::Role;
-use URI::Escape;
 
-requires qw(parameter_name parameter_value);
+requires 'as_query';
 
 no Moose;
-
-sub as_query {
-    my $self = shift;
-    return wantarray ? 
-        ($self->parameter_name, $self->parameter_value) :
-        join('=', $self->parameter_name, URI::Escape::uri_escape($self->parameter_value))
-    ;
-}
 
 1;

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Size.pm

@@ -8 +8 @@
 use constant parameter_name => 'chs';
 
-with 'Google::Chart::QueryComponent';
+with 'Google::Chart::QueryComponent::Simple';
 
 coerce 'Google::Chart::Size'

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type.pm

@@ -3 +3 @@
 package Google::Chart::Type;
 use Moose::Role;
-use constant parameter_name => 'cht';
 
 with 'Google::Chart::QueryComponent';

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/Bar.pm

@@ -5 +5 @@
 use Moose::Util::TypeConstraints;
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 enum 'Google::Chart::Type::Bar::Orientation' => qw(horizontal vertical);

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/Line.pm

@@ -5 +5 @@
 use constant parameter_value => 'lc';
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 no Moose;

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/Pie.pm

@@ -5 +5 @@
 use Moose::Util::TypeConstraints;
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
-has 'type' => (
+has 'pie_type' => (
     is => 'rw',
     isa => enum([ qw(2d 3d) ]),
@@ -21 +21 @@
     my $self = shift;
 
-    return $self->type eq '3d' ? 'p3' : 'p';
+    return $self->pie_type eq '3d' ? 'p3' : 'p';
 }
 
@@ -42 +42 @@
       module => 'Pie',
       args   => {
-        type => '3d'
+        pie_type => '3d'
       }
     }

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/QRcode.pm

@@ -4 +4 @@
 use Moose;
 use Moose::Util::TypeConstraints;
-use constant parameter_value => '';
 
 enum 'Google::Chart::Type::QRcode::Encoding' => qw(shift_jis utf-8 iso-8859-1);

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/Radar.pm

@@ -5 +5 @@
 use constant parameter_value => 'r';
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 __PACKAGE__->meta->make_immutable;

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/ScatterPlot.pm

@@ -5 +5 @@
 use constant parameter_value => 's';
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 __PACKAGE__->meta->make_immutable;

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/SparkLine.pm

@@ -6 +6 @@
 use constant parameter_value => 'ls';
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 __PACKAGE__->meta->make_immutable;

lang/perl/Google-Chart/branches/moose/lib/Google/Chart/Type/Venn.pm

@@ -6 +6 @@
 use constant parameter_value => 'v';
 
-with 'Google::Chart::Type';
+with 'Google::Chart::Type::Simple';
 
 __PACKAGE__->meta->make_immutable;