tweaked routing examples a bit

mojolicious · Feb 29, 2012 · 4bbfa21 · 4bbfa21
1 parent 9f7a012
commit 4bbfa21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -86,7 +86,7 @@ sub startup {
   # Documentation browser under "/perldoc"
   $self->plugin('PODRenderer');
 
-  # Routes
+  # Router
   my $r = $self->routes;
 
   # Normal route to controller

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -507,7 +507,6 @@ actual action code needs to be changed.
     my $users = MyUsers->new;
     $self->helper(users => sub { return $users });
 
-    # Routes
     my $r = $self->routes;
 
     $r->any('/' => sub {

diff --git a/lib/Mojolicious/Guides/Routing.pod b/lib/Mojolicious/Guides/Routing.pod
@@ -150,7 +150,7 @@ routes structures.
   sub startup {
     my $self = shift;
 
-    # Routes
+    # Router
     my $r = $self->routes;
 
     # Route
@@ -258,11 +258,8 @@ sensitive.
   sub startup {
     my $self = shift;
 
-    # Routes
-    my $r = $self->routes;
-
     # /bye -> {controller => 'foo', action => 'bye'} -> MyApp::Foo->bye
-    $r->route('/bye')->to(controller => 'foo', action => 'bye');
+    $self->routes->route('/bye')->to(controller => 'foo', action => 'bye');
   }
 
   1;
@@ -534,10 +531,8 @@ which makes them a very powerful tool especially for plugins.
         if $self->req->url->path->contains('/test');
     });
 
-    # Routes
-    my $r = $self->routes;
-
     # These will not be reached if the hook above renders a response
+    my $r = $self->routes;
     $r->route('/welcome')->to('foo#welcome');
     $r->route('/bye')->to('foo#bye');
   }
@@ -724,11 +719,8 @@ applications.
     # Plugin
     $self->plugin('WerewolfCondition');
 
-    # Routes
-    my $r = $self->routes;
-
     # /hideout (keep them out for 4 days after full moon)
-    $r->route('/hideout')->over(werewolf => 4)
+    $self->routes->route('/hideout')->over(werewolf => 4)
       ->to(controller => 'foo', action => 'bar');
   }
 

diff --git a/t/mojolicious/lib/MojoliciousTest.pm b/t/mojolicious/lib/MojoliciousTest.pm
@@ -41,11 +41,9 @@ sub startup {
   $self->sessions->cookie_domain('.example.com');
   $self->sessions->cookie_path('/bar');
 
-  # Routes
-  my $r = $self->routes;
-
   # /plugin/upper_case
   # /plugin/camel_case (plugins loaded correctly)
+  my $r = $self->routes;
   $r->route('/plugin/upper_case')->to('foo#plugin_upper_case');
   $r->route('/plugin/camel_case')->to('foo#plugin_camel_case');
 

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -6,10 +6,8 @@ use Test::More tests => 351;
 use_ok 'Mojolicious::Routes';
 use_ok 'Mojolicious::Routes::Match';
 
-# Routes
-my $r = Mojolicious::Routes->new;
-
 # /clean
+my $r = Mojolicious::Routes->new;
 $r->route('/clean')->to(clean => 1);
 
 # /clean/too