reverted deprecation for Mojocasts

mojolicious · Apr 16, 2012 · 7da957a · 7da957a
1 parent ff3d6a9
commit 7da957a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/Changes b/Changes
@@ -1,7 +1,6 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 2.82  2012-04-16
-  - Deprecated relaxed placeholders "/(.foo)" in favor of "/#foo".
   - Deprecated Mojolicious::Routes::Route->waypoint.
   - Deprecated Mojolicious::Routes::Route->block.
   - Improved Mojolicious::Routes::Pattern to render formats.

diff --git a/lib/Mojolicious/Guides/Routing.pod b/lib/Mojolicious/Guides/Routing.pod
@@ -110,21 +110,9 @@ the surrounding text.
   /sebastian23hello  -> /(:name)hello -> {name => 'sebastian23'}
   /sebastian 23hello -> /(:name)hello -> {name => 'sebastian 23'}
 
-=head2 Relaxed placeholders
-
-Relaxed placeholders are just like generic placeholders, but match all
-characters except C</>.
-
-  /hello              -> /#name/hello -> undef
-  /sebastian/23/hello -> /#name/hello -> undef
-  /sebastian.23/hello -> /#name/hello -> {name => 'sebastian.23'}
-  /sebastian/hello    -> /#name/hello -> {name => 'sebastian'}
-  /sebastian23/hello  -> /#name/hello -> {name => 'sebastian23'}
-  /sebastian 23/hello -> /#name/hello -> {name => 'sebastian 23'}
-
 =head2 Wildcard placeholders
 
-Wildcard placeholders are just like the two placeholders above, but match
+Wildcard placeholders are just like generic placeholders, but match
 absolutely everything, including C</> and C<.>.
 
   /hello              -> /*name/hello -> undef
@@ -134,6 +122,18 @@ absolutely everything, including C</> and C<.>.
   /sebastian23/hello  -> /*name/hello -> {name => 'sebastian23'}
   /sebastian 23/hello -> /*name/hello -> {name => 'sebastian 23'}
 
+=head2 Relaxed placeholders
+
+Relaxed placeholders are similar to the two placeholders above, but always
+require parentheses and match all characters except C</>.
+
+  /hello              -> /(.name)/hello -> undef
+  /sebastian/23/hello -> /(.name)/hello -> undef
+  /sebastian.23/hello -> /(.name)/hello -> {name => 'sebastian.23'}
+  /sebastian/hello    -> /(.name)/hello -> {name => 'sebastian'}
+  /sebastian23/hello  -> /(.name)/hello -> {name => 'sebastian23'}
+  /sebastian 23/hello -> /(.name)/hello -> {name => 'sebastian 23'}
+
 =head1 BASICS
 
 Most commonly used features every L<Mojolicious> developer should know about.

diff --git a/lib/Mojolicious/Routes/Pattern.pm b/lib/Mojolicious/Routes/Pattern.pm
@@ -5,7 +5,7 @@ has [qw/defaults reqs/] => sub { {} };
 has [qw/format pattern regex/];
 has quote_end     => ')';
 has quote_start   => '(';
-has relaxed_start => '#';
+has relaxed_start => '.';
 has symbol_start  => ':';
 has [qw/symbols tree/] => sub { [] };
 has wildcard_start => '*';
@@ -203,12 +203,6 @@ sub _tokenize {
     # Inside a placeholder
     my $placeholder = $state ~~ [qw/relaxed symbol wildcard/];
 
-    # DEPRECATED in Leaf Fluttering In Wind!
-    if ($quoted && $char eq '.' && $state eq 'symbol') {
-      warn "Relaxed placeholders /(.foo) are DEPRECATED in favor of /#foo!\n";
-      $char = $relaxed;
-    }
-
     # Quote start
     if ($char eq $quote_start) {
       $quoted = 1;
@@ -222,10 +216,15 @@ sub _tokenize {
       $state = 'symbol';
     }
 
-    # Relaxed or wildcard start (upgrade when quoted)
-    elsif ($char ~~ [$relaxed, $wildcard]) {
+    # Relaxed start (needs to be quoted)
+    elsif ($quoted && $char eq $relaxed && $state eq 'symbol') {
+      $tree[-1]->[0] = $state = 'relaxed';
+    }
+
+    # Wildcard start (upgrade when quoted)
+    elsif ($char eq $wildcard) {
       push @tree, ['symbol', ''] unless $quoted;
-      $tree[-1]->[0] = $state = $char eq $relaxed ? 'relaxed' : 'wildcard';
+      $tree[-1]->[0] = $state = 'wildcard';
     }
 
     # Quote end
@@ -331,7 +330,7 @@ Pattern in compiled regex form.
   my $relaxed = $pattern->relaxed_start;
   $pattern    = $pattern->relaxed_start('*');
 
-Character indicating a relaxed placeholder, defaults to C<#>.
+Character indicating a relaxed placeholder, defaults to C<.>.
 
 =head2 C<reqs>
 

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -248,7 +248,7 @@ get '/source' => sub {
 };
 
 # GET /foo_relaxed/*
-get '/foo_relaxed/#test' => sub {
+get '/foo_relaxed/(.test)' => sub {
   my $self = shift;
   $self->render_text(
     $self->stash('test') . ($self->req->headers->dnt ? 1 : 0));

diff --git a/t/mojolicious/pattern.t b/t/mojolicious/pattern.t
@@ -58,13 +58,13 @@ $result = $pattern->match('/test/lala');
 is $result, undef, 'no result';
 
 # Relaxed
-$pattern = Mojolicious::Routes::Pattern->new('/test/#controller/:action');
+$pattern = Mojolicious::Routes::Pattern->new('/test/(.controller)/:action');
 $result  = $pattern->match('/test/foo.bar/baz');
 is $result->{controller}, 'foo.bar', 'right value';
 is $result->{action},     'baz',     'right value';
 is $pattern->render({controller => 'foo.bar', action => 'baz'}),
   '/test/foo.bar/baz', 'right result';
-$pattern = Mojolicious::Routes::Pattern->new('/test/(#groovy)');
+$pattern = Mojolicious::Routes::Pattern->new('/test/(.groovy)');
 $result  = $pattern->match('/test/foo.bar');
 is $pattern->defaults->{format}, undef, 'no value';
 is $result->{groovy}, 'foo.bar', 'right value';