--- trunk/Nos.pm	2005/05/24 17:04:01	50
+++ trunk/Nos.pm	2005/06/21 09:14:54	56
@@ -16,7 +16,7 @@
 our @EXPORT = qw( 
 );
 
-our $VERSION = '0.4';
+our $VERSION = '0.5';
 
 use Class::DBI::Loader;
 use Email::Valid;
@@ -108,7 +108,10 @@
 	my $arg = {@_};
 
 	confess "need list name" unless ($arg->{'list'});
-	confess "need list email" unless ($arg->{'list'});
+	confess "need list email" unless ($arg->{'email'});
+
+	$arg->{'list'} = lc($arg->{'list'});
+	$arg->{'email'} = lc($arg->{'email'});
 
 	my $l = $self->_get_list($arg->{'list'}) ||
 		$self->_add_list( @_ ) ||
@@ -126,9 +129,10 @@
  	list => "My list",
 	email => "john.doe@example.com",
 	name => "John A. Doe",
+	ext_id => 42,
  );
 
-C<name> parametar is optional.
+C<name> and C<ext_id> parametars are optional.
 
 Return member ID if user is added.
 
@@ -139,9 +143,10 @@
 
 	my $arg = {@_};
 
-	my $email = $arg->{'email'} || croak "can't add user without e-mail";
+	my $email = lc($arg->{'email'}) || croak "can't add user without e-mail";
 	my $name = $arg->{'name'} || '';
-	my $list_name = $arg->{'list'} || croak "need list name";
+	my $list_name = lc($arg->{'list'}) || croak "need list name";
+	my $ext_id = $arg->{'ext_id'};
 
 	my $list = $self->_get_list($list_name) || croak "list $list_name doesn't exist";
 
@@ -164,6 +169,11 @@
 		$this_user->update;
 	}
 
+	if (defined($ext_id) && ($this_user->ext_id || '') ne $ext_id) {
+		$this_user->ext_id($ext_id);
+		$this_user->update;
+	}
+
 	my $user_on_list = $user_list->find_or_create({
 		user_id => $this_user->id,
 		list_id => $list->id,
@@ -191,7 +201,8 @@
 	email => 'dpavlin@rot13.org
  }
 
-If list is not found, returns false.
+If list is not found, returns false. If there is C<ext_id> in user data,
+that will also be returned.
 
 =cut
 
@@ -200,7 +211,7 @@
 
 	my $args = {@_};
 
-	my $list_name = $args->{'list'} || confess "need list name";
+	my $list_name = lc($args->{'list'}) || confess "need list name";
 
 	my $lists = $self->{'loader'}->find_class('lists');
 	my $user_list = $self->{'loader'}->find_class('user_list');
@@ -215,6 +226,9 @@
 			email => $user_on_list->user_id->email,
 		};
 
+		my $ext_id = $user_on_list->user_id->ext_id;
+		$row->{'ext_id'} = $ext_id if (defined($ext_id));
+
 		push @results, $row;
 	}
 
@@ -246,6 +260,8 @@
 
 	croak "need name or email of user to delete" unless ($args->{'name'} || $args->{'email'});
 
+	$args->{'email'} = lc($args->{'email'}) if ($args->{'email'});
+
 	my $key = 'name';
 	$key = 'email' if ($args->{'email'});
 
@@ -283,7 +299,7 @@
 
 	my $args = {@_};
 
-	my $list_name = $args->{'list'} || confess "need list name";
+	my $list_name = lc($args->{'list'}) || confess "need list name";
 	my $message_text = $args->{'message'} || croak "need message";
 
 	my $m = Email::Simple->new($message_text) || croak "can't parse message";
@@ -352,7 +368,7 @@
 
 	my $arg = {@_};
 
-	my $list_name = $arg->{'list'} || '';
+	my $list_name = lc($arg->{'list'}) || '';
 	my $driver = $arg->{'driver'} || '';
 	my $sleep = $arg->{'sleep'};
 	$sleep ||= 3 unless defined($sleep);
@@ -363,8 +379,9 @@
 	if (lc($driver) eq 'smtp') {
 		$email_send_driver = 'Email::Send::SMTP';
 		@email_send_options = ['127.0.0.1'];
+	} else {
+		warn "dumping all messages to STDERR\n";
 	}
-	warn "using $driver [$email_send_driver]\n";
 
 	my $lists = $self->{'loader'}->find_class('lists');
 	my $queue = $self->{'loader'}->find_class('queue');
@@ -467,6 +484,8 @@
 	return unless ($arg->{'message'});
 	croak "need list name" unless ($arg->{'list'});
 
+	$arg->{'list'} = lc($arg->{'list'});
+
 	my $this_list = $self->_get_list($arg->{'list'}) || croak "can't find list ".$arg->{'list'}."\n";
 
 	my $m = Email::Simple->new($arg->{'message'}) || croak "can't parse message";
@@ -484,7 +503,7 @@
 	my $hash;
 
 	foreach my $a (@addrs) {
-		if ($a->address =~ m/\+([a-f0-9]{$hl})@/) {
+		if ($a->address =~ m/\+([a-f0-9]{$hl})@/i) {
 			$hash = $1;
 			last;
 		}
@@ -508,7 +527,7 @@
 		my $users = $self->{'loader'}->find_class('users');
 		my $from = $m->header('From');
 		$from = $1 if ($from =~ m/<(.*)>/);
-		my $this_user = $users->search( email => $from )->first;
+		my $this_user = $users->search( email => lc($from) )->first;
 		$user_id = $this_user->id if ($this_user);
 	}
 
@@ -569,8 +588,8 @@
 
 	my $arg = {@_};
 
-	my $name = $arg->{'list'} || confess "can't add list without name";
-	my $email = $arg->{'email'} || confess "can't add list without e-mail";
+	my $name = lc($arg->{'list'}) || confess "can't add list without name";
+	my $email = lc($arg->{'email'}) || confess "can't add list without e-mail";
 	my $from_addr = $arg->{'from'};
 
 	my $lists = $self->{'loader'}->find_class('lists');
@@ -611,7 +630,7 @@
 
 	my $lists = $self->{'loader'}->find_class('lists') || confess "can't find lists class";
 
-	return $lists->search({ name => $name })->first;
+	return $lists->search({ name => lc($name) })->first;
 }
 
 ###
@@ -653,6 +672,7 @@
 
  $message_id = NewList(
 	list => 'My list',
+	from => 'Name of my list',
 	email => 'my-list@example.com'
  ); 
 
@@ -663,7 +683,7 @@
 
 	if ($_[0] !~ m/^HASH/) {
 		return $nos->new_list(
-			list => $_[0], email => $_[1],
+			list => $_[0], from => $_[1], email => $_[2],
 		);
 	} else {
 		return $nos->new_list( %{ shift @_ } );