improvements to the layout of interesting stats page

barbie · Aug 4, 2009 · b222ab8 · b222ab8
1 parent a6a36ae
commit b222ab8
Show file tree

Hide file tree

Showing 13 changed files with 230 additions and 93 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for CPAN-Testers-WWW-Statistics
 
+0.67	current
+	- improvements to the layout of interesting stats page.
+	- moved from Class::Accessor::Chained::Fast to Class::Accessor::Fast
+
 0.66	25/07/2009
 	- added stats and graphs about CPAN, including extra menu section.
 

diff --git a/META.yml b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                CPAN::Testers::WWW::Statistics
-version:             0.66
+version:             0.67
 abstract:            Scripts to create the cpanstats website
 author:
   - Barbie <barbie@cpan.org>
@@ -11,7 +11,7 @@ installdirs:         site
 
 requires:
   CGI:                              0
-  Class::Accessor::Chained::Fast:   0
+  Class::Accessor::Fast:            0
   Config::IniFiles:                 0
   CPAN::Testers::Common::DBUtils:   0.03
   DBD::mysql:                       0
@@ -46,13 +46,13 @@ build_requires:
 provides:
   CPAN::Testers::WWW::Statistics:
     file:     lib/CPAN/Testers/WWW/Statistics.pm
-    version:  0.66
+    version:  0.67
   CPAN::Testers::WWW::Statistics::Graphs:
     file:     lib/CPAN/Testers/WWW/Statistics/Graphs.pm
-    version:  0.66
+    version:  0.67
   CPAN::Testers::WWW::Statistics::Pages:
     file:     lib/CPAN/Testers/WWW/Statistics/Pages.pm
-    version:  0.66
+    version:  0.67
 
 meta-spec:
    version:   1.4

diff --git a/Makefile.PL b/Makefile.PL
@@ -5,7 +5,7 @@ WriteMakefile(
     'VERSION_FROM'     => 'lib/CPAN/Testers/WWW/Statistics.pm',
     'PREREQ_PM'        => {
 
-        Class::Accessor::Chained::Fast  => 0,
+        Class::Accessor::Fast           => 0,
         Config::IniFiles                => 0,
         CPAN::Testers::Common::DBUtils  => 0.03,
         GD::Graph::lines                => 0,
@@ -35,9 +35,9 @@ WriteMakefile(
         File::Spec                      => 0,     # for testing
     },
 
-    NO_META            => 1,
+    NO_META         => 1,
 
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-      (ABSTRACT => 'Scripts to create the cpanstats website',
-       AUTHOR     => 'Barbie <barbie@cpan.org>') : ()),
+      (ABSTRACT     => 'Scripts to create the cpanstats website',
+       AUTHOR       => 'Barbie <barbie@cpan.org>') : ()),
 );
diff --git a/data/01mailrc.txt b/data/01mailrc.txt
diff --git a/lib/CPAN/Testers/WWW/Statistics.pm b/lib/CPAN/Testers/WWW/Statistics.pm
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '0.66';
+$VERSION = '0.67';
 
 #----------------------------------------------------------------------------
 
@@ -22,7 +22,7 @@ testers, and some backend code to help map tester address to a real identity.
 # -------------------------------------
 # Library Modules
 
-use base qw(Class::Accessor::Chained::Fast);
+use base qw(Class::Accessor::Fast);
 
 use Config::IniFiles;
 use CPAN::Testers::Common::DBUtils;
@@ -79,7 +79,7 @@ sub new {
     bless $self, $class;
 
     # ensure we have a configuration file
-    die "Must specify the configuration file\n"             unless($hash{config});
+    die "Must specify the configuration file\n"             unless(   $hash{config});
     die "Configuration file [$hash{config}] not found\n"    unless(-f $hash{config});
 
     # load configuration file

diff --git a/lib/CPAN/Testers/WWW/Statistics/Graphs.pm b/lib/CPAN/Testers/WWW/Statistics/Graphs.pm
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '0.66';
+$VERSION = '0.67';
 
 #----------------------------------------------------------------------------
 

diff --git a/lib/CPAN/Testers/WWW/Statistics/Pages.pm b/lib/CPAN/Testers/WWW/Statistics/Pages.pm
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '0.66';
+$VERSION = '0.67';
 
 #----------------------------------------------------------------------------
 
@@ -604,24 +604,27 @@ sub _report_interesting {
     my (@postersx,@entriesx,@reportsx);
     for my $row (@posters) {
         $row->[0] = $index{posters}{$row->[1]};
+        $row->[2] = uc $row->[2];
         $row->[4] = $self->_tester_name($row->[4])  if($row->[4] =~ /\@/);
         my @this = @$row;
         push @postersx, \@this;
     }
     for my $row (@entries) {
         $row->[0] = $index{entries}{$row->[1]};
+        $row->[2] = uc $row->[2];
         $row->[4] = $self->_tester_name($row->[4])  if($row->[4] =~ /\@/);
         my @this = @$row;
         push @entriesx, \@this;
     }
     for my $row (@reports) {
         $row->[0] = $index{reports}{$row->[1]};
+        $row->[2] = uc $row->[2];
         $row->[4] = $self->_tester_name($row->[4])  if($row->[4] =~ /\@/);
         my @this = @$row;
         push @reportsx, \@this;
     }
 
-    my @headings = ('count','id','state','postdate','tester','dist','version','platform','perl','osname','osvers','fulldate');
+    my @headings = qw( count id grade postdate tester dist version platform perl osname osvers fulldate );
 
     $tvars{HEADINGS} = \@headings;
     $tvars{POSTERS}  = \@postersx;

diff --git a/t/05setup_db-cpanstats.t b/t/05setup_db-cpanstats.t
@@ -5,7 +5,6 @@ use warnings;
 $|=1;
 use Test::More tests => 1;
 use DBI;
-use DBD::SQLite;
 use File::Spec;
 use File::Path;
 use File::Basename;

diff --git a/t/05setup_db-ixlatest.t b/t/05setup_db-ixlatest.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More tests => 1;
 use DBI;
-use DBD::SQLite;
 use File::Spec;
 use File::Path;
 use File::Basename;

diff --git a/t/05setup_db-uploads.t b/t/05setup_db-uploads.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More tests => 1;
 use DBI;
-use DBD::SQLite;
 use File::Spec;
 use File::Path;
 use File::Basename;

diff --git a/t/20attributes.t b/t/20attributes.t
@@ -27,7 +27,7 @@ foreach my $k ( qw/
     ok( $obj->can($k), "$label can" )
 	or skip "'$k' attribute missing", 3;
     isnt( $obj->$k(), undef, "$label has default" );
-    is( $obj->$k(123), $obj, "$label set" ); # chained, so returns object, not value.
+    is( $obj->$k(123), 123, "$label set" );
     is( $obj->$k, 123, "$label get" );
   };
 }
@@ -41,7 +41,7 @@ foreach my $k ( qw/
     ok( $obj->can($k), "$label can" )
 	or skip "'$k' attribute missing", 3;
     is( $obj->$k(), undef, "$label has no default" );
-    is( $obj->$k(123), $obj, "$label set" ); # chained, so returns object, not value.
+    is( $obj->$k(123), 123, "$label set" );
     is( $obj->$k, 123, "$label get" );
   };
 }

diff --git a/t/expected.zip b/t/expected.zip
diff --git a/templates/interest.html b/templates/interest.html
@@ -47,7 +47,7 @@ <h2>All Posts to cpan-testers</h2>
 <table>
 <tr>[% FOREACH cell = HEADINGS %]<th class="top">[% cell %]</th>[% END %]</tr>
 [% FOREACH row = POSTERS; cnt = 0 %]
-<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
+<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td[% IF cnt == 2 %] class="[% col %]"[% END %]>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
 [% END %]
 </table>
 </div>
@@ -58,7 +58,7 @@ <h2>Notable Entries posted to cpan-testers</h2>
 <table>
 <tr>[% FOREACH cell = HEADINGS %]<th class="top">[% cell %]</th>[% END %]</tr>
 [% FOREACH row = ENTRIES; cnt = 0 %]
-<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
+<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td[% IF cnt == 2 %] class="[% col %]"[% END %]>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
 [% END %]
 </table>
 </div>
@@ -69,7 +69,7 @@ <h2>Notable Reports posted to cpan-testers</h2>
 <table>
 <tr>[% FOREACH cell = HEADINGS %]<th class="top">[% cell %]</th>[% END %]</tr>
 [% FOREACH row = REPORTS; cnt = 0 %]
-<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
+<tr>[% FOREACH col = row; IF cnt == 1 %]<td><a href="http://nntp.x.perl.org/group/perl.cpan.testers/[% col %]">[% col %]</a></td>[% ELSE %]<td[% IF cnt == 2 %] class="[% col %]"[% END %]>[% col %]</td>[% END; cnt = cnt + 1; END %]</tr>
 [% END %]
 </table>
 </div>