Added support for {{{JavaScript::Minifier::XS}}}, if available.

Author: bleargh45

Build.PL

@@ -53,6 +53,9 @@ $build_pkg->new(
         'mod_perl2'             => 2.0,
         'Time::HiRes'           => 0,
         },
+    'recommends'        => {
+        'JavaScript::Minifier::XS' => 0,
+        },
     # add configuration requirements both to build_requires and to META.yml,
     # until M::B supports "configure_requires" directly.
     'build_requires'    => { %configure_requires },

Changes

@@ -2,6 +2,9 @@ Revision history for Perl extension Apache2::Filter::Minifier::JavaScript.
 
 1.04_01 ???
     - added timing info to the debug logs
+    - use JavaScript::Minifier::XS if available; its -MUCH- faster
+    - new "JsMinifier" PerlVar, to let you specify which minifier package or
+      function to use (otherwise we try J:M:XS first, falling back to J:M)
 
 1.03    Fri Sep 28 11:09 PDT 2007
     - release; verified that changes in 1.03_01 for configuration requirements

MANIFEST

@@ -11,6 +11,7 @@ t/content-length.t
 t/decline.t
 t/dynamic.t
 t/mime-types.t
+t/minifiers.t
 t/mod-cgi.t
 t/non-js.t
 t/registry.t
@@ -20,6 +21,7 @@ t/conf/extra.conf.in
 t/htdocs/test.js
 t/htdocs/test.txt
 t/htdocs/minified.txt
+t/htdocs/minified-xs.txt
 t/MY/slurp.pm
 t/MY/CharsetHandler.pm
 t/MY/JSHandler.pm

META.yml

@@ -13,6 +13,8 @@ requires:
   mod_perl2: 2
 build_requires:
   Apache::Test: 1.12
+recommends:
+  JavaScript::Minifier::XS: 0
 provides:
   Apache2::Filter::Minifier::JavaScript:
     file: lib/Apache2/Filter/Minifier/JavaScript.pm

lib/Apache2/Filter/Minifier/JavaScript.pm

@@ -11,7 +11,11 @@ use Apache2::Log qw();              # $log->*()
 use APR::Table qw();                # dir_config->get() and headers_out->unset()
 use Apache2::Const -compile => qw(OK DECLINED);
 use Time::HiRes qw(gettimeofday tv_interval);
-use JavaScript::Minifier qw(minify);
+
+###############################################################################
+# Load up the JS minifier modules.
+use JavaScript::Minifier;
+eval { require JavaScript::Minifier::XS; };
 
 ###############################################################################
 # Version number.
@@ -52,6 +56,35 @@ sub handler {
         return Apache2::Const::DECLINED;
     }
 
+    # figure out which minifier module/function we're supposed to be using;
+    # either an explicit minifier function/package, or our list of acceptable
+    # minifiers
+    my $minifier;
+    my @possible = $r->dir_config->get('JsMinifier') || (
+        'JavaScript::Minifier::XS',
+        'JavaScript::Minifier',
+        );
+    foreach my $maybe (@possible) {
+        no strict 'refs';
+        # explicit function name
+        if (defined &{"$maybe"}) {
+            $minifier = sub { $maybe->(shift) };
+            last;
+        }
+        # package name; look for "minify()" function
+        if (defined &{"${maybe}::minify"}) {
+            my $func = \&{"${maybe}::minify"};
+            $minifier = ($maybe eq 'JavaScript::Minifier')
+                            ? sub { $func->(input=>shift) }
+                            : sub { $func->(shift) };
+            last;
+        }
+    }
+    unless ($minifier) {
+        $log->info( "no JavaScript minifier available; declining" );
+        return Apache2::Const::DECLINED;
+    }
+
     # gather up entire document
     my $ctx = $f->ctx;
     while ($f->read(my $buffer, 4096)) {
@@ -67,7 +100,7 @@ sub handler {
     # if we've got JS to minify, minify it
     if ($ctx) {
         my $t_st = [gettimeofday()];
-        my $min  = eval { minify( input=>$ctx ) };
+        my $min  = eval { $minifier->($ctx) };
         if ($@) {
             # minification failed; log error and send original JS
             $log->error( "error minifying: $@" );
@@ -100,12 +133,18 @@ Apache2::Filter::Minifier::JavaScript - JS minifying output filter
 
       # if you need to supplement MIME-Type list
       PerlSetVar                JsMimeType  text/json
+
+      # if you want to explicitly specify the minifier to use
+      #PerlSetVar               JsMinifier  JavaScript::Minifier::XS
+      #PerlSetVar               JsMinifier  JavaScript::Minifier
+      #PerlSetVar               JsMinifier  MY::Minifier::function
   </LocationMatch>
 
 =head1 DESCRIPTION
 
 C<Apache2::Filter::Minifier::JavaScript> is a Mod_perl2 output filter which
-minifies JavaScript using C<JavaScript::Minifier>.
+minifies JavaScript using C<JavaScript::Minifier> or
+C<JavaScript::Minifier::XS>.
 
 Only JavaScript documents are minified, all others are passed through
 unaltered.  C<Apache2::Filter::Minifier::JavaScript> comes with a list of
@@ -114,6 +153,15 @@ supplement that list yourself by setting the C<JsMimeType> PerlVar
 appropriately (use C<PerlSetVar> for a single new MIME-Type, or C<PerlAddVar>
 when you want to add multiple MIME-Types).
 
+Given a choice, using C<JavaScript::Minifier::XS> is preferred over
+C<JavaScript::Minifier>, but we'll use whichever one you've got available.  If
+you want to explicitly specify which minifier you want to use, set the
+C<JsMinifier> PerlVar to the name of the package/function that implements the
+minifier.  Minification functions are expected to accept a single parameter
+(the JavaScript to be minified) and to return the minified JavaScript on
+completion.  If you specify a package name, we look for a C<minify()> function
+in that package.
+
 =head2 Caching
 
 Minification does require additional CPU resources, and it is recommended that
@@ -167,6 +215,7 @@ license as Perl itself.
 =head1 SEE ALSO
 
 L<JavaScript::Minifier>,
+L<JavaScript::Minifier::XS>,
 L<Apache2::Filter::Minifier::CSS>,
 L<Apache::Clean>.
 

t/conf/extra.conf.in

@@ -2,6 +2,10 @@ PerlSwitches -w
 LogLevel debug
 DirectoryIndex test.js
 
+<Location />
+    PerlSetVar              JsMinifier      JavaScript::Minifier
+</Location>
+
 Alias /raw @DocumentRoot@
 <Location /raw>
     PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
@@ -61,3 +65,17 @@ Alias /perl-bin @ServerRoot@/perl-bin
     PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
     Options                 +ExecCGI
 </Location>
+
+<Location /explicit/pp>
+    SetHandler              modperl
+    PerlResponseHandler     MY::JSHandler
+    PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
+    PerlSetVar              JsMinifier      JavaScript::Minifier
+</Location>
+
+<Location /explicit/xs>
+    SetHandler              modperl
+    PerlResponseHandler     MY::JSHandler
+    PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
+    PerlSetVar              JsMinifier      JavaScript::Minifier::XS
+</Location>

t/htdocs/minified-xs.txt

@@ -0,0 +1 @@
+function test(){alert("minify me!");}

t/minifiers.t

@@ -0,0 +1,34 @@
+use strict;
+use warnings FATAL => 'all';
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil qw(t_cmp);
+use lib 't';
+use MY::slurp;
+
+# Test minification with an explicitly specified minifier.
+plan tests => 2, need_lwp;
+
+# JavaScript::Minifier
+js_minifier: {
+    my $body = GET_BODY '/explicit/pp';
+    my $min  = slurp('t/htdocs/minified.txt');
+    chomp($min);
+
+    ok( t_cmp($body, $min) );
+}
+
+# JavaScript::Minifier::XS
+js_minifier_xs: {
+    eval { require JavaScript::Minifier::XS };
+    if ($@) {
+        skip "JavaScript::Minifier::XS not installed";
+    }
+    else {
+        my $body = GET_BODY '/explicit/xs';
+        my $min  = slurp('t/htdocs/minified-xs.txt');
+        chomp($min);
+
+        ok( t_cmp($body, $min) );
+    }
+}