[haver-commits] r903 - in trunk: . perl/server/lib/Haver/Server perl/server/lib/Haver/Server/Entity perl/server/lib/Haver/Server/Wheel perl/server/t

[haver]

Author: dylan
Date: 2005-08-01 14:09:44 -0400 (Mon, 01 Aug 2005)
New Revision: 903

Modified:
   trunk/
   trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm
   trunk/perl/server/lib/Haver/Server/Talker.pm
   trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
   trunk/perl/server/t/005_lobby.t
Log:
Don't need a command stack.

Removed keep(), use passcode existence for now...
Fixed it so the test case won't fail.


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1330
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1335
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm 2005-08-01 15:04:37 UTC 
(rev 902)
+++ trunk/perl/server/lib/Haver/Server/Entity/Avatar.pm 2005-08-01 18:09:44 UTC 
(rev 903)
@@ -11,11 +11,17 @@
 field -weak    => 'wheel';
 field _access  => {};
 field passcode => undef;
-field keep     => 0;
 field address  => '0.0.0.*';
 field version  => 'unknown';
 field email    => '';
 
+sub initialize {
+       my ($self) = @_;
+       if (not exists $self->{passcode}) {
+               $self->{passcode} = undef;
+       }
+}
+
 sub put {
        my ($self, $msg) = @_;
 
@@ -51,7 +57,6 @@
        $self->_access($data->{access});
        $self->passcode($data->{passcode});
        $self->email($data->{email});
-       $self->keep(1);
 
        return $self;
 }

Modified: trunk/perl/server/lib/Haver/Server/Talker.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Talker.pm        2005-08-01 15:04:37 UTC 
(rev 902)
+++ trunk/perl/server/lib/Haver/Server/Talker.pm        2005-08-01 18:09:44 UTC 
(rev 903)
@@ -85,18 +85,16 @@
        my $cmd = shift @$args;
        my $event = 'msg_' . $cmd;
        
-       Log('info', 'Cmd Stack: ', join(", ", @{ $heap->{cmd} || [] }));
        Log('info', "Command: '$cmd'");
-       push @{ $heap->{cmd} }, $cmd;
+       $heap->{cmd} = $cmd;
        call('schedule_ping');
        call($event, $args, $cmd);
-       pop @{ $heap->{cmd} };
 }
 
 sub fail {
        my ($kernel, $heap, $err, @args) = @_[KERNEL, HEAP, ARG0 .. $#_];
-       Log('info', "Failing client on command $heap->{cmd}[-1] with error 
$err");
-       $heap->{client}->put(['FAIL', $heap->{cmd}[-1], $err, @args]);
+       Log('info', "Failing client on command $heap->{cmd} with error $err");
+       $heap->{client}->put(['FAIL', $heap->{cmd}, $err, @args]);
 }
 
 
@@ -133,7 +131,7 @@
        if (@why) {
                if ($heap->{user}) {
                        my $user = delete $heap->{user};
-                       $store->insert($user) if $user->keep;
+                       $store->insert($user) if defined $user->passcode;
                        $lobby->remove($user->namespace, $user->name);
                        my %seen;
                        foreach my $name ($user->channels) {

Modified: trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm     2005-08-01 15:04:37 UTC 
(rev 902)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm     2005-08-01 18:09:44 UTC 
(rev 903)
@@ -33,7 +33,6 @@
                return;
        }
 
-       $user->keep(1);
        $user->passcode($passcode);
        $user->email($email);
        $store->insert($user);

Modified: trunk/perl/server/t/005_lobby.t
===================================================================
--- trunk/perl/server/t/005_lobby.t     2005-08-01 15:04:37 UTC (rev 902)
+++ trunk/perl/server/t/005_lobby.t     2005-08-01 18:09:44 UTC (rev 903)
@@ -13,7 +13,7 @@
 );
 my $lobby = new Haver::Server::Entity::Lobby;
 $lobby->add($chan);
-my $data = $lobby->dump;
+my $data = $lobby->dump(new FakeStore);
 
 is($data->{channels}[0], 'pants', "dumps lobby");
 
@@ -33,4 +33,6 @@
                my ($self, $ns, $name) = @_;
                new Haver::Server::Entity::Channel(name => $name);
        }
+
+       sub insert { 1 }
 }