r39991 - in /branches/upstream/libjifty-plugin-chart-perl/current: ./ lib/Jifty/Plugin/ lib/Jifty/Plugin/Chart/ lib/Jifty/Plugin/Chart/Renderer/ lib/Jifty/Plugin/Chart/Renderer/GoogleViz/ t/TestApp-Plugin-Chart/t/

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Thu Jul 16 00:17:30 2009
New Revision: 39991

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39991
Log:
[svn-upgrade] Integrating new upstream version, libjifty-plugin-chart-perl (1.01)

Modified:
    branches/upstream/libjifty-plugin-chart-perl/current/META.yml
    branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart.pm
    branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm
    branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm
    branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/View.pm
    branches/upstream/libjifty-plugin-chart-perl/current/t/TestApp-Plugin-Chart/t/chart.t

Modified: branches/upstream/libjifty-plugin-chart-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/META.yml?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/META.yml (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/META.yml Thu Jul 16 00:17:30 2009
@@ -27,4 +27,4 @@
   Jifty: 0.90409
 resources:
   license: http://dev.perl.org/licenses/
-version: 1.00
+version: 1.01

Modified: branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart.pm?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart.pm (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart.pm Thu Jul 16 00:17:30 2009
@@ -4,7 +4,7 @@
 package Jifty::Plugin::Chart;
 use base qw/ Jifty::Plugin Class::Accessor::Fast /;
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 use Jifty::Plugin::Chart::Web;
 use Scalar::Util qw/ blessed /;

Modified: branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm Thu Jul 16 00:17:30 2009
@@ -32,9 +32,9 @@
     my $chart_id = 'chart_' . Jifty->web->serial;
     my $chart_class = $self->chart_class;
     my $load_params = objToJson($self->load_params);
-    my $draw_params = objToJson($self->draw_params);
+    my $draw_params = objToJson($self->draw_params($args{options}));
     my $callback_name = 'callback_' . Jifty->web->serial;
-
+    
     Jifty->web->out(<< "JS_HEADER");
         <script type="text/javascript">
             google.load('visualization', 1, $load_params);
@@ -58,7 +58,7 @@
             style="width: $args{width}; height: $args{height};"
             id="$chart_id"
         ></div>
-    });
+    }); #"
 
     return;
 }

Modified: branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm Thu Jul 16 00:17:30 2009
@@ -5,9 +5,12 @@
 
 use constant packages_to_load => 'annotatedtimeline';
 use constant chart_class => 'google.visualization.AnnotatedTimeLine';
-use constant draw_params => {
-    displayAnnotations => "true",
-};
+
+sub draw_params {
+    my $self = shift;
+    my $opts = shift || {};
+    return { displayAnnotations => 'true', %$opts };
+}
 
 1;
 

Modified: branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/View.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/View.pm?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/View.pm (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/lib/Jifty/Plugin/Chart/View.pm Thu Jul 16 00:17:30 2009
@@ -121,8 +121,8 @@
         my $label = $args->{legend}[$i];
 
         push @{$chart{'chart_data'}{'row'}}, {
+            string => [ defined $label ? $label : {} ],
             number => $args->{data}[$i],
-            defined($label) ? (string => [ $label ]) : (),
         };
     }
 

Modified: branches/upstream/libjifty-plugin-chart-perl/current/t/TestApp-Plugin-Chart/t/chart.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libjifty-plugin-chart-perl/current/t/TestApp-Plugin-Chart/t/chart.t?rev=39991&op=diff
==============================================================================
--- branches/upstream/libjifty-plugin-chart-perl/current/t/TestApp-Plugin-Chart/t/chart.t (original)
+++ branches/upstream/libjifty-plugin-chart-perl/current/t/TestApp-Plugin-Chart/t/chart.t Thu Jul 16 00:17:30 2009
@@ -4,8 +4,10 @@
 
 # XXX FIXME This is here to prevent a segfault on my machine during testing.
 #   -- sterling
+# typo: s/Chart::pie/Chart::Pie/ certainly fix this
+#   -- yves (found by gregor Herrmann)
 use Test::More;
-eval "use GD; use Chart::pie; 1";
+eval "use GD; use Chart::Pie; 1";
 if ($@) {
     plan skip_all => 'Chart is not installed.';
 }