Make Gruntmaster::Page::Base also act as strict/warnings/feature/etc

diff --git a/lib/Gruntmaster/Page/Base.pm b/lib/Gruntmaster/Page/Base.pm
index 475be80d6952521e4d0fc96c6c82881913b64764..cffb656564e21c835ede46c38866335c3e21e52f 100644 (file)
--- a/lib/Gruntmaster/Page/Base.pm
+++ b/lib/Gruntmaster/Page/Base.pm
@@ -3,6 +3,7 @@ package Gruntmaster::Page::Base;
 use 5.014000;
 use strict;
 use warnings;
+our $VERSION = '0.001';
 
 use File::Slurp qw/read_file/;
 use HTML::Template::Compiled;
@@ -34,6 +35,8 @@ use POSIX ();
 use Gruntmaster::Data ();
 use List::Util ();
 use LWP::UserAgent;
+use Plack::Request ();
+use feature ();
 
 my $ua = LWP::UserAgent->new;
 my %templates;
@@ -43,10 +46,16 @@ use Carp qw/cluck/;
 sub import_to {
        my ($self, $caller, $name, $title) = @_;
 
+       strict->import;
+       feature->import(':5.14');
+       warnings->import;
+       File::Slurp->export_to_level(1, $caller, qw/read_file/);
        Gruntmaster::Data->export_to_level(1, $caller);
        List::Util->export_to_level(1, $caller, qw/sum/);
 
        no strict 'refs';
+       *{"${caller}::ISA"} = [__PACKAGE__];
+       *{"${caller}::VERSION"} = $VERSION;
        *{"${caller}::strftime"} = \&POSIX::strftime;
        *{"${caller}::debug"} = sub {
                local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;

diff --git a/lib/Gruntmaster/Page/CSS.pm b/lib/Gruntmaster/Page/CSS.pm
index 7165c3adefc8d4bef306b60fd4ba4615c55ca063..912e948a03600febf1f189a3dc3fe9126d2c389d 100644 (file)
--- a/lib/Gruntmaster/Page/CSS.pm
+++ b/lib/Gruntmaster/Page/CSS.pm
@@ -1,13 +1,6 @@
 package Gruntmaster::Page::CSS;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
-use File::Slurp qw/read_file/;
 use CSS::Minifier::XS qw/minify/;
 
 sub generate{

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 37e793105b1de231c1b04ce024e01baebb833318..9e097c052737e053f6a980a5972e7d3cc9e41d31 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -3,12 +3,11 @@ package Gruntmaster::Page::Generic;
 use 5.014000;
 use strict;
 use warnings;
+our $VERSION = '0.001';
 
 use Gruntmaster::Data;
 use Gruntmaster::Page::Base;
-use JSON qw/decode_json/;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
+use JSON qw/encode_json decode_json/;
 
 sub hgetall {
        my $hash = shift;
@@ -28,7 +27,7 @@ sub makepkg {
        return if $INC{"$fn.pm"};
        $INC{"$fn.pm"} = 1;
        Gruntmaster::Page::Base->import_to($pkg, $id, $title);
-       putsym "${pkg}::ISA", ['Gruntmaster::Page::Base'];
+       1
 }
 
 sub make_generate {

diff --git a/lib/Gruntmaster/Page/JS.pm b/lib/Gruntmaster/Page/JS.pm
index fbaf3daaa163186ae1544a1b4139357a7d0d14d4..f51000e85693665d81d3bcea6f5586fc1183c28e 100644 (file)
--- a/lib/Gruntmaster/Page/JS.pm
+++ b/lib/Gruntmaster/Page/JS.pm
@@ -1,13 +1,6 @@
 package Gruntmaster::Page::JS;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
-use File::Slurp qw/read_file/;
 use JavaScript::Minifier::XS qw/minify/;
 
 sub generate{

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 68f45fdc3790bfe8ca045740d0782c1a36cd911a..7fe888523f0809acda18af0cf88eb0545ff33dae 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::Log;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base log => 'Job log';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant PAGE_SIZE => 10;
 

diff --git a/lib/Gruntmaster/Page/Passwd.pm b/lib/Gruntmaster/Page/Passwd.pm
index 73b768026d8f3dcbcca9aaae8d1aed4286a3c599..3a7522e4e6393a8a2a2d02cf6beb5105db491317 100644 (file)
--- a/lib/Gruntmaster/Page/Passwd.pm
+++ b/lib/Gruntmaster/Page/Passwd.pm
@@ -1,14 +1,7 @@
 package Gruntmaster::Page::Passwd;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
 use Apache2::Authen::Passphrase qw/pwcheck pwset/;
-use Plack::Request;
 
 sub generate{
        my ($self, $format, $env) = @_;

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 4cf007edcd1760d3eaf7dea49298ad942d52265f..f03fe7aa265b569dfbb03b046daac7f77f64e080 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::Pb::Entry;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant FORMATS => [qw/C CPP JAVA PERL PYTHON/];
 

diff --git a/lib/Gruntmaster/Page/Register.pm b/lib/Gruntmaster/Page/Register.pm
index 5a3edd161a7184a9f666ce6e95cc78d836ef9bb6..be1d4bec513b312376fef765da8104febab40d7e 100644 (file)
--- a/lib/Gruntmaster/Page/Register.pm
+++ b/lib/Gruntmaster/Page/Register.pm
@@ -1,14 +1,7 @@
 package Gruntmaster::Page::Register;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
 use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
-use Plack::Request;
 
 sub generate{
        my ($self, $format, $env) = @_;

diff --git a/lib/Gruntmaster/Page/Src.pm b/lib/Gruntmaster/Page/Src.pm
index 6dd5a9c2ad29dc5201a89786628ce2488fa5500b..8f9ab1b89ea9b45d8194df8fa97db8bc57766ad1 100644 (file)
--- a/lib/Gruntmaster/Page/Src.pm
+++ b/lib/Gruntmaster/Page/Src.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::Src;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant CONTENT_TYPES => +{
        c => 'text/x-csrc',

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 5e256b1c8b51b945f3d8d9ccf63553a08f47f374..3857c1ad22f991a6c5e5745b1ee5e6b9ef1a67d8 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::St;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base st => 'Standings';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant LEVEL_VALUES => {
        beginner => 100,

diff --git a/lib/Gruntmaster/Page/Submit.pm b/lib/Gruntmaster/Page/Submit.pm
index 2c9fef0c526cb8d869fd698bd4edbcc9e0abb42e..e537765165bb64fe05646d9df0bb26a3df098a3e 100644 (file)
--- a/lib/Gruntmaster/Page/Submit.pm
+++ b/lib/Gruntmaster/Page/Submit.pm
@@ -1,15 +1,6 @@
 package Gruntmaster::Page::Submit;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base;
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
-use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
-use File::Slurp qw/read_file/;
-use Plack::Request;
 
 use constant FORMAT_EXTENSION => {
        C => 'c',