diff -rup WWW-Mechanize-1.30/lib/WWW/Mechanize.pm WWW-Mechanize-1.30 copy/lib/WWW/Mechanize.pm
--- WWW-Mechanize-1.30/lib/WWW/Mechanize.pm	2007-05-24 19:32:10.000000000 -0700
+++ WWW-Mechanize-1.30 copy/lib/WWW/Mechanize.pm	2007-07-15 23:35:44.000000000 -0700
@@ -105,6 +105,7 @@ use HTTP::Request 1.30;
 use LWP::UserAgent 2.003;
 use HTML::Form 1.00;
 use HTML::TokeParser;
+use Exporter 'import';
 
 use base 'LWP::UserAgent';
 
@@ -113,6 +114,13 @@ BEGIN {
     $HAS_ZLIB = eval 'use Compress::Zlib (); 1;';
 }
 
+our @EXPORT_OK = qw/next_handler abort/;
+our @EXPORT_TAGS = (
+    callback => ['next_handler', 'abort'],
+    all      => \@EXPORT_OK,
+);
+
+
 =head1 CONSTRUCTOR AND STARTUP
 
 =head2 new()
@@ -490,7 +498,11 @@ sub response {      my $self = shift; re
 sub status {        my $self = shift; return $self->{status}; }
 sub ct {            my $self = shift; return $self->{ct}; }
 sub base {          my $self = shift; return $self->{base}; }
-sub current_form {  my $self = shift; return $self->{form}; }
+sub current_form {
+    my $self = shift;
+    $self->_extract_forms() unless $self->{_extracted_forms};
+    return $self->{form} = $self->{forms}->[0];
+}
 sub is_html {       my $self = shift; return defined $self->{ct} && ($self->{ct} eq 'text/html'); }
 
 =head2 $mech->title()
@@ -547,23 +559,30 @@ but will likely be backwards-compatible 
 
 sub content {
     my $self = shift;
-    my $content = $self->{content};
+    my $content;
 
     if ( $self->is_html ) {
         my %parms = @_;
         if ( exists $parms{base_href} ) {
             my $arg = (delete $parms{base_href}) || $self->base;
+            $content = $self->_call_handler('get_content') ||
+                $self->{content};
             $content=~s/<head>/<head>\n<base href="$arg">/;
         }
         if ( my $arg = delete $parms{format} ) {
             if ($arg eq 'text') {
-                require HTML::TreeBuilder;
-                my $tree = HTML::TreeBuilder->new();
-                $tree->parse($content);
-                $tree->eof();
-                $tree->elementify(); # just for safety
-                $content = $tree->as_text();
-                $tree->delete;
+                unless(
+                    $content = $self->_call_handler('get_text_content')
+                ) {
+                    $content = $self->{content};
+                    require HTML::TreeBuilder;
+                    my $tree = HTML::TreeBuilder->new();
+                    $tree->parse($content);
+                    $tree->eof();
+                    $tree->elementify(); # just for safety
+                    $content = $tree->as_text();
+                    $tree->delete;
+                }
             }
             else {
                 $self->die( qq{Unknown "format" parameter "$arg"} );
@@ -574,7 +593,8 @@ sub content {
         }
     } # is HTML
 
-    return $content;
+    return $content || $self->_call_handler('get_content') ||
+        $self->{content};
 }
 
 =head1 LINK METHODS
@@ -1093,6 +1113,7 @@ context, returns an array reference of a
 
 sub forms {
     my $self = shift ;
+    $self->_extract_forms() unless $self->{_extracted_forms};
     return @{$self->{forms}} if wantarray;
     return $self->{forms};
 }
@@ -1117,6 +1138,8 @@ sub form_number {
     my ($self, $form) = @_;
     # XXX Should we die if no $form is defined? Same question for form_name()
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
+
     if ($self->{forms}->[$form-1]) {
         $self->{form} = $self->{forms}->[$form-1];
         return $self->{form};
@@ -1145,6 +1168,8 @@ Note that this functionality requires li
 sub form_name {
     my ($self, $form) = @_;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
+
     my $temp;
     my @matches = grep {defined($temp = $_->attr('name')) and ($temp eq $form) } $self->forms;
     if ( my $nmatches = @matches ) {
@@ -1177,6 +1202,8 @@ sub form_with_fields {
     my ($self, @fields) = @_;
     die 'no fields provided' unless scalar @fields;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
+
     my @matches;
     FORMS: for my $form (@{ $self->forms }) {
         my @fields_in_form = $form->param();
@@ -1215,6 +1242,7 @@ sub field {
     my ($self, $name, $value, $number) = @_;
     $number ||= 1;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $form = $self->{form};
     if ($number > 1) {
         $form->find_input($name, undef, $number)->value($value);
@@ -1249,6 +1277,7 @@ undef and calls C<< $self>warn() >> with
 sub select {
     my ($self, $name, $value) = @_;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $form = $self->{form};
 
     my $input = $form->find_input($name);
@@ -1492,6 +1521,7 @@ sub value {
     my $name = shift;
     my $number = shift || 1;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $form = $self->{form};
     if ( $number > 1 ) {
         return $form->find_input( $name, undef, $number )->value();
@@ -1518,6 +1548,7 @@ Returns an L<HTTP::Response> object.
 sub click {
     my ($self, $button, $x, $y) = @_;
     for ($x, $y) { $_ = 1 unless defined; }
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $request = $self->{form}->click($button, $x, $y);
     return $self->request( $request );
 }
@@ -1577,6 +1608,7 @@ sub click_button {
         $_ = 1 unless defined;
     }
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $form = $self->{form};
     my $request;
     if ( $args{name} ) {
@@ -1616,6 +1648,7 @@ longer so.
 sub submit {
     my $self = shift;
 
+    $self->_extract_forms() unless $self->{_extracted_forms};
     my $request = $self->{form}->make_request;
     return $self->request( $request );
 }
@@ -1893,15 +1926,23 @@ Returns an L<HTTP::Response> object.
 
 sub request {
     my $self = shift;
-    my $request = shift;
+    my $orig_request = shift;
 
-    $request = $self->_modify_request( $request );
+    my $request = $self->_call_handler( 'modify_request', $orig_request );
+    defined $request
+        ? $request || ($request = $self->_modify_request( $orig_request ))
+        : return;
+
+    my $response = $self->_call_handler( 'make_request', $request );
+    defined $response
+        ? $response || ($response = $self->_make_request( $request ))
+        : return;
 
     if ( $request->method eq 'GET' || $request->method eq 'POST' ) {
         $self->_push_page_stack();
     }
 
-    $self->_update_page($request, $self->_make_request( $request, @_ ));
+    $self->_update_page($request, $response);
 }
 
 =head2 $mech->update_html( $html )
@@ -1949,15 +1990,9 @@ sub update_html {
     $self->{ct} = 'text/html';
     $self->{content} = $html;
 
-    $self->{forms} = [ HTML::Form->parse($html, $self->base) ];
-    for my $form (@{ $self->{forms} }) {
-        for my $input ($form->inputs) {
-             if ($input->type eq 'file') {
-                 $input->value( undef );
-             }
-        }
-    }
-    $self->{form}  = $self->{forms}->[0];
+    $self->_call_handler('parse_html', $html);
+
+    $self->{_extracted_forms} = 0;
     $self->{_extracted_links} = 0;
     $self->{_extracted_images} = 0;
 
@@ -2161,6 +2196,7 @@ sub _reset_page {
 
     $self->{_extracted_links} = 0;
     $self->{_extracted_images} = 0;
+    $self->{_extracted_forms} = 0;
     $self->{links} = [];
     $self->{images} = [];
     $self->{forms} = [];
@@ -2188,13 +2224,18 @@ sub _extract_links {
     my $self = shift;
 
 
-    $self->{links} = [];
-    if ( defined $self->{content} ) {
-        my $parser = HTML::TokeParser->new(\$self->{content});
-        while ( my $token = $parser->get_tag( keys %link_tags ) ) {
-            my $link = $self->_link_from_token( $token, $parser );
-            push( @{$self->{links}}, $link ) if $link;
-        } # while
+    if (my $ret = $self->_call_handler('extract_links')) {
+        $self->{links} = $ret;
+    }
+    else {
+        $self->{links} = [];
+        if ( defined $self->{content} ) {
+            my $parser = HTML::TokeParser->new(\$self->content);
+            while ( my $token = $parser->get_tag( keys %link_tags ) ) {
+                my $link = $self->_link_from_token( $token, $parser );
+                push( @{$self->{links}}, $link ) if $link;
+            } # while
+        }
     }
 
     $self->{_extracted_links} = 1;
@@ -2203,6 +2244,30 @@ sub _extract_links {
 }
 
 
+sub _extract_forms { # XXX documentation?
+    my $self = shift;
+
+    if (my $ret = $self->_call_handler('extract_forms')) {
+        $self->{forms} = $ret;
+    }
+    else {
+        $self->{forms} =
+            [ HTML::Form->parse($self->content, $self->base) ];
+        for my $form (@{ $self->{forms} }) {
+            for my $input ($form->inputs) {
+                 if ($input->type eq 'file') {
+                     $input->value( undef );
+                 }
+            }
+        }
+     }
+
+    $self->{_extracted_forms} = 1;
+
+    return;
+}
+
+
 my %image_tags = (
     img => 'src',
     input => 'src',
@@ -2211,14 +2276,19 @@ my %image_tags = (
 sub _extract_images {
     my $self = shift;
 
-    $self->{images} = [];
-
-    if ( defined $self->{content} ) {
-        my $parser = HTML::TokeParser->new(\$self->{content});
-        while ( my $token = $parser->get_tag( keys %image_tags ) ) {
-            my $image = $self->_image_from_token( $token, $parser );
-            push( @{$self->{images}}, $image ) if $image;
-        } # while
+    if (my $ret = $self->_call_handler('extract_images')) {
+        $self->{images} = $ret;
+    }
+    else {
+        $self->{images} = [];
+    
+        if ( defined $self->{content} ) {
+            my $parser = HTML::TokeParser->new(\$self->content);
+            while ( my $token = $parser->get_tag( keys %image_tags ) ) {
+                my $image = $self->_image_from_token( $token, $parser );
+                push( @{$self->{images}}, $image ) if $image;
+            } # while
+        }
     }
 
     $self->{_extracted_images} = 1;
@@ -2406,6 +2476,87 @@ sub _die {
     return &Carp::croak; ## no critic
 }
 
+
+# XXX: Callback Mechanism -- This needs documentation.
+# The hooks are as follows:
+#   parse_html
+#   extract_forms  -- should return an array ref
+#   extract_links  -- likewise
+#   extract_images -- ditto
+#   get_content
+#   get_text_content
+#   modify_request
+#   make_request
+
+# If a callback routine returns false, it means that the default action
+# should be taken.
+
+sub add_handler {
+    my $self = shift;
+    my $name = shift;
+    my $sub  = shift;
+
+    push @{$self->{callback}{$name}}, $sub;
+}
+
+# NOT an object method! This function is exported upon request.
+sub next_handler {
+    CORE::die \'next';
+}
+
+# NOT an object method! This function is exported upon request.
+# XXX Maybe the name should be something longer, like abort_action.
+# This only makes sense for modify_request and make_request.
+sub abort {
+    CORE::die \'abort';
+}
+
+# _call_handler returns undef when the handlers calls abort().
+# It returns a defined false if the handler returns false or undef.
+sub _call_handler {
+    my $self = shift;
+    my $name = shift;
+
+    if (exists $self->{callback}{$name}) {
+        local $@;
+        for (@{$self->{callback}{$name}}) {
+            my $ret = eval { $_->($self, @_); };
+            if (ref $@ eq 'SCALAR' && ${$@} eq 'next') {
+                next
+            }
+            elsif (ref $@ eq 'SCALAR' && ${$@} eq 'abort') {
+                return
+            }
+            elsif ($@) { $self->die($@) } # propagate the error
+            return $ret || 0;
+        }
+    }
+    return 0; # indicates that the default action should be taken
+}
+
+
+# XXX: Plugin Mechanism -- This needs documentation.
+
+# This calls init if the plugin in question has not been loaded for
+# this mech object. Otherwise, it calls options. The 'init' method will
+# return a plugin object (actually it doesn't have to), that will be stored 
+# in the plugins hash.
+sub use_plugin {
+    my($self, $plugin, @opts) = @_;
+    my $plugins = $self->{plugins} ||= {};
+    if(exists $plugins->{$plugin}) {
+        $plugins->{$plugin}->options(@opts);
+    }
+    else {
+        require "WWW/Mechanize/Plugin/$plugin.pm";
+        $plugins->{$plugin} =
+            "WWW::Mechanize::Plugin::$plugin"->init($self,@opts);
+    }
+    $plugins->{$plugin};
+}
+sub plugin { my $self = shift; return $self->{plugins}{+shift}; }
+
+
 1; # End of module
 
 __END__
