improved not found page to highlight custom route names

mojolicious · Jun 22, 2012 · 4e7318a · 4e7318a
1 parent bdd39f4
commit 4e7318a
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 25 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-3.0  2012-06-22
+3.0  2012-06-23
   - Code name "Rainbow", this is a major release.
   - Removed Mojolicious::Plugin::I18N so it can be maintained as a separate
     distribution.
@@ -17,6 +17,7 @@
   - Added accept_interval attribute to Mojo::IOLoop.
   - Added support for new HTTP status code.
   - Modernized ".perltidyrc".
+  - Improved not found page to highlight custom route names.
   - Improved to method in Mojolicious::Routes::Route to give easier access to
     default parameters.
   - Improved message parser performance slightly.

diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -39,7 +39,7 @@ sub detect {
     # Load
     my $file = class_to_path $class;
     unless ($INC{$file}) {
-      if (my $e = Mojo::Loader->load($class)) { die $e if ref $e }
+      if (my $e = Mojo::Loader->new->load($class)) { die $e if ref $e }
     }
 
     # Detect

diff --git a/lib/Mojo/Loader.pm b/lib/Mojo/Loader.pm
@@ -65,11 +65,11 @@ sub _all {
   my $class = shift;
 
   # Refresh or use cached data
-  my $d = do { no strict 'refs'; \*{"$class\::DATA"} };
-  return $CACHE{$class} || {} unless fileno $d;
-  seek $d, 0, 0;
-  my $content = join '', <$d>;
-  close $d;
+  my $handle = do { no strict 'refs'; \*{"$class\::DATA"} };
+  return $CACHE{$class} || {} unless fileno $handle;
+  seek $handle, 0, 0;
+  my $content = join '', <$handle>;
+  close $handle;
 
   # Ignore everything before __DATA__ (windows will seek to start of file)
   $content =~ s/^.*\n__DATA__\r?\n/\n/s;
@@ -106,9 +106,12 @@ Mojo::Loader - Loader
   my $loader = Mojo::Loader->new;
   for my $module (@{$loader->search('Some::Namespace')}) {
 
-    # And load them safely
+    # Load them safely
     my $e = $loader->load($module);
-    warn qq{Loading "$module" failed: $e} if ref $e;
+    warn qq{Loading "$module" failed: $e} and next if ref $e;
+
+    # And extract files from the DATA section
+    say $loader->data($module, 'some_file.txt');
   }
 
 =head1 DESCRIPTION

diff --git a/lib/Mojo/Reactor.pm b/lib/Mojo/Reactor.pm
@@ -7,7 +7,7 @@ use Mojo::Loader;
 
 sub detect {
   my $try = $ENV{MOJO_REACTOR} || 'Mojo::Reactor::EV';
-  return Mojo::Loader->load($try) ? 'Mojo::Reactor::Poll' : $try;
+  return Mojo::Loader->new->load($try) ? 'Mojo::Reactor::Poll' : $try;
 }
 
 sub io { croak 'Method "io" not implemented by subclass' }

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -13,7 +13,7 @@ has app => sub {
 
   # Load and initialize application
   my $class = $ENV{MOJO_APP} ||= 'Mojo::HelloWorld';
-  if (my $e = Mojo::Loader->load($class)) { die $e if ref $e }
+  if (my $e = Mojo::Loader->new->load($class)) { die $e if ref $e }
   return $ENV{MOJO_APP} = $class->new;
 };
 

diff --git a/lib/Mojolicious/Command.pm b/lib/Mojolicious/Command.pm
@@ -60,7 +60,7 @@ sub rel_file { catfile(getcwd(), split /\//, pop) }
 
 sub render_data {
   my $self = shift;
-  Mojo::Template->new->render(Mojo::Loader->data(ref $self, shift), @_);
+  Mojo::Template->new->render(Mojo::Loader->new->data(ref $self, shift), @_);
 }
 
 sub render_to_file {

diff --git a/lib/Mojolicious/Command/inflate.pm b/lib/Mojolicious/Command/inflate.pm
@@ -13,8 +13,9 @@ sub run {
 
   # Find all embedded files
   my %all;
-  my $app = $self->app;
-  %all = (%{Mojo::Loader->data($_)}, %all)
+  my $app    = $self->app;
+  my $loader = Mojo::Loader->new;
+  %all = (%{$loader->data($_)}, %all)
     for @{$app->renderer->classes}, @{$app->static->classes};
 
   # Turn them into real files

diff --git a/lib/Mojolicious/Commands.pm b/lib/Mojolicious/Commands.pm
@@ -83,8 +83,9 @@ sub run {
 
   # Try all namespaces
   my (@commands, %seen);
+  my $loader = Mojo::Loader->new;
   for my $namespace (@{$self->namespaces}) {
-    for my $module (@{Mojo::Loader->search($namespace)}) {
+    for my $module (@{$loader->search($namespace)}) {
       next unless my $command = _command($module);
       $command =~ s/^$namespace\:\://;
       push @commands, [$command => $module] unless $seen{$command}++;
@@ -126,7 +127,7 @@ sub start_app {
 sub _command {
   my ($module, $fatal) = @_;
   return $module->isa('Mojolicious::Command') ? $module : undef
-    unless my $e = Mojo::Loader->load($module);
+    unless my $e = Mojo::Loader->new->load($module);
   $fatal && ref $e ? die $e : return;
 }
 

diff --git a/lib/Mojolicious/Plugins.pm b/lib/Mojolicious/Plugins.pm
@@ -60,7 +60,7 @@ sub _load {
   my ($self, $module) = @_;
 
   # Load
-  if (my $e = Mojo::Loader->load($module)) { ref $e ? die $e : return }
+  if (my $e = Mojo::Loader->new->load($module)) { ref $e ? die $e : return }
 
   # Module is a plugin
   return $module->isa('Mojolicious::Plugin') ? 1 : undef;

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -62,15 +62,16 @@ sub get_data_template {
   my ($self, $options, $template) = @_;
 
   # Index DATA templates
+  my $loader = Mojo::Loader->new;
   unless ($self->{index}) {
     my $index = $self->{index} = {};
     for my $class (reverse @{$self->classes}) {
-      $index->{$_} = $class for keys %{Mojo::Loader->data($class)};
+      $index->{$_} = $class for keys %{$loader->data($class)};
     }
   }
 
   # Find template
-  return Mojo::Loader->data($self->{index}{$template}, $template);
+  return $loader->data($self->{index}{$template}, $template);
 }
 
 sub render {
@@ -188,8 +189,8 @@ sub _detect_handler {
 
   # DATA templates
   unless ($self->{data}) {
-    my @templates
-      = map { sort keys %{Mojo::Loader->data($_)} } @{$self->classes};
+    my $loader = Mojo::Loader->new;
+    my @templates = map { sort keys %{$loader->data($_)} } @{$self->classes};
     s/\.(\w+)$// and $self->{data}{$_} ||= $1 for @templates;
   }
   return $self->{data}{$file} if exists $self->{data}{$file};

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -155,7 +155,7 @@ sub _load {
 
   # Load unless already loaded or application
   return 1 if $self->{loaded}{$app} || ref $app;
-  if (my $e = Mojo::Loader->load($app)) {
+  if (my $e = Mojo::Loader->new->load($app)) {
 
     # Doesn't exist
     $c->app->log->debug(qq{Controller "$app" does not exist.}) and return

diff --git a/lib/Mojolicious/Static.pm b/lib/Mojolicious/Static.pm
@@ -122,15 +122,16 @@ sub _get_data_file {
   return if $rel =~ /\.\w+\.\w+$/;
 
   # Index DATA files
+  my $loader = Mojo::Loader->new;
   unless ($self->{index}) {
     my $index = $self->{index} = {};
     for my $class (reverse @{$self->classes}) {
-      $index->{$_} = $class for keys %{Mojo::Loader->data($class)};
+      $index->{$_} = $class for keys %{$loader->data($class)};
     }
   }
 
   # Find file
-  return Mojo::Loader->data($self->{index}{$rel}, $rel);
+  return $loader->data($self->{index}{$rel}, $rel);
 }
 
 sub _get_file {

diff --git a/lib/Mojolicious/templates/not_found.development.html.ep b/lib/Mojolicious/templates/not_found.development.html.ep
@@ -96,7 +96,10 @@
             <td>
               <pre><%= uc(join ',', @{$node->via || []}) || '*' %></pre>
             </td>
-            <td><pre><%= $node->name %></pre></td>
+            <td>
+              % my $name = $node->name;
+              <pre><%= $node->has_custom_name ? qq{"$name"} : $name %></pre>
+            </td>
           </tr>
           % $depth++;
           %= $walk->($_, $depth) for @{$node->children};