X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FRequest.pm;h=c85ca09e2fec6e7b0a234e9290d002da1f053d0e;hp=e134fbebc0eea2e625f9cc20aaee79cdac115011;hb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;hpb=059c085bfcead450e70ace9ef193aa99ac2ab37d

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index e134fbe..c85ca09 100644
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -6,38 +6,49 @@ use utf8;
 use URI::http;
 use URI::https;
 use URI::QueryParam;
+use HTTP::Headers;
 
 use Moose;
 
-has action            => (is => 'rw');
-has address           => (is => 'rw');
-has arguments         => (is => 'rw', default => sub { [] });
-has cookies           => (is => 'rw', default => sub { {} });
-has query_keywords    => (is => 'rw');
-has match             => (is => 'rw');
-has method            => (is => 'rw');
-has protocol          => (is => 'rw');
+has action => (is => 'rw');
+has address => (is => 'rw');
+has arguments => (is => 'rw', default => sub { [] });
+has cookies => (is => 'rw', default => sub { {} });
+has query_keywords => (is => 'rw');
+has match => (is => 'rw');
+has method => (is => 'rw');
+has protocol => (is => 'rw');
 has query_parameters  => (is => 'rw', default => sub { {} });
-has secure            => (is => 'rw', default => 0);
-has captures          => (is => 'rw', default => sub { [] });
-has uri               => (is => 'rw');
-has user              => (is => 'rw');
-has headers           => (
-  is      => 'rw', 
+has secure => (is => 'rw', default => 0);
+has captures => (is => 'rw', default => sub { [] });
+has uri => (is => 'rw');
+has user => (is => 'rw');
+has headers => (
+  is      => 'rw',
   isa     => 'HTTP::Headers',
   handles => [qw(content_encoding content_length content_type header referer user_agent)],
+  default => sub { HTTP::Headers->new() },
+  required => 1,
+  lazy => 1,
 );
 
+#Moose ToDo:
+#can we lose the before modifiers which just call prepare_body ?
+#they are wasteful, slow us down and feel cluttery.
+# Can we call prepare_body at BUILD time?
+# Can we make _body an attribute and have the rest of these lazy build from there?
+
 has _context => (
   is => 'rw',
   weak_ref => 1,
+  handles => ['read'],
 );
 
 has body_parameters => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub { {} },
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub { {} },
 );
 
 before body_parameters => sub {
@@ -46,16 +57,17 @@ before body_parameters => sub {
 };
 
 has uploads => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub { {} },
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub { {} },
 );
 
-before uploads => sub {
-  my ($self) = @_;
-  $self->_context->prepare_body;
-};
+# modifier was a noop (groditi)
+# before uploads => sub {
+#   my ($self) = @_;
+#   #$self->_context->prepare_body;
+# };
 
 has parameters => (
   is => 'rw',
@@ -66,9 +78,9 @@ has parameters => (
 
 before parameters => sub {
   my ($self, $params) = @_;
-  $self->_context->prepare_body();
+  #$self->_context->prepare_body();
   if ( $params && !ref $params ) {
-    $self->_context->log->warn( 
+    $self->_context->log->warn(
         "Attempt to retrieve '$params' with req->params(), " .
         "you probably meant to call req->param('$params')" );
     $params = undef;
@@ -77,14 +89,12 @@ before parameters => sub {
 };
 
 has base => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub {
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub {
     my $self = shift;
-    if( $self->uri ){
-      return $self->path;
-    }
+    return $self->path if $self->uri;
   },
 );
 
@@ -223,7 +233,7 @@ be either a scalar or an arrayref containing scalars.
     print $c->request->body_parameters->{field}->[0];
 
 These are the parameters from the POST part of the request, if any.
-    
+
 =head2 $req->body_params
 
 Shortcut for body_parameters.
@@ -290,7 +300,7 @@ Returns an L<HTTP::Headers> object containing the headers for the current reques
 =head2 $req->hostname
 
 Returns the hostname of the client.
-    
+
 =head2 $req->input
 
 Alias for $req->body.
@@ -434,10 +444,6 @@ defaults to the size of the request if not specified.
 
 You have to set MyApp->config->{parse_on_demand} to use this directly.
 
-=cut
-
-sub read { shift->_context->read(@_); }
-
 =head2 $req->referer
 
 Shortcut for $req->headers->referer. Returns the referring page.
@@ -531,7 +537,8 @@ Returns a URI object for the current request. Stringifies to the URI text.
 =head2 $req->uri_with( { key => 'value' } );
 
 Returns a rewritten URI object for the current request. Key/value pairs
-passed in will override existing parameters. Unmodified pairs will be
+passed in will override existing parameters. You can remove an existing
+parameter by passing in an undef value. Unmodified pairs will be
 preserved.
 
 =cut
@@ -541,7 +548,7 @@ sub uri_with {
     
     carp( 'No arguments passed to uri_with()' ) unless $args;
 
-    for my $value ( values %$args ) {
+    foreach my $value ( values %$args ) {
         next unless defined $value;
         for ( ref $value eq 'ARRAY' ? @$value : $value ) {
             $_ = "$_";
@@ -549,11 +556,12 @@ sub uri_with {
         }
     };
     
-    my $uri = $self->uri->clone;
-    
+    my $uri   = $self->uri->clone;
+    my %query = ( %{ $uri->query_form_hash }, %$args );
+
     $uri->query_form( {
-        %{ $uri->query_form_hash },
-        %$args
+        # remove undef values
+        map { defined $query{ $_ } ? ( $_ => $query{ $_ } ) : () } keys %query
     } );
     return $uri;
 }
@@ -574,9 +582,7 @@ Provided by Moose
 
 =head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-
-Marcus Ramberg, C<mramberg@cpan.org>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
@@ -585,4 +591,6 @@ it under the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
+
 1;