Changeset 489

Timestamp:

01/31/09 14:16:16 (3 years ago)

Author:

dom

Message:

Support configurable user-agent (also update copyright year and fix hard-coding the test port number in four places)

Location:

wiki-toolkit-plugin-ping/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit/Plugin/Ping.pm (modified) (6 diffs)
• t/02_call.t (modified) (4 diffs)

wiki-toolkit-plugin-ping/trunk/Changes

@@ -1 +1 @@
 0.02    
         Skip database test when SQLite is not available
-        (fixes cpantesters 2957644, 3047914, 3122378)
+         (fixes cpantesters 2957644, 3047914, 3122378)
+        Support configurable user-agent (#18)
 
 0.01    5 December 2006

wiki-toolkit-plugin-ping/trunk/lib/Wiki/Toolkit/Plugin/Ping.pm

@@ -11 +11 @@
 
 @ISA = qw( Wiki::Toolkit::Plugin );
-$VERSION = '0.01';
+$VERSION = '0.02';
 
 
@@ -37 +37 @@
     }
     $self->{node_to_url} = $args{node_to_url};
+    $self->{agent} = $args{agent} || "Wiki::Toolkit::Plugin::Ping $VERSION";
     
 
@@ -98 +99 @@
         # Get a LWP instance
         my $ua = LWP::UserAgent->new;
-        $ua->agent("Wiki::Toolkit::Plugin::Ping $version");        
+        $ua->agent($self->{agent});
 
         # Ping each service
@@ -141 +142 @@
             services => {
                     "geourl" => 'http://geourl.org/ping?p=$url'
-            }
+            },
+            agent    => "My Wiki ping agent",
   );
   $wiki->register_pugin( plugin => $ping );
@@ -152 +154 @@
 
 You need to tell it how to turn a node into a URL (node_to_url), and what
-services to ping (services).
+services to ping (services). You can optionally pass a custom user-agent
+string
 
 =head1 AUTHOR
@@ -160 +163 @@
 =head1 COPYRIGHT
 
-     Copyright (C) 2003-2004 I. P. Williams (ivorw_openguides [at] xemaps {dot} com).
-     Copyright (C) 2006 the Wiki::Toolkit team (http://www.wiki-toolkit.org/)
-     All Rights Reserved.
+Copyright (C) 2003-2004 I. P. Williams (ivorw_openguides [at] xemaps {dot} com).
+Copyright (C) 2006-2009 the Wiki::Toolkit team (http://www.wiki-toolkit.org/)
+All Rights Reserved.
 
 This module is free software; you can redistribute it and/or modify it

wiki-toolkit-plugin-ping/trunk/t/02_call.t

@@ -14 +14 @@
     plan skip_all => 'SQLite not availalbe';
 } else {
-    plan tests => 4;
+    plan tests => 5;
 }
 
@@ -26 +26 @@
 my $wiki = Wiki::Toolkit->new( store=>$store );
 
+my $port = 112233;
 
 # Listen on a special port, so we can check a ping happened
 my $sock = new IO::Socket::INET (
-                    LocalPort => 112233,
+                    LocalPort => $port,
                     Proto => 'tcp',
                     Listen => 1,
 );
 unless($sock) {
-    die("Can't listen on port 112233 for test");
+    die("Can't listen on port $port for test");
 }
 
@@ -42 +43 @@
     node_to_url => "http://wiki.org/\$node",
     services => {
-        test => "http://localhost:112233/url=\$url"
-    }
+        test => "http://localhost:$port/url=\$url"
+    },
+    agent => "Wiki::Toolkit::Plugin::Ping test suite",
 );
 ok( $plugin, "Plugin was created OK with the local URL" );
@@ -74 +76 @@
 my $allreq = join "\n", @req;
 like( $req[0], qr/^GET \/url=http:\/\/wiki.org\/TestNode/, "Did right get" );
-like( $allreq, qr/^Host: localhost:112233/m, "Correct http/1.1 host" );
+like( $allreq, qr/^Host: localhost:$port/m, "Correct http/1.1 host" );
+like( $allreq, qr/^User-Agent: Wiki::Toolkit::Plugin::Ping test suite/m, "Correct user-agent" );
 
 # Send them an OK