r46519 - in /branches/upstream/libtext-micromason-perl/current: ./ MicroMason/ MicroMason/Docs/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Oct 30 02:12:03 UTC 2009
Author: jawnsy-guest
Date: Fri Oct 30 02:11:58 2009
New Revision: 46519
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46519
Log:
[svn-upgrade] Integrating new upstream version, libtext-micromason-perl (2.02)
Removed:
branches/upstream/libtext-micromason-perl/current/CHANGES
branches/upstream/libtext-micromason-perl/current/MicroMason/Filters.pm.orig
branches/upstream/libtext-micromason-perl/current/README
branches/upstream/libtext-micromason-perl/current/TODO
branches/upstream/libtext-micromason-perl/current/t/33-filters.t.orig
Modified:
branches/upstream/libtext-micromason-perl/current/MANIFEST
branches/upstream/libtext-micromason-perl/current/META.yml
branches/upstream/libtext-micromason-perl/current/MicroMason.pm
branches/upstream/libtext-micromason-perl/current/MicroMason/Base.pm
branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/Changes.pod
branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/ReadMe.pod
branches/upstream/libtext-micromason-perl/current/MicroMason/TemplateDir.pm
branches/upstream/libtext-micromason-perl/current/MicroMason/TemplatePath.pm
branches/upstream/libtext-micromason-perl/current/t/33-filters.t
Modified: branches/upstream/libtext-micromason-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MANIFEST?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MANIFEST (original)
+++ branches/upstream/libtext-micromason-perl/current/MANIFEST Fri Oct 30 02:11:58 2009
@@ -1,6 +1,5 @@
-CHANGES
Makefile.PL
-MANIFEST
+MANIFEST This list of files
MANIFEST.SKIP
MicroMason.pm
MicroMason/AllowGlobals.pm
@@ -20,7 +19,6 @@
MicroMason/Embperl.pm
MicroMason/ExecuteCache.pm
MicroMason/Filters.pm
-MicroMason/Filters.pm.orig
MicroMason/Functions.pm
MicroMason/HasParams.pm
MicroMason/HTMLMason.pm
@@ -38,7 +36,6 @@
MicroMason/TemplateDir.pm
MicroMason/TemplatePath.pm
MicroMason/TextTemplate.pm
-README
samples/die.msn
samples/hello_world.msp
samples/if.tmpl
@@ -64,7 +61,6 @@
t/31-catch_errors.t
t/32-safe.t
t/33-filters.t
-t/33-filters.t.orig
t/34-compile_cache.t
t/35-execute_cache.t
t/36-template_dir.t
@@ -91,5 +87,4 @@
t/90-cache-dir-conflict.t
t/91-template_path.t
t/92-template_path-cache.t
-TODO
META.yml Module meta-data (added by MakeMaker)
Modified: branches/upstream/libtext-micromason-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/META.yml?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/META.yml (original)
+++ branches/upstream/libtext-micromason-perl/current/META.yml Fri Oct 30 02:11:58 2009
@@ -1,15 +1,23 @@
--- #YAML:1.0
-name: Text-MicroMason
-version: 2.0
-abstract: Simple and Extensible Templating
-license: perl
-author:
+name: Text-MicroMason
+version: 2.02
+abstract: Simple and Extensible Templating
+author:
- Alan Ferrency <ferrency at cpan.org>
-generated_by: ExtUtils::MakeMaker version 6.42
-distribution_type: module
-requires:
- Class::MixinFactory: 0.9
- File::Spec: 0.9
+license: perl
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ Class::MixinFactory: 0.9
+ File::Spec: 0.9
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.54
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason.pm?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason.pm (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason.pm Fri Oct 30 02:11:58 2009
@@ -1,5 +1,5 @@
package Text::MicroMason;
-$VERSION = '2.0';
+$VERSION = '2.02';
# The #line directive requires Perl 5.6 to work correctly the way we use
# it in Base.
@@ -491,10 +491,12 @@
For more information, see L<Inline::Mason>.
-=head1 DIAGNOSTICS
-
-The following diagnostic messages are produced for the indicated error
-conditions (where %s indicates variable message text):
+=head1 EXCEPTIONS
+
+Text::MicroMason croaks on error, with an appropriate error string. Some
+commonly occurring error messages are described below (where %s
+indicates variable message text). See also the pod for each mixin class,
+for additional exception strings that may be thrown.
=over 4
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason/Base.pm?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason/Base.pm (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason/Base.pm Fri Oct 30 02:11:58 2009
@@ -508,7 +508,7 @@
=item croak_msg
-Called when a fatal exception has occured.
+Called when a fatal exception has occurred.
=item NEXT
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/Changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/Changes.pod?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/Changes.pod (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/Changes.pod Fri Oct 30 02:11:58 2009
@@ -4,6 +4,38 @@
=head1 VERSION 2 HISTORY
+
+=head2 Version 2.02
+
+=over 4
+
+=item 2009-10-29
+
+Updated Changes.pod.
+
+Fixed SKIP count in t/33 which caused test count mismatches when
+HTML::Entities wasn't installed.
+
+=back
+
+=head2 Version 2.01
+
+=over 4
+
+=item 2009-10-29
+
+Fix a bug with TemplatePath error messages. If a template name was
+provided that didn't exist in the path, the error message generated by
+read_file didn't specify which template was requested. This version
+now croaks in resolve_path instead of returning undef and letting
+read_file croak.
+
+Updated pod to reflect this change and document previously undocumented
+exception strings.
+
+Modified undocumented exception strings for strict_root violations.
+
+=back
=head2 Version 2.0
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/ReadMe.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/ReadMe.pod?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/ReadMe.pod (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason/Docs/ReadMe.pod Fri Oct 30 02:11:58 2009
@@ -51,7 +51,7 @@
=head1 DISTRIBUTION STATUS
-This is version 2.0 of Text::MicroMason.
+This is version 2.02 of Text::MicroMason.
This module has been available on CPAN for over six years.
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason/TemplateDir.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason/TemplateDir.pm?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason/TemplateDir.pm (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason/TemplateDir.pm Fri Oct 30 02:11:58 2009
@@ -53,7 +53,7 @@
my $path = File::Spec->canonpath( $file );
# warn "Checking for '$root' in '$path'\n";
( $path =~ /\A\Q$root\E(\/|(?<=\/))(?!\.\.)/ )
- or $self->croak_msg("Not in required base path '$root'");
+ or $self->croak_msg("Text::MicroMason::TemplateDir: Template not in required base path '$root'");
}
return $self->NEXT('read_file', $file );
@@ -106,7 +106,11 @@
=item strict_root
-Optional directory beyond which not to read files. If set to 1, uses template_root, Causes read_file to croak if any filename outside of the root is provided. (Note that this is not a chroot jail and only affects attempts to load a file as a template; for greater security see the chroot() builtin and L<Text::MicroMason::Safe>.)
+Optional directory beyond which not to read files. If set to 1, uses
+template_root, Causes read_file to croak if any filename outside of the
+root is provided. (Note that this is not a chroot jail and only affects
+attempts to load a file as a template; for greater security see the
+chroot() builtin and L<Text::MicroMason::Safe>.)
=back
@@ -124,6 +128,23 @@
=back
+=head2 EXCEPTIONS
+
+The following additional exceptions are generated by
+Text::MicroMason::TemplateDir when appropriate:
+
+=over 4
+
+=item *
+
+Text::MicroMason::TemplatePath: Template not in required base path '%s'
+
+The template found in the configured template path was not within the
+configured strict_root directory. This may be caused by requesting an
+absolute template filename not within strict_root, or by specifying a
+strict_root which does not match the configured template path.
+
+=back
=head1 SEE ALSO
Modified: branches/upstream/libtext-micromason-perl/current/MicroMason/TemplatePath.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/MicroMason/TemplatePath.pm?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/MicroMason/TemplatePath.pm (original)
+++ branches/upstream/libtext-micromason-perl/current/MicroMason/TemplatePath.pm Fri Oct 30 02:11:58 2009
@@ -20,15 +20,15 @@
my $current = $self->{source_file};
unshift @path, $current if $current;
- # Check out path for an existing template file.
+ # Check path for an existing template file.
foreach my $dir (@path) {
my $fn = File::Spec->canonpath(File::Spec->catfile($dir, $src_data));
next unless -e $fn;
return $fn;
}
- # Fall through to failure: file not found!
- return;
+ # We couldn't find a matching template, croak.
+ $self->croak_msg("Text::MicroMason::TemplatePath: template '$src_data' not found in path.\n");
}
# $contents = $mason->read_file( $filename );
@@ -39,7 +39,7 @@
my $path = File::Spec->canonpath( $file );
# warn "Checking for '$root' in '$path'\n";
( $path =~ /\A\Q$root\E(\/|(?<=\/))(?!\.\.)/ )
- or $self->croak_msg("Not in required base path '$root'");
+ or $self->croak_msg("Text::MicroMason::TemplatePath: Template not in required base path '$root'");
}
return $self->NEXT('read_file', $file );
@@ -139,6 +139,30 @@
=back
+=head2 EXCEPTIONS
+
+The following additional exceptions are generated by
+Text::MicroMason::TemplatePath when appropriate:
+
+=over 4
+
+=item *
+
+Text::MicroMason::TemplatePath: template '%s' not found in path.
+
+This indicates that the specified template name does not exist in any of
+the directories in the configured path.
+
+=item *
+
+Text::MicroMason::TemplatePath: Template not in required base path '%s'
+
+The template found in the configured template path was not within the
+configured strict_root directory. This may be caused by requesting an
+absolute template filename not within strict_root, or by specifying a
+strict_root which does not match the configured template path.
+
+=back
=head1 SEE ALSO
Modified: branches/upstream/libtext-micromason-perl/current/t/33-filters.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-micromason-perl/current/t/33-filters.t?rev=46519&op=diff
==============================================================================
--- branches/upstream/libtext-micromason-perl/current/t/33-filters.t (original)
+++ branches/upstream/libtext-micromason-perl/current/t/33-filters.t Fri Oct 30 02:11:58 2009
@@ -17,7 +17,7 @@
######################################################################
# Test h encoding flag if we have HTML::Entities
SKIP: {
- skip "HTML::Entities is not installed", 3
+ skip "HTML::Entities is not installed", 4
unless HTML::Entities->can('encode');
my $src_h = q(Hello <% '<"world">' |h %>!);
More information about the Pkg-perl-cvs-commits
mailing list