--- trunk/Nos.pm	2005/05/17 19:15:27	37
+++ trunk/Nos.pm	2005/05/18 13:12:54	45
@@ -16,7 +16,7 @@
 our @EXPORT = qw( 
 );
 
-our $VERSION = '0.3';
+our $VERSION = '0.4';
 
 use Class::DBI::Loader;
 use Email::Valid;
@@ -56,8 +56,8 @@
 	hash_len => 8,
  );
 
-Parametar C<hash_len> defined length of hash which will be added to each
-outgoing e-mail message.
+Parametar C<hash_len> defines length of hash which will be added to each
+outgoing e-mail message to ensure that replies can be linked with sent e-mails.
 
 =cut
 
@@ -87,15 +87,18 @@
 
 =head2 new_list
 
-Create new list
+Create new list. Required arguments are name of C<list> and
+C<email> address.
 
  $nos->new_list(
- 	list => 'My list",
+ 	list => 'My list',
 	email => 'my-list@example.com',
  );
 
 Returns ID of newly created list.
 
+Calls internally L<_add_list>, see details there.
+
 =cut
 
 sub new_list {
@@ -155,8 +158,8 @@
 		email => $email,
 	}) || croak "can't find or create member\n";
 
-	if ($name && $this_user->full_name ne $name) {
-		$this_user->full_name($name || '');
+	if ($name && $this_user->name ne $name) {
+		$this_user->name($name || '');
 		$this_user->update;
 	}
 
@@ -172,6 +175,90 @@
 	return $this_user->id;
 }
 
+=head2 list_members
+
+List all members of some list.
+
+ my @members = list_members(
+ 	list => 'My list',
+ );
+
+Returns array of hashes with user informations like this:
+
+ $member = {
+ 	name => 'Dobrica Pavlinusic',
+	email => 'dpavlin@rot13.org
+ }
+
+If list is not found, returns false.
+
+=cut
+
+sub list_members {
+	my $self = shift;
+
+	my $args = {@_};
+
+	my $list_name = $args->{'list'} || confess "need list name";
+
+	my $lists = $self->{'loader'}->find_class('lists');
+	my $user_list = $self->{'loader'}->find_class('user_list');
+
+	my $this_list = $lists->search( name => $list_name )->first || return;
+
+	my @results;
+
+	foreach my $user_on_list ($user_list->search(list_id => $this_list->id)) {
+		my $row = {
+			name => $user_on_list->user_id->name,
+			email => $user_on_list->user_id->email,
+		};
+
+		push @results, $row;
+	}
+
+	return @results;
+
+}
+
+
+=head2 delete_member
+
+Delete member from database.
+
+ my $ok = delete_member(
+ 	name => 'Dobrica Pavlinusic'
+ );
+
+ my $ok = delete_member(
+ 	email => 'dpavlin@rot13.org'
+ );
+
+Returns false if user doesn't exist.
+
+=cut
+
+sub delete_member {
+	my $self = shift;
+
+	my $args = {@_};
+
+	croak "need name or email of user to delete" unless ($args->{'name'} || $args->{'email'});
+
+	my $key = 'name';
+	$key = 'email' if ($args->{'email'});
+
+	my $users = $self->{'loader'}->find_class('users');
+
+	my $this_user = $users->search( $key => $args->{$key} )->first || return;
+
+print Dumper($this_user);
+
+	$this_user->delete || croak "can't delete user\n";
+
+	return $users->dbi_commit || croak "can't commit";
+}
+
 =head2 add_message_to_list
 
 Adds message to one list's queue for later sending.
@@ -179,7 +266,7 @@
  $nos->add_message_to_list(
  	list => 'My list',
  	message => 'Subject: welcome to list
- 
+
  This is example message
  ',
  );	
@@ -285,13 +372,16 @@
 				my $hash = $auth->generate_hash( $to_email );
 
 				my $from = $u->list_id->name . " <" . $from . "+" . $hash . ( $domain ? "@" . $domain : '' ). ">";
-				my $to = $u->user_id->full_name . " <$to_email>";
+				my $to = $u->user_id->name . " <$to_email>";
 
 				my $m_obj = Email::Simple->new($msg) || croak "can't parse message";
 
 				$m_obj->header_set('From', $from) || croak "can't set From: header";
 				$m_obj->header_set('To', $to) || croak "can't set To: header";
 
+				$m_obj->header_set('X-Nos-Version', $VERSION);
+				$m_obj->header_set('X-Nos-Hash', $hash);
+
 				# FIXME do real sending :-)
 				send IO => $m_obj->as_string;
 
@@ -364,7 +454,6 @@
 		$user_id = $sent_msg->user_id || carp "no user_id";
 	}
 
-print "message_id: ",($message_id || "not found"),"\n";
 
 	my $is_bounce = 0;
 
@@ -387,6 +476,9 @@
 
 	$this_received->dbi_commit;
 
+	print "message_id: ",($message_id || "not found")," -- $is_bounce\n";
+
+
 	warn "inbox is not yet implemented";
 }
 
@@ -406,6 +498,11 @@
 
 Returns C<Class::DBI> object for created list.
 
+C<email> address can be with domain or without it if your
+MTA appends it. There is no checking for validity of your
+list e-mail. Flexibility comes with resposibility, so please
+feed correct (and configured) return addresses.
+
 =cut
 
 sub _add_list {
@@ -452,6 +549,133 @@
 	return $lists->search({ name => $name })->first;
 }
 
+###
+### SOAP
+###
+
+package Nos::SOAP;
+
+use Carp;
+
+=head1 SOAP methods
+
+This methods are thin wrappers to provide SOAP calls. They are grouped in
+C<Nos::SOAP> package which is in same F<Nos.pm> module file.
+
+Usually, you want to use named variables in your SOAP calls if at all
+possible.
+
+However, if you have broken SOAP library (like PHP SOAP class from PEAR)
+you will want to use positional arguments (in same order as documented for
+methods below).
+
+=cut
+
+my $nos;
+
+sub new {
+        my $class = shift;
+        my $self = {@_};
+	bless($self, $class);
+
+	$nos = new Nos( @_ ) || die "can't create Nos object";
+
+	$self ? return $self : return undef;
+}
+
+
+=head2 NewList
+
+ $message_id = NewList(
+	list => 'My list',
+	email => 'my-list@example.com'
+ ); 
+
+=cut
+
+sub NewList {
+	my $self = shift;
+
+	if ($_[0] !~ m/^HASH/) {
+		return $nos->new_list(
+			list => $_[0], email => $_[1],
+		);
+	} else {
+		return $nos->new_list( %{ shift @_ } );
+	}
+}
+
+
+=head2 AddMemberToList
+
+ $member_id = AddMemberToList(
+	list => 'My list',
+	email => 'e-mail@example.com',
+	name => 'Full Name'
+ );
+
+=cut
+
+sub AddMemberToList {
+	my $self = shift;
+
+	if ($_[0] !~ m/^HASH/) {
+		return $nos->add_member_to_list(
+			list => $_[0], email => $_[1], name => $_[2],
+		);
+	} else {
+		return $nos->add_member_to_list( %{ shift @_ } );
+	}
+}
+
+
+=head2 ListMembers
+
+ my @members = ListMembers(
+ 	list => 'My list',
+ );
+
+Returns array of hashes with user informations, see C<list_members>.
+
+=cut
+
+sub ListMembers {
+	my $self = shift;
+
+	my $list_name;
+
+	if ($_[0] !~ m/^HASH/) {
+		$list_name = shift;
+	} else {
+		$list_name = $_[0]->{'list'};
+	}
+
+	return $nos->list_members( list => $list_name );
+}
+
+=head2 AddMessageToList
+
+ $message_id = AddMessageToList(
+	list => 'My list',
+	message => 'From: My list...'
+ ); 
+
+=cut
+
+sub AddMessageToList {
+	my $self = shift;
+
+	if ($_[0] !~ m/^HASH/) {
+		return $nos->add_message_to_list(
+			list => $_[0], message => $_[1],
+		);
+	} else {
+		return $nos->add_message_to_list( %{ shift @_ } );
+	}
+}
+
+
+###
 
 =head1 EXPORT
 
@@ -477,3 +701,5 @@
 
 
 =cut
+
+1;