r5110 - in
/packages/libemail-simple-creator-perl/branches/upstream/current:
Changes LICENSE MANIFEST META.yml Makefile.PL lib/Email/Simple/Creator.pm
t/create.t
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sun Apr 15 13:36:31 UTC 2007
Author: gregoa-guest
Date: Sun Apr 15 13:36:31 2007
New Revision: 5110
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=5110
Log:
[svn-upgrade] Integrating new upstream version, libemail-simple-creator-perl (1.420)
Added:
packages/libemail-simple-creator-perl/branches/upstream/current/LICENSE
Modified:
packages/libemail-simple-creator-perl/branches/upstream/current/Changes
packages/libemail-simple-creator-perl/branches/upstream/current/MANIFEST
packages/libemail-simple-creator-perl/branches/upstream/current/META.yml
packages/libemail-simple-creator-perl/branches/upstream/current/Makefile.PL
packages/libemail-simple-creator-perl/branches/upstream/current/lib/Email/Simple/Creator.pm
packages/libemail-simple-creator-perl/branches/upstream/current/t/create.t
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/Changes?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/Changes (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/Changes Sun Apr 15 13:36:31 2007
@@ -1,21 +1,27 @@
-1.41 2006-07-03
+1.421 2007-03-22
+ packaging improvements
- - don't use no_plan in test; it breaks under old Test::More
- (applied by RJBS, thanks to LTHEGLER)
+1.420 2007-02-23
+ reduce use of unneeded variables during creation
+ fix bugs that skipped creating headers with false values
+ use standard crlf for creating mail
+ A changelog entry below indicates that this was not the goal, but
+ all the code seems as if it was meant to do this. There was a bug
+ in the logic, and there were no tests.
-1.4 2004-07-25
+1.41 2006-07-03
+ don't use no_plan in test; it breaks under old Test::More
+ (applied by RJBS, thanks to LTHEGLER)
- - use Email::Date
+1.4 2004-07-25
+ use Email::Date
-1.3 2004-07-05
+1.3 2004-07-05
+ Create a message using its local crlf (Casey West).
+ Include timezone info in the Date header (Steffen Goeldner).
- - Create a message using its local crlf (Casey West).
- - Include timezone info in the Date header (Steffen Goeldner).
+1.2 2004-07-05
+ Handle undefined values in the header list properly.
-1.2 2004-07-05
-
- - Handle undefined values in the header list properly.
-
-1.1
-
- - Initial Version
+1.1 ????-??-??
+ Initial Version
Added: packages/libemail-simple-creator-perl/branches/upstream/current/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/LICENSE?rev=5110&op=file
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/LICENSE (added)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/LICENSE Sun Apr 15 13:36:31 2007
@@ -1,0 +1,378 @@
+
+Terms of Perl itself
+
+a) the GNU General Public License as published by the Free
+ Software Foundation; either version 1, or (at your option) any
+ later version, or
+b) the "Artistic License"
+
+----------------------------------------------------------------------------
+
+The General Public License (GPL)
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to most of
+the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for this service if you wish), that
+you receive source code or can get it if you want it, that you can change the
+software or use pieces of it in new free programs; and that you know you can do
+these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a
+fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer
+you this license which gives you legal permission to copy, distribute and/or
+modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced by
+others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish
+to avoid the danger that redistributors of a free program will individually obtain
+patent licenses, in effect making the program proprietary. To prevent this, we
+have made it clear that any patent must be licensed for everyone's free use or
+not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License. The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or translated
+into another language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope. The act of running the Program is not
+restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and appropriately
+publish on each copy an appropriate copyright notice and disclaimer of warranty;
+keep intact all the notices that refer to this License and to the absence of any
+warranty; and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at
+your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you also
+meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you
+changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be licensed
+as a whole at no charge to all third parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively when run, you
+must cause it, when started running for such interactive use in the most ordinary
+way, to print or display an announcement including an appropriate copyright
+notice and a notice that there is no warranty (or else, saying that you provide a
+warranty) and that users may redistribute the program under these conditions,
+and telling the user how to view a copy of this License. (Exception: if the
+Program itself is interactive but does not normally print such an announcement,
+your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License,
+and its terms, do not apply to those sections when you distribute them as
+separate works. But when you distribute the same sections as part of a whole
+which is a work based on the Program, the distribution of the whole must be on
+the terms of this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to control
+the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and 2
+above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give any
+third party, for a charge no more than your cost of physically performing source
+distribution, a complete machine-readable copy of the corresponding source
+code, to be distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for noncommercial
+distribution and only if you received the program in object code or executable
+form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all the
+source code for all modules it contains, plus any associated interface definition
+files, plus the scripts used to control compilation and installation of the
+executable. However, as a special exception, the source code distributed need
+not include anything that is normally distributed (in either source or binary form)
+with the major components (compiler, kernel, and so on) of the operating system
+on which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License. However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so long
+as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works. These actions are prohibited by law if you do not accept
+this License. Therefore, by modifying or distributing the Program (or any work
+based on the Program), you indicate your acceptance of this License to do so,
+and all its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to copy,
+distribute or modify the Program subject to these terms and conditions. You
+may not impose any further restrictions on the recipients' exercise of the rights
+granted herein. You are not responsible for enforcing compliance by third parties
+to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement
+or for any other reason (not limited to patent issues), conditions are imposed on
+you (whether by court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the conditions of this
+License. If you cannot distribute so as to satisfy simultaneously your obligations
+under this License and any other pertinent obligations, then as a consequence
+you may not distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who receive
+copies directly or indirectly through you, then the only way you could satisfy
+both it and this License would be to refrain entirely from distribution of the
+Program.
+
+If any portion of this section is held invalid or unenforceable under any particular
+circumstance, the balance of the section is intended to apply and the section as
+a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other
+property right claims or to contest validity of any such claims; this section has
+the sole purpose of protecting the integrity of the free software distribution
+system, which is implemented by public license practices. Many people have
+made generous contributions to the wide range of software distributed through
+that system in reliance on consistent application of that system; it is up to the
+author/donor to decide if he or she is willing to distribute software through any
+other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries
+either by patents or by copyrighted interfaces, the original copyright holder who
+places the Program under this License may add an explicit geographical
+distribution limitation excluding those countries, so that distribution is permitted
+only in or among countries not thus excluded. In such case, this License
+incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time. Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems or
+concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a
+version number of this License which applies to it and "any later version", you
+have the option of following the terms and conditions either of that version or of
+any later version published by the Free Software Foundation. If the Program does
+not specify a version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of all
+derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
+TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
+WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS
+PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
+OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+
+----------------------------------------------------------------------------
+
+The Artistic License
+
+Preamble
+
+The intent of this document is to state the conditions under which a Package
+may be copied, such that the Copyright Holder maintains some semblance of
+artistic control over the development of the package, while giving the users of the
+package the right to use and distribute the Package in a more-or-less customary
+fashion, plus the right to make reasonable modifications.
+
+Definitions:
+
+- "Package" refers to the collection of files distributed by the Copyright
+ Holder, and derivatives of that collection of files created through textual
+ modification.
+- "Standard Version" refers to such a Package if it has not been modified,
+ or has been modified in accordance with the wishes of the Copyright
+ Holder.
+- "Copyright Holder" is whoever is named in the copyright or copyrights for
+ the package.
+- "You" is you, if you're thinking about copying or distributing this Package.
+- "Reasonable copying fee" is whatever you can justify on the basis of
+ media cost, duplication charges, time of people involved, and so on. (You
+ will not be required to justify it to the Copyright Holder, but only to the
+ computing community at large as a market that must bear the fee.)
+- "Freely Available" means that no fee is charged for the item itself, though
+ there may be fees involved in handling the item. It also means that
+ recipients of the item may redistribute it under the same conditions they
+ received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you duplicate
+all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications derived from
+the Public Domain or from the Copyright Holder. A Package modified in such a
+way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and when
+you changed that file, and provided that you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said modifications
+ to Usenet or an equivalent medium, or placing the modifications on
+ a major archive site such as ftp.uu.net, or by allowing the
+ Copyright Holder to include your modifications in the Standard
+ Version of the Package.
+
+ b) use the modified Package only within your corporation or
+ organization.
+
+ c) rename any non-standard executables so the names do not
+ conflict with standard executables, which must also be provided,
+ and provide a separate manual page for each non-standard
+ executable that clearly documents how it differs from the Standard
+ Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or executable
+form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library
+ files, together with instructions (in the manual page or equivalent)
+ on where to get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of
+ the Package with your modifications.
+
+ c) accompany any non-standard executables with their
+ corresponding Standard Version executables, giving the
+ non-standard executables non-standard names, and clearly
+ documenting the differences in manual pages (or equivalent),
+ together with instructions on where to get the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this Package.
+You may charge any fee you choose for support of this Package. You may not
+charge a fee for this Package itself. However, you may distribute this Package in
+aggregate with other (possibly commercial) programs as part of a larger
+(possibly commercial) software distribution provided that you do not advertise
+this Package as a product of your own.
+
+6. The scripts and library files supplied as input to or produced as output from
+the programs of this Package do not automatically fall under the copyright of this
+Package, but belong to whomever generated them, and may be sold
+commercially, and may be aggregated with this Package.
+
+7. C or perl subroutines supplied by you and linked into this Package shall not
+be considered part of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+The End
+
+
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/MANIFEST?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/MANIFEST (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/MANIFEST Sun Apr 15 13:36:31 2007
@@ -2,8 +2,9 @@
lib/Email/Simple/Creator.pm
Makefile.PL
MANIFEST This list of files
-META.yml
README
t/create.t
t/pod.t
t/pod-coverage.t
+LICENSE
+META.yml Module meta-data (added by MakeMaker)
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/META.yml?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/META.yml (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/META.yml Sun Apr 15 13:36:31 2007
@@ -1,13 +1,16 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Email-Simple-Creator
-version: 1.41
-version_from: lib/Email/Simple/Creator.pm
-installdirs: site
-requires:
+--- #YAML:1.0
+name: Email-Simple-Creator
+version: 1.420
+abstract: Email::Simple constructor for starting anew.
+license: perl
+generated_by: ExtUtils::MakeMaker version 6.32
+distribution_type: module
+requires:
Email::Date:
Email::Simple:
Test::More: 0.47
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.2.html
+ version: 1.2
+author:
+ - Casey West <casey at geeknest.com>
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/Makefile.PL?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/Makefile.PL (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/Makefile.PL Sun Apr 15 13:36:31 2007
@@ -1,13 +1,15 @@
+use strict;
use ExtUtils::MakeMaker;
WriteMakefile (
- AUTHOR => 'Casey West <casey at geeknest.com>',
- ABSTRACT => "Email::Simple constructor for starting anew.",
- NAME => 'Email::Simple::Creator',
- PREREQ_PM => {
- 'Test::More' => '0.47',
- 'Email::Simple' => '',
- 'Email::Date' => '',
- },
- VERSION_FROM => 'lib/Email/Simple/Creator.pm',
- );
+ AUTHOR => 'Casey West <casey at geeknest.com>',
+ ABSTRACT => "Email::Simple constructor for starting anew.",
+ NAME => 'Email::Simple::Creator',
+ (eval { ExtUtils::MakeMaker->VERSION(6.21) } ? (LICENSE => 'perl') : ()),
+ PREREQ_PM => {
+ 'Test::More' => '0.47',
+ 'Email::Simple' => '',
+ 'Email::Date' => '',
+ },
+ VERSION_FROM => 'lib/Email/Simple/Creator.pm',
+);
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/lib/Email/Simple/Creator.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/lib/Email/Simple/Creator.pm?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/lib/Email/Simple/Creator.pm (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/lib/Email/Simple/Creator.pm Sun Apr 15 13:36:31 2007
@@ -2,18 +2,26 @@
use strict;
use vars qw[$VERSION $CRLF];
-$VERSION = '1.41';
-$CRLF = "\x0a\x0d";
+$VERSION = '1.420';
+
+sub _crlf {
+ "\x0a\x0d";
+}
sub _date_header {
- require Email::Date;
- Email::Date::format_date();
+ require Email::Date;
+ Email::Date::format_date();
}
sub _add_to_header {
- my ($class, $header, $key, $value) = @_;
- return unless $value;
- ${$header} .= join(": ", $key, $value) . $CRLF;
+ my ($class, $header, $key, $value) = @_;
+ $value = '' unless defined $value;
+ $$header .= "$key: $value" . $class->_crlf;
+}
+
+sub _finalize_header {
+ my ($class, $header) = @_;
+ $$header .= $class->_crlf;
}
package Email::Simple;
@@ -23,26 +31,32 @@
$CREATOR = 'Email::Simple::Creator';
sub create {
- my ($class, %args) = @_;
+ my ($class, %args) = @_;
- my @headers = @{ $args{header} || [] };
- my $body = $args{body} || '';
- my $header = '';
- my %headers;
+ my $headers = $args{header} || [];
+ my $body = $args{body} || '';
- pop @headers if @headers % 2 == 1;
- while ( my ($key, $value) = splice @headers, 0, 2 ) {
- $headers{$key} = 1;
- $CREATOR->_add_to_header(\$header, $key, $value);
- }
+ my $empty = q{};
+ my $header = \$empty;
- $CREATOR->_add_to_header(\$header,
- Date => $CREATOR->_date_header
- ) unless $headers{Date};
+ for my $idx (map { $_ * 2 } 0 .. @$headers / 2 - 1) {
+ my ($key, $value) = @$headers[ $idx, $idx + 1 ];
+ $CREATOR->_add_to_header($header, $key, $value);
+ }
- my $email = $class->new($header);
- $email->body_set($body . $email->{mycrlf});
- return $email;
+ $CREATOR->_finalize_header($header);
+
+ my $email = $class->new($header);
+
+ $email->header_set(Date => $CREATOR->_date_header)
+ unless defined $email->header('Date');
+
+ # No reason to add a trailing CRLF if we have one already.
+ my $crlf = $email->crlf;
+ $body .= $crlf unless $crlf eq (substr $body, - length $crlf);
+ $email->body_set($body);
+
+ return $email;
}
1;
@@ -51,7 +65,7 @@
=head1 NAME
-Email::Simple::Creator - Email::Simple constructor for starting anew.
+Email::Simple::Creator - Email::Simple constructor for starting anew
=head1 SYNOPSIS
@@ -76,11 +90,9 @@
This software provides a constructor to L<Email::Simple|Email::Simple> for
creating messages from scratch.
-=head2 Methods
+=head1 METHODS
-=over 5
-
-=item create
+=head2 create
my $email = Email::Simple->create(header => [ @headers ], body => '...');
@@ -100,8 +112,6 @@
to C<< Email::Simple->new() >>. C<create()> returns the value returned
by C<new()>. With skill, that's an C<Email::Simple> object.
-=back
-
=head1 SEE ALSO
L<Email::Simple>,
Modified: packages/libemail-simple-creator-perl/branches/upstream/current/t/create.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libemail-simple-creator-perl/branches/upstream/current/t/create.t?rev=5110&op=diff
==============================================================================
--- packages/libemail-simple-creator-perl/branches/upstream/current/t/create.t (original)
+++ packages/libemail-simple-creator-perl/branches/upstream/current/t/create.t Sun Apr 15 13:36:31 2007
@@ -1,49 +1,114 @@
-use Test::More tests => 6;
+use strict;
+use warnings;
+
+use Test::More tests => 12;
+
+use_ok 'Email::Simple';
use_ok 'Email::Simple::Creator';
-use_ok 'Email::Simple';
-sub test_email;
+sub tested_email {
+ my (%args) = @_;
-test_email 0 => {
- header => [
- To => 'you',
- ],
- body => 'test test',
-} => <<__MESSAGE__;
-To: you
-Date: Thu, 17 Jun 2004 18:13:14 -0000
+ my $email = Email::Simple->create(%args);
+ isa_ok $email, 'Email::Simple';
-test test
-__MESSAGE__
+ my $string = $email->as_string;
-test_email 1 => {
- header => [
- Date => 'testing',
- 'X-Header' => 'one',
- 'X-Header' => 'two',
- 'X-Header' => 'three',
- ],
- body => q[This is a multi-
- line message.],
-} => <<__MESSAGE__;
+ my @last_two = (
+ substr($string, -2, 1),
+ substr($string, -1, 1),
+ );
+
+ is(
+ sprintf("%03u %03u", map { ord } @last_two),
+ '010 013',
+ 'stringified message ends with std CRLF'
+ );
+
+ return $email;
+}
+
+{ # should get an automatic date header
+ my $email = tested_email(
+ header => [
+ To => 'you',
+ ],
+ body => 'test test',
+ );
+
+ like(
+ $email->header('date'),
+ qr/^[A-Z][a-z]{2},/, # lame -- rjbs, 2007-02-23
+ "we got an auto-generated date header starting with a DOW",
+ );
+}
+
+{ # no date header, we provided one
+ my $email = tested_email(
+ header => [
+ Date => 'testing',
+ 'X-Header' => 'one',
+ 'X-Header' => 'two',
+ 'X-Header' => 'three',
+ ],
+ body => q[This is a multi-
+ line message.],
+ );
+
+ my $expected = <<'END_MESSAGE';
Date: testing
X-Header: one
X-Header: two
X-Header: three
This is a multi-
- line message.
-__MESSAGE__
+ line message.
+END_MESSAGE
-sub test_email {
- my ($pass, $args, $message) = @_;
- my $email = Email::Simple->create(%{$args});
- print $email->as_string and return unless $message; # debugging
- isa_ok $email, 'Email::Simple';
- my $string = $email->as_string;
- $string =~ s/\x0a\x0d/\n/g;
- $message =~ s/\x0a\x0d/\n/g;
- $pass ?
- is $string, $message :
- isnt $string, $message;
+ my $string = $email->as_string;
+ $string =~ s/\x0a\x0d/\n/gsm;
+
+ is(
+ $string,
+ $expected,
+ "we got just the string we expected",
+ );
}
+
+{ # a few headers with false values
+ my $email = tested_email(
+ header => [
+ Date => undef,
+ Zero => 0,
+ Empty => '',
+ ],
+ body => "The body is uninteresting.",
+ );
+
+ is_deeply(
+ [ $email->header_pairs ],
+ [
+ Date => '',
+ Zero => 0,
+ Empty => '',
+ ],
+ "got the false headers back we want",
+ );
+
+ my $expected = <<'END_MESSAGE';
+Date:
+Zero: 0
+Empty:
+
+The body is uninteresting.
+END_MESSAGE
+
+ my $string = $email->as_string;
+ $string =~ s/\x0a\x0d/\n/gsm;
+
+ is(
+ $string,
+ $expected,
+ "we got just the string we expected",
+ );
+}
More information about the Pkg-perl-cvs-commits
mailing list