X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FStatic%2FSimple.pm;h=2cfe241233c029542fe6fbc698e1b6b3678979f1;hb=d925e93e969c28bd2d5634ebf1424dccea0db46c;hp=73a98fe612da03b2f2a4bf0a6dfde2de339e0cc1;hpb=b108737b2d548e40e9aa80dfb2405b5d921e61c3;p=catagits%2FCatalyst-Plugin-Static-Simple.git
diff --git a/lib/Catalyst/Plugin/Static/Simple.pm b/lib/Catalyst/Plugin/Static/Simple.pm
index 73a98fe..2cfe241 100644
--- a/lib/Catalyst/Plugin/Static/Simple.pm
+++ b/lib/Catalyst/Plugin/Static/Simple.pm
@@ -1,19 +1,18 @@
package Catalyst::Plugin::Static::Simple;
-use strict;
-use warnings;
-use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
+use Moose::Role;
use File::stat;
use File::Spec ();
use IO::File ();
use MIME::Types ();
use MRO::Compat;
-our $VERSION = '0.21';
+our $VERSION = '0.26';
-__PACKAGE__->mk_accessors( qw/_static_file _static_debug_message/ );
+has _static_file => ( is => 'rw' );
+has _static_debug_message => ( is => 'rw', isa => 'Str' );
-sub prepare_action {
+before prepare_action => sub {
my $c = shift;
my $path = $c->req->path;
my $config = $c->config->{static};
@@ -27,10 +26,19 @@ sub prepare_action {
# strip trailing slashes, they'll be added in our regex
$dir_re =~ s{/$}{};
- my $re = ( $dir =~ m{^qr/}xms ) ? eval $dir : qr{^${dir_re}/};
- if ($@) {
- $c->error( "Error compiling static dir regex '$dir': $@" );
+ my $re;
+
+ if ( $dir =~ m{^qr/}xms ) {
+ $re = eval $dir;
+
+ if ($@) {
+ $c->error( "Error compiling static dir regex '$dir': $@" );
+ }
+ }
+ else {
+ $re = qr{^${dir_re}/};
}
+
if ( $path =~ $re ) {
if ( $c->_locate_static_file( $path, 1 ) ) {
$c->_debug_msg( 'from static directory' )
@@ -49,11 +57,9 @@ sub prepare_action {
# and does it exist?
$c->_locate_static_file( $path );
}
+};
- return $c->next::method(@_);
-}
-
-sub dispatch {
+override dispatch => sub {
my $c = shift;
return if ( $c->res->status != 200 );
@@ -65,20 +71,18 @@ sub dispatch {
return $c->_serve_static;
}
else {
- return $c->next::method(@_);
+ return super;
}
-}
+};
-sub finalize {
+before finalize => sub {
my $c = shift;
# display all log messages
if ( $c->config->{static}{debug} && scalar @{$c->_debug_msg} ) {
$c->log->debug( 'Static::Simple: ' . join q{ }, @{$c->_debug_msg} );
}
-
- return $c->next::method(@_);
-}
+};
sub setup {
my $c = shift;
@@ -342,10 +346,14 @@ Define a list of top-level directories beneath your 'root' directory
that should always be served in static mode. Regular expressions may be
specified using C.
- MyApp->config->{static}->{dirs} = [
- 'static',
- qr/^(images|css)/,
- ];
+ MyApp->config(
+ static => {
+ dirs => [
+ 'static',
+ qr/^(images|css)/,
+ ],
+ }
+ );
=head2 Including additional directories
@@ -355,11 +363,15 @@ first file found. Note that your root directory is B automatically
added to the search path when you specify an C. You should
use Cconfig-E{root}> to add it.
- MyApp->config->{static}->{include_path} = [
- '/path/to/overlay',
- \&incpath_generator,
- MyApp->config->{root}
- ];
+ MyApp->config(
+ static => {
+ include_path => [
+ '/path/to/overlay',
+ \&incpath_generator,
+ MyApp->config->{root},
+ ],
+ },
+ );
With the above setting, a request for the file C will search
for the following files, returning the first one found:
@@ -378,7 +390,7 @@ For example:
sub incpath_generator {
my $c = shift;
-
+
if ( $c->session->{customer_dir} ) {
return [ $c->session->{customer_dir} ];
} else {
@@ -395,8 +407,11 @@ C will be ignored by Static::Simple in the interest of security.
If you wish to define your own extensions to ignore, use the
C option:
- MyApp->config->{static}->{ignore_extensions}
- = [ qw/html asp php/ ];
+ MyApp->config(
+ static => {
+ ignore_extensions => [ qw/html asp php/ ],
+ },
+ );
=head2 Ignoring entire directories
@@ -405,7 +420,11 @@ the C option. This option contains a list of relative
directory paths to ignore. If using C, the path will be
checked against every included path.
- MyApp->config->{static}->{ignore_dirs} = [ qw/tmpl css/ ];
+ MyApp->config(
+ static => {
+ ignore_dirs => [ qw/tmpl css/ ],
+ },
+ );
For example, if combined with the above C setting, this
C value will ignore the following directories if they exist:
@@ -422,10 +441,14 @@ C value will ignore the following directories if they exist:
To override or add to the default MIME types set by the L
module, you may enter your own extension to MIME type mapping.
- MyApp->config->{static}->{mime_types} = {
- jpg => 'image/jpg',
- png => 'image/png',
- };
+ MyApp->config(
+ static => {
+ mime_types => {
+ jpg => 'image/jpg',
+ png => 'image/png',
+ },
+ },
+ );
=head2 Compatibility with other plugins
@@ -438,7 +461,11 @@ many compatibility issues with other plugins.
Enable additional debugging information printed in the Catalyst log. This
is automatically enabled when running Catalyst in -Debug mode.
- MyApp->config->{static}->{debug} = 1;
+ MyApp->config(
+ static => {
+ debug => 1,
+ },
+ );
=head1 USING WITH APACHE
@@ -537,7 +564,11 @@ Jesse Sheidlower,
Guillermo Roditi,
-Florian Ragwitz
+Florian Ragwitz,
+
+Tomas Doran,
+
+Justin Wheeler (dnm)
=head1 THANKS
@@ -553,6 +584,12 @@ For the include_path code from Template Toolkit:
=head1 COPYRIGHT
+Copyright (c) 2005 - 2009
+the Catalyst::Plugin::Static::Simple L and L
+as listed above.
+
+=head1 LICENSE
+
This program is free software, you can redistribute it and/or modify it under
the same terms as Perl itself.