X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=de7e082ba29e9c7ca98fd583fae07f3256992f6c;hp=41a5049c96928f55cd1c7aa815386c2dce7c917f;hb=21465c884872c1ec8c30acd72796445f9eaacb31;hpb=a135d186f7acefbbab74e8e6d9a43ccd3560d326 diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 41a5049..de7e082 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -2,40 +2,35 @@ package Catalyst::Engine; use strict; use base qw/Class::Data::Inheritable Class::Accessor::Fast/; +use attributes (); use UNIVERSAL::require; use CGI::Cookie; use Data::Dumper; use HTML::Entities; use HTTP::Headers; -use Memoize; use Time::HiRes qw/gettimeofday tv_interval/; use Text::ASCIITable; -use Text::ASCIITable::Wrap 'wrap'; -use Tree::Simple; -use Tree::Simple::Visitor::FindByPath; +use Catalyst::Exception; use Catalyst::Request; +use Catalyst::Request::Upload; use Catalyst::Response; +use Catalyst::Utils; -require Module::Pluggable::Fast; - -$Data::Dumper::Terse = 1; - -__PACKAGE__->mk_classdata($_) for qw/actions components tree/; -__PACKAGE__->mk_accessors(qw/request response state/); - -__PACKAGE__->actions( - { plain => {}, private => {}, regex => {}, compiled => [], reverse => {} } -); -__PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) ); +__PACKAGE__->mk_classdata('components'); +__PACKAGE__->mk_accessors(qw/counter depth request response state/); *comp = \&component; *req = \&request; *res = \&response; -our $COUNT = 1; -our $START = time; +# For backwards compatibility +*finalize_output = \&finalize_body; -memoize('_class2prefix'); +# For statistics +our $COUNT = 1; +our $START = time; +our $RECURSION = 1000; +our $DETACH = "catalyst_detach\n"; =head1 NAME @@ -84,61 +79,35 @@ Regex search for a component. =cut sub component { - my ( $c, $name ) = @_; - if ( my $component = $c->components->{$name} ) { - return $component; - } - else { - for my $component ( keys %{ $c->components } ) { - return $c->components->{$component} if $component =~ /$name/i; - } - } -} - -=item $c->dispatch + my $c = shift; -Dispatch request to actions. + if (@_) { -=cut + my $name = shift; -sub dispatch { - my $c = shift; - my $action = $c->req->action; - my $namespace = ''; - $namespace = ( join( '/', @{ $c->req->args } ) || '/' ) - if $action eq 'default'; - unless ($namespace) { - if ( my $result = $c->get_action($action) ) { - $namespace = _class2prefix( $result->[0]->[0]->[0] ); - } - } - my $default = $action eq 'default' ? $namespace : undef; - my $results = $c->get_action( $action, $default ); - $namespace ||= '/'; - if ( @{$results} ) { - for my $begin ( @{ $c->get_action( 'begin', $namespace ) } ) { - $c->execute( @{ $begin->[0] } ); + if ( my $component = $c->components->{$name} ) { + return $component; } - if ( my $action = $c->req->action ) { - for my $result ( @{ $c->get_action( $action, $default ) }[-1] ) { - $c->execute( @{ $result->[0] } ); - last unless $default; + + else { + for my $component ( keys %{ $c->components } ) { + return $c->components->{$component} if $component =~ /$name/i; } } - for my $end ( reverse @{ $c->get_action( 'end', $namespace ) } ) { - $c->execute( @{ $end->[0] } ); - } - } - else { - my $path = $c->req->path; - my $error = $path - ? qq/Unknown resource "$path"/ - : "No default action defined"; - $c->log->error($error) if $c->debug; - $c->error($error); } + + return sort keys %{ $c->components }; } +=item $c->counter + +Returns a hashref containing coderefs and execution counts. +(Needed for deep recursion detection) + +=item $c->depth + +Returns the actual forward depth. + =item $c->error =item $c->error($error, ...) @@ -171,28 +140,53 @@ Errors are available via $c->error. sub execute { my ( $c, $class, $code ) = @_; - $class = $c->comp($class) || $class; + $class = $c->components->{$class} || $class; $c->state(0); my $callsub = ( caller(1) )[3]; + + my $action = ''; + if ( $c->debug ) { + $action = $c->actions->{reverse}->{"$code"}; + $action = "/$action" unless $action =~ /\-\>/; + $c->counter->{"$code"}++; + + if ( $c->counter->{"$code"} > $RECURSION ) { + my $error = qq/Deep recursion detected in "$action"/; + $c->log->error($error); + $c->error($error); + $c->state(0); + return $c->state; + } + + $action = "-> $action" if $callsub =~ /forward$/; + } + + $c->{depth}++; eval { if ( $c->debug ) { - my $action = $c->actions->{reverse}->{"$code"}; - $action = "/$action" unless $action =~ /\-\>/; - $action = "-> $action" if $callsub =~ /forward$/; my ( $elapsed, @state ) = $c->benchmark( $code, $class, $c, @{ $c->req->args } ); push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ]; $c->state(@state); } - else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) } + else { $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ) } }; + $c->{depth}--; + if ( my $error = $@ ) { - chomp $error; - $error = qq/Caught exception "$error"/; - $c->log->error($error); - $c->error($error) if $c->debug; - $c->state(0); + + if ( $error eq $DETACH ) { die $DETACH if $c->{depth} > 1 } + else { + unless ( ref $error ) { + chomp $error; + $error = qq/Caught exception "$error"/; + } + + $c->log->error($error); + $c->error($error); + $c->state(0); + } } return $c->state; } @@ -211,27 +205,47 @@ sub finalize { if ( my $location = $c->response->redirect ) { $c->log->debug(qq/Redirecting to "$location"/) if $c->debug; $c->response->header( Location => $location ); - $c->response->status(302) if $c->response->status !~ /3\d\d$/; + $c->response->status(302) if $c->response->status !~ /^3\d\d$/; } if ( $#{ $c->error } >= 0 ) { $c->finalize_error; } - if ( !$c->response->output && $c->response->status !~ /^(1|3)\d\d$/ ) { + if ( !$c->response->body && $c->response->status == 200 ) { $c->finalize_error; } - if ( $c->response->output && !$c->response->content_length ) { - use bytes; # play safe with a utf8 aware perl - $c->response->content_length( length $c->response->output ); + if ( $c->response->body && !$c->response->content_length ) { + $c->response->content_length( bytes::length( $c->response->body ) ); + } + + if ( $c->response->status =~ /^(1\d\d|[23]04)$/ ) { + $c->response->headers->remove_header("Content-Length"); + $c->response->body(''); + } + + if ( $c->request->method eq 'HEAD' ) { + $c->response->body(''); } my $status = $c->finalize_headers; - $c->finalize_output; + $c->finalize_body; return $status; } +=item $c->finalize_output + +, see finalize_body + +=item $c->finalize_body + +Finalize body. + +=cut + +sub finalize_body { } + =item $c->finalize_cookies Finalize cookies. @@ -269,7 +283,12 @@ sub finalize_error { my ( $title, $error, $infos ); if ( $c->debug ) { - $error = join '
', @{ $c->error }; + + # For pretty dumps + local $Data::Dumper::Terse = 1; + $error = join '', + map { '' . encode_entities($_) . '' } + @{ $c->error }; $error ||= 'No output'; $title = $name = "$name on Catalyst $Catalyst::VERSION"; my $req = encode_entities Dumper $c->req; @@ -302,7 +321,7 @@ sub finalize_error { $name = ''; } - $c->res->output( <<"" ); + $c->res->body( <<"" ); $title @@ -345,6 +364,12 @@ sub finalize_error { margin: 4px; -moz-border-radius: 10px; } + code.error { + display: block; + margin: 1em 0; + overflow: auto; + white-space: pre; + } @@ -366,159 +391,56 @@ Finalize headers. sub finalize_headers { } -=item $c->finalize_output - -Finalize output. - -=cut - -sub finalize_output { } - -=item $c->forward($command) - -Forward processing to a private action or a method from a class. -If you define a class without method it will default to process(). - - $c->forward('/foo'); - $c->forward('index'); - $c->forward(qw/MyApp::Model::CDBI::Foo do_stuff/); - $c->forward('MyApp::View::TT'); - -=cut - -sub forward { - my $c = shift; - my $command = shift; - unless ($command) { - $c->log->debug('Nothing to forward to') if $c->debug; - return 0; - } - my $caller = caller(0); - my $namespace = '/'; - if ( $command =~ /^\// ) { - $command =~ /^(.*)\/(\w+)$/; - $namespace = $1 || '/'; - $command = $2; - } - else { $namespace = _class2prefix($caller) || '/' } - my $results = $c->get_action( $command, $namespace ); - unless ( @{$results} ) { - my $class = $command; - if ( $class =~ /[^\w\:]/ ) { - $c->log->debug(qq/Couldn't forward to "$class"/) if $c->debug; - return 0; - } - my $method = shift || 'process'; - if ( my $code = $class->can($method) ) { - $c->actions->{reverse}->{"$code"} = "$class->$method"; - $results = [ [ [ $class, $code ] ] ]; - } - else { - $c->log->debug(qq/Couldn't forward to "$class->$method"/) - if $c->debug; - return 0; - } - } - for my $result ( @{$results} ) { - $c->execute( @{ $result->[0] } ); - } - return $c->state; -} - -=item $c->get_action( $action, $namespace ) - -Get an action in a given namespace. - -=cut - -sub get_action { - my ( $c, $action, $namespace ) = @_; - return [] unless $action; - $namespace ||= ''; - if ($namespace) { - $namespace = '' if $namespace eq '/'; - my $parent = $c->tree; - my @results; - my $result = $c->actions->{private}->{ $parent->getUID }->{$action}; - push @results, [$result] if $result; - my $visitor = Tree::Simple::Visitor::FindByPath->new; - for my $part ( split '/', $namespace ) { - $visitor->setSearchPath($part); - $parent->accept($visitor); - my $child = $visitor->getResult; - my $uid = $child->getUID if $child; - my $match = $c->actions->{private}->{$uid}->{$action} if $uid; - push @results, [$match] if $match; - $parent = $child if $child; - } - return \@results; - } - elsif ( my $p = $c->actions->{plain}->{$action} ) { return [ [$p] ] } - elsif ( my $r = $c->actions->{regex}->{$action} ) { return [ [$r] ] } - else { - for my $i ( 0 .. $#{ $c->actions->{compiled} } ) { - my $name = $c->actions->{compiled}->[$i]->[0]; - my $regex = $c->actions->{compiled}->[$i]->[1]; - if ( $action =~ $regex ) { - my @snippets; - for my $i ( 1 .. 9 ) { - no strict 'refs'; - last unless ${$i}; - push @snippets, ${$i}; - } - return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ]; - } - } - } - return []; -} - -=item $c->handler( $class, $r ) +=item $c->handler( $class, @arguments ) Handles the request. =cut sub handler { - my ( $class, $engine ) = @_; + my ( $class, @arguments ) = @_; # Always expect worst case! my $status = -1; eval { my @stats = (); + my $handler = sub { - my $c = $class->prepare($engine); + my $c = $class->prepare(@arguments); $c->{stats} = \@stats; $c->dispatch; return $c->finalize; }; + if ( $class->debug ) { my $elapsed; ( $elapsed, $status ) = $class->benchmark($handler); $elapsed = sprintf '%f', $elapsed; - my $av = sprintf '%.3f', 1 / $elapsed; + my $av = sprintf '%.3f', + ( $elapsed == 0 ? '??' : ( 1 / $elapsed ) ); my $t = Text::ASCIITable->new; $t->setCols( 'Action', 'Time' ); $t->setColWidth( 'Action', 64, 1 ); $t->setColWidth( 'Time', 9, 1 ); - for my $stat (@stats) { - $t->addRow( wrap( $stat->[0], 64 ), wrap( $stat->[1], 9 ) ); - } - $class->log->info( "Request took $elapsed" . "s ($av/s)", - $t->draw ); + for my $stat (@stats) { $t->addRow( $stat->[0], $stat->[1] ) } + $class->log->info( + "Request took ${elapsed}s ($av/s)\n" . $t->draw ); } else { $status = &$handler } + }; + if ( my $error = $@ ) { chomp $error; $class->log->error(qq/Caught exception in engine "$error"/); } + $COUNT++; return $status; } -=item $c->prepare($r) +=item $c->prepare(@arguments) Turns the engine-specific request( Apache, CGI ... ) into a Catalyst context . @@ -526,24 +448,34 @@ into a Catalyst context . =cut sub prepare { - my ( $class, $r ) = @_; + my ( $class, @arguments ) = @_; + my $c = bless { + counter => {}, + depth => 0, request => Catalyst::Request->new( { arguments => [], cookies => {}, headers => HTTP::Headers->new, parameters => {}, + secure => 0, snippets => [], uploads => {} } ), response => Catalyst::Response->new( - { cookies => {}, headers => HTTP::Headers->new, status => 200 } + { + body => '', + cookies => {}, + headers => HTTP::Headers->new( 'Content-Length' => 0 ), + status => 200 + } ), stash => {}, state => 0 }, $class; + if ( $c->debug ) { my $secs = time - $START || 1; my $av = sprintf '%.3f', $COUNT / $secs; @@ -552,32 +484,52 @@ sub prepare { $c->log->debug('**********************************'); $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION ); } - $c->prepare_request($r); - $c->prepare_path; + + $c->prepare_request(@arguments); + $c->prepare_connection; $c->prepare_headers; $c->prepare_cookies; - $c->prepare_connection; - my $method = $c->req->method || ''; - my $path = $c->req->path || ''; - my $hostname = $c->req->hostname || ''; - my $address = $c->req->address || ''; - $c->log->debug(qq/"$method" request for "$path" from $hostname($address)/) - if $c->debug; + $c->prepare_path; $c->prepare_action; - $c->prepare_parameters; + + my $method = $c->req->method || ''; + my $path = $c->req->path || ''; + my $address = $c->req->address || ''; + + $c->log->debug(qq/"$method" request for "$path" from $address/) + if $c->debug; + + if ( $c->request->method eq 'POST' and $c->request->content_length ) { + + if ( $c->req->content_type eq 'application/x-www-form-urlencoded' ) { + $c->prepare_parameters; + } + elsif ( $c->req->content_type eq 'multipart/form-data' ) { + $c->prepare_parameters; + $c->prepare_uploads; + } + else { + $c->prepare_body; + } + } + + if ( $c->request->method eq 'GET' ) { + $c->prepare_parameters; + } if ( $c->debug && keys %{ $c->req->params } ) { my $t = Text::ASCIITable->new; $t->setCols( 'Key', 'Value' ); $t->setColWidth( 'Key', 37, 1 ); $t->setColWidth( 'Value', 36, 1 ); - for my $key ( keys %{ $c->req->params } ) { - my $value = $c->req->params->{$key} || ''; - $t->addRow( wrap( $key, 37 ), wrap( $value, 36 ) ); + for my $key ( sort keys %{ $c->req->params } ) { + my $param = $c->req->params->{$key}; + my $value = defined($param) ? $param : ''; + $t->addRow( $key, $value ); } - $c->log->debug( 'Parameters are', $t->draw ); + $c->log->debug( "Parameters are:\n" . $t->draw ); } - $c->prepare_uploads; + return $c; } @@ -592,6 +544,7 @@ sub prepare_action { my $path = $c->req->path; my @path = split /\//, $c->req->path; $c->req->args( \my @args ); + while (@path) { $path = join '/', @path; if ( my $result = ${ $c->get_action($path) }[0] ) { @@ -609,23 +562,35 @@ sub prepare_action { $c->req->action($match); $c->req->snippets( \@snippets ); } + else { $c->req->action($path); $c->log->debug(qq/Requested action is "$path"/) if $c->debug; } + $c->req->match($path); last; } unshift @args, pop @path; } + unless ( $c->req->action ) { $c->req->action('default'); $c->req->match(''); } + $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' ) if ( $c->debug && @args ); } +=item $c->prepare_body + +Prepare message body. + +=cut + +sub prepare_body { } + =item $c->prepare_connection Prepare connection. @@ -712,219 +677,6 @@ Returns a C object. my $res = $c->res; -=item $c->set_action( $action, $code, $namespace, $attrs ) - -Set an action in a given namespace. - -=cut - -sub set_action { - my ( $c, $method, $code, $namespace, $attrs ) = @_; - - my $prefix = _class2prefix($namespace) || ''; - my %flags; - - for my $attr ( @{$attrs} ) { - if ( $attr =~ /^(Local|Relative)$/ ) { $flags{local}++ } - elsif ( $attr =~ /^(Global|Absolute)$/ ) { $flags{global}++ } - elsif ( $attr =~ /^Path\((.+)\)$/i ) { $flags{path} = $1 } - elsif ( $attr =~ /^Private$/i ) { $flags{private}++ } - elsif ( $attr =~ /^(Regex|Regexp)\((.+)\)$/i ) { $flags{regex} = $2 } - } - - return unless keys %flags; - - my $parent = $c->tree; - my $visitor = Tree::Simple::Visitor::FindByPath->new; - for my $part ( split '/', $prefix ) { - $visitor->setSearchPath($part); - $parent->accept($visitor); - my $child = $visitor->getResult; - unless ($child) { - $child = $parent->addChild( Tree::Simple->new($part) ); - $visitor->setSearchPath($part); - $parent->accept($visitor); - $child = $visitor->getResult; - } - $parent = $child; - } - my $uid = $parent->getUID; - $c->actions->{private}->{$uid}->{$method} = [ $namespace, $code ]; - my $forward = $prefix ? "$prefix/$method" : $method; - - if ( $flags{path} ) { - $flags{path} =~ s/^\w+//; - $flags{path} =~ s/\w+$//; - if ( $flags{path} =~ /^'(.*)'$/ ) { $flags{path} = $1 } - if ( $flags{path} =~ /^"(.*)"$/ ) { $flags{path} = $1 } - } - if ( $flags{regex} ) { - $flags{regex} =~ s/^\w+//; - $flags{regex} =~ s/\w+$//; - if ( $flags{regex} =~ /^'(.*)'$/ ) { $flags{regex} = $1 } - if ( $flags{regex} =~ /^"(.*)"$/ ) { $flags{regex} = $1 } - } - - my $reverse = $prefix ? "$prefix/$method" : $method; - - if ( $flags{local} || $flags{global} || $flags{path} ) { - my $path = $flags{path} || $method; - my $absolute = 0; - if ( $path =~ /^\/(.+)/ ) { - $path = $1; - $absolute = 1; - } - $absolute = 1 if $flags{global}; - my $name = $absolute ? $path : "$prefix/$path"; - $c->actions->{plain}->{$name} = [ $namespace, $code ]; - } - if ( my $regex = $flags{regex} ) { - push @{ $c->actions->{compiled} }, [ $regex, qr#$regex# ]; - $c->actions->{regex}->{$regex} = [ $namespace, $code ]; - } - - $c->actions->{reverse}->{"$code"} = $reverse; -} - -=item $class->setup - -Setup. - - MyApp->setup; - -=cut - -sub setup { - my $self = shift; - $self->setup_components; - if ( $self->debug ) { - my $name = $self->config->{name} || 'Application'; - $self->log->info("$name powered by Catalyst $Catalyst::VERSION"); - } -} - -=item $class->setup_actions($component) - -Setup actions for a component. - -=cut - -sub setup_actions { - my ( $self, $comp ) = @_; - $comp = ref $comp || $comp; - for my $action ( @{ $comp->_cache } ) { - my ( $code, $attrs ) = @{$action}; - my $name = ''; - no strict 'refs'; - my @cache = ( $comp, @{"$comp\::ISA"} ); - my %namespaces; - while ( my $namespace = shift @cache ) { - $namespaces{$namespace}++; - for my $isa ( @{"$comp\::ISA"} ) { - next if $namespaces{$isa}; - push @cache, $isa; - $namespaces{$isa}++; - } - } - for my $namespace ( keys %namespaces ) { - for my $sym ( values %{ $namespace . '::' } ) { - if ( *{$sym}{CODE} && *{$sym}{CODE} == $code ) { - $name = *{$sym}{NAME}; - $self->set_action( $name, $code, $comp, $attrs ); - last; - } - } - } - } -} - -=item $class->setup_components - -Setup components. - -=cut - -sub setup_components { - my $self = shift; - - # Components - my $class = ref $self || $self; - eval <<""; - package $class; - import Module::Pluggable::Fast - name => '_components', - search => [ - '$class\::Controller', '$class\::C', - '$class\::Model', '$class\::M', - '$class\::View', '$class\::V' - ]; - - if ( my $error = $@ ) { - chomp $error; - $self->log->error( - qq/Couldn't initialize "Module::Pluggable::Fast", "$error"/); - } - $self->setup_actions($self); - $self->components( {} ); - for my $comp ( $self->_components($self) ) { - $self->components->{ ref $comp } = $comp; - $self->setup_actions($comp); - } - my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } ); - $t->setCols('Class'); - $t->setColWidth( 'Class', 75, 1 ); - $t->addRow( wrap( $_, 75 ) ) for keys %{ $self->components }; - $self->log->debug( 'Loaded components', $t->draw ) - if ( @{ $t->{tbl_rows} } && $self->debug ); - my $actions = $self->actions; - my $privates = Text::ASCIITable->new; - $privates->setCols( 'Private', 'Class', 'Code' ); - $privates->setColWidth( 'Private', 28, 1 ); - $privates->setColWidth( 'Class', 28, 1 ); - $privates->setColWidth( 'Code', 14, 1 ); - my $walker = sub { - my ( $walker, $parent, $prefix ) = @_; - $prefix .= $parent->getNodeValue || ''; - $prefix .= '/' unless $prefix =~ /\/$/; - my $uid = $parent->getUID; - for my $action ( keys %{ $actions->{private}->{$uid} } ) { - my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} }; - $privates->addRow( - wrap( "$prefix$action", 28 ), - wrap( $class, 28 ), - wrap( $code, 14 ) - ); - } - $walker->( $walker, $_, $prefix ) for $parent->getAllChildren; - }; - $walker->( $walker, $self->tree, '' ); - $self->log->debug( 'Loaded private actions', $privates->draw ) - if ( @{ $privates->{tbl_rows} } && $self->debug ); - my $publics = Text::ASCIITable->new; - $publics->setCols( 'Public', 'Private' ); - $publics->setColWidth( 'Public', 37, 1 ); - $publics->setColWidth( 'Private', 36, 1 ); - - for my $plain ( sort keys %{ $actions->{plain} } ) { - my ( $class, $code ) = @{ $actions->{plain}->{$plain} }; - $publics->addRow( wrap( "/$plain", 37 ), - wrap( $self->actions->{reverse}->{$code} || $code, 36 ) ); - } - $self->log->debug( 'Loaded public actions', $publics->draw ) - if ( @{ $publics->{tbl_rows} } && $self->debug ); - my $regexes = Text::ASCIITable->new; - $regexes->setCols( 'Regex', 'Private' ); - $regexes->setColWidth( 'Regex', 37, 1 ); - $regexes->setColWidth( 'Private', 36, 1 ); - for my $regex ( sort keys %{ $actions->{regex} } ) { - my ( $class, $code ) = @{ $actions->{regex}->{$regex} }; - $regexes->addRow( wrap( $regex, 37 ), - wrap( $self->actions->{reverse}->{$class} || $class, 36 ) ); - } - $self->log->debug( 'Loaded regex actions', $regexes->draw ) - if ( @{ $regexes->{tbl_rows} } && $self->debug ); -} - =item $c->state Contains the return value of the last executed action. @@ -940,8 +692,8 @@ Returns a hashref containing all your data. sub stash { my $self = shift; - if ( $_[0] ) { - my $stash = $_[1] ? {@_} : $_[0]; + if (@_) { + my $stash = @_ > 1 ? {@_} : $_[0]; while ( my ( $key, $val ) = each %$stash ) { $self->{stash}->{$key} = $val; } @@ -949,23 +701,6 @@ sub stash { return $self->{stash}; } -sub _prefix { - my ( $class, $name ) = @_; - my $prefix = _class2prefix($class); - $name = "$prefix/$name" if $prefix; - return $name; -} - -sub _class2prefix { - my $class = shift || ''; - my $prefix; - if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) { - $prefix = lc $2; - $prefix =~ s/\:\:/\//g; - } - return $prefix; -} - =back =head1 AUTHOR