r53842 - in /branches/upstream/libstring-format-perl/current: COPYING Format.pm MANIFEST MANIFEST.SKIP META.yml Makefile.PL README t/04subrefs.t t/06slash-n.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sun Mar 7 05:39:45 UTC 2010
Author: jawnsy-guest
Date: Sun Mar 7 05:39:33 2010
New Revision: 53842
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53842
Log:
[svn-upgrade] Integrating new upstream version, libstring-format-perl (1.16)
Added:
branches/upstream/libstring-format-perl/current/COPYING
branches/upstream/libstring-format-perl/current/t/06slash-n.t
Modified:
branches/upstream/libstring-format-perl/current/Format.pm
branches/upstream/libstring-format-perl/current/MANIFEST
branches/upstream/libstring-format-perl/current/MANIFEST.SKIP
branches/upstream/libstring-format-perl/current/META.yml
branches/upstream/libstring-format-perl/current/Makefile.PL
branches/upstream/libstring-format-perl/current/README
branches/upstream/libstring-format-perl/current/t/04subrefs.t
Added: branches/upstream/libstring-format-perl/current/COPYING
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/COPYING?rev=53842&op=file
==============================================================================
--- branches/upstream/libstring-format-perl/current/COPYING (added)
+++ branches/upstream/libstring-format-perl/current/COPYING Sun Mar 7 05:39:33 2010
@@ -1,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Modified: branches/upstream/libstring-format-perl/current/Format.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/Format.pm?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/Format.pm (original)
+++ branches/upstream/libstring-format-perl/current/Format.pm Sun Mar 7 05:39:33 2010
@@ -1,9 +1,7 @@
package String::Format;
# ----------------------------------------------------------------------
-# $Id: Format.pm,v 1.4 2005/12/22 17:18:12 dlc Exp $
-# ----------------------------------------------------------------------
-# Copyright (C) 2002 darren chamberlain <darren at cpan.org>
+# Copyright (C) 2002,2009 darren chamberlain <darren at cpan.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -21,12 +19,11 @@
# -------------------------------------------------------------------
use strict;
-use vars qw($VERSION $REVSION @EXPORT);
+use vars qw($VERSION @EXPORT);
use Exporter;
use base qw(Exporter);
-$VERSION = '1.14';
-$REVSION = sprintf "%d.%02d", q$Revision: 1.4 $ =~ /(\d+)\.(\d+)/;
+$VERSION = '1.16';
@EXPORT = qw(stringf);
sub _replace {
@@ -81,9 +78,9 @@
sub stringf {
my $format = shift || return;
my $args = UNIVERSAL::isa($_[0], 'HASH') ? shift : { @_ };
- $args->{'n'} = "\n" unless defined $args->{'n'};
- $args->{'t'} = "\t" unless defined $args->{'t'};
- $args->{'%'} = "%" unless defined $args->{'%'};
+ $args->{'n'} = "\n" unless exists $args->{'n'};
+ $args->{'t'} = "\t" unless exists $args->{'t'};
+ $args->{'%'} = "%" unless exists $args->{'%'};
$format =~ s/$regex/_replace($args, $1, $2, $3, $4, $5, $6)/ge;
@@ -111,11 +108,7 @@
=head1 SYNOPSIS
- # In a script invoked as:
- # script.pl -f "I like %a, %b, and %g, but not %m or %w."
-
use String::Format;
- use Getopt::Std;
my %fruit = (
'a' => "apples",
@@ -125,10 +118,9 @@
'w' => "watermelons",
);
- use vars qw($opt_f);
- getopt("f");
-
- print stringf($opt_f, %fruit);
+ my $format = "I like %a, %b, and %g, but not %m or %w.";
+
+ print stringf($format, %fruit);
# prints:
# I like apples, bannanas, and grapefruits, but not melons or watermelons.
@@ -233,6 +225,13 @@
my $reformed = reformat($format_string);
+=head1 LICENSE
+
+C<String::Format> is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; version 2.
+
+
=head1 AUTHOR
darren chamberlain <darren at cpan.org>
Modified: branches/upstream/libstring-format-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/MANIFEST?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/MANIFEST (original)
+++ branches/upstream/libstring-format-perl/current/MANIFEST Sun Mar 7 05:39:33 2010
@@ -1,12 +1,14 @@
Changes
+COPYING
Format.pm
+Makefile.PL
MANIFEST
MANIFEST.SKIP
-Makefile.PL
README
t/01load.t
t/02basic.t
t/03multiple.t
t/04subrefs.t
t/05stringfactory.t
+t/06slash-n.t
META.yml Module meta-data (added by MakeMaker)
Modified: branches/upstream/libstring-format-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/MANIFEST.SKIP?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/MANIFEST.SKIP (original)
+++ branches/upstream/libstring-format-perl/current/MANIFEST.SKIP Sun Mar 7 05:39:33 2010
@@ -4,3 +4,4 @@
^_build/
^pm_to_blib$
^blib/
+\.git
Modified: branches/upstream/libstring-format-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/META.yml?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/META.yml (original)
+++ branches/upstream/libstring-format-perl/current/META.yml Sun Mar 7 05:39:33 2010
@@ -1,11 +1,19 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: String-Format
-version: 1.14
-version_from:
-installdirs: site
+--- #YAML:1.0
+name: String-Format
+version: 1.16
+abstract: ~
+author: []
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Test::More: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Test::More: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.48
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libstring-format-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/Makefile.PL?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/Makefile.PL (original)
+++ branches/upstream/libstring-format-perl/current/Makefile.PL Sun Mar 7 05:39:33 2010
@@ -6,10 +6,10 @@
);
WriteMakefile(
- 'NAME' => 'String::Format',
- 'VERSION' => '1.14',
- 'clean' => \%clean,
- 'PREREQ_PM' => {
+ 'NAME' => 'String::Format',
+ 'VERSION_FROM' => 'Format.pm',
+ 'clean' => \%clean,
+ 'PREREQ_PM' => {
'Test::More' => 0.00,
},
);
Modified: branches/upstream/libstring-format-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/README?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/README (original)
+++ branches/upstream/libstring-format-perl/current/README Sun Mar 7 05:39:33 2010
@@ -1,17 +1,13 @@
NAME
- String::Format - sprintf-like string formatting capabilities
- with arbitrary format definitions
+ String::Format - sprintf-like string formatting capabilities with
+ arbitrary format definitions
ABSTRACT
- String::Format allows for sprintf-style formatting capabilities
- with arbitrary format definitions
+ String::Format allows for sprintf-style formatting capabilities with
+ arbitrary format definitions
SYNOPSIS
- # In a script invoked as:
- # script.pl -f "I like %a, %b, and %g, but not %m or %w."
-
use String::Format;
- use Getopt::Std;
my %fruit = (
'a' => "apples",
@@ -21,60 +17,53 @@
'w' => "watermelons",
);
- use vars qw($opt_f);
- getopt("f");
+ my $format = "I like %a, %b, and %g, but not %m or %w.";
- print stringf($opt_f, %fruit);
-
+ print stringf($format, %fruit);
+
# prints:
# I like apples, bannanas, and grapefruits, but not melons or watermelons.
DESCRIPTION
- String::Format lets you define arbitrary printf-like format
- sequences to be expanded. This module would be most useful in
- configuration files and reporting tools, where the results of a
- query need to be formatted in a particular way. It was inspired
- by mutt's index_format and related directives (see
- <URL:http://www.mutt.org/doc/manual/manual-
- 6.html#index_format>).
+ String::Format lets you define arbitrary printf-like format sequences to
+ be expanded. This module would be most useful in configuration files and
+ reporting tools, where the results of a query need to be formatted in a
+ particular way. It was inspired by mutt's index_format and related
+ directives (see
+ <URL:http://www.mutt.org/doc/manual/manual-6.html#index_format>).
FUNCTIONS
stringf
-
- String::Format exports a single function called stringf. stringf
- takes two arguments: a format string (see FORMAT STRINGS, below)
- and a hash (or reference to a hash) of name => value pairs.
- These name => value pairs are what will be expanded in the
- format string.
+ String::Format exports a single function called stringf. stringf takes
+ two arguments: a format string (see FORMAT STRINGS, below) and a
+ reference to a hash of name => value pairs. These name => value pairs
+ are what will be expanded in the format string.
FORMAT STRINGS
Format strings must match the following regular expression:
- qr!
+ qr/
(% # leading '%'
(-)? # left-align, rather than right
(\d*)? # (optional) minimum field width
(?:\.(\d*))? # (optional) maximum field width
({.*?})? # (optional) stuff inside
(\S) # actual format character
- )!x;
+ )/x;
- If the escape character specified does not exist in %args, then
- the original string is used. The alignment, minimum width, and
- maximum width options function identically to how they are
- defined in sprintf(3) (any variation is a bug, and should be
- reported).
+ If the escape character specified does not exist in %args, then the
+ original string is used. The alignment, minimum width, and maximum width
+ options function identically to how they are defined in sprintf(3) (any
+ variation is a bug, and should be reported).
- Note that Perl's sprintf definition is a little more liberal
- than the above regex; the deviations were intentional, and all
- deal with numeric formatting (the #, 0, and + leaders were
- specifically left out).
+ Note that Perl's sprintf definition is a little more liberal than the
+ above regex; the deviations were intentional, and all deal with numeric
+ formatting (the #, 0, and + leaders were specifically left out).
- The value attached to the key can be a scalar value or a
- subroutine reference; if it is a subroutine reference, then
- anything between the '{' and '}' ($5 in the above regex) will be
- passed as $_[0] to the subroutine reference. This allows for
- entries such as this:
+ The value attached to the key can be a scalar value or a subroutine
+ reference; if it is a subroutine reference, then anything between the
+ '{' and '}' ($5 in the above regex) will be passed as $_[0] to the
+ subroutine reference. This allows for entries such as this:
%args = (
d => sub { POSIX::strftime($_[0], localtime) },
@@ -88,29 +77,28 @@
It is 17:45 right now, on Monday, February 4.
- Note that since the string is passed unmolested to the
- subroutine reference, and strftime would Do The Right Thing with
- this data, the above format string could be written as:
+ Note that since the string is passed unmolested to the subroutine
+ reference, and strftime would Do The Right Thing with this data, the
+ above format string could be written as:
"It is %{%M:%S right now, on %A, %B %e}d."
- By default, the formats 'n', 't', and '%' are defined to be a
- newline, tab, and '%', respectively, if they are not already
- defined in the hash of arguments that gets passed it. So we can
- add carriage returns simply:
+ By default, the formats 'n', 't', and '%' are defined to be a newline,
+ tab, and '%', respectively, if they are not already defined in the
+ hashref of arguments that gets passed it. So we can add carriage returns
+ simply:
"It is %{%M:%S right now, on %A, %B %e}d.%n"
- Because of how the string is parsed, the normal "\n" and "\t"
- are turned into two characters each, and are not treated as a
- newline and tab. This is a bug.
+ Because of how the string is parsed, the normal "\n" and "\t" are turned
+ into two characters each, and are not treated as a newline and tab. This
+ is a bug.
FACTORY METHOD
- String::Format also supports a class method, named
- stringfactory, which will return reference to a "primed"
- subroutine. stringfatory should be passed a reference to a hash
- of value; the returned subroutine will use these values as the
- %args hash.
+ String::Format also supports a class method, named stringfactory, which
+ will return reference to a "primed" subroutine. stringfatory should be
+ passed a reference to a hash of value; the returned subroutine will use
+ these values as the %args hash.
my $self = Some::Groovy::Package->new($$, $<, $^T);
my %formats = (
@@ -124,8 +112,8 @@
print $index_format->($format1);
print $index_format->($format2);
- This subroutine reference can be assigned to a local symbol
- table entry, and called normally, of course:
+ This subroutine reference can be assigned to a local symbol table entry,
+ and called normally, of course:
*reformat = String::Format->stringfactory(\%formats);
Modified: branches/upstream/libstring-format-perl/current/t/04subrefs.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/t/04subrefs.t?rev=53842&op=diff
==============================================================================
--- branches/upstream/libstring-format-perl/current/t/04subrefs.t (original)
+++ branches/upstream/libstring-format-perl/current/t/04subrefs.t Sun Mar 7 05:39:33 2010
@@ -11,10 +11,9 @@
use strict;
-use Test::More tests => 3;
+use Test::More tests => 2;
use String::Format;
use POSIX qw(strftime); # for test 1
-use Socket; # for test 3
my ($orig, $target, $result);
@@ -32,9 +31,8 @@
# using getpwuid
# ======================================================================
SKIP: {
- use Config;
- skip "getpwuid not implmented on this platform", 1
- unless $Config{'d_getpwuid_r'};
+ skip "Test skipped on this platform", 1
+ if $^O eq 'MSWin32';
$orig = "I am %u.";
$target = "I am " . getpwuid($<) . ".";
@@ -42,13 +40,3 @@
is $target => $result;
}
-# ======================================================================
-# Test 3
-# hostname lookups
-# ======================================================================
-sub ip { inet_ntoa inet_aton $_[0] }
-$orig = q(The address for localhost is %{localhost}i.);
-$target = q(The address for localhost is 127.0.0.1.);
-$result = stringf $orig, "i" => \&ip;
-is $target => $result;
-
Added: branches/upstream/libstring-format-perl/current/t/06slash-n.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-format-perl/current/t/06slash-n.t?rev=53842&op=file
==============================================================================
--- branches/upstream/libstring-format-perl/current/t/06slash-n.t (added)
+++ branches/upstream/libstring-format-perl/current/t/06slash-n.t Sun Mar 7 05:39:33 2010
@@ -1,0 +1,19 @@
+#!perl
+use strict;
+use warnings;
+use Test::More 'no_plan';
+
+use String::Format;
+
+my $unknown_fmt = "This is awesome.%x";
+is(stringf($unknown_fmt), $unknown_fmt, "unknown %-entities are left intact");
+
+my $with_n = "End in n.%n";
+is(stringf($with_n), "End in n.\n", '%s becomes \n');
+
+is(stringf($with_n, n => undef), 'End in n.%n', '(n=>undef) and %n untouched');
+
+is(stringf($with_n, n => '%n'), 'End in n.%n', '(n=>%n) and %n still %n');
+
+my $with_nl = "Newline!\n";
+is(stringf($with_nl), "Newline!\n", '\n in string is unmolested');
More information about the Pkg-perl-cvs-commits
mailing list