removed url_with method and upgraded url_with helper

mojolicious · Jan 13, 2012 · f65e2d3 · f65e2d3
1 parent ea0d9c9
commit f65e2d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/Changes b/Changes
@@ -1,8 +1,8 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 2.44    2012-01-13 00:00:00
-        - Added EXPERIMENTAL url_with method to Mojolicious::Controller.
-          (diegok, marcus, judofyr, sri)
+        - Added EXPERIMENTAL url_with helper to
+          Mojolicious::Plugin::DefaultHelpers. (diegok, marcus, judofyr, sri)
         - Added EXPERIMENTAL support for removing query parmaters while
           merging to query method of Mojo::URL. (marcus, judofyr, sri)
         - Removed experimental status from Mojo::IOLoop::Delay.

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -590,11 +590,6 @@ sub url_for {
   return $url;
 }
 
-sub url_with {
-  my $self = shift;
-  return $self->url_for(@_)->query($self->req->url->query->clone);
-}
-
 sub write {
   my ($self, $chunk, $cb) = @_;
 
@@ -1026,21 +1021,6 @@ Generate a portable L<Mojo::URL> object with base for a route, path or URL.
   # "/myapp/perldoc?foo=bar" if application is deployed under "/myapp"
   say $c->url_for('/perldoc')->query(foo => 'bar');
 
-=head2 C<url_with>
-
-  my $url = $c->url_with;
-  my $url = $c->url_with(name => 'sebastian');
-  my $url = $c->url_with('test', name => 'sebastian');
-  my $url = $c->url_with('/perldoc');
-  my $url = $c->url_with('http://mojolicio.us/perldoc');
-
-Does the same as C<url_for>, but inherits query parameters from the current
-request. Note that this method is EXPERIMENTAL and might change without
-warning!
-
-  # Replace one query parameter
-  say $c->url_with->query([page => 2]);
-
 =head2 C<write>
 
   $c->write;

diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -9,7 +9,7 @@ sub register {
   my ($self, $app) = @_;
 
   # Controller alias helpers
-  for my $name (qw/app flash param stash session url_for url_with/) {
+  for my $name (qw/app flash param stash session url_for/) {
     $app->helper($name => sub { shift->$name(@_) });
   }
 
@@ -98,6 +98,14 @@ sub register {
       $memorize->{$name}->{content} = $cb->();
     }
   );
+
+  # Add "url_with" helper
+  $app->helper(
+    url_with => sub {
+      my $self = shift;
+      return $self->url_for(@_)->query($self->req->url->query->clone);
+    }
+  );
 }
 
 1;
@@ -239,8 +247,11 @@ Alias for L<Mojolicious::Controller/"url_for">.
 
   %= url_with 'named', controller => 'bar', action => 'baz'
 
-Alias for L<Mojolicious::Controller/"url_with">. Note that this helper is
-EXPERIMENTAL and might change without warning!
+Does the same as C<url_for>, but inherits query parameters from the current
+request. Note that this helper is EXPERIMENTAL and might change without
+warning!
+
+  %= url_with->query([page => 2])
 
 =head1 METHODS