merge URI::QueryParam into URI itself

3 files changed, 162 insertions, 184 deletions

diff --git a/lib/URI.pm b/lib/URI.pm
index 1bd9802..5a454dc 100644
--- a/lib/URI.pm
+++ b/lib/URI.pm
@@ -759,8 +759,79 @@ documents as this avoids the trouble of escaping the "&" character.
 You might also set the $URI::DEFAULT_QUERY_FORM_DELIMITER variable to
 ";" for the same global effect.
 
-The C<URI::QueryParam> module can be loaded to add further methods to
-manipulate the form of a URI.  See L<URI::QueryParam> for details.
+=item @keys = $u->query_param
+
+=item @values = $u->query_param( $key )
+
+=item $first_value = $u->query_param( $key )
+
+=item $u->query_param( $key, $value,... )
+
+If $u->query_param is called with no arguments, it returns all the
+distinct parameter keys of the URI.  In a scalar context it returns the
+number of distinct keys.
+
+When a $key argument is given, the method returns the parameter values with the
+given key.  In a scalar context, only the first parameter value is
+returned.
+
+If additional arguments are given, they are used to update successive
+parameters with the given key.  If any of the values provided are
+array references, then the array is dereferenced to get the actual
+values.
+
+Please note that you can supply multiple values to this method, but you cannot
+supply multiple keys.
+
+Do this:
+
+    $uri->query_param( widget_id => 1, 5, 9 );
+
+Do NOT do this:
+
+    $uri->query_param( widget_id => 1, frobnicator_id => 99 );
+
+=item $u->query_param_append($key, $value,...)
+
+Adds new parameters with the given
+key without touching any old parameters with the same key.  It
+can be explained as a more efficient version of:
+
+   $u->query_param($key,
+                   $u->query_param($key),
+                   $value,...);
+
+One difference is that this expression would return the old values
+of $key, whereas the query_param_append() method does not.
+
+=item @values = $u->query_param_delete($key)
+
+=item $first_value = $u->query_param_delete($key)
+
+Deletes all key/value pairs with the given key.
+The old values are returned.  In a scalar context, only the first value
+is returned.
+
+Using the query_param_delete() method is slightly more efficient than
+the equivalent:
+
+   $u->query_param($key, []);
+
+=item $hashref = $u->query_form_hash
+
+=item $u->query_form_hash( \%new_form )
+
+Returns a reference to a hash that represents the
+query form's key/value pairs.  If a key occurs multiple times, then the hash
+value becomes an array reference.
+
+Note that sequence information is lost.  This means that:
+
+   $u->query_form_hash($u->query_form_hash);
+
+is not necessarily a no-op, as it may reorder the key/value pairs.
+The values returned by the query_param() method should stay the same
+though.
 
 =item $uri->query_keywords
 
@@ -1208,7 +1279,7 @@ readable alternative.
 
 =head1 SEE ALSO
 
-L<URI::file>, L<URI::WithBase>, L<URI::QueryParam>, L<URI::Escape>,
+L<URI::file>, L<URI::WithBase>, L<URI::Escape>,
 L<URI::Split>, L<URI::Heuristic>
 
 RFC 2396: "Uniform Resource Identifiers (URI): Generic Syntax",
diff --git a/lib/URI/QueryParam.pm b/lib/URI/QueryParam.pm
index 2768093..e912448 100644
--- a/lib/URI/QueryParam.pm
+++ b/lib/URI/QueryParam.pm
@@ -1,91 +1,9 @@
 package URI::QueryParam;
-
 use strict;
 use warnings;
 
 our $VERSION = '5.16';
 
-sub URI::_query::query_param {
-    my $self = shift;
-    my @old = $self->query_form;
-
-    if (@_ == 0) {
-	# get keys
-	my (%seen, $i);
-	return grep !($i++ % 2 || $seen{$_}++), @old;
-    }
-
-    my $key = shift;
-    my @i = grep $_ % 2 == 0 && $old[$_] eq $key, 0 .. $#old;
-
-    if (@_) {
-	my @new = @old;
-	my @new_i = @i;
-	my @vals = map { ref($_) eq 'ARRAY' ? @$_ : $_ } @_;
-
-	while (@new_i > @vals) {
-	    splice @new, pop @new_i, 2;
-	}
-	if (@vals > @new_i) {
-	    my $i = @new_i ? $new_i[-1] + 2 : @new;
-	    my @splice = splice @vals, @new_i, @vals - @new_i;
-
-	    splice @new, $i, 0, map { $key => $_ } @splice;
-	}
-	if (@vals) {
-	    #print "SET $new_i[0]\n";
-	    @new[ map $_ + 1, @new_i ] = @vals;
-	}
-
-	$self->query_form(\@new);
-    }
-
-    return wantarray ? @old[map $_+1, @i] : @i ? $old[$i[0]+1] : undef;
-}
-
-sub URI::_query::query_param_append {
-    my $self = shift;
-    my $key = shift;
-    my @vals = map { ref $_ eq 'ARRAY' ? @$_ : $_ } @_;
-    $self->query_form($self->query_form, $key => \@vals);  # XXX
-    return;
-}
-
-sub URI::_query::query_param_delete {
-    my $self = shift;
-    my $key = shift;
-    my @old = $self->query_form;
-    my @vals;
-
-    for (my $i = @old - 2; $i >= 0; $i -= 2) {
-	next if $old[$i] ne $key;
-	push(@vals, (splice(@old, $i, 2))[1]);
-    }
-    $self->query_form(\@old) if @vals;
-    return wantarray ? reverse @vals : $vals[-1];
-}
-
-sub URI::_query::query_form_hash {
-    my $self = shift;
-    my @old = $self->query_form;
-    if (@_) {
-	$self->query_form(@_ == 1 ? %{shift(@_)} : @_);
-    }
-    my %hash;
-    while (my($k, $v) = splice(@old, 0, 2)) {
-	if (exists $hash{$k}) {
-	    for ($hash{$k}) {
-		$_ = [$_] unless ref($_) eq "ARRAY";
-		push(@$_, $v);
-	    }
-	}
-	else {
-	    $hash{$k} = $v;
-	}
-    }
-    return \%hash;
-}
-
 1;
 
 __END__
@@ -97,108 +15,16 @@ URI::QueryParam - Additional query methods for URIs
 =head1 SYNOPSIS
 
   use URI;
-  use URI::QueryParam;
-
-  $u = URI->new("", "http");
-  $u->query_param(foo => 1, 2, 3);
-  print $u->query;    # prints foo=1&foo=2&foo=3
-
-  for my $key ($u->query_param) {
-      print "$key: ", join(", ", $u->query_param($key)), "\n";
-  }
 
 =head1 DESCRIPTION
 
-Loading the C<URI::QueryParam> module adds some extra methods to
-URIs that support query methods.  These methods provide an alternative
-interface to the $u->query_form data.
-
-The query_param_* methods have deliberately been made identical to the
-interface of the corresponding C<CGI.pm> methods.
-
-The following additional methods are made available:
-
-=over
-
-=item @keys = $u->query_param
-
-=item @values = $u->query_param( $key )
-
-=item $first_value = $u->query_param( $key )
-
-=item $u->query_param( $key, $value,... )
-
-If $u->query_param is called with no arguments, it returns all the
-distinct parameter keys of the URI.  In a scalar context it returns the
-number of distinct keys.
-
-When a $key argument is given, the method returns the parameter values with the
-given key.  In a scalar context, only the first parameter value is
-returned.
-
-If additional arguments are given, they are used to update successive
-parameters with the given key.  If any of the values provided are
-array references, then the array is dereferenced to get the actual
-values.
-
-Please note that you can supply multiple values to this method, but you cannot
-supply multiple keys.
-
-Do this:
-
-    $uri->query_param( widget_id => 1, 5, 9 );
-
-Do NOT do this:
-
-    $uri->query_param( widget_id => 1, frobnicator_id => 99 );
-
-=item $u->query_param_append($key, $value,...)
-
-Adds new parameters with the given
-key without touching any old parameters with the same key.  It
-can be explained as a more efficient version of:
-
-   $u->query_param($key,
-                   $u->query_param($key),
-                   $value,...);
-
-One difference is that this expression would return the old values
-of $key, whereas the query_param_append() method does not.
-
-=item @values = $u->query_param_delete($key)
-
-=item $first_value = $u->query_param_delete($key)
-
-Deletes all key/value pairs with the given key.
-The old values are returned.  In a scalar context, only the first value
-is returned.
-
-Using the query_param_delete() method is slightly more efficient than
-the equivalent:
-
-   $u->query_param($key, []);
-
-=item $hashref = $u->query_form_hash
-
-=item $u->query_form_hash( \%new_form )
-
-Returns a reference to a hash that represents the
-query form's key/value pairs.  If a key occurs multiple times, then the hash
-value becomes an array reference.
-
-Note that sequence information is lost.  This means that:
-
-   $u->query_form_hash($u->query_form_hash);
-
-is not necessarily a no-op, as it may reorder the key/value pairs.
-The values returned by the query_param() method should stay the same
-though.
-
-=back
-
-=head1 SEE ALSO
-
-L<URI>, L<CGI>
+C<URI::QueryParam> used to provide the
+L<< query_form_hash|URI/$hashref = $u->query_form_hash >>,
+L<< query_param|URI/@keys = $u->query_param >>
+L<< query_param_append|URI/$u->query_param_append($key, $value,...) >>, and
+L<< query_param_delete|URI/ @values = $u->query_param_delete($key) >> methods
+on L<URI> objects. These methods have been merged into L<URI> itself, so this
+module is now a no-op.
 
 =head1 COPYRIGHT
 
diff --git a/lib/URI/_query.pm b/lib/URI/_query.pm
index 307d096..2b5ce12 100644
--- a/lib/URI/_query.pm
+++ b/lib/URI/_query.pm
@@ -94,4 +94,85 @@ sub query_keywords
 # Some URI::URL compatibility stuff
 sub equery { goto &query }
 
+sub query_param {
+    my $self = shift;
+    my @old = $self->query_form;
+
+    if (@_ == 0) {
+        # get keys
+        my (%seen, $i);
+        return grep !($i++ % 2 || $seen{$_}++), @old;
+    }
+
+    my $key = shift;
+    my @i = grep $_ % 2 == 0 && $old[$_] eq $key, 0 .. $#old;
+
+    if (@_) {
+        my @new = @old;
+        my @new_i = @i;
+        my @vals = map { ref($_) eq 'ARRAY' ? @$_ : $_ } @_;
+
+        while (@new_i > @vals) {
+            splice @new, pop @new_i, 2;
+        }
+        if (@vals > @new_i) {
+            my $i = @new_i ? $new_i[-1] + 2 : @new;
+            my @splice = splice @vals, @new_i, @vals - @new_i;
+
+            splice @new, $i, 0, map { $key => $_ } @splice;
+        }
+        if (@vals) {
+            #print "SET $new_i[0]\n";
+            @new[ map $_ + 1, @new_i ] = @vals;
+        }
+
+        $self->query_form(\@new);
+    }
+
+    return wantarray ? @old[map $_+1, @i] : @i ? $old[$i[0]+1] : undef;
+}
+
+sub query_param_append {
+    my $self = shift;
+    my $key = shift;
+    my @vals = map { ref $_ eq 'ARRAY' ? @$_ : $_ } @_;
+    $self->query_form($self->query_form, $key => \@vals);  # XXX
+    return;
+}
+
+sub query_param_delete {
+    my $self = shift;
+    my $key = shift;
+    my @old = $self->query_form;
+    my @vals;
+
+    for (my $i = @old - 2; $i >= 0; $i -= 2) {
+        next if $old[$i] ne $key;
+        push(@vals, (splice(@old, $i, 2))[1]);
+    }
+    $self->query_form(\@old) if @vals;
+    return wantarray ? reverse @vals : $vals[-1];
+}
+
+sub query_form_hash {
+    my $self = shift;
+    my @old = $self->query_form;
+    if (@_) {
+        $self->query_form(@_ == 1 ? %{shift(@_)} : @_);
+    }
+    my %hash;
+    while (my($k, $v) = splice(@old, 0, 2)) {
+        if (exists $hash{$k}) {
+            for ($hash{$k}) {
+                $_ = [$_] unless ref($_) eq "ARRAY";
+                push(@$_, $v);
+            }
+        }
+        else {
+            $hash{$k} = $v;
+        }
+    }
+    return \%hash;
+}
+
 1;