[Rt-commit] r5148 - in Locale-Maketext-Simple: . lib lib/Locale/Maketext t

autrijus at bestpractical.com autrijus at bestpractical.com
Tue May 2 09:35:47 EDT 2006


Author: autrijus
Date: Tue May  2 09:35:43 2006
New Revision: 5148

Added:
   Locale-Maketext-Simple/Changes
   Locale-Maketext-Simple/MANIFEST
   Locale-Maketext-Simple/Makefile.PL
   Locale-Maketext-Simple/README
   Locale-Maketext-Simple/lib/
   Locale-Maketext-Simple/lib/Locale/
   Locale-Maketext-Simple/lib/Locale/Maketext/
   Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
   Locale-Maketext-Simple/t/
   Locale-Maketext-Simple/t/0-signature.t
   Locale-Maketext-Simple/t/1-basic.t   (contents, props changed)

Log:
* Import L::M::S

Added: Locale-Maketext-Simple/Changes
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/Changes	Tue May  2 09:35:43 2006
@@ -0,0 +1,74 @@
+[Changes for 0.15 - 2006-05-02]
+
+* LICENSING CHANGE: This compilation and all individual files in it
+  are now under the permissive "MIT" license.  See the COPYRIGHT
+  section in README for the new terms.
+
+* Oops, the gettext_to_maketext function was missing an escape
+  sequence, rendering message strings with [ ~ ] characters invalid.
+  Reported By: Rong-En Fan
+
+[Changes for 0.14 - 2006-04-27]
+
+* Repair Perl 5.005 compatibility in the build system.
+  Reported By: Rong-En Fan
+
+[Changes for 0.13 - 2006-04-11]
+
+* The "_style => 'gettext'" option was broken for adjacent variables
+  such as "%1%2%3".
+
+* Also removed the sole occurrence of of $&. 
+
+[Changes for 0.12 - 2004-03-17]
+
+* Supports the "Encoding" directive, including the special "locale" value.
+
+* Fix test to not emit warnings.
+
+[Changes for 0.11 - 2004-02-06]
+
+* ->auto_path was broken and always checking L::M::S's auto/ path.
+  Reported By: Marcus Ramberg
+
+[Changes for 0.10 - 2003-11-13]
+
+* The "%tense()" form was not working.
+  Reported By: Jos Boumans
+
+* Add reload_loc to clear away all cached handles.
+
+[Changes for 0.09 - 2003-09-16]
+
+* Without an English .po, L::M::S would not pick up any other POs.
+  Reported By: Marcus Ramberg
+
+* The default "maketext" calling style was broken.
+
+[Changes for 0.08 - 2003-08-26]
+
+* Calling loc_lang() without arguments now switches to "autodetected"
+  language properly.
+
+[Changes for 0.07 - 2003-08-21]
+
+* The "%quant()" form was not working as advertised.
+  Reported By: Jos Boumans
+
+[Changes for 0.05 - 2003-08-17]
+
+* Fixed breakage on Win32 with \\ pathnames.
+
+[Changes for 0.03 - 2003-08-03]
+
+* Documentation cleanup.
+
+* Avoid warnings during testing.
+
+[Changes for 0.03 - 2003-05-20]
+
+* Add Path option and loc_lang function.
+
+[Changes for 0.01 - 2003-05-09]
+
+* Initial release.

Added: Locale-Maketext-Simple/MANIFEST
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/MANIFEST	Tue May  2 09:35:43 2006
@@ -0,0 +1,17 @@
+Changes
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
+lib/Locale/Maketext/Simple.pm
+Makefile.PL
+MANIFEST			This list of files
+META.yml
+README
+SIGNATURE			Public-key signature (added by MakeMaker)
+t/0-signature.t
+t/1-basic.t

Added: Locale-Maketext-Simple/Makefile.PL
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/Makefile.PL	Tue May  2 09:35:43 2006
@@ -0,0 +1,9 @@
+#!/usr/bin/perl
+
+use inc::Module::Install;
+
+name	    'Locale-Maketext-Simple';
+license     'MIT';
+all_from    'lib/Locale/Maketext/Simple.pm';
+
+sign; WriteAll;

Added: Locale-Maketext-Simple/README
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/README	Tue May  2 09:35:43 2006
@@ -0,0 +1,33 @@
+This is the README file for Locale::Maketext::Simple, a simple interface
+to Locale::Maketext::Lexicon.
+
+* Installation
+
+Locale::Maketext::Simple uses the standard perl module install process:
+
+    cpansign -v		# optional; see SIGNATURE for details
+    perl Makefile.PL
+    make                # or 'nmake' on Win32
+    make test
+    make install
+
+* COPYRIGHT (The "MIT" License)
+
+Copyright 2002-2006 by Audrey Tang <cpan at audreyt.org>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
+CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Added: Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm	Tue May  2 09:35:43 2006
@@ -0,0 +1,330 @@
+package Locale::Maketext::Simple;
+$Locale::Maketext::Simple::VERSION = '0.15';
+
+use strict;
+use 5.004;
+
+=head1 NAME
+
+Locale::Maketext::Simple - Simple interface to Locale::Maketext::Lexicon
+
+=head1 VERSION
+
+This document describes version 0.15 of Locale::Maketext::Simple,
+released May 2, 2006.
+
+=head1 SYNOPSIS
+
+Minimal setup (looks for F<auto/Foo/*.po> and F<auto/Foo/*.mo>):
+
+    package Foo;
+    use Locale::Maketext::Simple;	# exports 'loc'
+    loc_lang('fr');			# set language to French
+    sub hello {
+	print loc("Hello, [_1]!", "World");
+    }
+
+More sophisticated example:
+
+    package Foo::Bar;
+    use Locale::Maketext::Simple (
+	Class	    => 'Foo',	    # search in auto/Foo/
+	Style	    => 'gettext',   # %1 instead of [_1]
+	Export	    => 'maketext',  # maketext() instead of loc()
+	Subclass    => 'L10N',	    # Foo::L10N instead of Foo::I18N
+	Decode	    => 1,	    # decode entries to unicode-strings
+	Encoding    => 'locale',    # but encode lexicons in current locale
+				    # (needs Locale::Maketext::Lexicon 0.36)
+    );
+    sub japh {
+	print maketext("Just another %1 hacker", "Perl");
+    }
+
+=head1 DESCRIPTION
+
+This module is a simple wrapper around B<Locale::Maketext::Lexicon>,
+designed to alleviate the need of creating I<Language Classes> for
+module authors.
+
+If B<Locale::Maketext::Lexicon> is not present, it implements a
+minimal localization function by simply interpolating C<[_1]> with
+the first argument, C<[_2]> with the second, etc.  Interpolated
+function like C<[quant,_1]> are treated as C<[_1]>, with the sole
+exception of C<[tense,_1,X]>, which will append C<ing> to C<_1> when
+X is C<present>, or appending C<ed> to <_1> otherwise.
+
+=head1 OPTIONS
+
+All options are passed either via the C<use> statement, or via an
+explicit C<import>.
+
+=head2 Class
+
+By default, B<Locale::Maketext::Simple> draws its source from the
+calling package's F<auto/> directory; you can override this behaviour
+by explicitly specifying another package as C<Class>.
+
+=head2 Path
+
+If your PO and MO files are under a path elsewhere than C<auto/>,
+you may specify it using the C<Path> option.
+
+=head2 Style
+
+By default, this module uses the C<maketext> style of C<[_1]> and
+C<[quant,_1]> for interpolation.  Alternatively, you can specify the
+C<gettext> style, which uses C<%1> and C<%quant(%1)> for interpolation.
+
+This option is case-insensitive.
+
+=head2 Export
+
+By default, this module exports a single function, C<loc>, into its
+caller's namespace.  You can set it to another name, or set it to
+an empty string to disable exporting.
+
+=head2 Subclass
+
+By default, this module creates an C<::I18N> subclass under the
+caller's package (or the package specified by C<Class>), and stores
+lexicon data in its subclasses.  You can assign a name other than
+C<I18N> via this option.
+
+=head2 Decode
+
+If set to a true value, source entries will be converted into
+utf8-strings (available in Perl 5.6.1 or later).  This feature
+needs the B<Encode> or B<Encode::compat> module.
+
+=head2 Encoding
+
+Specifies an encoding to store lexicon entries, instead of
+utf8-strings.  If set to C<locale>, the encoding from the current
+locale setting is used.  Implies a true value for C<Decode>.
+
+=cut
+
+sub import {
+    my ($class, %args) = @_;
+
+    $args{Class}    ||= caller;
+    $args{Style}    ||= 'maketext';
+    $args{Export}   ||= 'loc';
+    $args{Subclass} ||= 'I18N';
+
+    my ($loc, $loc_lang) = $class->load_loc(%args);
+    $loc ||= $class->default_loc(%args);
+
+    no strict 'refs';
+    *{caller(0) . "::$args{Export}"} = $loc if $args{Export};
+    *{caller(0) . "::$args{Export}_lang"} = $loc_lang || sub { 1 };
+}
+
+my %Loc;
+
+sub reload_loc { %Loc = () }
+
+sub load_loc {
+    my ($class, %args) = @_;
+
+    my $pkg = join('::', grep { defined and length } $args{Class}, $args{Subclass});
+    return $Loc{$pkg} if exists $Loc{$pkg};
+
+    eval { require Locale::Maketext::Lexicon; 1 }   or return;
+    $Locale::Maketext::Lexicon::VERSION > 0.20	    or return;
+    eval { require File::Spec; 1 }		    or return;
+
+    my $path = $args{Path} || $class->auto_path($args{Class}) or return;
+    my $pattern = File::Spec->catfile($path, '*.[pm]o');
+    my $decode = $args{Decode} || 0;
+    my $encoding = $args{Encoding} || undef;
+
+    $decode = 1 if $encoding;
+
+    $pattern =~ s{\\}{/}g; # to counter win32 paths
+
+    eval "
+	package $pkg;
+	use base 'Locale::Maketext';
+        %${pkg}::Lexicon = ( '_AUTO' => 1 );
+	Locale::Maketext::Lexicon->import({
+	    'i-default' => [ 'Auto' ],
+	    '*'	=> [ Gettext => \$pattern ],
+	    _decode => \$decode,
+	    _encoding => \$encoding,
+	});
+	*tense = sub { \$_[1] . ((\$_[2] eq 'present') ? 'ing' : 'ed') }
+	    unless defined &tense;
+
+	1;
+    " or die $@;
+    
+    my $lh = eval { $pkg->get_handle } or return;
+    my $style = lc($args{Style});
+    if ($style eq 'maketext') {
+	$Loc{$pkg} = sub {
+	    $lh->maketext(@_)
+	};
+    }
+    elsif ($style eq 'gettext') {
+	$Loc{$pkg} = sub {
+	    my $str = shift;
+            $str =~ s{
+                ([%\\]%)                        # 1 - escaped sequence
+            |
+                %   (?:
+                        ([A-Za-z#*]\w*)         # 2 - function call
+                            \(([^\)]*)\)        # 3 - arguments
+                    |
+                        ([1-9]\d*|\*)           # 4 - variable
+                    )
+            }{
+                $1 ? $1
+                   : $2 ? "\[$2,"._unescape($3)."]"
+                        : "[_$4]"
+            }egx;
+	    return $lh->maketext($str, @_);
+	};
+    }
+    else {
+	die "Unknown Style: $style";
+    }
+
+    return $Loc{$pkg}, sub {
+	$lh = $pkg->get_handle(@_);
+	$lh = $pkg->get_handle(@_);
+    };
+}
+
+sub default_loc {
+    my ($self, %args) = @_;
+    my $style = lc($args{Style});
+    if ($style eq 'maketext') {
+	return sub {
+	    my $str = shift;
+            $str =~ s{((?<!~)(?:~~)*)\[_([1-9]\d*|\*)\]}
+                     {$1%$2}g;
+            $str =~ s{((?<!~)(?:~~)*)\[([A-Za-z#*]\w*),([^\]]+)\]} 
+                     {"$1%$2(" . _escape($3) . ')'}eg;
+	    _default_gettext($str, @_);
+	};
+    }
+    elsif ($style eq 'gettext') {
+	return \&_default_gettext;
+    }
+    else {
+	die "Unknown Style: $style";
+    }
+}
+
+sub _default_gettext {
+    my $str = shift;
+    $str =~ s{
+	%			# leading symbol
+	(?:			# either one of
+	    \d+			#   a digit, like %1
+	    |			#     or
+	    (\w+)\(		#   a function call -- 1
+		(?:		#     either
+		    %\d+	#	an interpolation
+		    |		#     or
+		    ([^,]*)	#	some string -- 2
+		)		#     end either
+		(?:		#     maybe followed
+		    ,		#       by a comma
+		    ([^),]*)	#       and a param -- 3
+		)?		#     end maybe
+		(?:		#     maybe followed
+		    ,		#       by another comma
+		    ([^),]*)	#       and a param -- 4
+		)?		#     end maybe
+		[^)]*		#     and other ignorable params
+	    \)			#   closing function call
+	)			# closing either one of
+    }{
+	my $digit = $2 || shift;
+	$digit . (
+	    $1 ? (
+		($1 eq 'tense') ? (($3 eq 'present') ? 'ing' : 'ed') :
+		($1 eq 'quant') ? ' ' . (($digit > 1) ? ($4 || "$3s") : $3) :
+		''
+	    ) : ''
+	);
+    }egx;
+    return $str;
+};
+
+sub _escape {
+    my $text = shift;
+    $text =~ s/\b_([1-9]\d*)/%$1/g;
+    return $text;
+}
+
+sub _unescape {
+    join(',', map {
+        /\A(\s*)%([1-9]\d*|\*)(\s*)\z/ ? "$1_$2$3" : $_
+    } split(/,/, $_[0]));
+}
+
+sub auto_path {
+    my ($self, $calldir) = @_;
+    $calldir =~ s#::#/#g;
+    my $path = $INC{$calldir . '.pm'} or return;
+
+    # Try absolute path name.
+    if ($^O eq 'MacOS') {
+	(my $malldir = $calldir) =~ tr#/#:#;
+	$path =~ s#^(.*)$malldir\.pm\z#$1auto:$malldir:#s;
+    } else {
+	$path =~ s#^(.*)$calldir\.pm\z#$1auto/$calldir/#;
+    }
+
+    return $path if -d $path;
+
+    # If that failed, try relative path with normal @INC searching.
+    $path = "auto/$calldir/";
+    foreach my $inc (@INC) {
+	return "$inc/$path" if -d "$inc/$path";
+    }
+
+    return;
+}
+
+1;
+
+=head1 ACKNOWLEDGMENTS
+
+Thanks to Jos I. Boumans for suggesting this module to be written.
+
+Thanks to Chia-Liang Kao for suggesting C<Path> and C<loc_lang>.
+
+=head1 SEE ALSO
+
+L<Locale::Maketext>, L<Locale::Maketext::Lexicon>
+
+=head1 AUTHORS
+
+Audrey Tang E<lt>cpan at audreyt.orgE<gt>
+
+=head1 COPYRIGHT (The "MIT" License)
+
+Copyright 2003, 2004, 2005, 2006 by Audrey Tang E<lt>cpan at audreyt.orgE<gt>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
+CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=cut

Added: Locale-Maketext-Simple/t/0-signature.t
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/t/0-signature.t	Tue May  2 09:35:43 2006
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+
+use strict;
+print "1..1\n";
+
+if (!$ENV{TEST_SIGNATURE}) {
+    print "ok 1 # skip set the environment variable TEST_SIGNATURE to enable this test\n";
+}
+elsif (!-s 'SIGNATURE') {
+    print "ok 1 # skip No signature file found\n";
+}
+elsif (!eval { require Module::Signature; 1 }) {
+    print "ok 1 # skip ",
+	    "Next time around, consider install Module::Signature, ",
+	    "so you can verify the integrity of this distribution.\n";
+}
+elsif (!eval { require Socket; Socket::inet_aton('pgp.mit.edu') }) {
+    print "ok 1 # skip ",
+	    "Cannot connect to the keyserver\n";
+}
+else {
+    (Module::Signature::verify() == Module::Signature::SIGNATURE_OK())
+	or print "not ";
+    print "ok 1 # Valid signature\n";
+}
+
+__END__

Added: Locale-Maketext-Simple/t/1-basic.t
==============================================================================
--- (empty file)
+++ Locale-Maketext-Simple/t/1-basic.t	Tue May  2 09:35:43 2006
@@ -0,0 +1,26 @@
+use strict;
+use Test;
+
+BEGIN {
+    plan tests => 9;
+    $INC{'Locale/Maketext/Lexicon.pm'} = __FILE__;
+    $Locale::Maketext::Lexicon::VERSION = 0;
+}
+
+use Locale::Maketext::Simple;
+ok(Locale::Maketext::Simple->VERSION);
+ok(loc("Just [_1] Perl [_2]", qw(another hacker)), "Just another Perl hacker");
+
+{
+    local $^W; # shuts up 'redefined' warnings
+    Locale::Maketext::Simple->reload_loc;
+    Locale::Maketext::Simple->import(Style => 'gettext');
+}
+
+ok(loc("Just %1 Perl %2", qw(another hacker)), "Just another Perl hacker");
+ok(loc_lang('fr'));
+ok(loc("Just %quant(%1,Perl hacker)", 1), "Just 1 Perl hacker");
+ok(loc("Just %quant(%1,Perl hacker)", 2), "Just 2 Perl hackers");
+ok(loc("Just %quant(%1,Mad skill,Mad skillz)", 3), "Just 3 Mad skillz");
+ok(loc("Error %tense(%1,present)", 'uninstall'), "Error uninstalling");
+ok(loc("Error %tense(uninstall,present)"), "Error uninstalling");


More information about the Rt-commit mailing list