[Catalyst-commits] r7535 - in Catalyst-Plugin-SmartURI/1.000/trunk:
lib/Catalyst lib/Catalyst/Plugin t t/uri
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Sun Mar 30 07:46:27 BST 2008
Author: caelum
Date: 2008-03-30 07:46:26 +0100 (Sun, 30 Mar 2008)
New Revision: 7535
Modified:
Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/Plugin/SmartURI.pm
Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/SmartURI.pm
Catalyst-Plugin-SmartURI/1.000/trunk/t/04-smart-uri-subclass.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/abs.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/clone.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/data.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/escape.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/file.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ftp.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/generic.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/heuristic.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/http.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ldap.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mailto.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mix.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mms.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/news.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-absconf.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-base.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-file.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-relbase.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/pop.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/query-param.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rel.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rfc2732.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/roy-test.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rsync.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rtsp.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/sip.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/split.t
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/storable-test.pl
Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/urn-oid.t
Log:
Slightly more sane.
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/Plugin/SmartURI.pm
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/Plugin/SmartURI.pm 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/Plugin/SmartURI.pm 2008-03-30 06:46:26 UTC (rev 7535)
@@ -112,7 +112,7 @@
sub uri_for {
my $c = shift;
- $c->prepare_uri($c->next::method(@_), $c->req)
+ $c->prepare_uri($c->next::method(@_))
}
{
@@ -122,7 +122,7 @@
sub uri_with {
my $req = shift;
- $context->prepare_uri($req->next::method(@_), $req)
+ $context->prepare_uri($req->next::method(@_))
}
}
@@ -151,12 +151,12 @@
}
sub prepare_uri {
- my ($c, $uri, $req) = @_;
- my $disposition = $c->uri_disposition;
+ my ($c, $uri) = @_;
+ my $disposition = $c->uri_disposition;
eval 'require '.$c->uri_class;
- $c->uri_class->new($uri, { reference => $req->uri })->$disposition
+ $c->uri_class->new($uri, { reference => $c->req->uri })->$disposition
}
# Reset accessors to configured values at beginning of request.
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/SmartURI.pm
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/SmartURI.pm 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/lib/Catalyst/SmartURI.pm 2008-03-30 06:46:26 UTC (rev 7535)
@@ -260,11 +260,14 @@
$self->$method
}
-# Preload some URI classes, the ones that come in files anyway
+# Preload some URI classes, the ones that come in files anyway,
+# but only if asked to.
sub import {
no strict 'refs';
my $class = shift;
+ return unless $_[0] && $_[0] eq '-import_uri_mods';
+
return if ${$class.'::__INITIALIZED__'};
# File::Find::Rule is not taint safe, and Module::Starter suggests running
@@ -453,12 +456,12 @@
=head1 MAGICAL IMPORT
-On import (when you "use" the module) it loads all the URI .pms into the class
-namespace.
+On import with the C<-import_uri_mods> flag it loads all the URI .pms into your
+class namespace.
This works:
- use Catalyst::SmartURI;
+ use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::WithBase;
use Catalyst::SmartURI::URL;
@@ -466,7 +469,7 @@
Even this works:
- use Catalyst::SmartURI;
+ use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::Escape qw(%escapes);
It even works with a subclass of Catalyst::SmartURI.
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/04-smart-uri-subclass.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/04-smart-uri-subclass.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/04-smart-uri-subclass.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -28,7 +28,7 @@
}
BEGIN {
- MyURI->import;
+ MyURI->import('-import_uri_mods');
use_ok('MyURI::URL')
}
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/abs.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/abs.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/abs.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -5,7 +5,7 @@
# This test the resolution of abs path for all examples given
# in the "Uniform Resource Identifiers (Catalyst::SmartURI): Generic Syntax" document.
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$base = "http://a/b/c/d;p?q";
$testno = 1;
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/clone.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/clone.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/clone.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..2\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::URL;
my $b = Catalyst::SmartURI::URL->new("http://www/");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/data.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/data.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/data.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -11,7 +11,7 @@
print "1..21\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new("data:,A%20brief%20note");
print "not " unless $u->scheme eq "data" && $u->opaque eq ",A%20brief%20note";
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/escape.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/escape.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/escape.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..9\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::Escape;
print "not " unless uri_escape("|abcå") eq "%7Cabc%E5";
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/file.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/file.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/file.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -1,6 +1,6 @@
#!perl -w
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::file;
@tests = (
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ftp.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ftp.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ftp.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..13\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $uri;
$uri = Catalyst::SmartURI->new("ftp://ftp.example.com/path");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/generic.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/generic.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/generic.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..48\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$foo = Catalyst::SmartURI->new("Foo:opaque#frag");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/heuristic.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/heuristic.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/heuristic.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -7,7 +7,7 @@
print "1..15\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::Heuristic qw(uf_urlstr uf_url);
if (shift) {
$URI::Heuristic::DEBUG++;
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/http.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/http.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/http.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..13\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new("<http://www.perl.com/path?q=fôo>");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ldap.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ldap.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/ldap.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..22\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $uri;
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mailto.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mailto.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mailto.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..7\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new('mailto:gisle at aas.no');
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mix.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mix.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mix.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..6\n";
# Test mixing of Catalyst::SmartURI and Catalyst::SmartURI::WithBase objects
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::WithBase;
use Catalyst::SmartURI::URL;
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mms.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mms.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/mms.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..8\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new("<mms://66.250.188.13/KFOG_FM>");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/news.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/news.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/news.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..7\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new("news:comp.lang.perl.misc");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-absconf.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-absconf.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-absconf.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..6\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::URL qw(url);
# Test configuration via some global variables.
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-base.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-base.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-base.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -1,6 +1,6 @@
#!/local/bin/perl -w
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::URL qw(url);
use Catalyst::SmartURI::Escape qw(uri_escape uri_unescape);
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-file.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-file.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-file.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -1,6 +1,6 @@
#!perl -w
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::file;
$URI::file::DEFAULT_AUTHORITY = undef;
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-relbase.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-relbase.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/old-relbase.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..5\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::URL;
# We used to have problems with URLs that used a base that was
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/pop.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/pop.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/pop.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..8\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new('pop://aas@pop.sn.no');
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/query-param.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/query-param.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/query-param.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -4,7 +4,7 @@
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::QueryParam;
my $u = Catalyst::SmartURI->new("http://www.sol.no?foo=4&bar=5&foo=5");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rel.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rel.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rel.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..4\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $uri = Catalyst::SmartURI->new("http://www.example.com/foo/bar/");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rfc2732.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rfc2732.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rfc2732.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..9\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $uri = Catalyst::SmartURI->new("http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html");
print "not " unless $uri->as_string eq "http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html";
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/roy-test.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/roy-test.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/roy-test.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -10,7 +10,7 @@
}
}
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$no = 1;
for $i (1..5) {
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rsync.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rsync.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rsync.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..4\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $u = Catalyst::SmartURI->new('rsync://gisle@perl.com/foo/bar');
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rtsp.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rtsp.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/rtsp.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..9\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
$u = Catalyst::SmartURI->new("<rtsp://media.perl.com/fôo.smi/>");
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/sip.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/sip.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/sip.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -2,7 +2,7 @@
print "1..11\n";
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use strict;
my $u = Catalyst::SmartURI->new('sip:phone at domain.ext');
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/split.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/split.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/split.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..17\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
use Catalyst::SmartURI::Split qw(uri_split uri_join);
sub j { join("-", map { defined($_) ? $_ : "<undef>" } @_) }
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/storable-test.pl
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/storable-test.pl 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/storable-test.pl 2008-03-30 06:46:26 UTC (rev 7535)
@@ -4,7 +4,7 @@
use Storable;
if (@ARGV && $ARGV[0] eq "store") {
- use Catalyst::SmartURI;
+ use Catalyst::SmartURI '-import_uri_mods';
require Catalyst::SmartURI::URL;
my $a = {
u => new Catalyst::SmartURI('http://search.cpan.org/'),
Modified: Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/urn-oid.t
===================================================================
--- Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/urn-oid.t 2008-03-30 00:51:46 UTC (rev 7534)
+++ Catalyst-Plugin-SmartURI/1.000/trunk/t/uri/urn-oid.t 2008-03-30 06:46:26 UTC (rev 7535)
@@ -3,7 +3,7 @@
print "1..4\n";
use strict;
-use Catalyst::SmartURI;
+use Catalyst::SmartURI '-import_uri_mods';
my $u = Catalyst::SmartURI->new("urn:oid");
More information about the Catalyst-commits
mailing list