Changeset 11778 for lang/perl/Punc/trunk

Timestamp:

05/17/08 20:38:17 (6 months ago)

Author:

mizzy

Message:

r68@puppet: miya | 2008-05-16 02:12:11 +0900

Location:

lang/perl/Punc/trunk/lib/Punc

Files:

• Client.pm (modified) (1 diff)
• Client/Request.pm (modified) (4 diffs)

lang/perl/Punc/trunk/lib/Punc/Client.pm

@@ -45 +45 @@
         module => $module,
     });
+
+    return $client->init;
 }
 

lang/perl/Punc/trunk/lib/Punc/Client/Request.pm

@@ -9 +9 @@
 our $AUTOLOAD;
 
-sub new {
-    my ( $class, $args ) = @_;
+use Moose;
 
-    my $confdir = $args->{conf}->{confdir};
+has 'conf'   => ( is => 'rw', isa => 'HashRef' );
+has 'hosts'  => ( is => 'rw', isa => 'ArrayRef' );
+has 'module' => ( is => 'rw', isa => 'Str' );
+has 'method' => ( is => 'rw', isa => 'Str' );
+has 'args'   => ( is => 'rw', isa => 'HashRef' );
+
+has 'client' => (
+    is      => 'rw',
+    isa     => 'JSON::RPC::Client',
+    default => sub { JSON::RPC::Client->new },
+);
+
+sub init {
+    my ( $self, $args ) = @_;
+
+    my $confdir = $self->conf->{confdir};
 
     $ENV{HTTPS_VERSION}   = 3;
@@ -22 +36 @@
     );
 
-    $args->{client} = JSON::RPC::Client->new;
-
-    bless $args, $class;
-}
+    return $self;
+};
 
 sub request {
@@ -31 +43 @@
 
     my $response = Punc::Client::Response->new;
-    for my $host ( @{ $self->{hosts} } ) {
+    for my $host ( @{ $self->hosts } ) {
 
         my $url     = "https://$host:7080/$self->{module}";
         my $callobj = {
-            method  => $self->{method},
-            params  => $self->{args},
+            method  => $self->method,
+            params  => $self->args,
         };
 
-        my $res = $self->{client}->call($url, $callobj) or warn @?;
+        my $res = $self->client->call($url, $callobj) or warn @?;
 
         if( $res ) {
@@ -58 +70 @@
     return if $method eq 'DESTROY';
 
-    $self->{method} = $method;
-    $self->{args}   = $args;
+    $self->method($method);
+    $self->args($args);
 
-    if ( $self->{module} eq 'file' and $self->{method} eq 'copy' ) {
+    if ( $self->module eq 'file' and $self->method eq 'copy' ) {
         open my $fh, '<', $args->{src} or die $!;
         $args->{content} = do { local $/; <$fh> };