diff options
Diffstat (limited to 'lib/Net/Riak/Role')
| -rw-r--r-- | lib/Net/Riak/Role/MapReduce.pm | 2 | ||||
| -rw-r--r-- | lib/Net/Riak/Role/REST.pm | 20 | ||||
| -rw-r--r-- | lib/Net/Riak/Role/UserAgent.pm | 7 |
3 files changed, 22 insertions, 7 deletions
diff --git a/lib/Net/Riak/Role/MapReduce.pm b/lib/Net/Riak/Role/MapReduce.pm index d80e242..48f3805 100644 --- a/lib/Net/Riak/Role/MapReduce.pm +++ b/lib/Net/Riak/Role/MapReduce.pm @@ -20,7 +20,7 @@ sub link { sub map { my ($self, @args) = @_; my $mr = Net::Riak::MapReduce->new(client => $self->client); - $mr->mapd(@args); + $mr->map(@args); $mr; } diff --git a/lib/Net/Riak/Role/REST.pm b/lib/Net/Riak/Role/REST.pm index 1a18ff7..136ea88 100644 --- a/lib/Net/Riak/Role/REST.pm +++ b/lib/Net/Riak/Role/REST.pm @@ -6,6 +6,10 @@ use URI; use HTTP::Request; use Moose::Role; +requires 'http_request'; +requires 'http_response'; +requires 'useragent'; + sub _build_path { my ($self, $path) = @_; $path = join('/', @$path); @@ -20,10 +24,22 @@ sub _build_uri { $uri; } -sub request { +# constructs a HTTP::Request +sub new_request { my ($self, $method, $path, $params) = @_; my $uri = $self->_build_uri($path, $params); - HTTP::Request->new($method => $uri); + return HTTP::Request->new($method => $uri); +} + +# makes a HTTP::Request returns and stores a HTTP::Response +sub send_request { + my ($self, $req) = @_; + + $self->http_request($req); + my $r = $self->useragent->request($req); + $self->http_response($r); + + return $r; } 1; diff --git a/lib/Net/Riak/Role/UserAgent.pm b/lib/Net/Riak/Role/UserAgent.pm index ecc412f..123a378 100644 --- a/lib/Net/Riak/Role/UserAgent.pm +++ b/lib/Net/Riak/Role/UserAgent.pm @@ -6,9 +6,9 @@ use Moose::Role; use LWP::UserAgent; has useragent => ( - is => 'rw', - isa => 'LWP::UserAgent', - lazy => 1, + is => 'rw', + isa => 'LWP::UserAgent', + lazy => 1, default => sub { my $self = shift; @@ -19,7 +19,6 @@ has useragent => ( @LWP::Protocol::http::EXTRA_SOCK_OPTS = %opts; my $ua = LWP::UserAgent->new; - $ua->timeout(3); $ua; } ); |