Changeset 11757

Timestamp:

05/17/08 17:56:53 (5 years ago)

Author:

kan

Message:

component config to attribute.
fix TODO

Location:

lang/perl/XIRCD/trunk

Files:

• TODO (modified) (1 diff)
• lib/XIRCD.pm (modified) (1 diff)
• lib/XIRCD/Component.pm (modified) (2 diffs)
• lib/XIRCD/Component/Server.pm (modified) (2 diffs)
• lib/XIRCD/Component/Twitter.pm (modified) (7 diffs)
• lib/XIRCD/Component/Wassr.pm (modified) (8 diffs)

lang/perl/XIRCD/trunk/TODO

@@ -1 @@
-- auto START & STOP
--- auto join channel
--- config to attribute
--- join_channel, yeild, publish_message, etc ... write DSL
 - support TIG like message queue
+- more tests

lang/perl/XIRCD/trunk/lib/XIRCD.pm

@@ -26 +26 @@
             %{$component} 
         );
-        warn "load $module";
     }
 

lang/perl/XIRCD/trunk/lib/XIRCD/Component.pm

@@ -40 +40 @@
     my ($nick, $text) = @_;
 
-    post ircd => 'publish_message' => $nick, $self->channel, $text;
+    post ircd => '_publish_message' => $nick, $self->channel, $text;
 }
 
@@ -47 +47 @@
     my ($text,) = @_;
 
-    post ircd => 'publish_notice' => $self->channel, $text;
+    post ircd => '_publish_notice' => $self->channel, $text;
 }
 

lang/perl/XIRCD/trunk/lib/XIRCD/Component/Server.pm

@@ -60 +60 @@
 };
 
-event publish_message => sub {
+event _publish_message => sub {
     my ($nick, $channel, $message) = get_args;
 
@@ -78 +78 @@
 };
 
-event publish_notice => sub {
+event _publish_notice => sub {
     my ($channel, $message) = get_args;
 

lang/perl/XIRCD/trunk/lib/XIRCD/Component/Twitter.pm

@@ -3 +3 @@
 use XIRCD::Component;
 
-with qw(MooseX::POE::Aliased);
+with qw(XIRCD::Role);
 
 use Encode;
@@ -13 +13 @@
 
 
-has 'config' => (
-    isa => 'HashRef',
-    is  => 'rw',
-);
+has 'apiurl'   => ( isa => 'Str', is => 'rw', default => sub { 'http://twitter.com/statuses' } );
+has 'apihost'  => ( isa => 'Str', is => 'rw', default => sub { 'twitter.com:80' } );
+has 'apirealm' => ( isa => 'Str', is => 'rw', default => sub { 'Twitter API' } );
+
+has 'screenname' => ( isa => 'Str', is => 'rw' );
+has 'username'   => ( isa => 'Str', is => 'rw' );
+has 'password'   => ( isa => 'Str', is => 'rw' );
+has 'retry'      => ( isa => 'Int', is => 'rw', default => sub { 60 } );
 
 has 'since' => (
@@ -25 +29 @@
     my $call = shift;
 
-    my self = $call->(@_);
+    my $self = $call->(@_);
 
     POE::Component::Client::HTTP->spawn(
         Agent => 'xircd_component_twitter/0.1',
-        Alias => self->http_alias,
+        Alias => $self->http_alias,
     );
 
-    self->config->{apiurl}   ||= 'http://twitter.com/statuses';
-    self->config->{apihost}  ||= 'twitter.com:80';
-    self->config->{apirealm} ||= 'Twitter API';
-    self->config->{alias}    ||= 'twitter';
-
-    return self;
+    return $self;
 };
-
-sub START {
-    self->alias('twitter');
-
-    debug "start twitter";
-
-    POE::Kernel->post( ircd => 'join_channel', self->config->{channel}, self->alias );
-    self->yield('read_twitter_friend_timeline');
-}
 
 event send_message => sub {
@@ -53 +43 @@
 
     my $req = HTTP::Request::Common::POST(
-        self->config->{apiurl} . '/update.json',
+        self->apiurl . '/update.json',
         [ status => encode('utf-8',$status) ],
     );  
-    $req->authorization_basic(self->config->{twitter}->{username}, self->config->{twitter}->{password});
+    $req->authorization_basic(self->username, self->password);
 
-    POE::Kernel->post(self->http_alias => request => 'http_response', $req);
+    post self->http_alias => request => 'http_response', $req;
 };
 
-event read_twitter_friend_timeline => sub {
+event start => sub {
     debug "read twitter";
 
-    my $uri = URI->new(self->config->{apiurl} . '/friends_timeline.json');
+    my $uri = URI->new(self->apiurl . '/friends_timeline.json');
     $uri->query_form(since => HTTP::Date::time2str(self->since)) if self->since;
     self->since(time);
 
     my $req = HTTP::Request->new(GET => $uri);
-    $req->authorization_basic(self->config->{twitter}->{username}, self->config->{twitter}->{password});
+    $req->authorization_basic(self->username, self->password);
 
-    POE::Kernel->post(self->http_alias => request => 'http_response', $req);
+    post self->http_alias => request => 'http_response', $req;
 };
 
@@ -83 +73 @@
     if ($uri =~ /update.json/) {
         unless ($response->is_success) {
-            self->yield(response_error => $response);
+            yield response_error => $response;
             return;
         }
-        self->yield(update_success => $response);
+        yield update_success => $response;
     } elsif ($uri =~ /friends_timeline.json/) {
-        self->yield(friend_timeline_success => $response);
+        yield friend_timeline_success => $response;
     }
 };
@@ -99 +89 @@
         my $ret = JSON::Any->jsonToObj($response->content);
         for my $line ( reverse @{ $ret || [] } ) {
-            POE::Kernel->post(
-                ircd => publish_message => 
-                    $line->{user}->{screen_name},
-                    self->config->{channel}, 
-                    $line->{text},
-            );
+            publish_message  $line->{user}->{screen_name} => $line->{text};
         }
     }
 
-    POE::Kernel->delay('read_twitter_friend_timeline', self->config->{twitter}->{retry});
+    delay start => self->retry;
 };
 
@@ -116 +101 @@
     if ( $response->is_success ) {
         my $ret = JSON::Any->jsonToObj($response->content);
-        POE::Kernel->post( ircd => publish_notice => self->config->{channel}, $ret->{text} );
+        publish_notice $ret->{text};
     }
 };

lang/perl/XIRCD/trunk/lib/XIRCD/Component/Wassr.pm

@@ -3 +3 @@
 use XIRCD::Component;
 
-with 'MooseX::POE::Aliased';
+with 'XIRCD::Role';
 
 use POE qw(
@@ -15 +15 @@
 use POE::Filter::XML::NS qw/:JABBER :IQ/;
 
-has 'config' => (
-    isa => 'HashRef',
-    is  => 'rw',
-);
-
 has 'jabber' => (
     isa     => 'POE::Component::Jabber',
     is      => 'rw',
 );
+
+has 'username' => ( isa => 'Str', is => 'rw' );
+has 'password' => ( isa => 'Str', is => 'rw' );
+has 'server'   => ( isa => 'Str', is => 'rw' );
+has 'port'     => ( isa => 'Int', is => 'rw', default => sub { 5222 } );
 
 has 'jid' => (
@@ -30 +30 @@
 );
 
-sub START {
+event start => sub {
     self->alias('wassr');
 
     debug "start wassr";
-
-    my ($username, $hostname) = split '@', self->config->{jabber}->{username};
+    warn self->channel;
+    my ($username, $hostname) = split '@', self->username;
 
     self->jabber(
         POE::Component::Jabber->new(
-            IP       => self->config->{jabber}->{server},
-            Port     => self->config->{jabber}->{port} || 5222,
+            IP       => self->server,
+            Port     => self->port,
             Hostname => $hostname,
             Username => $username,
-            Password => self->config->{jabber}->{password},
+            Password => self->password,
             Alias    => 'jabber',
             States   => {
@@ -54 +54 @@
     );
 
-    POE::Kernel->post( ircd => 'join_channel', self->config->{channel}, self->alias );
-    POE::Kernel->post( jabber => 'connect' );
-}
+    post jabber => 'connect';
+};
 
 event status_handler => sub {
@@ -65 +64 @@
         self->jid(self->jabber->jid);
 
-        POE::Kernel->post(jabber => 'output_handler', POE::Filter::XML::Node->new('presence'));
-        POE::Kernel->post(jabber => 'purge_queue');
+        post jabber => 'output_handler', POE::Filter::XML::Node->new('presence');
+        post jabber => 'purge_queue';
     }
 };
 
 event input_handler => sub {
-    my self = shift;
     my ($node,) = get_args;
 
@@ -81 +79 @@
         my ($nick, $text) = $body->data =~ /^([A-Za-z0-9_.-]+): (.*)/s;
         if ($nick && $text) {
-            POE::Kernel->post( ircd => 'publish_message', $nick, self->config->{channel}, $text );
+            publish_message $nick => $text;
         } else {
-            POE::Kernel->post( ircd => 'publish_notice', self->config->{channel}, $body->data );
+            publish_notice self->config->{channel} => $body->data;
         }
     }
@@ -100 +98 @@
     debug "send:", $node->to_str;
 
-    POE::Kernel->post( jabber => output_handler => $node );
+    post jabber => output_handler => $node;
 };
 
@@ -107 +105 @@
 
     if ( $error == +PCJ_SOCKETFAIL or $error == +PCJ_SOCKETDISCONNECT or $error == +PCJ_CONNECTFAIL ) {
-        print "Reconnecting!\n";
-        POE::Kernel->post( jabber => 'reconnect' );
+        debug "Reconnecting!";
+        post jabber => 'reconnect';
     }
     elsif ( $error == +PCJ_SSLFAIL ) {
-        print "TLS/SSL negotiation failed\n";
+        debug "TLS/SSL negotiation failed";
     }
     elsif ( $error == +PCJ_AUTHFAIL ) {
-        print "Failed to authenticate\n";
+        debug "Failed to authenticate";
     }
     elsif ( $error == +PCJ_BINDFAIL ) {
-        print "Failed to bind a resource\n";
+        debug "Failed to bind a resource";
     }
     elsif ( $error == +PCJ_SESSIONFAIL ) {
-        print "Failed to establish a session\n";
+        debug "Failed to establish a session";
     }
 };