X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=ccc996e35d18deb0451de3caf2e1821fc589f8ac;hb=bfdaffa8cfd20d905dc451b05505d0ad8d476bea;hp=22deaf11b336e1665a723f82d11bf17db225ed1a;hpb=9bfaf006d5c1cde4938a32e97e1cc58f1c5befa4;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 22deaf1..ccc996e 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -49,7 +49,6 @@ our $COUNT = 1; our $START = time; our $RECURSION = 1000; our $DETACH = "catalyst_detach\n"; -our $GO = "catalyst_go\n"; __PACKAGE__->mk_classdata($_) for qw/components arguments dispatcher engine log dispatcher_class @@ -64,7 +63,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.7014'; +our $VERSION = '5.7099_03'; sub import { my ( $class, @arguments ) = @_; @@ -98,7 +97,7 @@ documentation and tutorials. catalyst.pl MyApp # add models, views, controllers - script/myapp_create.pl model MyDatabase DBIC::Schema create=dynamic dbi:SQLite:/path/to/db + script/myapp_create.pl model MyDatabase DBIC::Schema create=static dbi:SQLite:/path/to/db script/myapp_create.pl view MyTemplate TT script/myapp_create.pl controller Search @@ -328,20 +327,6 @@ When called with no arguments it escapes the processing chain entirely. sub detach { my $c = shift; $c->dispatcher->detach( $c, @_ ) } -=head2 $c->go( $action [, \@arguments ] ) - -=head2 $c->go( $class, $method, [, \@arguments ] ) - -Almost the same as C, but does a full dispatch, instead of just -calling the new C<$action> / C<$class-E$method>. This means that C, -C and the method you go to is called, just like a new request. - -C<$c-Estash> is kept unchanged. - -=cut - -sub go { my $c = shift; $c->dispatcher->go( $c, @_ ) } - =head2 $c->response =head2 $c->res @@ -452,10 +437,16 @@ sub _comp_search_prefixes { # regexp fallback $query = qr/$name/i; - @result = grep { $eligible{ $_ } =~ m{$query} } keys %eligible; + @result = map { $c->components->{ $_ } } grep { $eligible{ $_ } =~ m{$query} } keys %eligible; + + # no results? try against full names + if( !@result ) { + @result = map { $c->components->{ $_ } } grep { m{$query} } keys %eligible; + } # don't warn if we didn't find any results, it just might not exist if( @result ) { + $c->log->warn( qq(Found results for "${name}" using regexp fallback.) ); $c->log->warn( 'Relying on the regexp fallback behavior for component resolution is unreliable and unsafe.' ); $c->log->warn( 'If you really want to search, pass in a regexp as the argument.' ); } @@ -525,7 +516,7 @@ Gets a L instance by name. Any extra arguments are directly passed to ACCEPT_CONTEXT. If the name is omitted, it will look for - - a model object in $c->stash{current_model_instance}, then + - a model object in $c->stash->{current_model_instance}, then - a model name in $c->stash->{current_model}, then - a config setting 'default_model', or - check if there is only one model, and return it if that's the case. @@ -578,7 +569,7 @@ Gets a L instance by name. Any extra arguments are directly passed to ACCEPT_CONTEXT. If the name is omitted, it will look for - - a view object in $c->stash{current_view_instance}, then + - a view object in $c->stash->{current_view_instance}, then - a view name in $c->stash->{current_view}, then - a config setting 'default_view', or - check if there is only one view, and return it if that's the case. @@ -677,11 +668,13 @@ sub component { if( !ref $name ) { # is it the exact name? - return $comps->{ $name } if exists $comps->{ $name }; + return $c->_filter_component( $comps->{ $name }, @args ) + if exists $comps->{ $name }; # perhaps we just omitted "MyApp"? my $composed = ( ref $c || $c ) . "::${name}"; - return $comps->{ $composed } if exists $comps->{ $composed }; + return $c->_filter_component( $comps->{ $composed }, @args ) + if exists $comps->{ $composed }; # search all of the models, views and controllers my( $comp ) = $c->_comp_search_prefixes( $name, qw/Model M Controller C View V/ ); @@ -692,12 +685,13 @@ sub component { my $query = ref $name ? $name : qr{$name}i; my @result = grep { m{$query} } keys %{ $c->components }; - return @result if ref $name; + return map { $c->_filter_component( $_, @args ) } @result if ref $name; if( $result[ 0 ] ) { + $c->log->warn( qq(Found results for "${name}" using regexp fallback.) ); $c->log->warn( 'Relying on the regexp fallback behavior for component resolution' ); $c->log->warn( 'is unreliable and unsafe. You have been warned' ); - return $result[ 0 ]; + return $c->_filter_component( $result[ 0 ], @args ); } # I would expect to return an empty list here, but that breaks back-compat @@ -960,23 +954,75 @@ EOF $class->setup_finished(1); } +=head2 $c->uri_for( $action, \@captures?, @args?, \%query_values? ) + =head2 $c->uri_for( $path, @args?, \%query_values? ) -Merges path with C<< $c->request->base >> for absolute URIs and with -C<< $c->namespace >> for relative URIs, then returns a normalized L -object. If any args are passed, they are added at the end of the path. -If the last argument to C is a hash reference, it is assumed to -contain GET parameter key/value pairs, which will be appended to the URI -in standard fashion. +=over + +=item $action + +A Catalyst::Action object representing the Catalyst action you want to +create a URI for. To get one for an action in the current controller, +use C<< $c->action('someactionname') >>. To get one from different +controller, fetch the controller using C<< $c->controller() >>, then +call C on it. + +This method must be used to create URIs for +L actions. + +=item $path + +The actual path you wish to create a URI for, this is a public path, +not a private action path. + +=item \@captures + +If provided, this argument is used to insert values into a I +action in the parts where the definitions contain I. If +not needed, leave out this argument. + +=item @args + +If provided, this is used as a list of further path sections to append +to the URI. In a I action these are the equivalent to the +endpoint L. -Note that uri_for is destructive to the passed hashref. Subsequent calls -with the same hashref may have unintended results. +=item \%query_values -Instead of C<$path>, you can also optionally pass a C<$action> object -which will be resolved to a path using -C<< $c->dispatcher->uri_for_action >>; if the first element of -C<@args> is an arrayref it is treated as a list of captures to be passed -to C. +If provided, the query_values hashref is used to add query parameters +to the URI, with the keys as the names, and the values as the values. + +=back + +Returns a L object. + + ## Ex 1: a path with args and a query parameter + $c->uri_for('user/list', 'short', { page => 2}); + ## -> ($c->req->base is 'http://localhost:3000/' + URI->new('http://localhost:3000/user/list/short?page=2) + + ## Ex 2: a chained view action that captures the user id + ## In controller: + sub user : Chained('/'): PathPart('myuser'): CaptureArgs(1) {} + sub viewuser : Chained('user'): PathPart('view') {} + + ## In uri creating code: + my $uaction = $c->controller('Users')->action_for('viewuser'); + $c->uri_for($uaction, [ 42 ]); + ## outputs: + URI->new('http://localhost:3000/myuser/42/view') + +Creates a URI object using C<< $c->request->base >> and a path. If an +Action object is given instead of a path, the path is constructed +using C<< $c->dispatcher->uri_for_action >> and passing it the +@captures array, if supplied. + +If any query parameters are passed they are added to the end of the +URI in the usual way. + +Note that uri_for is destructive to the passed query values hashref. +Subsequent calls with the same hashref may have unintended results. =cut @@ -1278,9 +1324,6 @@ sub execute { if ( !ref($error) and $error eq $DETACH ) { die $DETACH if($c->depth > 1); } - elsif ( !ref($error) and $error eq $GO ) { - die $GO if($c->depth > 0); - } else { unless ( ref $error ) { no warnings 'uninitialized'; @@ -1906,6 +1949,11 @@ search paths, specify a key named C as an array reference. Items in the array beginning with C<::> will have the application class name prepended to them. +All components found will also have any +L loaded and set up as components. +Note, that modules which are B an I of the main +file namespace loaded will not be instantiated as components. + =cut sub setup_components { @@ -2411,13 +2459,15 @@ Wiki: =head2 L - The test suite. -=head1 CREDITS +=head1 PROJECT FOUNDER -Andy Grundman +sri: Sebastian Riedel -Andy Wardley +=head1 CONTRIBUTORS -Andreas Marienborg +abw: Andy Wardley + +acme: Leon Brocard Andrew Bramble @@ -2425,65 +2475,67 @@ Andrew Ford Andrew Ruthven -Arthur Bergman +andyg: Andy Grundman -Autrijus Tang +audreyt: Audrey Tang -Brian Cassidy +bricas: Brian Cassidy -Carl Franks +chansen: Christian Hansen -Christian Hansen +chicks: Christopher Hicks -Christopher Hicks +dkubb: Dan Kubb -Dan Sully +Drew Taylor -Danijel Milicevic +esskar: Sascha Kiefer -David Kamholz +fireartist: Carl Franks -David Naughton - -Drew Taylor +gabb: Danijel Milicevic Gary Ashton Jones Geoff Richards -Jesse Sheidlower - -Jesse Vincent +jcamacho: Juan Camacho Jody Belka Johan Lindstrom -Juan Camacho +jon: Jon Schutz -Leon Brocard +marcus: Marcus Ramberg -Marcus Ramberg +miyagawa: Tatsuhiko Miyagawa -Matt S Trout +mst: Matt S. Trout -Robert Sedlacek +mugwump: Sam Vilain -Sam Vilain +naughton: David Naughton -Sascha Kiefer +ningu: David Kamholz -Sebastian Willert +nothingmuch: Yuval Kogman -Tatsuhiko Miyagawa +numa: Dan Sully -Ulf Edvinsson +obra: Jesse Vincent + +omega: Andreas Marienborg + +phaylon: Robert Sedlacek -Yuval Kogman +sky: Arthur Bergman -=head1 AUTHOR +the_jester: Jesse Sheidlower + +Ulf Edvinsson -Sebastian Riedel, C +willert: Sebastian Willert =head1 LICENSE