Changeset 9687 for lang/perl/WebService-Simple/branch/lwp-base

Timestamp:

04/18/08 16:58:49 (8 months ago)

Author:

daisuke

Message:

lang/perl/WebService-Simple; make the test accept a flickr API, and actually parse the response

Location:

lang/perl/WebService-Simple/branch/lwp-base

Files:

• lib/WebService/Simple.pm (modified) (2 diffs)
• lib/WebService/Simple/Response.pm (modified) (1 diff)
• t/01_basic.t (modified) (3 diffs)

lang/perl/WebService-Simple/branch/lwp-base/lib/WebService/Simple.pm

@@ -5 +5 @@
 use warnings;
 use base qw(LWP::UserAgent Class::Data::ConfigHash);
+use WebService::Simple::Response;
 use UNIVERSAL::require;
 
@@ -75 +76 @@
         Carp::croak("request to $url failed");
     }
-    # まだできてない
-    # WebService::Simple::Response->new_from_response(
-    #   response => $response,
-    #   parser   => $self->reponse_parser
-    # );
-    return $response;
+
+    return WebService::Simple::Response->new_from_response(
+        response => $response,
+        parser   => $self->response_parser
+    );
 }
 

lang/perl/WebService-Simple/branch/lwp-base/lib/WebService/Simple/Response.pm

@@ +1 @@
+# $Id$
+
 package WebService::Simple::Response;
+use strict;
+use warnings;
+use base qw(HTTP::Response);
 
-use warnings;
-use strict;
-use Carp;
-use XML::Simple;
-our $VERSION = '0.01';
+sub new_from_response
+{
+    # XXX hack. This probably should be changed...
+    my $class = shift;
+    my %args  = @_;
+    my $self = bless $args{response}, $class;
+    $self->{__parser} = $args{parser};
+    return $self;
+}
 
-sub HTTP::Response::parse_xml {
-    my ($self, $opt) = @_;
-    my $xs = XML::Simple->new( %$opt );
-    my $results;
-    eval { $results = $xs->XMLin($self->content) };
-    croak("can't parse xml") if ($@);
-    return $results;
+sub parse_response
+{
+    my $self = shift;
+    return $self->{__parser}->parse_response($self);
 }
 

lang/perl/WebService-Simple/branch/lwp-base/t/01_basic.t

@@ -1 +1 @@
 use strict;
-use Test::More (tests => 5);
+use Test::More;
 
+my ($flickr_api_key);
 BEGIN
 {
+    $flickr_api_key = $ENV{FLICKR_API_KEY};
+    if (! $flickr_api_key ) {
+        plan( skip_all => "Please set FLICKR_API_KEY to enable this test" );
+    } else {
+        plan( tests => 10 );
+    }
+
     use_ok("WebService::Simple");
 }
@@ -10 +18 @@
     my $simple = WebService::Simple->new(
         base_url => "http://api.flickr.com/services/rest/",
+        params   => {
+            api_key => $flickr_api_key
+        }
     );
 
@@ -16 +27 @@
     ok( $simple->response_parser, "parser ok" );
     isa_ok( $simple->response_parser, "WebService::Simple::Parser::XML::Simple", "parser isa WebService::Simple::Parser::XML::Simple" );
+
+    my $response = $simple->get( { method => "flickr.test.echo", name => "value" } );
+
+    ok( $response );
+    isa_ok( $response, "WebService::Simple::Response" );
+
+    my $h = $response->parse_response;
+    ok($h);
+    isa_ok($h, 'HASH');
+
+    is( $h->{name}, 'value' );
 }