3 files changed, 28 insertions, 48 deletions

diff --git a/lib/WebService/ForecastIo.pm b/lib/WebService/ForecastIo.pm
index 6d37519..f3bf109 100644
--- a/lib/WebService/ForecastIo.pm
+++ b/lib/WebService/ForecastIo.pm
@@ -2,13 +2,13 @@ package WebService::ForecastIo;
 use Moo;
 use 5.10.0;
 use Types::Standard -types,'slurpy';
-use Type::Utils qw(duck_type enum);
 use Types::URI 'Uri';
 use Types::DateTime -all;
 use Type::Params;
+use Future::AsyncAwait;
 use WebService::ForecastIo::Response;
 use DateTime::TimeZone;
-use namespace::autoclean;
+use namespace::clean;
 
 has base_uri => (
     is => 'ro',
@@ -24,19 +24,10 @@ has api_key => (
 );
 
 has user_agent => (
-    is => 'lazy',
-    isa => duck_type(['get']),
+    is => 'ro',
+    isa => HasMethods['do_request'],
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $agent = LWP::UserAgent->new(
-        agent => __PACKAGE__ . ' version ' . ($WebService::ForecastIo::VERSION // 'devel' ),
-        env_proxy => 1,
-        keep_alive => 1,
-    );
-    $agent->default_header( 'Accept-Encoding' => 'gzip' );
-    return $agent;
-}
 
 sub _make_request_uri {
     my ($self,$opts) = @_;
@@ -74,10 +65,10 @@ sub _make_request_uri {
     return $req_uri;
 }
 
-my $units_type = enum [qw(us si ca uk auto)];
-my $block_type = enum [qw(currently minutely hourly daily alerts flags sources)];
+my $units_type = Enum [qw(us si ca uk auto)];
+my $block_type = Enum [qw(currently minutely hourly daily alerts flags sources)];
 
-sub request {
+async sub request {
     state $argcheck = compile(
         Object, Dict[
             latitude => Num,
@@ -85,25 +76,22 @@ sub request {
             time => Optional[DateTimeUTC],
             units => Optional[$units_type],
             exclude => Optional[ArrayRef[$block_type]],
-            raw => Optional[Bool],
         ],
     );
     my ($self,$opts) = $argcheck->(@_);
     $opts->{units} //= 'si';
     $opts->{exclude} //= [];
-    $opts->{raw} //= 0;
 
     my $uri = $self->_make_request_uri({%$opts});
 
-    my $response = $self->user_agent->get($uri);
+    my $response = await $self->user_agent->do_request(uri => $uri);
+
     if ($response->is_success) {
         my $json = $response->decoded_content;
-        return $json if $opts->{raw};
-        my $res = WebService::ForecastIo::Response->new($json);
-        return wantarray ? ($res,$json) : $res
+        return WebService::ForecastIo::Response->new($json);
     }
     else {
-        die $response->status_line
+        die $response->status_line;
     }
 }
 
diff --git a/lib/WebService/TFL/Bus.pm b/lib/WebService/TFL/Bus.pm
index 31bd9c3..8f43c0f 100644
--- a/lib/WebService/TFL/Bus.pm
+++ b/lib/WebService/TFL/Bus.pm
@@ -1,21 +1,16 @@
 package WebService::TFL::Bus;
 use Moo;
 use Types::URI 'Uri';
-use Type::Utils 'duck_type';
+use Types::Standard -types;
+use Future::AsyncAwait;
 use WebService::TFL::Bus::Response;
 use namespace::clean;
 
 has user_agent => (
-    isa => duck_type(['get']),
-    is => 'lazy',
-
+    isa => HasMethods['do_request'],
+    is => 'ro',
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $ua = LWP::UserAgent->new();
-    $ua->env_proxy;
-    return $ua;
-}
 
 has uri => (
     isa => Uri,
@@ -29,7 +24,7 @@ has parser => (
     builder => sub { JSON->new->utf8 },
 );
 
-sub request {
+async sub request {
     my ($self,$stop_id) = @_;
 
     my $uri = $self->uri->clone;
@@ -37,7 +32,8 @@ sub request {
         map { $_ eq '__' ? $stop_id : $_ } $uri->path_segments
     );
 
-    my $http_response = $self->user_agent->get($uri);
+    my $http_response = await $self->user_agent->do_request(uri => $uri);
+
     if ($http_response->is_success) {
         my $json = $http_response->content;
 
diff --git a/lib/WebService/TFL/TubeStatus.pm b/lib/WebService/TFL/TubeStatus.pm
index 4166a79..52d573d 100644
--- a/lib/WebService/TFL/TubeStatus.pm
+++ b/lib/WebService/TFL/TubeStatus.pm
@@ -1,20 +1,16 @@
 package WebService::TFL::TubeStatus;
 use Moo;
-use Type::Utils 'duck_type';
 use Types::URI 'Uri';
+use Types::Standard -types;
+use Future::AsyncAwait;
 use WebService::TFL::TubeStatus::Response;
-use namespace::autoclean;
+use namespace::clean;
 
 has user_agent => (
-    isa => duck_type(['get']),
-    is => 'lazy',
+    isa => HasMethods['do_request'],
+    is => 'ro',
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $ua = LWP::UserAgent->new();
-    $ua->env_proxy;
-    return $ua;
-}
 
 has uri => (
     isa => Uri,
@@ -28,11 +24,11 @@ has parser => (
     builder => sub { JSON->new->utf8 },
 );
 
-sub request {
+async sub request {
     my ($self) = @_;
 
+    my $http_response = await $self->user_agent->do_request(uri => $self->uri);
 
-    my $http_response = $self->user_agent->get($self->uri);
     if ($http_response->is_success) {
         my $json = $http_response->content;