X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=2c6ca19cb7543f6e62ed35a5db42ecb7938d85f5;hp=26047c3e2b088a66aefc58a4b000441809b022a6;hb=e63948476024f865b8e84967ffe71681e90f2a4c;hpb=1985c30b4cd5db3162e9cfbccd1a49c93ab385fd diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 26047c3..2c6ca19 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1,13 +1,19 @@ package Catalyst; use strict; -use base 'Class::Data::Inheritable'; +use base qw[ Catalyst::Base Catalyst::Setup ]; use UNIVERSAL::require; +use Catalyst::Exception; use Catalyst::Log; +use Catalyst::Utils; +use NEXT; +use Text::ASCIITable; +use Path::Class; +our $CATALYST_SCRIPT_GEN = 4; -__PACKAGE__->mk_classdata($_) for qw/_config engine log/; +__PACKAGE__->mk_classdata($_) for qw/arguments dispatcher engine log/; -our $VERSION = '5.00'; +our $VERSION = '5.31'; our @ISA; =head1 NAME @@ -21,15 +27,15 @@ Catalyst - The Elegant MVC Web Application Framework cd MyApp # add models, views, controllers - script/create.pl model Something - script/create.pl view Stuff - script/create.pl controller Yada + script/myapp_create.pl model Something + script/myapp_create.pl view Stuff + script/myapp_create.pl controller Yada # built in testserver - script/server.pl + script/myapp_server.pl # command line interface - script/test.pl /yada + script/myapp_test.pl /yada use Catalyst; @@ -40,31 +46,24 @@ Catalyst - The Elegant MVC Web Application Framework use Catalyst qw/-Debug -Engine=CGI/; - __PACKAGE__->action( '!default' => sub { $_[1]->res->output('Hello') } ); + sub default : Private { $_[1]->res->output('Hello') } ); - __PACKAGE__->action( - 'index.html' => sub { - my ( $self, $c ) = @_; - $c->res->output('Hello'); - $c->forward('_foo'); - } - ); + sub index : Path('/index.html') { + my ( $self, $c ) = @_; + $c->res->output('Hello'); + $c->forward('foo'); + } - __PACKAGE__->action( - '/^product[_]*(\d*).html$/' => sub { - my ( $self, $c ) = @_; - $c->stash->{template} = 'product.tt'; - $c->stash->{product} = $c->req->snippets->[0]; - } - ); + sub product : Regex('^product[_]*(\d*).html$') { + my ( $self, $c ) = @_; + $c->stash->{template} = 'product.tt'; + $c->stash->{product} = $c->req->snippets->[0]; + } See also L =head1 DESCRIPTION -Catalyst is based upon L, which you should consider for smaller -projects. - The key concept of Catalyst is DRY (Don't Repeat Yourself). See L for more documentation. @@ -125,79 +124,22 @@ Returns a hashref containing your applications settings. =cut -sub config { - my $self = shift; - $self->_config( {} ) unless $self->_config; - if ( $_[0] ) { - my $config = $_[1] ? {@_} : $_[0]; - while ( my ( $key, $val ) = each %$config ) { - $self->_config->{$key} = $val; - } - } - return $self->_config; -} - sub import { - my ( $self, @options ) = @_; - my $caller = caller(0); - - unless ( $caller->isa($self) ) { - no strict 'refs'; - push @{"$caller\::ISA"}, $self; - } + my ( $class, @arguments ) = @_; + + # We have to limit $class to Catalyst to avoid pushing Catalyst upon every + # callers @ISA. + return unless $class eq 'Catalyst'; - unless ( $caller->log ) { - $caller->log( Catalyst::Log->new ); - } + my $caller = caller(0); - if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($caller) . '_DEBUG' } ) { + unless ( $caller->isa('Catalyst') ) { no strict 'refs'; - *{"$caller\::debug"} = sub { 1 }; - $caller->log->debug('Debug messages enabled'); + push @{"$caller\::ISA"}, $class; } - # Options - my $engine = $ENV{MOD_PERL} - ? 'Catalyst::Engine::Apache' - : 'Catalyst::Engine::CGI'; - - foreach (@options) { - if (/^\-Debug$/) { - next if $caller->debug; - no strict 'refs'; - *{"$caller\::debug"} = sub { 1 }; - $caller->log->debug('Debug messages enabled'); - } - elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" } - elsif (/^-.*$/) { $caller->log->error(qq/Unknown flag "$_"/) } - else { - my $plugin = "Catalyst::Plugin::$_"; - - # Plugin caller should be our application class - eval "package $caller; require $plugin"; - if ($@) { - $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/); - } - else { - $caller->log->debug(qq/Loaded plugin "$plugin"/) - if $caller->debug; - no strict 'refs'; - push @{"$caller\::ISA"}, $plugin; - } - } - } - - # Engine - $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}" - if $ENV{CATALYST_ENGINE}; - $engine->require; - die qq/Couldn't load engine "$engine", "$@"/ if $@; - { - no strict 'refs'; - push @{"$caller\::ISA"}, $engine; - } - $caller->engine($engine); - $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug; + $caller->arguments( [ @arguments ] ); + $caller->setup_home; } =item $c->engine @@ -215,9 +157,58 @@ C object. To use your own log class: Your log class should implement the methods described in the C man page. +=item $c->plugin( $name, $class, @args ) + +Instant plugins for Catalyst. +Classdata accessor/mutator will be created, class loaded and instantiated. + + MyApp->plugin( 'prototype', 'HTML::Prototype' ); + + $c->prototype->define_javascript_functions; + +=cut + +sub plugin { + my ( $class, $name, $plugin, @args ) = @_; + $plugin->require; + + if ( my $error = $UNIVERSAL::require::ERROR ) { + Catalyst::Exception->throw( + message => qq/Couldn't load instant plugin "$plugin", "$error"/ + ); + } + + eval { $plugin->import }; + $class->mk_classdata($name); + my $obj; + eval { $obj = $plugin->new(@args) }; + + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't instantiate instant plugin "$plugin", "$@"/ + ); + } + + $class->$name($obj); + $class->log->debug(qq/Initialized instant plugin "$plugin" as "$name"/) + if $class->debug; +} =back +=head1 CASE SENSITIVITY + +By default Catalyst is not case sensitive, so C becomes +C. + +But you can activate case sensitivity with a config parameter. + + MyApp->config->{case_sensitive} = 1; + +=head1 LIMITATIONS + +mod_perl2 support is considered experimental and may contain bugs. + =head1 SUPPORT IRC: @@ -229,10 +220,27 @@ Mailing-Lists: http://lists.rawmode.org/mailman/listinfo/catalyst http://lists.rawmode.org/mailman/listinfo/catalyst-dev +Web: + + http://catalyst.perl.org + =head1 SEE ALSO -L, L, L, -L, L +=over 4 + +=item L - The Catalyst Manual + +=item L - Core Engine + +=item L - The Log Class. + +=item L - The Request Object + +=item L - The Response Object + +=item L - The test suite. + +=back =head1 AUTHOR @@ -240,10 +248,11 @@ Sebastian Riedel, C =head1 THANK YOU -Andrew Ford, Andrew Ruthven, Christian Hansen, Christopher Hicks, -Dan Sully, Danijel Milicevic, David Naughton, Gary Ashton Jones, -Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa -and all the others who've helped. +Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen, +Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton, +Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka, +Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg, +Tatsuhiko Miyagawa and all the others who've helped. =head1 LICENSE