Changeset 13820

Timestamp:

06/13/08 18:30:47 (5 years ago)

Author:

hakobe

Message:

* 新しいautoboxの形式に書き換え
* エラーをトラップするように変更
* http_proxy環境変数を使うように変更

Location:

lang/perl/autobox-URI-Fetch/trunk

Files:

• lib/autobox/URI/Fetch.pm (modified) (2 diffs)
• t/01_fetch.t (modified) (1 diff)

lang/perl/autobox-URI-Fetch/trunk/lib/autobox/URI/Fetch.pm

@@ -2 +2 @@
 
 use strict;
-use 5.8.1;
-our $VERSION = '0.01';
+use warnings;
+use 5.8.8;
+our $VERSION = '0.02';
 
-use autobox;
+use base qw(autobox);
+
+sub import {
+    shift->SUPER::import(STRING => 'autobox::URI::Fetch::Impl');
+}
+
+package # hide from pause
+    autobox::URI::Fetch::Impl;
+
 use Carp;
-use Regexp::Common qw(URI);
 use URI;
 use URI::Fetch;
 
-sub SCALAR::fetch {
+my $ua = LWP::UserAgent->new;
+   $ua->env_proxy;
+
+sub fetch {
     my $uri = URI->new(shift);
+    my $res = URI::Fetch::fetch('URI::Fetch', $uri, UserAgent => $ua)
+        or croak(URI::Fetch->errstr);
 
-    return URI::Fetch::fetch('URI::Fetch', $uri);
+    return $res;
 }
 
-sub SCALAR::content {
+sub content {
     my $uri = URI->new(shift);
-    my $res = URI::Fetch::fetch('URI::Fetch', $uri);
+    my $res = URI::Fetch::fetch('URI::Fetch', $uri, UserAgent => $ua)
+        or croak(URI::Fetch->errstr);
 
     return $res->content;
@@ -33 +47 @@
 =head1 SYNOPSIS
 
-  use autobox;
   use autobox::URI::Fetch;
 

lang/perl/autobox-URI-Fetch/trunk/t/01_fetch.t

@@ -2 +2 @@
 use warnings;
 
-use autobox;
+use Test::More tests => 4;
+use Test::Exception;
+
 use autobox::URI::Fetch;
-
-use URI::Fetch;
-use Readonly;
-use Test::More tests => 2;
 
 isa_ok('http://d.hatena.ne.jp'->fetch, 'URI::Fetch::Response');
 like(
     'http://d.hatena.ne.jp'->content, 
-    qr{^<!DOCTYPE\ HTML\ PUBLIC\ "-//W3C//DTD\ HTML\ 4\.01\ Transitional//EN">}xms,
-    'content'
+    qr{^<!DOCTYPE\ HTML\ PUBLIC\ "-//W3C//DTD\ HTML\ 4\.01\ Transitional//EN">}xms
 );
 
+dies_ok { 'http://dummy'->fetch   };
+dies_ok { 'http://dummy'->content };