endpoints are just routes

mojolicious · Sep 26, 2014 · 4642a80 · 4642a80
1 parent 1ef444e
commit 4642a80
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -72,8 +72,8 @@ sub _csrf_token {
 }
 
 sub _current_route {
-  return '' unless my $endpoint = shift->match->endpoint;
-  return @_ ? $endpoint->name eq shift : $endpoint->name;
+  return '' unless my $route = shift->match->endpoint;
+  return @_ ? $route->name eq shift : $route->name;
 }
 
 sub _delay {

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -158,8 +158,8 @@ sub template_for {
     if $controller && $action;
 
   # Try the route name if we don't have controller and action
-  return undef unless my $endpoint = $c->match->endpoint;
-  return $endpoint->name;
+  return undef unless my $route = $c->match->endpoint;
+  return $route->name;
 }
 
 sub template_handler {

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -92,9 +92,9 @@ sub match {
 
   # Check routes
   $match->match($c => {method => $method, path => $path, websocket => $ws});
-  return unless my $endpoint = $match->endpoint;
+  return unless my $route = $match->endpoint;
   $cache->set(
-    "$method:$path:$ws" => {endpoint => $endpoint, stack => $match->stack});
+    "$method:$path:$ws" => {endpoint => $route, stack => $match->stack});
 }
 
 sub route {

diff --git a/lib/Mojolicious/Routes/Match.pm b/lib/Mojolicious/Routes/Match.pm
@@ -13,26 +13,26 @@ sub path_for {
   my ($self, $name, %values) = (shift, Mojo::Util::_options(@_));
 
   # Current route
-  my $endpoint;
+  my $route;
   if ($name && $name eq 'current' || !$name) {
-    return {} unless $endpoint = $self->endpoint;
+    return {} unless $route = $self->endpoint;
   }
 
   # Find endpoint
-  else { return {path => $name} unless $endpoint = $self->root->lookup($name) }
+  else { return {path => $name} unless $route = $self->root->lookup($name) }
 
   # Merge values (clear format)
   my $captures = $self->stack->[-1] || {};
   %values = (%$captures, format => undef, %values);
-  my $pattern = $endpoint->pattern;
+  my $pattern = $route->pattern;
   $values{format}
     //= defined $captures->{format}
     ? $captures->{format}
     : $pattern->defaults->{format}
     if $pattern->constraints->{format};
 
-  my $path = $endpoint->render('', \%values);
-  return {path => $path, websocket => $endpoint->has_websocket};
+  my $path = $route->render('', \%values);
+  return {path => $path, websocket => $route->has_websocket};
 }
 
 sub _match {
@@ -144,8 +144,8 @@ Current position on the L</"stack">, defaults to C<0>.
 
 =head2 endpoint
 
-  my $endpoint = $match->endpoint;
-  $match       = $match->endpoint(Mojolicious::Routes::Route->new);
+  my $route = $match->endpoint;
+  $match    = $match->endpoint(Mojolicious::Routes::Route->new);
 
 The route endpoint that matched, usually a L<Mojolicious::Routes::Route>
 object.