[Catalyst-commits] r6352 - trunk/Catalyst-Plugin-Static-Simple
bricas at dev.catalyst.perl.org
bricas at dev.catalyst.perl.org
Mon Apr 30 20:16:43 GMT 2007
Author: bricas
Date: 2007-04-30 20:16:42 +0100 (Mon, 30 Apr 2007)
New Revision: 6352
Removed:
trunk/Catalyst-Plugin-Static-Simple/Build.PL
trunk/Catalyst-Plugin-Static-Simple/MANIFEST
trunk/Catalyst-Plugin-Static-Simple/META.yml
Modified:
trunk/Catalyst-Plugin-Static-Simple/Changes
trunk/Catalyst-Plugin-Static-Simple/Makefile.PL
trunk/Catalyst-Plugin-Static-Simple/README
Log:
switch to Module::Install
Deleted: trunk/Catalyst-Plugin-Static-Simple/Build.PL
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Build.PL 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/Build.PL 2007-04-30 19:16:42 UTC (rev 6352)
@@ -1,35 +0,0 @@
-use strict;
-use Module::Build;
-
-my $build = Module::Build->new(
- create_makefile_pl => 'passthrough',
- license => 'perl',
- module_name => 'Catalyst::Plugin::Static::Simple',
- requires => {
- 'Catalyst' => '5.30',
- 'MIME::Types' => '1.15',
- },
- create_makefile_pl => 'passthrough',
- test_files => [
- glob('t/*.t')
- ]
-);
-
-# Require File::Slurp only for older Catalyst versions
-my $cat = $build->check_installed_status('Catalyst');
-if ( $cat->{have} le '5.33' ) {
- $build->requires->{'File::Slurp'} = 0;
-}
-
-# If the user has the SubRequest plugin installed, tell them to upgrade
-my $subreq = $build->check_installed_status('Catalyst::Plugin::SubRequest');
-if ( $subreq->{have} lt '0.08' ) {
- print "** WARNING **\n"
- . "You appear to have a version of Catalyst::Plugin::SubRequest "
- . "older than 0.08.\n"
- . "You must upgrade to SubRequest 0.08 or later if you use it "
- . "in any applications with Static::Simple.\n";
- $build->requires->{'Catalyst::Plugin::SubRequest'} => '0.08';
-}
-
-$build->create_build_script;
Modified: trunk/Catalyst-Plugin-Static-Simple/Changes
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Changes 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/Changes 2007-04-30 19:16:42 UTC (rev 6352)
@@ -6,6 +6,7 @@
ignore_extensions.
- Fixed bug where 204 or 304 status codes would result in a 500 error
under mod_perl.
+ - Switch to Module::Install
0.15 2006-12-08 22:30:00
- Quote metacharacters used in $c->config->{dirs} (Vlad Dan Dascalescu)
Deleted: trunk/Catalyst-Plugin-Static-Simple/MANIFEST
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/MANIFEST 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/MANIFEST 2007-04-30 19:16:42 UTC (rev 6352)
@@ -1,35 +0,0 @@
-Build.PL
-Changes
-lib/Catalyst/Plugin/Static/Simple.pm
-Makefile.PL
-MANIFEST This list of files
-META.yml
-README
-t/01use.t
-t/02pod.t
-t/03podcoverage.t
-t/04static.t
-t/05dirs.t
-t/06include_path.t
-t/07mime_types.t
-t/08subreq.t
-t/09ignore_ext.t
-t/10ignore_dirs.t
-t/lib/TestApp.pm
-t/lib/TestApp/root/always-static/test
-t/lib/TestApp/root/css/static.css
-t/lib/TestApp/root/files/bad.gif
-t/lib/TestApp/root/files/err.omg
-t/lib/TestApp/root/files/static.css
-t/lib/TestApp/root/ignored/bad.gif
-t/lib/TestApp/root/ignored/index.html
-t/lib/TestApp/root/ignored/static.css
-t/lib/TestApp/root/ignored/tmpl.tt
-t/lib/TestApp/root/images/bad.gif
-t/lib/TestApp/root/images/catalyst.png
-t/lib/TestApp/root/incpath/incpath.css
-t/lib/TestApp/root/overlay/o-ignored/bad.gif
-t/lib/TestApp/root/overlay/o-ignored/index.html
-t/lib/TestApp/root/overlay/o-ignored/static.css
-t/lib/TestApp/root/overlay/o-ignored/tmpl.tt
-t/lib/TestApp/root/overlay/overlay.jpg
Deleted: trunk/Catalyst-Plugin-Static-Simple/META.yml
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/META.yml 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/META.yml 2007-04-30 19:16:42 UTC (rev 6352)
@@ -1,8 +0,0 @@
---- #YAML:1.0
-name: Catalyst-Plugin-Static-Simple
-version: 0.15
-author:
- - Andy Grundman, <andy at hybridized.org>
-abstract: Make serving static pages painless.
-license: perl
-generated_by: Module::Build version 0.2612, without YAML.pm
Modified: trunk/Catalyst-Plugin-Static-Simple/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Makefile.PL 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/Makefile.PL 2007-04-30 19:16:42 UTC (rev 6352)
@@ -1,31 +1,26 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-
- unless (eval "use Module::Build::Compat 0.02; 1" ) {
- print "This module requires Module::Build to install itself.\n";
-
- require ExtUtils::MakeMaker;
- my $yn = ExtUtils::MakeMaker::prompt
- (' Install Module::Build now from CPAN?', 'y');
-
- unless ($yn =~ /^y/i) {
- die " *** Cannot install without Module::Build. Exiting ...\n";
- }
-
- require Cwd;
- require File::Spec;
- require CPAN;
-
- # Save this 'cause CPAN will chdir all over the place.
- my $cwd = Cwd::cwd();
- my $makefile = File::Spec->rel2abs($0);
-
- CPAN::Shell->install('Module::Build::Compat')
- or die " *** Cannot install without Module::Build. Exiting ...\n";
-
- chdir $cwd or die "Cannot chdir() back to $cwd: $!";
+use inc::Module::Install 0.65;
+
+name 'Catalyst-Plugin-Static-Simple';
+all_from 'lib/Catalyst/Plugin/Static/Simple.pm';
+
+requires 'Catalyst::Runtime' => '5.30';
+requires 'MIME::Types' => '1.15';
+requires 'Test::More';
+
+unless( can_use 'Catalyst' => '5.33' ) {
+ requires 'File::Slurp';
+}
+
+if( can_use 'Catalyst::Plugin::SubRequest' ) {
+ unless( can_use 'Catalyst::Plugin::SubRequest' => '0.08' ) {
+ print "** WARNING **\n"
+ . "You appear to have a version of Catalyst::Plugin::SubRequest "
+ . "older than 0.08.\n"
+ . "You must upgrade to SubRequest 0.08 or later if you use it "
+ . "in any applications with Static::Simple.\n";
+ requires 'Catalyst::Plugin::SubRequest' => '0.08';
}
- eval "use Module::Build::Compat 0.02; 1" or die $@;
- use lib '_build/lib';
- Module::Build::Compat->run_build_pl(args => \@ARGV);
- require Module::Build;
- Module::Build::Compat->write_makefile(build_class => 'Module::Build');
+}
+
+auto_install;
+WriteAll;
Modified: trunk/Catalyst-Plugin-Static-Simple/README
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/README 2007-04-30 17:50:34 UTC (rev 6351)
+++ trunk/Catalyst-Plugin-Static-Simple/README 2007-04-30 19:16:42 UTC (rev 6352)
@@ -4,40 +4,63 @@
SYNOPSIS
use Catalyst;
MyApp->setup( qw/Static::Simple/ );
+ # that's it; static content is automatically served by
+ # Catalyst, though you can configure things or bypass
+ # Catalyst entirely in a production environment
DESCRIPTION
The Static::Simple plugin is designed to make serving static content in
your application during development quick and easy, without requiring a
single line of code from you.
- It will detect static files used in your application by looking for file
- extensions in the URI. By default, you can simply load this plugin and
- it will immediately begin serving your static files with the correct
- MIME type. The light-weight MIME::Types module is used to map file
- extensions to IANA-registered MIME types.
+ This plugin detects static files by looking at the file extension in the
+ URL (such as .css or .png or .js). The plugin uses the lightweight
+ MIME::Types module to map file extensions to IANA-registered MIME types,
+ and will serve your static files with the correct MIME type directly to
+ the browser, without being processed through Catalyst.
Note that actions mapped to paths using periods (.) will still operate
properly.
- You may further tweak the operation by adding configuration options,
- described below.
+ Though Static::Simple is designed to work out-of-the-box, you can tweak
+ the operation by adding various configuration options. In a production
+ environment, you will probably want to use your webserver to deliver
+ static content; for an example see "USING WITH APACHE", below.
+DEFAULT BEHAVIOR
+ By default, Static::Simple will deliver all files having extensions
+ (that is, bits of text following a period (".")), *except* files having
+ the extensions "tmpl", "tt", "tt2", "html", and "xhtml". These files,
+ and all files without extensions, will be processed through Catalyst. If
+ MIME::Types doesn't recognize an extension, it will be served as
+ "text/plain".
+
+ To restate: files having the extensions "tmpl", "tt", "tt2", "html", and
+ "xhtml" *will not* be served statically by default, they will be
+ processed by Catalyst. Thus if you want to use ".html" files from within
+ a Catalyst app as static files, you need to change the configuration of
+ Static::Simple. Note also that files having any other extension *will*
+ be served statically, so if you're using any other extension for
+ template files, you should also change the configuration.
+
+ Logging of static files is turned off by default.
+
ADVANCED CONFIGURATION
Configuration is completely optional and is specified within
- MyApp->config->{static}. If you use any of these options, the module
+ "MyApp->config->{static}". If you use any of these options, this module
will probably feel less "simple" to you!
- Aborting request logging
- Since Catalyst 5.50, there has been added support for dropping logging
- for a request. This is enabled by default for static files, as static
- requests tend to clutter the log output. However, if you want logging of
- static requests, you can enable it by setting
- MyApp->config->{static}->{no_logs} to 0.
+ Enabling request logging
+ Since Catalyst 5.50, logging of static requests is turned off by
+ default; static requests tend to clutter the log output and rarely
+ reveal anything useful. However, if you want to enable logging of static
+ requests, you can do so by setting "MyApp->config->{static}->{no_logs}"
+ to 0.
Forcing directories into static mode
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 qr//.
+ specified using "qr//".
MyApp->config->{static}->{dirs} = [
'static',
@@ -48,8 +71,8 @@
You may specify a list of directories in which to search for your static
files. The directories will be searched in order and will return the
first file found. Note that your root directory is not automatically
- added to the search path when you specify an include_path. You should
- use MyApp->config->{root} to add it.
+ added to the search path when you specify an "include_path". You should
+ use "MyApp->config->{root}" to add it.
MyApp->config->{static}->{include_path} = [
'/path/to/overlay',
@@ -57,7 +80,7 @@
MyApp->config->{root}
];
- With the above setting, a request for the file /images/logo.jpg will
+ With the above setting, a request for the file "/images/logo.jpg" will
search for the following files, returning the first one found:
/path/to/overlay/images/logo.jpg
@@ -67,7 +90,7 @@
The include path can contain a subroutine reference to dynamically
return a list of available directories. This method will receive the $c
object as a parameter and should return a reference to a list of
- directories. Errors can be reported using die(). This method will be
+ directories. Errors can be reported using "die()". This method will be
called every time a file is requested that appears to be a static file
(i.e. it has an extension).
@@ -86,22 +109,24 @@
Ignoring certain types of files
There are some file types you may not wish to serve as static files.
Most important in this category are your raw template files. By default,
- files with the extensions tt, html, and xhtml will be ignored by
- Static::Simple in the interest of security. If you wish to define your
- own extensions to ignore, use the ignore_extensions option:
+ files with the extensions "tmpl", "tt", "tt2", "html", and "xhtml" will
+ be ignored by Static::Simple in the interest of security. If you wish to
+ define your own extensions to ignore, use the "ignore_extensions"
+ option:
- MyApp->config->{static}->{ignore_extensions} = [ qw/tt html xhtml/ ];
+ MyApp->config->{static}->{ignore_extensions}
+ = [ qw/html asp php/ ];
Ignoring entire directories
To prevent an entire directory from being served statically, you can use
- the ignore_dirs option. This option contains a list of relative
- directory paths to ignore. If using include_path, the path will be
+ the "ignore_dirs" option. This option contains a list of relative
+ directory paths to ignore. If using "include_path", the path will be
checked against every included path.
MyApp->config->{static}->{ignore_dirs} = [ qw/tmpl css/ ];
- For example, if combined with the above include_path setting, this
- ignore_dirs value will ignore the following directories if they exist:
+ For example, if combined with the above "include_path" setting, this
+ "ignore_dirs" value will ignore the following directories if they exist:
/path/to/overlay/tmpl
/path/to/overlay/css
@@ -119,49 +144,53 @@
png => 'image/png',
};
- Apache integration and performance
- Optionally, when running under mod_perl, Static::Simple can return
- DECLINED on static files to allow Apache to serve the file. A check is
- first done to make sure that Apache's DocumentRoot matches your Catalyst
- root, and that you are not using any custom MIME types or multiple
- roots. To enable the Apache support, you can set the following option.
+ Compatibility with other plugins
+ Since version 0.12, Static::Simple plays nice with other plugins. It no
+ longer short-circuits the "prepare_action" stage as it was causing too
+ many compatibility issues with other plugins.
- MyApp->config->{static}->{use_apache} = 1;
+ Debugging information
+ Enable additional debugging information printed in the Catalyst log.
+ This is automatically enabled when running Catalyst in -Debug mode.
+
+ MyApp->config->{static}->{debug} = 1;
- By default this option is disabled because after several benchmarks it
- appears that just serving the file from Catalyst is the better option.
- On a 3K file, Catalyst appears to be around 25% faster, and is 42%
- faster on a 10K file. My benchmarking was done using the following
- 'siege' command, so other benchmarks would be welcome!
+USING WITH APACHE
+ While Static::Simple will work just fine serving files through Catalyst
+ in mod_perl, for increased performance, you may wish to have Apache
+ handle the serving of your static files. To do this, simply use a
+ dedicated directory for your static files and configure an Apache
+ Location block for that directory. This approach is recommended for
+ production installations.
- siege -u http://server/static/css/10K.css -b -t 1M -c 1
-
- For best static performance, you should still serve your static files
- directly from Apache by defining a Location block similar to the
- following:
-
<Location /static>
SetHandler default-handler
</Location>
- Bypassing other plugins
- This plugin checks for a static file in the prepare_action stage. If the
- request is for a static file, it will bypass all remaining
- prepare_action steps. This means that by placing Static::Simple before
- all other plugins, they will not execute when a static file is found.
- This can be helpful by skipping session cookie checks for example. Or,
- if you want some plugins to run even on static files, list them before
- Static::Simple.
+ Using this approach Apache will bypass any handling of these directories
+ through Catalyst. You can leave Static::Simple as part of your
+ application, and it will continue to function on a development server,
+ or using Catalyst's built-in server.
- Currently, work done by plugins in any other prepare method will execute
- normally.
+INTERNAL EXTENDED METHODS
+ Static::Simple extends the following steps in the Catalyst process.
- Debugging information
- Enable additional debugging information printed in the Catalyst log.
- This is automatically enabled when running Catalyst in -Debug mode.
+ prepare_action
+ "prepare_action" is used to first check if the request path is a static
+ file. If so, we skip all other "prepare_action" steps to improve
+ performance.
- MyApp->config->{static}->{debug} = 1;
+ dispatch
+ "dispatch" takes the file found during "prepare_action" and writes it to
+ the output.
+ finalize
+ "finalize" serves up final header information and displays any log
+ messages.
+
+ setup
+ "setup" initializes all default values.
+
SEE ALSO
Catalyst, Catalyst::Plugin::Static,
<http://www.iana.org/assignments/media-types/>
@@ -170,7 +199,7 @@
Andy Grundman, <andy at hybridized.org>
CONTRIBUTORS
- Marcus Ramberg, <mramberg at cpan.org>
+ Marcus Ramberg, <mramberg at cpan.org> Jesse Sheidlower, <jester at panix.com>
THANKS
The authors of Catalyst::Plugin::Static:
More information about the Catalyst-commits
mailing list