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=e7cc9a943d40e60e893142cf5526ad559225f87e;hb=e63948476024f865b8e84967ffe71681e90f2a4c;hpb=d1a31ac68c5b7f93e3b1f99c08006638bce7c907 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index e7cc9a9..2c6ca19 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1,14 +1,19 @@ package Catalyst; use strict; -use base 'Catalyst::Base'; +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/dispatcher engine log/; +__PACKAGE__->mk_classdata($_) for qw/arguments dispatcher engine log/; -our $VERSION = '5.00'; +our $VERSION = '5.31'; our @ISA; =head1 NAME @@ -22,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; @@ -46,10 +51,10 @@ Catalyst - The Elegant MVC Web Application Framework sub index : Path('/index.html') { my ( $self, $c ) = @_; $c->res->output('Hello'); - $c->forward('_foo'); + $c->forward('foo'); } - sub product : Regex('/^product[_]*(\d*).html$/') { + sub product : Regex('^product[_]*(\d*).html$') { my ( $self, $c ) = @_; $c->stash->{template} = 'product.tt'; $c->stash->{product} = $c->req->snippets->[0]; @@ -59,9 +64,6 @@ 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. @@ -123,139 +125,89 @@ Returns a hashref containing your applications settings. =cut sub import { - my ( $self, @options ) = @_; + my ( $class, @arguments ) = @_; + + # We have to limit $class to Catalyst to avoid pushing Catalyst upon every + # callers @ISA. + return unless $class eq 'Catalyst'; + my $caller = caller(0); - # Prepare inheritance - unless ( $caller->isa($self) ) { + unless ( $caller->isa('Catalyst') ) { no strict 'refs'; - push @{"$caller\::ISA"}, $self; - } - - if ( $caller->engine ) { - return; # Catalyst is allready initialized - } - - unless ( $caller->log ) { - $caller->log( Catalyst::Log->new ); + push @{"$caller\::ISA"}, $class; } - # Debug? - if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($caller) . '_DEBUG' } ) { - no strict 'refs'; - *{"$caller\::debug"} = sub { 1 }; - $caller->log->debug('Debug messages enabled'); - } + $caller->arguments( [ @arguments ] ); + $caller->setup_home; +} - my $engine = 'Catalyst::Engine::CGI'; - my $dispatcher = 'Catalyst::Dispatcher'; +=item $c->engine - # Detect mod_perl - if ( $ENV{MOD_PERL} ) { +Contains the engine class. - require mod_perl; +=item $c->log - if ( $mod_perl::VERSION >= 1.99 ) { - $engine = 'Catalyst::Engine::Apache::MP19'; - } - else { - $engine = 'Catalyst::Engine::Apache::MP13'; - } - } +Contains the logging object. Unless it is already set Catalyst sets this up with a +C object. To use your own log class: - # Process options - my @plugins; - foreach (@options) { + $c->log( MyLogger->new ); + $c->log->info("now logging with my own logger!"); - if (/^\-Debug$/) { - next if $caller->debug; - no strict 'refs'; - *{"$caller\::debug"} = sub { 1 }; - $caller->log->debug('Debug messages enabled'); - } +Your log class should implement the methods described in the C +man page. - elsif (/^-Dispatcher=(.*)$/) { - $dispatcher = "Catalyst::Dispatcher::$1"; - } +=item $c->plugin( $name, $class, @args ) - elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" } - elsif (/^-.*$/) { $caller->log->error(qq/Unknown flag "$_"/) } +Instant plugins for Catalyst. +Classdata accessor/mutator will be created, class loaded and instantiated. - else { - my $plugin = "Catalyst::Plugin::$_"; + MyApp->plugin( 'prototype', 'HTML::Prototype' ); - $plugin->require; + $c->prototype->define_javascript_functions; - if ($@) { die qq/Couldn't load plugin "$plugin", "$@"/ } - else { - push @plugins, $plugin; - no strict 'refs'; - push @{"$caller\::ISA"}, $plugin; - } - } +=cut - } +sub plugin { + my ( $class, $name, $plugin, @args ) = @_; + $plugin->require; - # Plugin table - my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } ); - $t->setCols('Class'); - $t->setColWidth( 'Class', 75, 1 ); - $t->addRow($_) for @plugins; - $caller->log->debug( 'Loaded plugins', $t->draw ) - if ( @plugins && $caller->debug ); - - # 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; + if ( my $error = $UNIVERSAL::require::ERROR ) { + Catalyst::Exception->throw( + message => qq/Couldn't load instant plugin "$plugin", "$error"/ + ); } - $caller->engine($engine); - $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug; - # Dispatcher - $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}" - if $ENV{CATALYST_DISPATCHER}; + eval { $plugin->import }; + $class->mk_classdata($name); + my $obj; + eval { $obj = $plugin->new(@args) }; - $dispatcher->require; - die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@; - { - no strict 'refs'; - push @{"$caller\::ISA"}, $dispatcher; + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't instantiate instant plugin "$plugin", "$@"/ + ); } - $caller->dispatcher($dispatcher); - $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug; + $class->$name($obj); + $class->log->debug(qq/Initialized instant plugin "$plugin" as "$name"/) + if $class->debug; } -=item $c->engine - -Contains the engine class. - -=item $c->log - -Contains the logging object. Unless it is already set Catalyst sets this up with a -C object. To use your own log class: +=back - $c->log( MyLogger->new ); - $c->log->info("now logging with my own logger!"); +=head1 CASE SENSITIVITY -Your log class should implement the methods described in the C -man page. +By default Catalyst is not case sensitive, so C becomes +C. +But you can activate case sensitivity with a config parameter. -=back + MyApp->config->{case_sensitive} = 1; =head1 LIMITATIONS -FCGI and mod_perl2 support are considered experimental and may contain bugs. - -You may encounter problems accessing the built in test server on public ip -addresses on the internet, thats because of a bug in HTTP::Daemon. +mod_perl2 support is considered experimental and may contain bugs. =head1 SUPPORT @@ -268,6 +220,10 @@ 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 =over 4 @@ -292,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