[libparams-validate-perl] 03/09: Imported Upstream version 1.18
gregor herrmann
gregoa at debian.org
Sat May 9 20:53:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libparams-validate-perl.
commit 89983d7dd54b0cc9edd646cf9d56daffb3574315
Author: gregor herrmann <gregoa at debian.org>
Date: Sat May 9 22:41:58 2015 +0200
Imported Upstream version 1.18
---
Build.PL | 20 +-
Changes | 35 +
INSTALL | 1 -
LICENSE | 2 +-
MANIFEST | 39 +-
META.json | 738 ++++++++++++++++++-
META.yml | 595 +++++++++++++++-
README | 16 -
README.md | 783 +++++++++++++++++++++
_build/auto_features | 2 -
_build/build_params | 119 ----
_build/cleanup | 8 -
_build/config_data | 2 -
_build/features | 2 -
_build/magicnum | 1 -
_build/notes | 2 -
_build/prereqs | 9 -
_build/runtime_params | 2 -
cpanfile | 59 ++
dist.ini | 74 +-
lib/Attribute/Params/Validate.pm | 16 +-
lib/Params/Validate.pm | 194 +++--
lib/Params/Validate/Constants.pm | 4 +-
lib/Params/Validate/PP.pm | 36 +-
lib/Params/Validate/XS.pm | 4 +-
lib/Params/Validate/XS.xs | 293 ++++----
lib/Params/ValidatePP.pm | 7 +-
lib/Params/ValidateXS.pm | 7 +-
perlcriticrc | 58 ++
perltidyrc | 21 +
t/00-compile.t | 57 ++
t/00-report-prereqs.dd | 70 ++
t/00-report-prereqs.t | 183 +++++
t/15-case.t | 4 +-
t/18-depends.t | 21 +-
t/22-overload-can-bug.t | 1 -
t/24-tied.t | 19 +-
t/27-string-as-type.t | 6 +-
t/32-regex-as-value.t | 3 +-
t/34-recursive-validation.t | 8 +-
t/{35-large-arrays.t => 36-large-arrays.t} | 3 +-
t/37-exports.t | 52 ++
t/38-callback-message.t | 113 +++
t/{release-no-tabs.t => author-eol.t} | 31 +-
t/{release-no-tabs.t => author-no-tabs.t} | 27 +-
t/author-pod-spell.t | 55 ++
t/lib/PVTests/Defaults.pm | 6 +-
t/lib/PVTests/Standard.pm | 12 +-
t/release-cpan-changes.t | 12 +-
t/release-memory-leak.t | 105 +++
t/release-pod-coverage.t | 53 +-
t/release-pod-spell.t | 46 --
t/{release-eol.t => release-portability.t} | 10 +-
t/release-pp-01-validate.t | 2 +-
t/release-pp-02-noop.t | 2 +-
t/release-pp-03-attribute.t | 2 +-
t/release-pp-04-defaults.t | 2 +-
t/release-pp-05-noop_default.t | 2 +-
t/release-pp-06-options.t | 2 +-
t/release-pp-07-with.t | 2 +-
t/release-pp-08-noop_with.t | 2 +-
t/release-pp-09-regex.t | 2 +-
t/release-pp-10-noop_regex.t | 2 +-
t/release-pp-11-cb.t | 2 +-
t/release-pp-12-noop_cb.t | 2 +-
t/release-pp-13-taint.t | 2 +-
t/release-pp-14-no_validate.t | 2 +-
t/release-pp-15-case.t | 6 +-
t/release-pp-16-normalize.t | 2 +-
t/release-pp-17-callbacks.t | 2 +-
t/release-pp-18-depends.t | 23 +-
t/release-pp-19-untaint.t | 2 +-
t/release-pp-21-can.t | 2 +-
t/release-pp-22-overload-can-bug.t | 3 +-
t/release-pp-23-readonly.t | 2 +-
t/release-pp-24-tied.t | 21 +-
t/release-pp-25-undef-regex.t | 2 +-
t/release-pp-26-isa.t | 2 +-
t/release-pp-27-string-as-type.t | 8 +-
t/release-pp-28-readonly-return.t | 2 +-
t/release-pp-29-taint-mode.t | 2 +-
t/release-pp-30-hashref-alteration.t | 2 +-
t/release-pp-31-incorrect-spelling.t | 2 +-
t/release-pp-32-regex-as-value.t | 5 +-
t/release-pp-33-keep-errsv.t | 2 +-
t/release-pp-34-recursive-validation.t | 10 +-
t/release-pp-35-default-xs-bug.t | 2 +-
...large-arrays.t => release-pp-36-large-arrays.t} | 5 +-
t/release-pp-37-exports.t | 65 ++
t/release-pp-38-callback-message.t | 126 ++++
t/{release-cpan-changes.t => release-synopsis.t} | 8 +-
t/release-test-version.t | 30 +
tidyall.ini | 19 +
weaver.ini | 17 +
94 files changed, 3771 insertions(+), 675 deletions(-)
diff --git a/Build.PL b/Build.PL
index 14b8e52..0be42f0 100644
--- a/Build.PL
+++ b/Build.PL
@@ -3,16 +3,16 @@
use strict;
use warnings;
-use Module::Build 0.3601;
+use Module::Build 0.28;
my %module_build_args = (
"build_requires" => {
- "Module::Build" => "0.3601"
+ "Module::Build" => "0.28"
},
"c_source" => "c",
"configure_requires" => {
- "Module::Build" => "0.3601"
+ "Module::Build" => "0.28"
},
"dist_abstract" => "Validate method/function parameters",
"dist_author" => [
@@ -20,7 +20,7 @@ my %module_build_args = (
"Ilya Martynov <ilya\@martynov.org>"
],
"dist_name" => "Params-Validate",
- "dist_version" => "1.13",
+ "dist_version" => "1.18",
"license" => "artistic_2",
"module_name" => "Params::Validate",
"recommends" => {},
@@ -41,10 +41,13 @@ my %module_build_args = (
"script_files" => [],
"test_requires" => {
"Devel::Peek" => 0,
+ "ExtUtils::MakeMaker" => 0,
"File::Spec" => 0,
"File::Temp" => 0,
+ "IO::Handle" => 0,
+ "IPC::Open3" => 0,
"Test::Fatal" => 0,
- "Test::More" => "0.88",
+ "Test::More" => "0.96",
"Test::Requires" => 0,
"Tie::Array" => 0,
"Tie::Hash" => 0,
@@ -57,11 +60,14 @@ my %module_build_args = (
my %fallback_build_requires = (
"Devel::Peek" => 0,
+ "ExtUtils::MakeMaker" => 0,
"File::Spec" => 0,
"File::Temp" => 0,
- "Module::Build" => "0.3601",
+ "IO::Handle" => 0,
+ "IPC::Open3" => 0,
+ "Module::Build" => "0.28",
"Test::Fatal" => 0,
- "Test::More" => "0.88",
+ "Test::More" => "0.96",
"Test::Requires" => 0,
"Tie::Array" => 0,
"Tie::Hash" => 0,
diff --git a/Changes b/Changes
index ca865a4..970eb16 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,38 @@
+1.18 2015-02-13
+
+- We no longer attempt to save and restore an existing $SIG{__DIE__} hook
+ before calling a validation callback. This uses undocumented black magic
+ poking at the Perl interpreter guts, which seems to cause sporadic
+ segfaults. Reported by David Wheeler with help from Andreas Koenig. RT
+ #102112.
+
+
+1.17 2015-01-08
+
+- More XS fixes. Simplified how we localize $@ in the XS code and fixed error
+ with Perls compiled with -DDEBUGGING. Reported by Lars Dɪᴇᴄᴋᴏᴡ. RT #101416.
+
+
+1.16 2015-01-07
+
+- The changes in 1.14 introduced a memory leak any time a callback was called
+ and it did not throw an error that was a reference. This affected the
+ DateTime constructor and probably many other things. Reported by David
+ Kayal. RT #101380.
+
+
+1.15 2015-01-01
+
+- No changes from 1.14
+
+
+1.14 2014-12-20 (TRIAL RELEASE)
+
+- Callbacks can now die to provide a custom error message or exception
+ object. Requested by multiple people. Addresses RT #95701 and will allow
+ MooseX::Params::Validate to use messages provided by the type object.
+
+
1.13 2014-06-28
- Fix my brain damage so that this code compiles with Perl 5.14.
diff --git a/INSTALL b/INSTALL
index b60f007..6e46b28 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,3 @@
-
This is the Perl distribution Params-Validate.
Installing Params-Validate is straightforward.
diff --git a/LICENSE b/LICENSE
index 624da2d..083f068 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2014 by Dave Rolsky and Ilya Martynov.
+This software is Copyright (c) 2001 - 2015 by Dave Rolsky and Ilya Martynov.
This is free software, licensed under:
diff --git a/MANIFEST b/MANIFEST
index a184bb7..139f6fb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.019.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.031.
Build.PL
Changes
INSTALL
@@ -6,19 +6,11 @@ LICENSE
MANIFEST
META.json
META.yml
-README
+README.md
TODO
-_build/auto_features
-_build/build_params
-_build/cleanup
-_build/config_data
-_build/features
-_build/magicnum
-_build/notes
-_build/prereqs
-_build/runtime_params
benchmarks/basic
c/ppport.h
+cpanfile
dist.ini
inc/MyModuleBuild.pm
lib/Attribute/Params/Validate.pm
@@ -29,6 +21,11 @@ lib/Params/Validate/XS.pm
lib/Params/Validate/XS.xs
lib/Params/ValidatePP.pm
lib/Params/ValidateXS.pm
+perlcriticrc
+perltidyrc
+t/00-compile.t
+t/00-report-prereqs.dd
+t/00-report-prereqs.t
t/01-validate.t
t/02-noop.t
t/03-attribute.t
@@ -63,7 +60,12 @@ t/32-regex-as-value.t
t/33-keep-errsv.t
t/34-recursive-validation.t
t/35-default-xs-bug.t
-t/35-large-arrays.t
+t/36-large-arrays.t
+t/37-exports.t
+t/38-callback-message.t
+t/author-eol.t
+t/author-no-tabs.t
+t/author-pod-spell.t
t/lib/PVTests.pm
t/lib/PVTests/Callbacks.pm
t/lib/PVTests/Defaults.pm
@@ -71,13 +73,12 @@ t/lib/PVTests/Regex.pm
t/lib/PVTests/Standard.pm
t/lib/PVTests/With.pm
t/release-cpan-changes.t
-t/release-eol.t
-t/release-no-tabs.t
+t/release-memory-leak.t
t/release-pod-coverage.t
t/release-pod-linkcheck.t
t/release-pod-no404s.t
-t/release-pod-spell.t
t/release-pod-syntax.t
+t/release-portability.t
t/release-pp-01-validate.t
t/release-pp-02-noop.t
t/release-pp-03-attribute.t
@@ -112,7 +113,13 @@ t/release-pp-32-regex-as-value.t
t/release-pp-33-keep-errsv.t
t/release-pp-34-recursive-validation.t
t/release-pp-35-default-xs-bug.t
-t/release-pp-35-large-arrays.t
+t/release-pp-36-large-arrays.t
+t/release-pp-37-exports.t
+t/release-pp-38-callback-message.t
t/release-pp-is-loaded.t
+t/release-synopsis.t
+t/release-test-version.t
t/release-xs-is-loaded.t
t/release-xs-segfault.t
+tidyall.ini
+weaver.ini
diff --git a/META.json b/META.json
index 5f6a5e3..6bbd0bc 100644
--- a/META.json
+++ b/META.json
@@ -5,31 +5,44 @@
"Ilya Martynov <ilya at martynov.org>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 5.019, CPAN::Meta::Converter version 2.120921",
+ "generated_by" : "Dist::Zilla version 5.031, CPAN::Meta::Converter version 2.143240",
"license" : [
"artistic_2"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
- "version" : "2"
+ "version" : 2
},
"name" : "Params-Validate",
"prereqs" : {
"build" : {
"requires" : {
- "Module::Build" : "0.3601"
+ "Module::Build" : "0.28"
}
},
"configure" : {
"requires" : {
- "Module::Build" : "0.3601"
+ "Module::Build" : "0.28"
}
},
"develop" : {
"requires" : {
- "Test::More" : "0",
+ "Perl::Critic" : "1.123",
+ "Perl::Tidy" : "20140711",
+ "Pod::Coverage::TrustPod" : "0",
+ "Readonly" : "1.03",
+ "Scalar::Util" : "1.20",
+ "Test::CPAN::Changes" : "0.19",
+ "Test::EOL" : "0",
+ "Test::LeakTrace" : "0.15",
+ "Test::More" : "0.96",
"Test::NoTabs" : "0",
- "Test::Pod" : "1.41"
+ "Test::Pod" : "1.41",
+ "Test::Pod::Coverage" : "1.08",
+ "Test::Spelling" : "0.12",
+ "Test::Synopsis" : "0",
+ "Test::Taint" : "0.02",
+ "Test::Version" : "1"
}
},
"runtime" : {
@@ -48,12 +61,18 @@
}
},
"test" : {
+ "recommends" : {
+ "CPAN::Meta" : "2.120900"
+ },
"requires" : {
"Devel::Peek" : "0",
+ "ExtUtils::MakeMaker" : "0",
"File::Spec" : "0",
"File::Temp" : "0",
+ "IO::Handle" : "0",
+ "IPC::Open3" : "0",
"Test::Fatal" : "0",
- "Test::More" : "0.88",
+ "Test::More" : "0.96",
"Test::Requires" : "0",
"Tie::Array" : "0",
"Tie::Hash" : "0",
@@ -63,18 +82,715 @@
}
}
},
+ "provides" : {
+ "Attribute::Params::Validate" : {
+ "file" : "lib/Attribute/Params/Validate.pm",
+ "version" : "1.18"
+ },
+ "Params::Validate" : {
+ "file" : "lib/Params/Validate.pm",
+ "version" : "1.18"
+ },
+ "Params::Validate::Constants" : {
+ "file" : "lib/Params/Validate/Constants.pm",
+ "version" : "1.18"
+ },
+ "Params::Validate::PP" : {
+ "file" : "lib/Params/Validate/PP.pm",
+ "version" : "1.18"
+ },
+ "Params::Validate::XS" : {
+ "file" : "lib/Params/Validate/XS.pm",
+ "version" : "1.18"
+ }
+ },
"release_status" : "stable",
"resources" : {
"bugtracker" : {
"mailto" : "bug-params-validate at rt.cpan.org",
- "web" : "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Params-Validate"
+ "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=Params-Validate"
},
+ "homepage" : "http://metacpan.org/release/Params-Validate",
"repository" : {
"type" : "git",
- "url" : "git://git.urth.org/Params-Validate.git",
- "web" : "http://git.urth.org/Params-Validate.git"
+ "url" : "git://github.com/autarch/Params-Validate.git",
+ "web" : "https://github.com/autarch/Params-Validate"
+ }
+ },
+ "version" : "1.18",
+ "x_Dist_Zilla" : {
+ "perl" : {
+ "version" : "5.020001"
+ },
+ "plugins" : [
+ {
+ "class" : "Dist::Zilla::Plugin::Authority",
+ "name" : "@DROLSKY/Authority",
+ "version" : "1.009"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::AutoPrereqs",
+ "name" : "@DROLSKY/AutoPrereqs",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
+ "name" : "@DROLSKY/CopyFilesFromBuild",
+ "version" : "0.150250"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::GatherDir",
+ "config" : {
+ "Dist::Zilla::Plugin::GatherDir" : {
+ "exclude_filename" : [
+ "Makefile.PL",
+ "README.md",
+ "Build.PL",
+ "LICENSE",
+ "cpanfile"
+ ],
+ "exclude_match" : [],
+ "follow_symlinks" : "0",
+ "include_dotfiles" : "0",
+ "prefix" : "",
+ "prune_directory" : [],
+ "root" : "."
+ },
+ "Dist::Zilla::Plugin::Git::GatherDir" : {
+ "include_untracked" : "0"
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::GatherDir",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::GitHub::Meta",
+ "name" : "@DROLSKY/GitHub::Meta",
+ "version" : "0.40"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::GitHub::Update",
+ "name" : "@DROLSKY/GitHub::Update",
+ "version" : "0.40"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::MetaResources",
+ "name" : "@DROLSKY/MetaResources",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::MetaProvides::Package",
+ "config" : {
+ "Dist::Zilla::Plugin::MetaProvides::Package" : {
+ "finder_objects" : [
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : "@DROLSKY/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
+ "version" : "5.031"
+ }
+ ]
+ },
+ "Dist::Zilla::Role::MetaProvider::Provider" : {
+ "inherit_missing" : "1",
+ "inherit_version" : "1",
+ "meta_noindex" : "1"
+ }
+ },
+ "name" : "@DROLSKY/MetaProvides::Package",
+ "version" : "2.003001"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::NextRelease",
+ "name" : "@DROLSKY/NextRelease",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Prereqs",
+ "config" : {
+ "Dist::Zilla::Plugin::Prereqs" : {
+ "phase" : "test",
+ "type" : "requires"
+ }
+ },
+ "name" : "@DROLSKY/Test::More with subtest()",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Prereqs",
+ "config" : {
+ "Dist::Zilla::Plugin::Prereqs" : {
+ "phase" : "develop",
+ "type" : "requires"
+ }
+ },
+ "name" : "@DROLSKY/Modules for use with tidyall",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::PromptIfStale",
+ "config" : {
+ "Dist::Zilla::Plugin::PromptIfStale" : {
+ "check_all_plugins" : "1",
+ "check_all_prereqs" : "1",
+ "modules" : [],
+ "phase" : "release",
+ "skip" : [
+ "Dist::Zilla::Plugin::DROLSKY::Contributors",
+ "Dist::Zilla::Plugin::DROLSKY::License",
+ "Dist::Zilla::Plugin::DROLSKY::TidyAll"
+ ]
+ }
+ },
+ "name" : "@DROLSKY/PromptIfStale",
+ "version" : "0.038"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+ "name" : "@DROLSKY/README.md in build",
+ "version" : "0.150250"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+ "name" : "@DROLSKY/README.md in root",
+ "version" : "0.150250"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable",
+ "name" : "@DROLSKY/Test::Pod::Coverage::Configurable",
+ "version" : "0.03"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::PodSpelling",
+ "name" : "@DROLSKY/Test::PodSpelling",
+ "version" : "2.006008"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs",
+ "name" : "@DROLSKY/Test::ReportPrereqs",
+ "version" : "0.020"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Version",
+ "name" : "@DROLSKY/Test::Version",
+ "version" : "0.003001"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ManifestSkip",
+ "name" : "@DROLSKY/ManifestSkip",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::MetaYAML",
+ "name" : "@DROLSKY/MetaYAML",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::License",
+ "name" : "@DROLSKY/License",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ExtraTests",
+ "name" : "@DROLSKY/ExtraTests",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ExecDir",
+ "name" : "@DROLSKY/ExecDir",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ShareDir",
+ "name" : "@DROLSKY/ShareDir",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Manifest",
+ "name" : "@DROLSKY/Manifest",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::CheckVersionIncrement",
+ "name" : "@DROLSKY/CheckVersionIncrement",
+ "version" : "0.121750"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::TestRelease",
+ "name" : "@DROLSKY/TestRelease",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::ConfirmRelease",
+ "name" : "@DROLSKY/ConfirmRelease",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::UploadToCPAN",
+ "name" : "@DROLSKY/UploadToCPAN",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed",
+ "name" : "@DROLSKY/CheckPrereqsIndexed",
+ "version" : "0.015"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::CPANFile",
+ "name" : "@DROLSKY/CPANFile",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::DROLSKY::Contributors",
+ "name" : "@DROLSKY/DROLSKY::Contributors",
+ "version" : "0.32"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::DROLSKY::License",
+ "name" : "@DROLSKY/DROLSKY::License",
+ "version" : "0.32"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::DROLSKY::TidyAll",
+ "name" : "@DROLSKY/DROLSKY::TidyAll",
+ "version" : "0.32"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch",
+ "config" : {
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::CheckFor::CorrectBranch",
+ "version" : "0.011"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::CheckFor::MergeConflicts",
+ "config" : {
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::CheckFor::MergeConflicts",
+ "version" : "0.011"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Contributors",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Contributors" : {
+ "include_authors" : "0",
+ "include_releaser" : "1",
+ "order_by" : "name",
+ "paths" : []
+ }
+ },
+ "name" : "@DROLSKY/Git::Contributors",
+ "version" : "0.009"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::InstallGuide",
+ "name" : "@DROLSKY/InstallGuide",
+ "version" : "1.200006"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Meta::Contributors",
+ "name" : "@DROLSKY/Meta::Contributors",
+ "version" : "0.001"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::MetaConfig",
+ "name" : "@DROLSKY/MetaConfig",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::MetaJSON",
+ "name" : "@DROLSKY/MetaJSON",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::RewriteVersion",
+ "name" : "@DROLSKY/RewriteVersion",
+ "version" : "0.009"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::SurgicalPodWeaver",
+ "config" : {
+ "Dist::Zilla::Plugin::PodWeaver" : {
+ "finder" : [
+ ":InstallModules",
+ ":ExecFiles"
+ ],
+ "plugins" : [
+ {
+ "class" : "Pod::Weaver::Plugin::EnsurePod5",
+ "name" : "@CorePrep/EnsurePod5",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Plugin::H1Nester",
+ "name" : "@CorePrep/H1Nester",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Name",
+ "name" : "Name",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Version",
+ "name" : "Version",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Region",
+ "name" : "prelude",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Generic",
+ "name" : "SYNOPSIS",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Generic",
+ "name" : "DESCRIPTION",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Leftovers",
+ "name" : "Leftovers",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Region",
+ "name" : "postlude",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Authors",
+ "name" : "Authors",
+ "version" : "4.010"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Contributors",
+ "name" : "Contributors",
+ "version" : "0.009"
+ },
+ {
+ "class" : "Pod::Weaver::Section::Legal",
+ "name" : "Legal",
+ "version" : "4.010"
+ }
+ ]
+ }
+ },
+ "name" : "@DROLSKY/SurgicalPodWeaver",
+ "version" : "0.0023"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
+ "name" : "@DROLSKY/PodSyntaxTests",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::CPAN::Changes",
+ "name" : "@DROLSKY/Test::CPAN::Changes",
+ "version" : "0.009"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Compile",
+ "config" : {
+ "Dist::Zilla::Plugin::Test::Compile" : {
+ "bail_out_on_fail" : "0",
+ "fail_on_warning" : "author",
+ "fake_home" : "0",
+ "filename" : "t/00-compile.t",
+ "module_finder" : [
+ ":InstallModules"
+ ],
+ "needs_display" : "0",
+ "phase" : "test",
+ "script_finder" : [
+ ":ExecFiles"
+ ],
+ "skips" : []
+ }
+ },
+ "name" : "@DROLSKY/Test::Compile",
+ "version" : "2.051"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::EOL",
+ "config" : {
+ "Dist::Zilla::Plugin::Test::EOL" : {
+ "filename" : "xt/author/eol.t",
+ "finder" : [
+ ":InstallModules",
+ ":ExecFiles",
+ ":TestFiles"
+ ],
+ "trailing_whitespace" : "1"
+ }
+ },
+ "name" : "@DROLSKY/Test::EOL",
+ "version" : "0.17"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::NoTabs",
+ "config" : {
+ "Dist::Zilla::Plugin::Test::NoTabs" : {
+ "filename" : "xt/author/no-tabs.t",
+ "finder" : [
+ ":InstallModules",
+ ":ExecFiles",
+ ":TestFiles"
+ ]
+ }
+ },
+ "name" : "@DROLSKY/Test::NoTabs",
+ "version" : "0.13"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Pod::LinkCheck",
+ "name" : "@DROLSKY/Test::Pod::LinkCheck",
+ "version" : "1.001"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Pod::No404s",
+ "name" : "@DROLSKY/Test::Pod::No404s",
+ "version" : "1.001"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Portability",
+ "name" : "@DROLSKY/Test::Portability",
+ "version" : "2.000006"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Test::Synopsis",
+ "name" : "@DROLSKY/Test::Synopsis",
+ "version" : "2.000006"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Check",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Check" : {
+ "untracked_files" : "die"
+ },
+ "Dist::Zilla::Role::Git::DirtyFiles" : {
+ "allow_dirty" : [
+ "Makefile.PL",
+ "README.md",
+ "Build.PL",
+ "LICENSE",
+ "cpanfile",
+ "Changes",
+ "CONTRIBUTING.md"
+ ],
+ "allow_dirty_match" : [],
+ "changelog" : "Changes"
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::Check",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Commit",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Commit" : {
+ "add_files_in" : [],
+ "commit_msg" : "v%v%n%n%c",
+ "time_zone" : "local"
+ },
+ "Dist::Zilla::Role::Git::DirtyFiles" : {
+ "allow_dirty" : [
+ "Makefile.PL",
+ "README.md",
+ "Build.PL",
+ "LICENSE",
+ "cpanfile",
+ "Changes",
+ "CONTRIBUTING.md"
+ ],
+ "allow_dirty_match" : [],
+ "changelog" : "Changes"
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/commit generated files",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Tag",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Tag" : {
+ "branch" : null,
+ "signed" : 0,
+ "tag" : "v1.18",
+ "tag_format" : "v%v",
+ "tag_message" : "v%v",
+ "time_zone" : "local"
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::Tag",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Push",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Push" : {
+ "push_to" : [
+ "origin"
+ ],
+ "remotes_must_exist" : 1
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/Git::Push",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::BumpVersionAfterRelease",
+ "name" : "@DROLSKY/BumpVersionAfterRelease",
+ "version" : "0.009"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Commit",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Commit" : {
+ "add_files_in" : [],
+ "commit_msg" : "Bump version after release",
+ "time_zone" : "local"
+ },
+ "Dist::Zilla::Role::Git::DirtyFiles" : {
+ "allow_dirty" : [
+ "dist.ini",
+ "Changes"
+ ],
+ "allow_dirty_match" : [
+ "(?^:.+)"
+ ],
+ "changelog" : "Changes"
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/commit version bump",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Git::Push",
+ "config" : {
+ "Dist::Zilla::Plugin::Git::Push" : {
+ "push_to" : [
+ "origin"
+ ],
+ "remotes_must_exist" : 1
+ },
+ "Dist::Zilla::Role::Git::Repo" : {
+ "repo_root" : "."
+ }
+ },
+ "name" : "@DROLSKY/push version bump",
+ "version" : "2.029"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::Prereqs",
+ "config" : {
+ "Dist::Zilla::Plugin::Prereqs" : {
+ "phase" : "develop",
+ "type" : "requires"
+ }
+ },
+ "name" : "DevelopRequires",
+ "version" : "5.031"
+ },
+ {
+ "class" : "inc::MyModuleBuild",
+ "config" : {
+ "Dist::Zilla::Role::TestRunner" : {
+ "default_jobs" : 1
+ }
+ },
+ "name" : "=inc::MyModuleBuild",
+ "version" : null
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::PurePerlTests",
+ "name" : "PurePerlTests",
+ "version" : "0.04"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":InstallModules",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":IncModules",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":TestFiles",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":ExecFiles",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":ShareFiles",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":MainModule",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":AllFiles",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : ":NoFiles",
+ "version" : "5.031"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::FinderCode",
+ "name" : "@DROLSKY/MetaProvides::Package/AUTOVIV/:InstallModulesPM",
+ "version" : "5.031"
+ }
+ ],
+ "zilla" : {
+ "class" : "Dist::Zilla::Dist::Builder",
+ "config" : {
+ "is_trial" : "0"
+ },
+ "version" : "5.031"
}
},
- "version" : "1.13"
+ "x_authority" : "cpan:DROLSKY",
+ "x_contributors" : [
+ "J.R. Mash <jmash.code at gmail.com>",
+ "Olivier Mengué <dolmen at cpan.org>"
+ ]
}
diff --git a/META.yml b/META.yml
index 3316548..e50b48b 100644
--- a/META.yml
+++ b/META.yml
@@ -4,40 +4,577 @@ author:
- 'Dave Rolsky <autarch at urth.org>'
- 'Ilya Martynov <ilya at martynov.org>'
build_requires:
- Devel::Peek: 0
- File::Spec: 0
- File::Temp: 0
- Module::Build: 0.3601
- Test::Fatal: 0
- Test::More: 0.88
- Test::Requires: 0
- Tie::Array: 0
- Tie::Hash: 0
- base: 0
- lib: 0
- overload: 0
+ Devel::Peek: '0'
+ ExtUtils::MakeMaker: '0'
+ File::Spec: '0'
+ File::Temp: '0'
+ IO::Handle: '0'
+ IPC::Open3: '0'
+ Module::Build: '0.28'
+ Test::Fatal: '0'
+ Test::More: '0.96'
+ Test::Requires: '0'
+ Tie::Array: '0'
+ Tie::Hash: '0'
+ base: '0'
+ lib: '0'
+ overload: '0'
configure_requires:
- Module::Build: 0.3601
+ Module::Build: '0.28'
dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.019, CPAN::Meta::Converter version 2.120921'
+generated_by: 'Dist::Zilla version 5.031, CPAN::Meta::Converter version 2.143240'
license: artistic_2
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: '1.4'
name: Params-Validate
+provides:
+ Attribute::Params::Validate:
+ file: lib/Attribute/Params/Validate.pm
+ version: '1.18'
+ Params::Validate:
+ file: lib/Params/Validate.pm
+ version: '1.18'
+ Params::Validate::Constants:
+ file: lib/Params/Validate/Constants.pm
+ version: '1.18'
+ Params::Validate::PP:
+ file: lib/Params/Validate/PP.pm
+ version: '1.18'
+ Params::Validate::XS:
+ file: lib/Params/Validate/XS.pm
+ version: '1.18'
requires:
- Attribute::Handlers: 0.79
- Carp: 0
- Exporter: 0
- Module::Implementation: 0
- Scalar::Util: 1.10
- XSLoader: 0
- attributes: 0
- perl: 5.008001
- strict: 0
- vars: 0
- warnings: 0
+ Attribute::Handlers: '0.79'
+ Carp: '0'
+ Exporter: '0'
+ Module::Implementation: '0'
+ Scalar::Util: '1.10'
+ XSLoader: '0'
+ attributes: '0'
+ perl: '5.008001'
+ strict: '0'
+ vars: '0'
+ warnings: '0'
resources:
- bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Params-Validate
- repository: git://git.urth.org/Params-Validate.git
-version: 1.13
+ bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Params-Validate
+ homepage: http://metacpan.org/release/Params-Validate
+ repository: git://github.com/autarch/Params-Validate.git
+version: '1.18'
+x_Dist_Zilla:
+ perl:
+ version: '5.020001'
+ plugins:
+ -
+ class: Dist::Zilla::Plugin::Authority
+ name: '@DROLSKY/Authority'
+ version: '1.009'
+ -
+ class: Dist::Zilla::Plugin::AutoPrereqs
+ name: '@DROLSKY/AutoPrereqs'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::CopyFilesFromBuild
+ name: '@DROLSKY/CopyFilesFromBuild'
+ version: '0.150250'
+ -
+ class: Dist::Zilla::Plugin::Git::GatherDir
+ config:
+ Dist::Zilla::Plugin::GatherDir:
+ exclude_filename:
+ - Makefile.PL
+ - README.md
+ - Build.PL
+ - LICENSE
+ - cpanfile
+ exclude_match: []
+ follow_symlinks: '0'
+ include_dotfiles: '0'
+ prefix: ''
+ prune_directory: []
+ root: .
+ Dist::Zilla::Plugin::Git::GatherDir:
+ include_untracked: '0'
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::GatherDir'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::GitHub::Meta
+ name: '@DROLSKY/GitHub::Meta'
+ version: '0.40'
+ -
+ class: Dist::Zilla::Plugin::GitHub::Update
+ name: '@DROLSKY/GitHub::Update'
+ version: '0.40'
+ -
+ class: Dist::Zilla::Plugin::MetaResources
+ name: '@DROLSKY/MetaResources'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::MetaProvides::Package
+ config:
+ Dist::Zilla::Plugin::MetaProvides::Package:
+ finder_objects:
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: '@DROLSKY/MetaProvides::Package/AUTOVIV/:InstallModulesPM'
+ version: '5.031'
+ Dist::Zilla::Role::MetaProvider::Provider:
+ inherit_missing: '1'
+ inherit_version: '1'
+ meta_noindex: '1'
+ name: '@DROLSKY/MetaProvides::Package'
+ version: '2.003001'
+ -
+ class: Dist::Zilla::Plugin::NextRelease
+ name: '@DROLSKY/NextRelease'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: test
+ type: requires
+ name: '@DROLSKY/Test::More with subtest()'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: develop
+ type: requires
+ name: '@DROLSKY/Modules for use with tidyall'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::PromptIfStale
+ config:
+ Dist::Zilla::Plugin::PromptIfStale:
+ check_all_plugins: '1'
+ check_all_prereqs: '1'
+ modules: []
+ phase: release
+ skip:
+ - Dist::Zilla::Plugin::DROLSKY::Contributors
+ - Dist::Zilla::Plugin::DROLSKY::License
+ - Dist::Zilla::Plugin::DROLSKY::TidyAll
+ name: '@DROLSKY/PromptIfStale'
+ version: '0.038'
+ -
+ class: Dist::Zilla::Plugin::ReadmeAnyFromPod
+ name: '@DROLSKY/README.md in build'
+ version: '0.150250'
+ -
+ class: Dist::Zilla::Plugin::ReadmeAnyFromPod
+ name: '@DROLSKY/README.md in root'
+ version: '0.150250'
+ -
+ class: Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable
+ name: '@DROLSKY/Test::Pod::Coverage::Configurable'
+ version: '0.03'
+ -
+ class: Dist::Zilla::Plugin::Test::PodSpelling
+ name: '@DROLSKY/Test::PodSpelling'
+ version: '2.006008'
+ -
+ class: Dist::Zilla::Plugin::Test::ReportPrereqs
+ name: '@DROLSKY/Test::ReportPrereqs'
+ version: '0.020'
+ -
+ class: Dist::Zilla::Plugin::Test::Version
+ name: '@DROLSKY/Test::Version'
+ version: '0.003001'
+ -
+ class: Dist::Zilla::Plugin::ManifestSkip
+ name: '@DROLSKY/ManifestSkip'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::MetaYAML
+ name: '@DROLSKY/MetaYAML'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::License
+ name: '@DROLSKY/License'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::ExtraTests
+ name: '@DROLSKY/ExtraTests'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::ExecDir
+ name: '@DROLSKY/ExecDir'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::ShareDir
+ name: '@DROLSKY/ShareDir'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::Manifest
+ name: '@DROLSKY/Manifest'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::CheckVersionIncrement
+ name: '@DROLSKY/CheckVersionIncrement'
+ version: '0.121750'
+ -
+ class: Dist::Zilla::Plugin::TestRelease
+ name: '@DROLSKY/TestRelease'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::ConfirmRelease
+ name: '@DROLSKY/ConfirmRelease'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::UploadToCPAN
+ name: '@DROLSKY/UploadToCPAN'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::CheckPrereqsIndexed
+ name: '@DROLSKY/CheckPrereqsIndexed'
+ version: '0.015'
+ -
+ class: Dist::Zilla::Plugin::CPANFile
+ name: '@DROLSKY/CPANFile'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::DROLSKY::Contributors
+ name: '@DROLSKY/DROLSKY::Contributors'
+ version: '0.32'
+ -
+ class: Dist::Zilla::Plugin::DROLSKY::License
+ name: '@DROLSKY/DROLSKY::License'
+ version: '0.32'
+ -
+ class: Dist::Zilla::Plugin::DROLSKY::TidyAll
+ name: '@DROLSKY/DROLSKY::TidyAll'
+ version: '0.32'
+ -
+ class: Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch
+ config:
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::CheckFor::CorrectBranch'
+ version: '0.011'
+ -
+ class: Dist::Zilla::Plugin::Git::CheckFor::MergeConflicts
+ config:
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::CheckFor::MergeConflicts'
+ version: '0.011'
+ -
+ class: Dist::Zilla::Plugin::Git::Contributors
+ config:
+ Dist::Zilla::Plugin::Git::Contributors:
+ include_authors: '0'
+ include_releaser: '1'
+ order_by: name
+ paths: []
+ name: '@DROLSKY/Git::Contributors'
+ version: '0.009'
+ -
+ class: Dist::Zilla::Plugin::InstallGuide
+ name: '@DROLSKY/InstallGuide'
+ version: '1.200006'
+ -
+ class: Dist::Zilla::Plugin::Meta::Contributors
+ name: '@DROLSKY/Meta::Contributors'
+ version: '0.001'
+ -
+ class: Dist::Zilla::Plugin::MetaConfig
+ name: '@DROLSKY/MetaConfig'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::MetaJSON
+ name: '@DROLSKY/MetaJSON'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::RewriteVersion
+ name: '@DROLSKY/RewriteVersion'
+ version: '0.009'
+ -
+ class: Dist::Zilla::Plugin::SurgicalPodWeaver
+ config:
+ Dist::Zilla::Plugin::PodWeaver:
+ finder:
+ - ':InstallModules'
+ - ':ExecFiles'
+ plugins:
+ -
+ class: Pod::Weaver::Plugin::EnsurePod5
+ name: '@CorePrep/EnsurePod5'
+ version: '4.010'
+ -
+ class: Pod::Weaver::Plugin::H1Nester
+ name: '@CorePrep/H1Nester'
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Name
+ name: Name
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Version
+ name: Version
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Region
+ name: prelude
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Generic
+ name: SYNOPSIS
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Generic
+ name: DESCRIPTION
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Leftovers
+ name: Leftovers
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Region
+ name: postlude
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Authors
+ name: Authors
+ version: '4.010'
+ -
+ class: Pod::Weaver::Section::Contributors
+ name: Contributors
+ version: '0.009'
+ -
+ class: Pod::Weaver::Section::Legal
+ name: Legal
+ version: '4.010'
+ name: '@DROLSKY/SurgicalPodWeaver'
+ version: '0.0023'
+ -
+ class: Dist::Zilla::Plugin::PodSyntaxTests
+ name: '@DROLSKY/PodSyntaxTests'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::Test::CPAN::Changes
+ name: '@DROLSKY/Test::CPAN::Changes'
+ version: '0.009'
+ -
+ class: Dist::Zilla::Plugin::Test::Compile
+ config:
+ Dist::Zilla::Plugin::Test::Compile:
+ bail_out_on_fail: '0'
+ fail_on_warning: author
+ fake_home: '0'
+ filename: t/00-compile.t
+ module_finder:
+ - ':InstallModules'
+ needs_display: '0'
+ phase: test
+ script_finder:
+ - ':ExecFiles'
+ skips: []
+ name: '@DROLSKY/Test::Compile'
+ version: '2.051'
+ -
+ class: Dist::Zilla::Plugin::Test::EOL
+ config:
+ Dist::Zilla::Plugin::Test::EOL:
+ filename: xt/author/eol.t
+ finder:
+ - ':InstallModules'
+ - ':ExecFiles'
+ - ':TestFiles'
+ trailing_whitespace: '1'
+ name: '@DROLSKY/Test::EOL'
+ version: '0.17'
+ -
+ class: Dist::Zilla::Plugin::Test::NoTabs
+ config:
+ Dist::Zilla::Plugin::Test::NoTabs:
+ filename: xt/author/no-tabs.t
+ finder:
+ - ':InstallModules'
+ - ':ExecFiles'
+ - ':TestFiles'
+ name: '@DROLSKY/Test::NoTabs'
+ version: '0.13'
+ -
+ class: Dist::Zilla::Plugin::Test::Pod::LinkCheck
+ name: '@DROLSKY/Test::Pod::LinkCheck'
+ version: '1.001'
+ -
+ class: Dist::Zilla::Plugin::Test::Pod::No404s
+ name: '@DROLSKY/Test::Pod::No404s'
+ version: '1.001'
+ -
+ class: Dist::Zilla::Plugin::Test::Portability
+ name: '@DROLSKY/Test::Portability'
+ version: '2.000006'
+ -
+ class: Dist::Zilla::Plugin::Test::Synopsis
+ name: '@DROLSKY/Test::Synopsis'
+ version: '2.000006'
+ -
+ class: Dist::Zilla::Plugin::Git::Check
+ config:
+ Dist::Zilla::Plugin::Git::Check:
+ untracked_files: die
+ Dist::Zilla::Role::Git::DirtyFiles:
+ allow_dirty:
+ - Makefile.PL
+ - README.md
+ - Build.PL
+ - LICENSE
+ - cpanfile
+ - Changes
+ - CONTRIBUTING.md
+ allow_dirty_match: []
+ changelog: Changes
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::Check'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::Git::Commit
+ config:
+ Dist::Zilla::Plugin::Git::Commit:
+ add_files_in: []
+ commit_msg: v%v%n%n%c
+ time_zone: local
+ Dist::Zilla::Role::Git::DirtyFiles:
+ allow_dirty:
+ - Makefile.PL
+ - README.md
+ - Build.PL
+ - LICENSE
+ - cpanfile
+ - Changes
+ - CONTRIBUTING.md
+ allow_dirty_match: []
+ changelog: Changes
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/commit generated files'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::Git::Tag
+ config:
+ Dist::Zilla::Plugin::Git::Tag:
+ branch: ~
+ signed: 0
+ tag: v1.18
+ tag_format: v%v
+ tag_message: v%v
+ time_zone: local
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::Tag'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::Git::Push
+ config:
+ Dist::Zilla::Plugin::Git::Push:
+ push_to:
+ - origin
+ remotes_must_exist: 1
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/Git::Push'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::BumpVersionAfterRelease
+ name: '@DROLSKY/BumpVersionAfterRelease'
+ version: '0.009'
+ -
+ class: Dist::Zilla::Plugin::Git::Commit
+ config:
+ Dist::Zilla::Plugin::Git::Commit:
+ add_files_in: []
+ commit_msg: 'Bump version after release'
+ time_zone: local
+ Dist::Zilla::Role::Git::DirtyFiles:
+ allow_dirty:
+ - dist.ini
+ - Changes
+ allow_dirty_match:
+ - (?^:.+)
+ changelog: Changes
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/commit version bump'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::Git::Push
+ config:
+ Dist::Zilla::Plugin::Git::Push:
+ push_to:
+ - origin
+ remotes_must_exist: 1
+ Dist::Zilla::Role::Git::Repo:
+ repo_root: .
+ name: '@DROLSKY/push version bump'
+ version: '2.029'
+ -
+ class: Dist::Zilla::Plugin::Prereqs
+ config:
+ Dist::Zilla::Plugin::Prereqs:
+ phase: develop
+ type: requires
+ name: DevelopRequires
+ version: '5.031'
+ -
+ class: inc::MyModuleBuild
+ config:
+ Dist::Zilla::Role::TestRunner:
+ default_jobs: 1
+ name: =inc::MyModuleBuild
+ version: ~
+ -
+ class: Dist::Zilla::Plugin::PurePerlTests
+ name: PurePerlTests
+ version: '0.04'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':InstallModules'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':IncModules'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':TestFiles'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':ExecFiles'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':ShareFiles'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':MainModule'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':AllFiles'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: ':NoFiles'
+ version: '5.031'
+ -
+ class: Dist::Zilla::Plugin::FinderCode
+ name: '@DROLSKY/MetaProvides::Package/AUTOVIV/:InstallModulesPM'
+ version: '5.031'
+ zilla:
+ class: Dist::Zilla::Dist::Builder
+ config:
+ is_trial: '0'
+ version: '5.031'
+x_authority: cpan:DROLSKY
+x_contributors:
+ - 'J.R. Mash <jmash.code at gmail.com>'
+ - 'Olivier Mengué <dolmen at cpan.org>'
diff --git a/README b/README
deleted file mode 100644
index b4d02ef..0000000
--- a/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-This archive contains the distribution Params-Validate,
-version 1.13:
-
- Validate method/function parameters
-
-This software is Copyright (c) 2014 by Dave Rolsky and Ilya Martynov.
-
-This is free software, licensed under:
-
- The Artistic License 2.0 (GPL Compatible)
-
-
-This README file was generated by Dist::Zilla::Plugin::Readme v5.019.
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..883ecae
--- /dev/null
+++ b/README.md
@@ -0,0 +1,783 @@
+NAME
+
+ Params::Validate - Validate method/function parameters
+
+VERSION
+
+ version 1.18
+
+SYNOPSIS
+
+ use Params::Validate qw(:all);
+
+ # takes named params (hash or hashref)
+ sub foo {
+ validate(
+ @_, {
+ foo => 1, # mandatory
+ bar => 0, # optional
+ }
+ );
+ }
+
+ # takes positional params
+ sub bar {
+ # first two are mandatory, third is optional
+ validate_pos( @_, 1, 1, 0 );
+ }
+
+ sub foo2 {
+ validate(
+ @_, {
+ foo =>
+ # specify a type
+ { type => ARRAYREF },
+ bar =>
+ # specify an interface
+ { can => [ 'print', 'flush', 'frobnicate' ] },
+ baz => {
+ type => SCALAR, # a scalar ...
+ # ... that is a plain integer ...
+ regex => qr/^\d+$/,
+ callbacks => { # ... and smaller than 90
+ 'less than 90' => sub { shift() < 90 },
+ },
+ }
+ }
+ );
+ }
+
+ sub callback_with_custom_error {
+ validate(
+ @_,
+ {
+ foo => callbacks => {
+ 'is an integer' => sub {
+ return 1 if $_[0] =~ /^-?[1-9][0-9]*$/;
+ die "$_[0] is not a valid integer value";
+ },
+ }
+ }
+ );
+ }
+
+ sub with_defaults {
+ my %p = validate(
+ @_, {
+ # required
+ foo => 1,
+ # $p{bar} will be 99 if bar is not given. bar is now
+ # optional.
+ bar => { default => 99 }
+ }
+ );
+ }
+
+ sub pos_with_defaults {
+ my @p = validate_pos( @_, 1, { default => 99 } );
+ }
+
+ sub sets_options_on_call {
+ my %p = validate_with(
+ params => \@_,
+ spec => { foo => { type => SCALAR, default => 2 } },
+ normalize_keys => sub { $_[0] =~ s/^-//; lc $_[0] },
+ );
+ }
+
+DESCRIPTION
+
+ The Params::Validate module allows you to validate method or function
+ call parameters to an arbitrary level of specificity. At the simplest
+ level, it is capable of validating the required parameters were given
+ and that no unspecified additional parameters were passed in.
+
+ It is also capable of determining that a parameter is of a specific
+ type, that it is an object of a certain class hierarchy, that it
+ possesses certain methods, or applying validation callbacks to
+ arguments.
+
+ EXPORT
+
+ The module always exports the validate() and validate_pos() functions.
+
+ It also has an additional function available for export, validate_with,
+ which can be used to validate any type of parameters, and set various
+ options on a per-invocation basis.
+
+ In addition, it can export the following constants, which are used as
+ part of the type checking. These are SCALAR, ARRAYREF, HASHREF,
+ CODEREF, GLOB, GLOBREF, and SCALARREF, UNDEF, OBJECT, BOOLEAN, and
+ HANDLE. These are explained in the section on Type Validation.
+
+ The constants are available via the export tag :types. There is also an
+ :all tag which includes all of the constants as well as the
+ validation_options() function.
+
+PARAMETER VALIDATION
+
+ The validation mechanisms provided by this module can handle both named
+ or positional parameters. For the most part, the same features are
+ available for each. The biggest difference is the way that the
+ validation specification is given to the relevant subroutine. The other
+ difference is in the error messages produced when validation checks
+ fail.
+
+ When handling named parameters, the module will accept either a hash or
+ a hash reference.
+
+ Subroutines expecting named parameters should call the validate()
+ subroutine like this:
+
+ validate(
+ @_, {
+ parameter1 => validation spec,
+ parameter2 => validation spec,
+ ...
+ }
+ );
+
+ Subroutines expecting positional parameters should call the
+ validate_pos() subroutine like this:
+
+ validate_pos( @_, { validation spec }, { validation spec } );
+
+ Mandatory/Optional Parameters
+
+ If you just want to specify that some parameters are mandatory and
+ others are optional, this can be done very simply.
+
+ For a subroutine expecting named parameters, you would do this:
+
+ validate( @_, { foo => 1, bar => 1, baz => 0 } );
+
+ This says that the "foo" and "bar" parameters are mandatory and that
+ the "baz" parameter is optional. The presence of any other parameters
+ will cause an error.
+
+ For a subroutine expecting positional parameters, you would do this:
+
+ validate_pos( @_, 1, 1, 0, 0 );
+
+ This says that you expect at least 2 and no more than 4 parameters. If
+ you have a subroutine that has a minimum number of parameters but can
+ take any maximum number, you can do this:
+
+ validate_pos( @_, 1, 1, (0) x (@_ - 2) );
+
+ This will always be valid as long as at least two parameters are given.
+ A similar construct could be used for the more complex validation
+ parameters described further on.
+
+ Please note that this:
+
+ validate_pos( @_, 1, 1, 0, 1, 1 );
+
+ makes absolutely no sense, so don't do it. Any zeros must come at the
+ end of the validation specification.
+
+ In addition, if you specify that a parameter can have a default, then
+ it is considered optional.
+
+ Type Validation
+
+ This module supports the following simple types, which can be exported
+ as constants:
+
+ * SCALAR
+
+ A scalar which is not a reference, such as 10 or 'hello'. A parameter
+ that is undefined is not treated as a scalar. If you want to allow
+ undefined values, you will have to specify SCALAR | UNDEF.
+
+ * ARRAYREF
+
+ An array reference such as [1, 2, 3] or \@foo.
+
+ * HASHREF
+
+ A hash reference such as { a => 1, b => 2 } or \%bar.
+
+ * CODEREF
+
+ A subroutine reference such as \&foo_sub or sub { print "hello" }.
+
+ * GLOB
+
+ This one is a bit tricky. A glob would be something like *FOO, but
+ not \*FOO, which is a glob reference. It should be noted that this
+ trick:
+
+ my $fh = do { local *FH; };
+
+ makes $fh a glob, not a glob reference. On the other hand, the return
+ value from Symbol::gensym is a glob reference. Either can be used as
+ a file or directory handle.
+
+ * GLOBREF
+
+ A glob reference such as \*FOO. See the GLOB entry above for more
+ details.
+
+ * SCALARREF
+
+ A reference to a scalar such as \$x.
+
+ * UNDEF
+
+ An undefined value
+
+ * OBJECT
+
+ A blessed reference.
+
+ * BOOLEAN
+
+ This is a special option, and is just a shortcut for UNDEF | SCALAR.
+
+ * HANDLE
+
+ This option is also special, and is just a shortcut for GLOB |
+ GLOBREF. However, it seems likely that most people interested in
+ either globs or glob references are likely to really be interested in
+ whether the parameter in question could be a valid file or directory
+ handle.
+
+ To specify that a parameter must be of a given type when using named
+ parameters, do this:
+
+ validate(
+ @_, {
+ foo => { type => SCALAR },
+ bar => { type => HASHREF }
+ }
+ );
+
+ If a parameter can be of more than one type, just use the bitwise or
+ (|) operator to combine them.
+
+ validate( @_, { foo => { type => GLOB | GLOBREF } );
+
+ For positional parameters, this can be specified as follows:
+
+ validate_pos( @_, { type => SCALAR | ARRAYREF }, { type => CODEREF } );
+
+ Interface Validation
+
+ To specify that a parameter is expected to have a certain set of
+ methods, we can do the following:
+
+ validate(
+ @_, {
+ foo =>
+ # just has to be able to ->bar
+ { can => 'bar' }
+ }
+ );
+
+ ... or ...
+
+ validate(
+ @_, {
+ foo =>
+ # must be able to ->bar and ->print
+ { can => [qw( bar print )] }
+ }
+ );
+
+ Class Validation
+
+ A word of warning. When constructing your external interfaces, it is
+ probably better to specify what methods you expect an object to have
+ rather than what class it should be of (or a child of). This will make
+ your API much more flexible.
+
+ With that said, if you want to validate that an incoming parameter
+ belongs to a class (or child class) or classes, do:
+
+ validate(
+ @_,
+ { foo => { isa => 'My::Frobnicator' } }
+ );
+
+ ... or ...
+
+ validate(
+ @_,
+ # must be both, not either!
+ { foo => { isa => [qw( My::Frobnicator IO::Handle )] } }
+ );
+
+ Regex Validation
+
+ If you want to specify that a given parameter must match a specific
+ regular expression, this can be done with "regex" spec key. For
+ example:
+
+ validate(
+ @_,
+ { foo => { regex => qr/^\d+$/ } }
+ );
+
+ The value of the "regex" key may be either a string or a pre-compiled
+ regex created via qr.
+
+ If the value being checked against a regex is undefined, the regex is
+ explicitly checked against the empty string ('') instead, in order to
+ avoid "Use of uninitialized value" warnings.
+
+ The Regexp::Common module on CPAN is an excellent source of regular
+ expressions suitable for validating input.
+
+ Callback Validation
+
+ If none of the above are enough, it is possible to pass in one or more
+ callbacks to validate the parameter. The callback will be given the
+ value of the parameter as its first argument. Its second argument will
+ be all the parameters, as a reference to either a hash or array.
+ Callbacks are specified as hash reference. The key is an id for the
+ callback (used in error messages) and the value is a subroutine
+ reference, such as:
+
+ validate(
+ @_,
+ {
+ foo => {
+ callbacks => {
+ 'smaller than a breadbox' => sub { shift() < $breadbox },
+ 'green or blue' => sub {
+ return 1 if $_[0] eq 'green' || $_[0] eq 'blue';
+ die "$_[0] is not green or blue!";
+ }
+ }
+ }
+ }
+ );
+
+ validate(
+ @_, {
+ foo => {
+ callbacks => {
+ 'bigger than baz' => sub { $_[0] > $_[1]->{baz} }
+ }
+ }
+ }
+ );
+
+ The callback should return a true value if the value is valid. If not,
+ it can return false or die. If you return false, a generic error
+ message will be thrown by Params::Validate.
+
+ If your callback dies instead you can provide a custom error message.
+ If the callback dies with a plain string, this string will be appended
+ to an exception message generated by Params::Validate. If the callback
+ dies with a reference (blessed or not), then this will be rethrown
+ as-is by Params::Validate.
+
+ Untainting
+
+ If you want values untainted, set the "untaint" key in a spec hashref
+ to a true value, like this:
+
+ my %p = validate(
+ @_, {
+ foo => { type => SCALAR, untaint => 1 },
+ bar => { type => ARRAYREF }
+ }
+ );
+
+ This will untaint the "foo" parameter if the parameters are valid.
+
+ Note that untainting is only done if all parameters are valid. Also,
+ only the return values are untainted, not the original values passed
+ into the validation function.
+
+ Asking for untainting of a reference value will not do anything, as
+ Params::Validate will only attempt to untaint the reference itself.
+
+ Mandatory/Optional Revisited
+
+ If you want to specify something such as type or interface, plus the
+ fact that a parameter can be optional, do this:
+
+ validate(
+ @_, {
+ foo => { type => SCALAR },
+ bar => { type => ARRAYREF, optional => 1 }
+ }
+ );
+
+ or this for positional parameters:
+
+ validate_pos(
+ @_,
+ { type => SCALAR },
+ { type => ARRAYREF, optional => 1 }
+ );
+
+ By default, parameters are assumed to be mandatory unless specified as
+ optional.
+
+ Dependencies
+
+ It also possible to specify that a given optional parameter depends on
+ the presence of one or more other optional parameters.
+
+ validate(
+ @_, {
+ cc_number => {
+ type => SCALAR,
+ optional => 1,
+ depends => [ 'cc_expiration', 'cc_holder_name' ],
+ },
+ cc_expiration { type => SCALAR, optional => 1 },
+ cc_holder_name { type => SCALAR, optional => 1 },
+ }
+ );
+
+ In this case, "cc_number", "cc_expiration", and "cc_holder_name" are
+ all optional. However, if "cc_number" is provided, then "cc_expiration"
+ and "cc_holder_name" must be provided as well.
+
+ This allows you to group together sets of parameters that all must be
+ provided together.
+
+ The validate_pos() version of dependencies is slightly different, in
+ that you can only depend on one other parameter. Also, if for example,
+ the second parameter 2 depends on the fourth parameter, then it implies
+ a dependency on the third parameter as well. This is because if the
+ fourth parameter is required, then the user must also provide a third
+ parameter so that there can be four parameters in total.
+
+ Params::Validate will die if you try to depend on a parameter not
+ declared as part of your parameter specification.
+
+ Specifying defaults
+
+ If the validate() or validate_pos() functions are called in a list
+ context, they will return a hash or containing the original parameters
+ plus defaults as indicated by the validation spec.
+
+ If the function is not called in a list context, providing a default in
+ the validation spec still indicates that the parameter is optional.
+
+ The hash or array returned from the function will always be a copy of
+ the original parameters, in order to leave @_ untouched for the calling
+ function.
+
+ Simple examples of defaults would be:
+
+ my %p = validate( @_, { foo => 1, bar => { default => 99 } } );
+
+ my @p = validate_pos( @_, 1, { default => 99 } );
+
+ In scalar context, a hash reference or array reference will be
+ returned, as appropriate.
+
+USAGE NOTES
+
+ Validation failure
+
+ By default, when validation fails Params::Validate calls
+ Carp::confess(). This can be overridden by setting the on_fail option,
+ which is described in the "GLOBAL" OPTIONS section.
+
+ Method calls
+
+ When using this module to validate the parameters passed to a method
+ call, you will probably want to remove the class/object from the
+ parameter list before calling validate() or validate_pos(). If your
+ method expects named parameters, then this is necessary for the
+ validate() function to actually work, otherwise @_ will not be usable
+ as a hash, because it will first have your object (or class) followed
+ by a set of keys and values.
+
+ Thus the idiomatic usage of validate() in a method call will look
+ something like this:
+
+ sub method {
+ my $self = shift;
+
+ my %params = validate(
+ @_, {
+ foo => 1,
+ bar => { type => ARRAYREF },
+ }
+ );
+ }
+
+ Speeding Up Validation
+
+ In most cases, the validation spec will remain the same for each call
+ to a subroutine. In that case, you can speed up validation by defining
+ the validation spec just once, rather than on each call to the
+ subroutine:
+
+ my %spec = ( ... );
+ sub foo {
+ my %params = validate( @_, \%spec );
+ }
+
+ You can also use the state feature to do this:
+
+ use feature 'state';
+
+ sub foo {
+ state $spec = { ... };
+ my %params = validate( @_, $spec );
+ }
+
+"GLOBAL" OPTIONS
+
+ Because the API for the validate() and validate_pos() functions does
+ not make it possible to specify any options other than the validation
+ spec, it is possible to set some options as pseudo-'globals'. These
+ allow you to specify such things as whether or not the validation of
+ named parameters should be case sensitive, for one example.
+
+ These options are called pseudo-'globals' because these settings are
+ only applied to calls originating from the package that set the
+ options.
+
+ In other words, if I am in package Foo and I call validation_options(),
+ those options are only in effect when I call validate() from package
+ Foo.
+
+ While this is quite different from how most other modules operate, I
+ feel that this is necessary in able to make it possible for one
+ module/application to use Params::Validate while still using other
+ modules that also use Params::Validate, perhaps with different options
+ set.
+
+ The downside to this is that if you are writing an app with a standard
+ calling style for all functions, and your app has ten modules, each
+ module must include a call to validation_options(). You could of course
+ write a module that all your modules use which uses various trickery to
+ do this when imported.
+
+ Options
+
+ * normalize_keys => $callback
+
+ This option is only relevant when dealing with named parameters.
+
+ This callback will be used to transform the hash keys of both the
+ parameters and the parameter spec when validate() or validate_with()
+ are called.
+
+ Any alterations made by this callback will be reflected in the
+ parameter hash that is returned by the validation function. For
+ example:
+
+ sub foo {
+ return validate_with(
+ params => \@_,
+ spec => { foo => { type => SCALAR } },
+ normalize_keys =>
+ sub { my $k = shift; $k =~ s/^-//; return uc $k },
+ );
+
+ }
+
+ %p = foo( foo => 20 );
+
+ # $p{FOO} is now 20
+
+ %p = foo( -fOo => 50 );
+
+ # $p{FOO} is now 50
+
+ The callback must return a defined value.
+
+ If a callback is given then the deprecated "ignore_case" and
+ "strip_leading" options are ignored.
+
+ * allow_extra => $boolean
+
+ If true, then the validation routine will allow extra parameters not
+ named in the validation specification. In the case of positional
+ parameters, this allows an unlimited number of maximum parameters
+ (though a minimum may still be set). Defaults to false.
+
+ * on_fail => $callback
+
+ If given, this callback will be called whenever a validation check
+ fails. It will be called with a single parameter, which will be a
+ string describing the failure. This is useful if you wish to have
+ this module throw exceptions as objects rather than as strings, for
+ example.
+
+ This callback is expected to die() internally. If it does not, the
+ validation will proceed onwards, with unpredictable results.
+
+ The default is to simply use the Carp module's confess() function.
+
+ * stack_skip => $number
+
+ This tells Params::Validate how many stack frames to skip when
+ finding a subroutine name to use in error messages. By default, it
+ looks one frame back, at the immediate caller to validate() or
+ validate_pos(). If this option is set, then the given number of
+ frames are skipped instead.
+
+ * ignore_case => $boolean
+
+ DEPRECATED
+
+ This is only relevant when dealing with named parameters. If it is
+ true, then the validation code will ignore the case of parameter
+ names. Defaults to false.
+
+ * strip_leading => $characters
+
+ DEPRECATED
+
+ This too is only relevant when dealing with named parameters. If this
+ is given then any parameters starting with these characters will be
+ considered equivalent to parameters without them entirely. For
+ example, if this is specified as '-', then -foo and foo would be
+ considered identical.
+
+PER-INVOCATION OPTIONS
+
+ The validate_with() function can be used to set the options listed
+ above on a per-invocation basis. For example:
+
+ my %p = validate_with(
+ params => \@_,
+ spec => {
+ foo => { type => SCALAR },
+ bar => { default => 10 }
+ },
+ allow_extra => 1,
+ );
+
+ In addition to the options listed above, it is also possible to set the
+ option "called", which should be a string. This string will be used in
+ any error messages caused by a failure to meet the validation spec.
+
+ This subroutine will validate named parameters as a hash if the "spec"
+ parameter is a hash reference. If it is an array reference, the
+ parameters are assumed to be positional.
+
+ my %p = validate_with(
+ params => \@_,
+ spec => {
+ foo => { type => SCALAR },
+ bar => { default => 10 }
+ },
+ allow_extra => 1,
+ called => 'The Quux::Baz class constructor',
+ );
+
+ my @p = validate_with(
+ params => \@_,
+ spec => [
+ { type => SCALAR },
+ { default => 10 }
+ ],
+ allow_extra => 1,
+ called => 'The Quux::Baz class constructor',
+ );
+
+DISABLING VALIDATION
+
+ If the environment variable PERL_NO_VALIDATION is set to something
+ true, then validation is turned off. This may be useful if you only
+ want to use this module during development but don't want the speed hit
+ during production.
+
+ The only error that will be caught will be when an odd number of
+ parameters are passed into a function/method that expects a hash.
+
+ If you want to selectively turn validation on and off at runtime, you
+ can directly set the $Params::Validate::NO_VALIDATION global variable.
+ It is strongly recommended that you localize any changes to this
+ variable, because other modules you are using may expect validation to
+ be on when they execute. For example:
+
+ {
+ local $Params::Validate::NO_VALIDATION = 1;
+
+ # no error
+ foo( bar => 2 );
+ }
+
+ # error
+ foo( bar => 2 );
+
+ sub foo {
+ my %p = validate( @_, { foo => 1 } );
+ ...;
+ }
+
+ But if you want to shoot yourself in the foot and just turn it off, go
+ ahead!
+
+TAINT MODE
+
+ The XS implementation of this module has some problems Under taint mode
+ with version of Perl before 5.14. If validation fails, then instead of
+ getting the expected error message you'll get a message like "Insecure
+ dependency in eval_sv". This can be worked around by either untainting
+ the arguments yourself, using the pure Perl implementation, or
+ upgrading your Perl.
+
+LIMITATIONS
+
+ Right now there is no way (short of a callback) to specify that
+ something must be of one of a list of classes, or that it must possess
+ one of a list of methods. If this is desired, it can be added in the
+ future.
+
+ Ideally, there would be only one validation function. If someone
+ figures out how to do this, please let me know.
+
+SUPPORT
+
+ Please submit bugs and patches to the CPAN RT system at
+ http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Params%3A%3AValidate or
+ via email at bug-params-validate at rt.cpan.org.
+
+ Support questions can be sent to Dave at autarch at urth.org.
+
+DONATIONS
+
+ If you'd like to thank me for the work I've done on this module, please
+ consider making a "donation" to me via PayPal. I spend a lot of free
+ time creating free software, and would appreciate any support you'd
+ care to offer.
+
+ Please note that I am not suggesting that you must do this in order for
+ me to continue working on this particular software. I will continue to
+ do so, inasmuch as I have in the past, for as long as it interests me.
+
+ Similarly, a donation made in this way will probably not make me work
+ on this software much more, unless I get so many donations that I can
+ consider working on free software full time, which seems unlikely at
+ best.
+
+ To donate, log into PayPal and send money to autarch at urth.org or use
+ the button on this page: http://www.urth.org/~autarch/fs-donation.html
+
+AUTHORS
+
+ * Dave Rolsky <autarch at urth.org>
+
+ * Ilya Martynov <ilya at martynov.org>
+
+CONTRIBUTORS
+
+ * J.R. Mash <jmash.code at gmail.com>
+
+ * Olivier Mengué <dolmen at cpan.org>
+
+COPYRIGHT AND LICENSE
+
+ This software is Copyright (c) 2001 - 2015 by Dave Rolsky and Ilya
+ Martynov.
+
+ This is free software, licensed under:
+
+ The Artistic License 2.0 (GPL Compatible)
+
diff --git a/_build/auto_features b/_build/auto_features
deleted file mode 100644
index 2df4e46..0000000
--- a/_build/auto_features
+++ /dev/null
@@ -1,2 +0,0 @@
-do{ my $x = {};
-$x; }
\ No newline at end of file
diff --git a/_build/build_params b/_build/build_params
deleted file mode 100644
index df1886c..0000000
--- a/_build/build_params
+++ /dev/null
@@ -1,119 +0,0 @@
-do{ my $x = [
- {
- 'ARGV' => []
- },
- {},
- {
- 'verbose' => undef,
- 'dist_suffix' => undef,
- 'PL_files' => undef,
- 'pollute' => undef,
- 'metafile2' => 'META.json',
- 'bindoc_dirs' => [
- 'blib/script'
- ],
- 'conflicts' => {},
- 'recommends' => {},
- 'scripts' => undef,
- 'pod_files' => undef,
- 'config_dir' => '_build',
- 'dist_version' => 42,
- 'sign' => undef,
- 'recurse_into' => [],
- 'build_bat' => 0,
- 'extra_linker_flags' => [],
- 'build_class' => 'Module::Build',
- 'prereq_action_types' => [
- 'requires',
- 'build_requires',
- 'conflicts',
- 'recommends'
- ],
- 'base_dir' => '/home/autarch/projects/Params-Validate',
- 'allow_mb_mismatch' => 0,
- 'xs_files' => undef,
- 'destdir' => undef,
- 'metafile' => 'META.yml',
- 'mb_version' => '0.38',
- 'use_tap_harness' => 0,
- 'test_file_exts' => [
- '.t'
- ],
- 'dist_name' => 'Params-Validate',
- 'has_config_data' => undef,
- 'install_base' => undef,
- 'module_name' => 'Params::Validate',
- '_have_c_compiler' => 1,
- 'recursive_test_files' => 1,
- 'libdoc_dirs' => [
- 'blib/lib',
- 'blib/arch'
- ],
- 'perl' => '/home/autarch/perl5/perlbrew/perls/perl-5.14.2/bin/perl',
- 'dist_author' => undef,
- 'bundle_inc' => [],
- 'use_rcfile' => 1,
- 'configure_requires' => {},
- 'test_files' => undef,
- 'dist_abstract' => 'Whatever',
- 'create_readme' => undef,
- 'prefix_relpaths' => {},
- 'share_dir' => undef,
- 'debug' => undef,
- 'meta_merge' => {},
- 'get_options' => {},
- 'dist_version_from' => undef,
- '_added_to_INC' => [],
- 'auto_configure_requires' => 1,
- 'create_license' => undef,
- 'debugger' => undef,
- 'html_css' => '',
- 'cpan_client' => 'cpan',
- 'mymetafile2' => 'MYMETA.json',
- 'bundle_inc_preload' => [],
- 'build_elements' => [
- 'PL',
- 'support',
- 'pm',
- 'xs',
- 'share_dir',
- 'pod',
- 'script'
- ],
- 'release_status' => 'stable',
- 'needs_compiler' => 1,
- 'orig_dir' => '/home/autarch/projects/Params-Validate',
- 'include_dirs' => [],
- 'installdirs' => 'site',
- 'mymetafile' => 'MYMETA.yml',
- 'create_makefile_pl' => undef,
- 'dynamic_config' => 1,
- 'magic_number' => undef,
- 'install_sets' => {},
- 'tap_harness_args' => {},
- 'install_base_relpaths' => {},
- 'create_packlist' => 1,
- 'meta_add' => {},
- 'requires' => {},
- 'install_path' => {},
- 'pm_files' => undef,
- 'quiet' => undef,
- 'script_files' => undef,
- 'extra_compiler_flags' => [
- '-Wall'
- ],
- 'build_script' => 'Build',
- 'original_prefix' => {},
- 'c_source' => 'c',
- 'program_name' => undef,
- 'autosplit' => undef,
- 'license' => 'artistic_2',
- 'build_requires' => {
- 'ExtUtils::CBuilder' => 0
- },
- 'config' => undef,
- 'blib' => 'blib',
- 'prefix' => undef
- }
-];
-$x; }
\ No newline at end of file
diff --git a/_build/cleanup b/_build/cleanup
deleted file mode 100644
index 31cf73d..0000000
--- a/_build/cleanup
+++ /dev/null
@@ -1,8 +0,0 @@
-do{ my $x = {
- 'blib/arch/auto/Params/Validate/XS/XS.bs' => 1,
- 'lib/Params/Validate/XS.c' => 1,
- 'blib/arch/auto/Params/Validate/XS/XS.so' => 1,
- 'lib/Params/Validate/XS.o' => 1,
- 'blib' => 1
-};
-$x; }
\ No newline at end of file
diff --git a/_build/config_data b/_build/config_data
deleted file mode 100644
index 2df4e46..0000000
--- a/_build/config_data
+++ /dev/null
@@ -1,2 +0,0 @@
-do{ my $x = {};
-$x; }
\ No newline at end of file
diff --git a/_build/features b/_build/features
deleted file mode 100644
index 2df4e46..0000000
--- a/_build/features
+++ /dev/null
@@ -1,2 +0,0 @@
-do{ my $x = {};
-$x; }
\ No newline at end of file
diff --git a/_build/magicnum b/_build/magicnum
deleted file mode 100644
index 42905b7..0000000
--- a/_build/magicnum
+++ /dev/null
@@ -1 +0,0 @@
-489835
\ No newline at end of file
diff --git a/_build/notes b/_build/notes
deleted file mode 100644
index 2df4e46..0000000
--- a/_build/notes
+++ /dev/null
@@ -1,2 +0,0 @@
-do{ my $x = {};
-$x; }
\ No newline at end of file
diff --git a/_build/prereqs b/_build/prereqs
deleted file mode 100644
index c5098b6..0000000
--- a/_build/prereqs
+++ /dev/null
@@ -1,9 +0,0 @@
-do{ my $x = {
- 'build_requires' => {
- 'ExtUtils::CBuilder' => 0
- },
- 'conflicts' => {},
- 'requires' => {},
- 'recommends' => {}
-};
-$x; }
\ No newline at end of file
diff --git a/_build/runtime_params b/_build/runtime_params
deleted file mode 100644
index 2df4e46..0000000
--- a/_build/runtime_params
+++ /dev/null
@@ -1,2 +0,0 @@
-do{ my $x = {};
-$x; }
\ No newline at end of file
diff --git a/cpanfile b/cpanfile
new file mode 100644
index 0000000..29b0f20
--- /dev/null
+++ b/cpanfile
@@ -0,0 +1,59 @@
+requires "Attribute::Handlers" => "0.79";
+requires "Carp" => "0";
+requires "Exporter" => "0";
+requires "Module::Implementation" => "0";
+requires "Scalar::Util" => "1.10";
+requires "XSLoader" => "0";
+requires "attributes" => "0";
+requires "perl" => "5.008001";
+requires "strict" => "0";
+requires "vars" => "0";
+requires "warnings" => "0";
+
+on 'build' => sub {
+ requires "Module::Build" => "0.28";
+};
+
+on 'test' => sub {
+ requires "Devel::Peek" => "0";
+ requires "ExtUtils::MakeMaker" => "0";
+ requires "File::Spec" => "0";
+ requires "File::Temp" => "0";
+ requires "IO::Handle" => "0";
+ requires "IPC::Open3" => "0";
+ requires "Test::Fatal" => "0";
+ requires "Test::More" => "0.96";
+ requires "Test::Requires" => "0";
+ requires "Tie::Array" => "0";
+ requires "Tie::Hash" => "0";
+ requires "base" => "0";
+ requires "lib" => "0";
+ requires "overload" => "0";
+};
+
+on 'test' => sub {
+ recommends "CPAN::Meta" => "2.120900";
+};
+
+on 'configure' => sub {
+ requires "Module::Build" => "0.28";
+};
+
+on 'develop' => sub {
+ requires "Perl::Critic" => "1.123";
+ requires "Perl::Tidy" => "20140711";
+ requires "Pod::Coverage::TrustPod" => "0";
+ requires "Readonly" => "1.03";
+ requires "Scalar::Util" => "1.20";
+ requires "Test::CPAN::Changes" => "0.19";
+ requires "Test::EOL" => "0";
+ requires "Test::LeakTrace" => "0.15";
+ requires "Test::More" => "0.96";
+ requires "Test::NoTabs" => "0";
+ requires "Test::Pod" => "1.41";
+ requires "Test::Pod::Coverage" => "1.08";
+ requires "Test::Spelling" => "0.12";
+ requires "Test::Synopsis" => "0";
+ requires "Test::Taint" => "0.02";
+ requires "Test::Version" => "1";
+};
diff --git a/dist.ini b/dist.ini
index 1600ab0..ac25fb4 100644
--- a/dist.ini
+++ b/dist.ini
@@ -3,52 +3,44 @@ author = Dave Rolsky <autarch at urth.org>
author = Ilya Martynov <ilya at martynov.org>
license = Artistic_2_0
copyright_holder = Dave Rolsky and Ilya Martynov
-
-version = 1.13
-
-[NextRelease]
-format = %-7v %{yyyy-MM-dd}d
-
-[@Filter]
--bundle = @Basic
+copyright_year = 2001
+
+[@DROLSKY]
+dist = Params-Validate
+next_release_width = 7
+pod_coverage_trustme = Params::Validate => qr/^(?:UNKNOWN|set_options|validate(?:_pos|_with)?|validation_options)$/
+pod_coverage_skip = Params::Validate::Constants
+pod_coverage_skip = Params::Validate::PP
+pod_coverage_skip = Params::Validate::XS
+pod_coverage_skip = Params::ValidatePP
+pod_coverage_skip = Params::ValidateXS
+prereqs_skip = ClassCan
+prereqs_skip = ClassISA
+prereqs_skip = Tie::StdArray
+prereqs_skip = Tie::StdHash
+stopwords = API
+stopwords = CPAN
+stopwords = GLOBREF
+stopwords = OO
+stopwords = PayPal
+stopwords = SCALARREF
+stopwords = ValidatePos
+stopwords = baz
+stopwords = onwards
+stopwords = pre
+stopwords = runtime
-remove = MakeMaker
+-remove = Test::TidyAll
-[PruneFiles]
-filenames = Build.PL
+[Prereqs / DevelopRequires]
+Readonly = 1.03
+Scalar::Util = 1.20
+Test::LeakTrace = 0.15
+Test::More = 0.96
+Test::Taint = 0.02
; authordep Dist::Zilla::Plugin::ModuleBuild::XSOrPP
[=inc::MyModuleBuild]
[PurePerlTests]
env_var = PV_TEST_PERL
-
-[InstallGuide]
-[MetaJSON]
-
-[MetaResources]
-bugtracker.web = http://rt.cpan.org/NoAuth/Bugs.html?Dist=Params-Validate
-bugtracker.mailto = bug-params-validate at rt.cpan.org
-repository.url = git://git.urth.org/Params-Validate.git
-repository.web = http://git.urth.org/Params-Validate.git
-repository.type = git
-
-[SurgicalPodWeaver]
-
-[PkgVersion]
-
-[EOLTests]
-[PodSyntaxTests]
-[Test::CPAN::Changes]
-[Test::NoTabs]
-[Test::Pod::LinkCheck]
-[Test::Pod::No404s]
-
-[AutoPrereqs]
-skip = ClassCan
-skip = ClassISA
-skip = Tie::StdArray
-skip = Tie::StdHash
-
-[CheckPrereqsIndexed]
-
-[@Git]
diff --git a/lib/Attribute/Params/Validate.pm b/lib/Attribute/Params/Validate.pm
index 5d6082f..19bcbae 100644
--- a/lib/Attribute/Params/Validate.pm
+++ b/lib/Attribute/Params/Validate.pm
@@ -1,8 +1,10 @@
package Attribute::Params::Validate;
-$Attribute::Params::Validate::VERSION = '1.13';
+
use strict;
use warnings;
+our $VERSION = '1.18';
+
use attributes;
use Attribute::Handlers 0.79;
@@ -98,7 +100,7 @@ Attribute::Params::Validate - Define validation through subroutine attributes
=head1 VERSION
-version 1.13
+version 1.18
=head1 SYNOPSIS
@@ -108,26 +110,26 @@ version 1.13
# foo is mandatory, bar is optional
sub foo : Validate( foo => 1, bar => 0 )
{
- ...
+ # insert code here
}
# takes positional params
# first two are mandatory, third is optional
sub bar : ValidatePos( 1, 1, 0 )
{
- ...
+ # insert code here
}
# for some reason Perl insists that the entire attribute be on one line
sub foo2 : Validate( foo => { type => ARRAYREF }, bar => { can => [ 'print', 'flush', 'frobnicate' ] }, baz => { type => SCALAR, callbacks => { 'numbers only' => sub { shift() =~ /^\d+$/ }, 'less than 90' => sub { shift() < 90 } } } )
{
- ...
+ # insert code here
}
# note that this is marked as a method. This is very important!
sub baz : Validate( foo => { type => ARRAYREF }, bar => { isa => 'Frobnicator' } ) method
{
- ...
+ # insert code here
}
=head1 DESCRIPTION
@@ -197,7 +199,7 @@ Ilya Martynov <ilya at martynov.org>
=head1 COPYRIGHT AND LICENSE
-This software is Copyright (c) 2014 by Dave Rolsky and Ilya Martynov.
+This software is Copyright (c) 2001 - 2015 by Dave Rolsky and Ilya Martynov.
This is free software, licensed under:
diff --git a/lib/Params/Validate.pm b/lib/Params/Validate.pm
index 66df9a2..3c9e605 100644
--- a/lib/Params/Validate.pm
+++ b/lib/Params/Validate.pm
@@ -1,10 +1,12 @@
package Params::Validate;
-$Params::Validate::VERSION = '1.13';
+
use 5.008001;
use strict;
use warnings;
+our $VERSION = '1.18';
+
use Exporter;
use Module::Implementation;
use Params::Validate::Constants;
@@ -13,30 +15,26 @@ use vars qw( $NO_VALIDATION %OPTIONS $options );
our @ISA = 'Exporter';
-my %tags = (
- types => [
- qw(
- SCALAR
- ARRAYREF
- HASHREF
- CODEREF
- GLOB
- GLOBREF
- SCALARREF
- HANDLE
- BOOLEAN
- UNDEF
- OBJECT
- )
- ],
+my @types = qw(
+ SCALAR
+ ARRAYREF
+ HASHREF
+ CODEREF
+ GLOB
+ GLOBREF
+ SCALARREF
+ HANDLE
+ BOOLEAN
+ UNDEF
+ OBJECT
);
our %EXPORT_TAGS = (
'all' => [
qw( validate validate_pos validation_options validate_with ),
- map { @{ $tags{$_} } } keys %tags
+ @types
],
- %tags,
+ types => \@types,
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{all} }, 'set_options' );
@@ -77,7 +75,7 @@ Params::Validate - Validate method/function parameters
=head1 VERSION
-version 1.13
+version 1.18
=head1 SYNOPSIS
@@ -120,12 +118,26 @@ version 1.13
);
}
+ sub callback_with_custom_error {
+ validate(
+ @_,
+ {
+ foo => callbacks => {
+ 'is an integer' => sub {
+ return 1 if $_[0] =~ /^-?[1-9][0-9]*$/;
+ die "$_[0] is not a valid integer value";
+ },
+ }
+ }
+ );
+ }
+
sub with_defaults {
my %p = validate(
@_, {
# required
foo => 1,
- # $p{bar} will be 99 if bar is not given. bar is now
+ # $p{bar} will be 99 if bar is not given. bar is now
# optional.
bar => { default => 99 }
}
@@ -147,7 +159,7 @@ version 1.13
=head1 DESCRIPTION
The Params::Validate module allows you to validate method or function
-call parameters to an arbitrary level of specificity. At the simplest
+call parameters to an arbitrary level of specificity. At the simplest
level, it is capable of validating the required parameters were given
and that no unspecified additional parameters were passed in.
@@ -166,21 +178,23 @@ C<validate_with>, which can be used to validate any type of
parameters, and set various options on a per-invocation basis.
In addition, it can export the following constants, which are used as
-part of the type checking. These are C<SCALAR>, C<ARRAYREF>,
+part of the type checking. These are C<SCALAR>, C<ARRAYREF>,
C<HASHREF>, C<CODEREF>, C<GLOB>, C<GLOBREF>, and C<SCALARREF>,
-C<UNDEF>, C<OBJECT>, C<BOOLEAN>, and C<HANDLE>. These are explained
+C<UNDEF>, C<OBJECT>, C<BOOLEAN>, and C<HANDLE>. These are explained
in the section on L<Type Validation|Params::Validate/Type Validation>.
-The constants are available via the export tag C<:types>. There is
+The constants are available via the export tag C<:types>. There is
also an C<:all> tag which includes all of the constants as well as the
C<validation_options()> function.
+=encoding UTF-8
+
=head1 PARAMETER VALIDATION
The validation mechanisms provided by this module can handle both
-named or positional parameters. For the most part, the same features
-are available for each. The biggest difference is the way that the
-validation specification is given to the relevant subroutine. The
+named or positional parameters. For the most part, the same features
+are available for each. The biggest difference is the way that the
+validation specification is given to the relevant subroutine. The
other difference is in the error messages produced when validation
checks fail.
@@ -213,7 +227,7 @@ For a subroutine expecting named parameters, you would do this:
validate( @_, { foo => 1, bar => 1, baz => 0 } );
This says that the "foo" and "bar" parameters are mandatory and that
-the "baz" parameter is optional. The presence of any other
+the "baz" parameter is optional. The presence of any other
parameters will cause an error.
For a subroutine expecting positional parameters, you would do this:
@@ -227,14 +241,14 @@ can take any maximum number, you can do this:
validate_pos( @_, 1, 1, (0) x (@_ - 2) );
This will always be valid as long as at least two parameters are
-given. A similar construct could be used for the more complex
+given. A similar construct could be used for the more complex
validation parameters described further on.
Please note that this:
validate_pos( @_, 1, 1, 0, 1, 1 );
-makes absolutely no sense, so don't do it. Any zeros must come at the
+makes absolutely no sense, so don't do it. Any zeros must come at the
end of the validation specification.
In addition, if you specify that a parameter can have a default, then
@@ -249,8 +263,8 @@ L<exported as constants|/EXPORT>:
=item * SCALAR
-A scalar which is not a reference, such as C<10> or C<'hello'>. A
-parameter that is undefined is B<not> treated as a scalar. If you
+A scalar which is not a reference, such as C<10> or C<'hello'>. A
+parameter that is undefined is B<not> treated as a scalar. If you
want to allow undefined values, you will have to specify C<SCALAR |
UNDEF>.
@@ -268,19 +282,19 @@ A subroutine reference such as C<\&foo_sub> or C<sub { print "hello" }>.
=item * GLOB
-This one is a bit tricky. A glob would be something like C<*FOO>, but
-not C<\*FOO>, which is a glob reference. It should be noted that this
+This one is a bit tricky. A glob would be something like C<*FOO>, but
+not C<\*FOO>, which is a glob reference. It should be noted that this
trick:
my $fh = do { local *FH; };
-makes C<$fh> a glob, not a glob reference. On the other hand, the
-return value from C<Symbol::gensym> is a glob reference. Either can
+makes C<$fh> a glob, not a glob reference. On the other hand, the
+return value from C<Symbol::gensym> is a glob reference. Either can
be used as a file or directory handle.
=item * GLOBREF
-A glob reference such as C<\*FOO>. See the L<GLOB|GLOB> entry above
+A glob reference such as C<\*FOO>. See the L<GLOB|GLOB> entry above
for more details.
=item * SCALARREF
@@ -302,7 +316,7 @@ This is a special option, and is just a shortcut for C<UNDEF | SCALAR>.
=item * HANDLE
This option is also special, and is just a shortcut for C<GLOB |
-GLOBREF>. However, it seems likely that most people interested in
+GLOBREF>. However, it seems likely that most people interested in
either globs or glob references are likely to really be interested in
whether the parameter in question could be a valid file or directory
handle.
@@ -353,9 +367,9 @@ methods, we can do the following:
=head2 Class Validation
-A word of warning. When constructing your external interfaces, it is
+A word of warning. When constructing your external interfaces, it is
probably better to specify what methods you expect an object to
-have rather than what class it should be of (or a child of). This
+have rather than what class it should be of (or a child of). This
will make your API much more flexible.
With that said, if you want to validate that an incoming parameter
@@ -377,7 +391,7 @@ belongs to a class (or child class) or classes, do:
=head2 Regex Validation
If you want to specify that a given parameter must match a specific
-regular expression, this can be done with "regex" spec key. For
+regular expression, this can be done with "regex" spec key. For
example:
validate(
@@ -398,23 +412,27 @@ expressions suitable for validating input.
=head2 Callback Validation
If none of the above are enough, it is possible to pass in one or more
-callbacks to validate the parameter. The callback will be given the
-B<value> of the parameter as its first argument. Its second argument
+callbacks to validate the parameter. The callback will be given the
+B<value> of the parameter as its first argument. Its second argument
will be all the parameters, as a reference to either a hash or array.
-Callbacks are specified as hash reference. The key is an id for the
+Callbacks are specified as hash reference. The key is an id for the
callback (used in error messages) and the value is a subroutine
reference, such as:
validate(
- @_, {
+ @_,
+ {
foo => {
callbacks => {
'smaller than a breadbox' => sub { shift() < $breadbox },
- 'green or blue' =>
- sub { $_[0] eq 'green' || $_[0] eq 'blue' }
+ 'green or blue' => sub {
+ return 1 if $_[0] eq 'green' || $_[0] eq 'blue';
+ die "$_[0] is not green or blue!";
+ }
}
}
- );
+ }
+ );
validate(
@_, {
@@ -426,6 +444,16 @@ reference, such as:
}
);
+The callback should return a true value if the value is valid. If not, it can
+return false or die. If you return false, a generic error message will be
+thrown by C<Params::Validate>.
+
+If your callback dies instead you can provide a custom error message. If the
+callback dies with a plain string, this string will be appended to an
+exception message generated by C<Params::Validate>. If the callback dies with
+a reference (blessed or not), then this will be rethrown as-is by
+C<Params::Validate>.
+
=head2 Untainting
If you want values untainted, set the "untaint" key in a spec hashref
@@ -488,16 +516,16 @@ the presence of one or more other optional parameters.
);
In this case, "cc_number", "cc_expiration", and "cc_holder_name" are
-all optional. However, if "cc_number" is provided, then
+all optional. However, if "cc_number" is provided, then
"cc_expiration" and "cc_holder_name" must be provided as well.
This allows you to group together sets of parameters that all must be
provided together.
The C<validate_pos()> version of dependencies is slightly different,
-in that you can only depend on one other parameter. Also, if for
+in that you can only depend on one other parameter. Also, if for
example, the second parameter 2 depends on the fourth parameter, then
-it implies a dependency on the third parameter as well. This is
+it implies a dependency on the third parameter as well. This is
because if the fourth parameter is required, then the user must also
provide a third parameter so that there can be four parameters in
total.
@@ -532,7 +560,7 @@ returned, as appropriate.
=head2 Validation failure
By default, when validation fails C<Params::Validate> calls
-C<Carp::confess()>. This can be overridden by setting the C<on_fail>
+C<Carp::confess()>. This can be overridden by setting the C<on_fail>
option, which is described in the L<"GLOBAL" OPTIONS|"GLOBAL" OPTIONS>
section.
@@ -584,7 +612,7 @@ You can also use the C<state> feature to do this:
Because the API for the C<validate()> and C<validate_pos()> functions does not
make it possible to specify any options other than the validation spec, it is
-possible to set some options as pseudo-'globals'. These allow you to specify
+possible to set some options as pseudo-'globals'. These allow you to specify
such things as whether or not the validation of named parameters should be
case sensitive, for one example.
@@ -621,7 +649,7 @@ parameters and the parameter spec when C<validate()> or
C<validate_with()> are called.
Any alterations made by this callback will be reflected in the
-parameter hash that is returned by the validation function. For
+parameter hash that is returned by the validation function. For
example:
sub foo {
@@ -650,19 +678,19 @@ If a callback is given then the deprecated "ignore_case" and
=item * allow_extra => $boolean
If true, then the validation routine will allow extra parameters not
-named in the validation specification. In the case of positional
+named in the validation specification. In the case of positional
parameters, this allows an unlimited number of maximum parameters
-(though a minimum may still be set). Defaults to false.
+(though a minimum may still be set). Defaults to false.
=item * on_fail => $callback
If given, this callback will be called whenever a validation check
-fails. It will be called with a single parameter, which will be a
-string describing the failure. This is useful if you wish to have
+fails. It will be called with a single parameter, which will be a
+string describing the failure. This is useful if you wish to have
this module throw exceptions as objects rather than as strings, for
example.
-This callback is expected to C<die()> internally. If it does not, the
+This callback is expected to C<die()> internally. If it does not, the
validation will proceed onwards, with unpredictable results.
The default is to simply use the Carp module's C<confess()> function.
@@ -670,26 +698,26 @@ The default is to simply use the Carp module's C<confess()> function.
=item * stack_skip => $number
This tells Params::Validate how many stack frames to skip when finding
-a subroutine name to use in error messages. By default, it looks one
+a subroutine name to use in error messages. By default, it looks one
frame back, at the immediate caller to C<validate()> or
-C<validate_pos()>. If this option is set, then the given number of
+C<validate_pos()>. If this option is set, then the given number of
frames are skipped instead.
=item * ignore_case => $boolean
DEPRECATED
-This is only relevant when dealing with named parameters. If it is
+This is only relevant when dealing with named parameters. If it is
true, then the validation code will ignore the case of parameter
-names. Defaults to false.
+names. Defaults to false.
=item * strip_leading => $characters
DEPRECATED
-This too is only relevant when dealing with named parameters. If this
+This too is only relevant when dealing with named parameters. If this
is given then any parameters starting with these characters will be
-considered equivalent to parameters without them entirely. For
+considered equivalent to parameters without them entirely. For
example, if this is specified as '-', then C<-foo> and C<foo> would be
considered identical.
@@ -698,7 +726,7 @@ considered identical.
=head1 PER-INVOCATION OPTIONS
The C<validate_with()> function can be used to set the options listed
-above on a per-invocation basis. For example:
+above on a per-invocation basis. For example:
my %p = validate_with(
params => \@_,
@@ -710,12 +738,12 @@ above on a per-invocation basis. For example:
);
In addition to the options listed above, it is also possible to set
-the option "called", which should be a string. This string will be
+the option "called", which should be a string. This string will be
used in any error messages caused by a failure to meet the validation
spec.
This subroutine will validate named parameters as a hash if the "spec"
-parameter is a hash reference. If it is an array reference, the
+parameter is a hash reference. If it is an array reference, the
parameters are assumed to be positional.
my %p = validate_with(
@@ -741,7 +769,7 @@ parameters are assumed to be positional.
=head1 DISABLING VALIDATION
If the environment variable C<PERL_NO_VALIDATION> is set to something
-true, then validation is turned off. This may be useful if you only
+true, then validation is turned off. This may be useful if you only
want to use this module during development but don't want the speed
hit during production.
@@ -750,9 +778,9 @@ parameters are passed into a function/method that expects a hash.
If you want to selectively turn validation on and off at runtime, you
can directly set the C<$Params::Validate::NO_VALIDATION> global
-variable. It is B<strongly> recommended that you B<localize> any
+variable. It is B<strongly> recommended that you B<localize> any
changes to this variable, because other modules you are using may
-expect validation to be on when they execute. For example:
+expect validation to be on when they execute. For example:
{
local $Params::Validate::NO_VALIDATION = 1;
@@ -784,10 +812,10 @@ yourself, using the pure Perl implementation, or upgrading your Perl.
Right now there is no way (short of a callback) to specify that
something must be of one of a list of classes, or that it must possess
-one of a list of methods. If this is desired, it can be added in the
+one of a list of methods. If this is desired, it can be added in the
future.
-Ideally, there would be only one validation function. If someone
+Ideally, there would be only one validation function. If someone
figures out how to do this, please let me know.
=head1 SUPPORT
@@ -833,9 +861,25 @@ Ilya Martynov <ilya at martynov.org>
=back
+=head1 CONTRIBUTORS
+
+=for stopwords J.R. Mash Olivier Mengué
+
+=over 4
+
+=item *
+
+J.R. Mash <jmash.code at gmail.com>
+
+=item *
+
+Olivier Mengué <dolmen at cpan.org>
+
+=back
+
=head1 COPYRIGHT AND LICENSE
-This software is Copyright (c) 2014 by Dave Rolsky and Ilya Martynov.
+This software is Copyright (c) 2001 - 2015 by Dave Rolsky and Ilya Martynov.
This is free software, licensed under:
diff --git a/lib/Params/Validate/Constants.pm b/lib/Params/Validate/Constants.pm
index 3039d5f..39fda9e 100644
--- a/lib/Params/Validate/Constants.pm
+++ b/lib/Params/Validate/Constants.pm
@@ -1,8 +1,10 @@
package Params::Validate::Constants;
-$Params::Validate::Constants::VERSION = '1.13';
+
use strict;
use warnings;
+our $VERSION = '1.18';
+
our @ISA = 'Exporter';
our @EXPORT = qw(
diff --git a/lib/Params/Validate/PP.pm b/lib/Params/Validate/PP.pm
index 72a6844..1311f57 100644
--- a/lib/Params/Validate/PP.pm
+++ b/lib/Params/Validate/PP.pm
@@ -1,8 +1,10 @@
package Params::Validate::PP;
-$Params::Validate::PP::VERSION = '1.13';
+
use strict;
use warnings;
+our $VERSION = '1.18';
+
use Params::Validate::Constants;
use Scalar::Util 1.10 ();
@@ -43,7 +45,7 @@ sub validate_pos (\@@) {
# if the spec is bigger that's where we can start adding
# defaults
- for ( my $x = $#p + 1 ; $x <= $#specs ; $x++ ) {
+ for ( my $x = $#p + 1; $x <= $#specs; $x++ ) {
$p[$x] = $specs[$x]->{default}
if ref $specs[$x] && exists $specs[$x]->{default};
}
@@ -346,7 +348,7 @@ OUTER:
if (@missing) {
my $called = _get_called();
- my $missing = join ', ', map { "'$_'" } @missing;
+ my $missing = join ', ', map {"'$_'"} @missing;
$options->{on_fail}->( "Mandatory parameter"
. ( @missing > 1 ? 's' : '' )
. " $missing missing in call to $called\n" );
@@ -495,12 +497,12 @@ sub _validate_one_param {
foreach ( ref $spec->{isa} ? @{ $spec->{isa} } : $spec->{isa} ) {
unless (
do {
- local $@;
+ local $@ = q{};
eval { $value->isa($_) };
}
) {
my $is = ref $value ? ref $value : 'plain scalar';
- my $article1 = $_ =~ /^[aeiou]/i ? 'an' : 'a';
+ my $article1 = $_ =~ /^[aeiou]/i ? 'an' : 'a';
my $article2 = $is =~ /^[aeiou]/i ? 'an' : 'a';
my $called = _get_called(1);
@@ -516,7 +518,7 @@ sub _validate_one_param {
foreach ( ref $spec->{can} ? @{ $spec->{can} } : $spec->{can} ) {
unless (
do {
- local $@;
+ local $@ = q{};
eval { $value->can($_) };
}
) {
@@ -546,11 +548,27 @@ sub _validate_one_param {
);
}
- unless ( $spec->{callbacks}{$_}->( $value, $params ) ) {
+ my $ok;
+ my $e = do {
+ local $@ = q{};
+ local $SIG{__DIE__} = undef;
+ $ok = eval { $spec->{callbacks}{$_}->( $value, $params ) };
+ $@;
+ };
+
+ if ( !$ok ) {
my $called = _get_called(1);
- $options->{on_fail}
- ->("$id to $called did not pass the '$_' callback\n");
+ my $msg;
+ if ( ref $e ) {
+ $msg = $e;
+ }
+ else {
+ $msg = "$id to $called did not pass the '$_' callback";
+ $msg .= ": $e" if length $e;
+ $msg .= "\n";
+ }
+ $options->{on_fail}->($msg);
}
}
}
diff --git a/lib/Params/Validate/XS.pm b/lib/Params/Validate/XS.pm
index 75ffd88..ba6148d 100644
--- a/lib/Params/Validate/XS.pm
+++ b/lib/Params/Validate/XS.pm
@@ -1,8 +1,10 @@
package Params::Validate::XS;
-$Params::Validate::XS::VERSION = '1.13';
+
use strict;
use warnings;
+our $VERSION = '1.18';
+
use Carp;
my $default_fail = sub {
diff --git a/lib/Params/Validate/XS.xs b/lib/Params/Validate/XS.xs
index ad8c5f5..20abe13 100644
--- a/lib/Params/Validate/XS.xs
+++ b/lib/Params/Validate/XS.xs
@@ -3,8 +3,6 @@
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
-#define NEED_eval_pv
-#define NEED_sv_2pv_flags
#include "ppport.h"
#ifdef __GNUC__
@@ -75,6 +73,33 @@
} STMT_END
+static SV *module;
+void peek(SV *thing)
+{
+ if (NULL == module) {
+ module = newSVpv("Devel::Peek", 0);
+ load_module(PERL_LOADMOD_NOIMPORT, module, NULL);
+ }
+
+ {
+ dSP;
+ ENTER;
+ SAVETMPS;
+
+ PUSHMARK(SP);
+ XPUSHs(thing);
+ PUTBACK;
+
+ (void)call_pv("Devel::Peek::Dump", G_VOID);
+
+ SPAGAIN;
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+ }
+}
+
INLINE static bool
no_validation() {
SV* no_v;
@@ -86,7 +111,6 @@ no_validation() {
return SvTRUE(no_v);
}
-
/* return type string that corresponds to typemask */
INLINE static SV*
typemask_to_string(IV mask) {
@@ -139,7 +163,6 @@ typemask_to_string(IV mask) {
return buffer;
}
-
/* compute numberic datatype for variable */
INLINE static IV
get_type(SV* sv) {
@@ -202,7 +225,6 @@ get_type(SV* sv) {
return UNKNOWN;
}
-
/* get an article for given string */
INLINE static const char*
article(SV* string) {
@@ -224,7 +246,6 @@ article(SV* string) {
return "a";
}
-
/* raises exception either using user-defined callback or using
built-in method */
static void
@@ -240,21 +261,29 @@ validation_failure(SV* message, HV* options) {
on_fail = NULL;
}
- /* use user defined callback if available */
- if (on_fail) {
+ {
dSP;
+ ENTER;
+ SAVETMPS;
PUSHMARK(SP);
- XPUSHs(message);
+ mXPUSHs(message);
PUTBACK;
- call_sv(on_fail, G_DISCARD);
- }
- else {
- /* by default resort to Carp::confess for error reporting */
- dSP;
- PUSHMARK(SP);
- XPUSHs(message);
+
+ /* use user defined callback if available */
+ if (on_fail) {
+ call_sv(on_fail, G_DISCARD);
+ }
+ else {
+ /* by default resort to Carp::confess for error reporting */
+ call_pv("Carp::confess", G_DISCARD);
+ }
+
+ /* We shouldn't get here if the thing we just called dies, but it
+ doesn't hurt to be careful. */
+ SPAGAIN;
PUTBACK;
- call_pv("Carp::confess", G_DISCARD);
+ FREETMPS;
+ LEAVE;
}
return;
@@ -262,11 +291,12 @@ validation_failure(SV* message, HV* options) {
/* get called subroutine fully qualified name */
static SV*
-get_called(HV* options) {
+get_caller(HV* options) {
SV** temp;
if ((temp = hv_fetch(options, "called", 6, 0))) {
SvGETMAGIC(*temp);
+ SvREFCNT_inc(*temp);
return *temp;
}
else {
@@ -321,17 +351,20 @@ get_called(HV* options) {
if (SvTYPE(caller) == SVt_NULL) {
sv_setpv(caller, "(unknown");
}
+
+ /* This will be decremented by the code that asked for this value, but
+ we need to do this here because the return value of caller() is
+ mortal and has a refcnt of 1. */
+ SvREFCNT_inc(caller);
#endif
return caller;
}
}
-
/* $value->isa alike validation */
static IV
validate_isa(SV* value, SV* package, SV* id, HV* options) {
- SV* buffer;
IV ok = 1;
if (! value) {
@@ -375,9 +408,11 @@ validate_isa(SV* value, SV* package, SV* id, HV* options) {
}
if (! ok) {
- buffer = sv_2mortal(newSVsv(id));
+ SV *caller = get_caller(options);
+ SV* buffer = newSVsv(id);
sv_catpv(buffer, " to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " was not ");
sv_catpv(buffer, article(package));
sv_catpv(buffer, " '");
@@ -398,7 +433,6 @@ validate_isa(SV* value, SV* package, SV* id, HV* options) {
return 1;
}
-
static IV
validate_can(SV* value, SV* method, SV* id, HV* options) {
IV ok = 1;
@@ -444,11 +478,11 @@ validate_can(SV* value, SV* method, SV* id, HV* options) {
}
if (! ok) {
- SV* buffer;
-
- buffer = sv_2mortal(newSVsv(id));
+ SV* buffer = newSVsv(id);
+ SV *caller = get_caller(options);
sv_catpv(buffer, " to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " does not have the method: '");
sv_catsv(buffer, method);
sv_catpv(buffer, "'\n");
@@ -496,9 +530,8 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
if ( ! ( SvOK(*temp)
&& looks_like_number(*temp)
&& SvIV(*temp) > 0 ) ) {
- SV* buffer;
- buffer = sv_2mortal(newSVsv(id));
+ SV* buffer = newSVsv(id);
sv_catpv( buffer, " has a type specification which is not a number. It is ");
if ( SvOK(*temp) ) {
sv_catpv( buffer, "a string - " );
@@ -515,13 +548,14 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
SvGETMAGIC(*temp);
type = get_type(value);
if (! (type & SvIV(*temp))) {
- SV* buffer;
+ SV* buffer = newSVsv(id);
+ SV *caller = get_caller(options);
SV* is;
SV* allowed;
- buffer = sv_2mortal(newSVsv(id));
sv_catpv(buffer, " to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " was ");
is = typemask_to_string(type);
allowed = typemask_to_string(SvIV(*temp));
@@ -531,6 +565,7 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
sv_catpv(buffer, "', which is not one of the allowed types: ");
sv_catsv(buffer, allowed);
sv_catpv(buffer, "\n");
+
validation_failure(buffer, options);
}
}
@@ -593,75 +628,99 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
/* let callbacks to do their tests */
if ((temp = hv_fetch(spec, "callbacks", 9, 0))) {
+ HE* he;
+
SvGETMAGIC(*temp);
- if (SvROK(*temp) && SvTYPE(SvRV(*temp)) == SVt_PVHV) {
- HE* he;
+ if (!(SvROK(*temp) && SvTYPE(SvRV(*temp)) == SVt_PVHV)) {
+ SV* buffer = newSVpv("'callbacks' validation parameter for '", 0);
+ SV *caller = get_caller(options);
- hv_iterinit((HV*) SvRV(*temp));
- while ((he = hv_iternext((HV*) SvRV(*temp)))) {
- if (SvROK(HeVAL(he)) && SvTYPE(SvRV(HeVAL(he))) == SVt_PVCV) {
- dSP;
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
+ sv_catpv(buffer, " must be a hash reference\n");
+ validation_failure(buffer, options);
+ }
- SV* ret;
- IV ok;
- IV count;
+ hv_iterinit((HV*) SvRV(*temp));
+ while ((he = hv_iternext((HV*) SvRV(*temp)))) {
+ SV* ret;
+ IV ok;
+ IV count;
+ SV *err;
- ENTER;
- SAVETMPS;
+ if (!(SvROK(HeVAL(he)) && SvTYPE(SvRV(HeVAL(he))) == SVt_PVCV)) {
+ SV* buffer = newSVpv("callback '", 0);
+ SV *caller = get_caller(options);
- PUSHMARK(SP);
- EXTEND(SP, 2);
- PUSHs(value);
- PUSHs(sv_2mortal(newRV_inc(params)));
- PUTBACK;
+ sv_catsv(buffer, HeSVKEY_force(he));
+ sv_catpv(buffer, "' for ");
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
+ sv_catpv(buffer, " is not a subroutine reference\n");
+ validation_failure(buffer, options);
+ }
- count = call_sv(SvRV(HeVAL(he)), G_SCALAR);
+ {
+ dSP;
+ ENTER;
+ SAVETMPS;
- SPAGAIN;
+ PUSHMARK(SP);
+ EXTEND(SP, 2);
+ PUSHs(value);
+ mPUSHs(newRV_inc(params));
+ PUTBACK;
+
+ /* local $@ = q{}; */
+ save_scalar(PL_errgv);
+ sv_setpv(ERRSV, "");
+
+ count = call_sv(SvRV(HeVAL(he)), G_EVAL|G_SCALAR);
+
+ SPAGAIN;
+
+ if (!count) {
+ croak("Validation callback did not return anything");
+ }
- if (! count)
- croak("Validation callback did not return anything");
+ ret = POPs;
+ SvGETMAGIC(ret);
+ ok = SvTRUE(ret);
- ret = POPs;
- SvGETMAGIC(ret);
- ok = SvTRUE(ret);
+ err = newSV(0);
+ SvSetSV_nosteal(err, ERRSV);
- PUTBACK;
- FREETMPS;
- LEAVE;
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
- if (! ok) {
- SV* buffer;
+ if (! ok) {
+ if (SvROK(err)) {
+ validation_failure(err, options);
+ }
+ else {
+ SV* buffer = newSVsv(id);
+ SV *caller = get_caller(options);
- buffer = sv_2mortal(newSVsv(id));
sv_catpv(buffer, " to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " did not pass the '");
sv_catsv(buffer, HeSVKEY_force(he));
- sv_catpv(buffer, "' callback\n");
+ sv_catpv(buffer, "' callback");
+ if (SvLEN(err) > 0) {
+ sv_catpv(buffer, ": ");
+ sv_catsv(buffer, err);
+ }
+ sv_catpv(buffer, "\n");
validation_failure(buffer, options);
}
}
else {
- SV* buffer;
-
- buffer = sv_2mortal(newSVpv("callback '", 0));
- sv_catsv(buffer, HeSVKEY_force(he));
- sv_catpv(buffer, "' for ");
- sv_catsv(buffer, get_called(options));
- sv_catpv(buffer, " is not a subroutine reference\n");
- validation_failure(buffer, options);
+ SvREFCNT_dec(err);
}
}
}
- else {
- SV* buffer;
-
- buffer = sv_2mortal(newSVpv("'callbacks' validation parameter for '", 0));
- sv_catsv(buffer, get_called(options));
- sv_catpv(buffer, " must be a hash reference\n");
- validation_failure(buffer, options);
- }
}
if ((temp = hv_fetch(spec, "regex", 5, 0))) {
@@ -691,10 +750,11 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
}
if (!has_regex) {
- SV* buffer;
+ SV* buffer = newSVpv("'regex' validation parameter for '", 0);
+ SV *caller = get_caller(options);
- buffer = sv_2mortal(newSVpv("'regex' validation parameter for '", 0));
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " must be a string or qr// regex\n");
validation_failure(buffer, options);
}
@@ -710,11 +770,12 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
PUTBACK;
if (!ok) {
- SV* buffer;
+ SV* buffer = newSVsv(id);
+ SV *caller = get_caller(options);
- buffer = sv_2mortal(newSVsv(id));
sv_catpv(buffer, " to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " did not pass regex check\n");
validation_failure(buffer, options);
}
@@ -729,7 +790,6 @@ validate_one_param(SV* value, SV* params, HV* spec, SV* id, HV* options, IV* unt
return 1;
}
-
/* merges one hash into another (not deep copy) */
static void
merge_hashes(HV* in, HV* out) {
@@ -745,7 +805,6 @@ merge_hashes(HV* in, HV* out) {
}
}
-
/* convert array to hash */
static IV
convert_array2hash(AV* in, HV* options, HV* out) {
@@ -754,9 +813,11 @@ convert_array2hash(AV* in, HV* options, HV* out) {
len = av_len(in);
if (len > -1 && len % 2 != 1) {
- SV* buffer;
- buffer = sv_2mortal(newSVpv("Odd number of parameters in call to ", 0));
- sv_catsv(buffer, get_called(options));
+ SV* buffer = newSVpv("Odd number of parameters in call to ", 0);
+ SV *caller = get_caller(options);
+
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " when named parameters were expected\n");
validation_failure(buffer, options);
@@ -828,7 +889,6 @@ get_options(HV* options) {
return ret;
}
-
static SV*
normalize_one_key(SV* key, SV* normalize_func, SV* strip_leading, IV ignore_case) {
SV* copy;
@@ -885,7 +945,6 @@ normalize_one_key(SV* key, SV* normalize_func, SV* strip_leading, IV ignore_case
return copy;
}
-
static HV*
normalize_hash_keys(HV* p, SV* normalize_func, SV* strip_leading, IV ignore_case) {
SV* normalized;
@@ -915,13 +974,11 @@ normalize_hash_keys(HV* p, SV* normalize_func, SV* strip_leading, IV ignore_case
return norm_p;
}
-
static IV
validate_pos_depends(AV* p, AV* specs, HV* options) {
IV p_idx;
SV** depends;
SV** p_spec;
- SV* buffer;
for (p_idx = 0; p_idx <= av_len(p); p_idx++) {
p_spec = av_fetch(specs, p_idx, 0);
@@ -940,20 +997,19 @@ validate_pos_depends(AV* p, AV* specs, HV* options) {
}
if (av_len(p) < SvIV(*depends) -1) {
-
- buffer =
- sv_2mortal(newSVpvf("Parameter #%d depends on parameter #%d, which was not given",
- (int) p_idx + 1,
- (int) SvIV(*depends)));
+ SV *buffer =
+ newSVpvf("Parameter #%d depends on parameter #%d, which was not given",
+ (int) p_idx + 1,
+ (int) SvIV(*depends));
validation_failure(buffer, options);
}
}
}
+
return 1;
}
-
static IV
validate_named_depends(HV* p, HV* specs, HV* options) {
HE* he;
@@ -1027,7 +1083,7 @@ validate_named_depends(HV* p, HV* specs, HV* options) {
/* if we got here, the spec was correct. we just
* need to issue a regular validation failure
*/
- buffer = sv_2mortal(newSVpv( "Parameter '", 0));
+ buffer = newSVpv( "Parameter '", 0);
sv_catsv(buffer, HeSVKEY_force(he1));
sv_catpv(buffer, "' depends on parameter '");
sv_catsv(buffer, depend_name);
@@ -1041,7 +1097,6 @@ validate_named_depends(HV* p, HV* specs, HV* options) {
return 1;
}
-
void
cat_string_representation(SV* buffer, SV* value) {
if(SvOK(value)) {
@@ -1054,7 +1109,6 @@ cat_string_representation(SV* buffer, SV* value) {
}
}
-
void
apply_defaults(HV *ret, HV *p, HV *specs, AV *missing) {
HE* he;
@@ -1118,7 +1172,6 @@ apply_defaults(HV *ret, HV *p, HV *specs, AV *missing) {
}
}
-
static IV
validate(HV* p, HV* specs, HV* options, HV* ret) {
AV* missing;
@@ -1239,9 +1292,9 @@ validate(HV* p, HV* specs, HV* options, HV* ret) {
}
if (av_len(unmentioned) > -1) {
- SV* buffer;
+ SV* buffer = newSVpv("The following parameter", 0);
+ SV *caller = get_caller(options);
- buffer = sv_2mortal(newSVpv("The following parameter", 0));
if (av_len(unmentioned) != 0) {
sv_catpv(buffer, "s were ");
}
@@ -1249,7 +1302,8 @@ validate(HV* p, HV* specs, HV* options, HV* ret) {
sv_catpv(buffer, " was ");
}
sv_catpv(buffer, "passed in the call to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, " but ");
if (av_len(unmentioned) != 0) {
sv_catpv(buffer, "were ");
@@ -1278,9 +1332,9 @@ validate(HV* p, HV* specs, HV* options, HV* ret) {
apply_defaults(ret, p, specs, missing);
if (av_len(missing) > -1) {
- SV* buffer;
+ SV* buffer = newSVpv("Mandatory parameter", 0);
+ SV *caller = get_caller(options);
- buffer = sv_2mortal(newSVpv("Mandatory parameter", 0));
if (av_len(missing) > 0) {
sv_catpv(buffer, "s ");
}
@@ -1296,7 +1350,8 @@ validate(HV* p, HV* specs, HV* options, HV* ret) {
}
}
sv_catpv(buffer, " missing in call to ");
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, caller);
+ SvREFCNT_dec(caller);
sv_catpv(buffer, "\n");
validation_failure(buffer, options);
@@ -1311,7 +1366,6 @@ validate(HV* p, HV* specs, HV* options, HV* ret) {
return 1;
}
-
static SV*
validate_pos_failure(IV pnum, IV min, IV max, HV* options) {
SV* buffer;
@@ -1326,14 +1380,14 @@ validate_pos_failure(IV pnum, IV min, IV max, HV* options) {
allow_extra = 0;
}
- buffer = sv_2mortal(newSViv(pnum + 1));
+ buffer = newSViv(pnum + 1);
if (pnum != 0) {
sv_catpv(buffer, " parameters were passed to ");
}
else {
sv_catpv(buffer, " parameter was passed to ");
}
- sv_catsv(buffer, get_called(options));
+ sv_catsv(buffer, get_caller(options));
sv_catpv(buffer, " but ");
if (!allow_extra) {
if (min != max) {
@@ -1356,7 +1410,6 @@ validate_pos_failure(IV pnum, IV min, IV max, HV* options) {
return buffer;
}
-
/* Given a single parameter spec and a corresponding complex spec form
of it (which must be false if the spec is not complex), return true
says that the parameter is options. */
@@ -1382,7 +1435,6 @@ spec_says_optional(SV* spec, IV complex_spec) {
return TRUE;
}
-
static IV
validate_pos(AV* p, AV* specs, HV* options, AV* ret) {
SV* buffer;
@@ -1535,10 +1587,7 @@ validate_pos(AV* p, AV* specs, HV* options, AV* ret) {
}
}
else {
- SV* buffer;
-
- buffer = validate_pos_failure(av_len(p), min, av_len(specs), options);
-
+ SV* buffer = validate_pos_failure(av_len(p), min, av_len(specs), options);
validation_failure(buffer, options);
}
}
@@ -1552,7 +1601,6 @@ validate_pos(AV* p, AV* specs, HV* options, AV* ret) {
return 1;
}
-
MODULE = Params::Validate::XS PACKAGE = Params::Validate::XS
void
@@ -1632,13 +1680,11 @@ SV* p
XSRETURN(0);
}
-
SvGETMAGIC(p);
if (!SvROK(p) || !(SvTYPE(SvRV(p)) == SVt_PVAV)) {
croak("Expecting array reference as first parameter");
}
-
specs = (AV*) sv_2mortal((SV*) newAV());
av_extend(specs, items);
for(i = 1; i < items; i++) {
@@ -1648,17 +1694,14 @@ SV* p
}
}
-
if (GIMME_V != G_VOID) {
ret = (AV*) sv_2mortal((SV*) newAV());
}
-
if (! validate_pos((AV*) SvRV(p), specs, get_options(NULL), ret)) {
XSRETURN(0);
}
-
RETURN_ARRAY(ret);
void
diff --git a/lib/Params/ValidatePP.pm b/lib/Params/ValidatePP.pm
index ba70ad2..d99d32d 100644
--- a/lib/Params/ValidatePP.pm
+++ b/lib/Params/ValidatePP.pm
@@ -1,5 +1,8 @@
-package Params::Validate;
-$Params::Validate::VERSION = '1.13';
+package # hide from PAUSE
+ Params::Validate;
+
+our $VERSION = '1.18';
+
BEGIN { $ENV{PARAMS_VALIDATE_IMPLEMENTATION} = 'PP' }
use Params::Validate;
diff --git a/lib/Params/ValidateXS.pm b/lib/Params/ValidateXS.pm
index ae6d4b9..3452a27 100644
--- a/lib/Params/ValidateXS.pm
+++ b/lib/Params/ValidateXS.pm
@@ -1,5 +1,8 @@
-package Params::Validate;
-$Params::Validate::VERSION = '1.13';
+package # hide from PAUSE
+ Params::Validate;
+
+our $VERSION = '1.18';
+
BEGIN { $ENV{PARAMS_VALIDATE_IMPLEMENTATION} = 'XS' }
use Params::Validate;
diff --git a/perlcriticrc b/perlcriticrc
new file mode 100644
index 0000000..1ab0851
--- /dev/null
+++ b/perlcriticrc
@@ -0,0 +1,58 @@
+severity = 3
+verbose = 11
+theme = core + pbp + bugs + maintenance + cosmetic + complexity + security + tests + moose
+
+exclude = Subroutines::ProhibitCallsToUndeclaredSubs
+
+[BuiltinFunctions::ProhibitStringySplit]
+severity = 3
+
+[CodeLayout::RequireTrailingCommas]
+severity = 3
+
+[ControlStructures::ProhibitCStyleForLoops]
+severity = 3
+
+[InputOutput::RequireCheckedSyscalls]
+functions = :builtins
+exclude_functions = sleep
+severity = 3
+
+[RegularExpressions::ProhibitComplexRegexes]
+max_characters = 200
+
+[RegularExpressions::ProhibitUnusualDelimiters]
+severity = 3
+
+[Subroutines::ProhibitUnusedPrivateSubroutines]
+private_name_regex = _(?!build)\w+
+
+[TestingAndDebugging::ProhibitNoWarnings]
+allow = redefine
+
+[ValuesAndExpressions::ProhibitEmptyQuotes]
+severity = 3
+
+[ValuesAndExpressions::ProhibitInterpolationOfLiterals]
+severity = 3
+
+[ValuesAndExpressions::RequireUpperCaseHeredocTerminator]
+severity = 3
+
+[Variables::ProhibitPackageVars]
+add_packages = Carp Test::Builder
+
+[-Subroutines::RequireFinalReturn]
+
+[-ErrorHandling::RequireCarping]
+
+# No need for /xsm everywhere
+[-RegularExpressions::RequireDotMatchAnything]
+[-RegularExpressions::RequireExtendedFormatting]
+[-RegularExpressions::RequireLineBoundaryMatching]
+
+# http://stackoverflow.com/questions/2275317/why-does-perlcritic-dislike-using-shift-to-populate-subroutine-variables
+[-Subroutines::RequireArgUnpacking]
+
+# "use v5.14" is more readable than "use 5.014"
+[-ValuesAndExpressions::ProhibitVersionStrings]
diff --git a/perltidyrc b/perltidyrc
new file mode 100644
index 0000000..8fb8d2a
--- /dev/null
+++ b/perltidyrc
@@ -0,0 +1,21 @@
+-l=78
+-i=4
+-ci=4
+-se
+-b
+-bar
+-boc
+-vt=0
+-vtc=0
+-cti=0
+-pt=1
+-bt=1
+-sbt=1
+-bbt=1
+-nolq
+-npro
+-nsfs
+--blank-lines-before-packages=0
+--opening-hash-brace-right
+--no-outdent-long-comments
+-wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= &&= -= /= |= >>= ||= .= %= ^= x="
diff --git a/t/00-compile.t b/t/00-compile.t
new file mode 100644
index 0000000..f5c453b
--- /dev/null
+++ b/t/00-compile.t
@@ -0,0 +1,57 @@
+use 5.006;
+use strict;
+use warnings;
+
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.051
+
+use Test::More;
+
+plan tests => 7 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
+
+my @module_files = (
+ 'Attribute/Params/Validate.pm',
+ 'Params/Validate.pm',
+ 'Params/Validate/Constants.pm',
+ 'Params/Validate/PP.pm',
+ 'Params/Validate/XS.pm',
+ 'Params/ValidatePP.pm',
+ 'Params/ValidateXS.pm'
+);
+
+
+
+# no fake home requested
+
+my $inc_switch = -d 'blib' ? '-Mblib' : '-Ilib';
+
+use File::Spec;
+use IPC::Open3;
+use IO::Handle;
+
+open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!";
+
+my @warnings;
+for my $lib (@module_files)
+{
+ # see L<perlfaq8/How can I capture STDERR from an external command?>
+ my $stderr = IO::Handle->new;
+
+ my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]");
+ binmode $stderr, ':crlf' if $^O eq 'MSWin32';
+ my @_warnings = <$stderr>;
+ waitpid($pid, 0);
+ is($?, 0, "$lib loaded ok");
+
+ if (@_warnings)
+ {
+ warn @_warnings;
+ push @warnings, @_warnings;
+ }
+}
+
+
+
+is(scalar(@warnings), 0, 'no warnings found')
+ or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) ) if $ENV{AUTHOR_TESTING};
+
+
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
new file mode 100644
index 0000000..1954256
--- /dev/null
+++ b/t/00-report-prereqs.dd
@@ -0,0 +1,70 @@
+do { my $x = {
+ 'build' => {
+ 'requires' => {
+ 'Module::Build' => '0.28'
+ }
+ },
+ 'configure' => {
+ 'requires' => {
+ 'Module::Build' => '0.28'
+ }
+ },
+ 'develop' => {
+ 'requires' => {
+ 'Perl::Critic' => '1.123',
+ 'Perl::Tidy' => '20140711',
+ 'Pod::Coverage::TrustPod' => '0',
+ 'Readonly' => '1.03',
+ 'Scalar::Util' => '1.20',
+ 'Test::CPAN::Changes' => '0.19',
+ 'Test::EOL' => '0',
+ 'Test::LeakTrace' => '0.15',
+ 'Test::More' => '0.96',
+ 'Test::NoTabs' => '0',
+ 'Test::Pod' => '1.41',
+ 'Test::Pod::Coverage' => '1.08',
+ 'Test::Spelling' => '0.12',
+ 'Test::Synopsis' => '0',
+ 'Test::Taint' => '0.02',
+ 'Test::Version' => '1'
+ }
+ },
+ 'runtime' => {
+ 'requires' => {
+ 'Attribute::Handlers' => '0.79',
+ 'Carp' => '0',
+ 'Exporter' => '0',
+ 'Module::Implementation' => '0',
+ 'Scalar::Util' => '1.10',
+ 'XSLoader' => '0',
+ 'attributes' => '0',
+ 'perl' => '5.008001',
+ 'strict' => '0',
+ 'vars' => '0',
+ 'warnings' => '0'
+ }
+ },
+ 'test' => {
+ 'recommends' => {
+ 'CPAN::Meta' => '2.120900'
+ },
+ 'requires' => {
+ 'Devel::Peek' => '0',
+ 'ExtUtils::MakeMaker' => '0',
+ 'File::Spec' => '0',
+ 'File::Temp' => '0',
+ 'IO::Handle' => '0',
+ 'IPC::Open3' => '0',
+ 'Test::Fatal' => '0',
+ 'Test::More' => '0.96',
+ 'Test::Requires' => '0',
+ 'Tie::Array' => '0',
+ 'Tie::Hash' => '0',
+ 'base' => '0',
+ 'lib' => '0',
+ 'overload' => '0'
+ }
+ }
+ };
+ $x;
+ }
\ No newline at end of file
diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t
new file mode 100644
index 0000000..b0e7e65
--- /dev/null
+++ b/t/00-report-prereqs.t
@@ -0,0 +1,183 @@
+#!perl
+
+use strict;
+use warnings;
+
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.020
+
+use Test::More tests => 1;
+
+use ExtUtils::MakeMaker;
+use File::Spec;
+
+# from $version::LAX
+my $lax_version_re =
+ qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )?
+ |
+ (?:\.[0-9]+) (?:_[0-9]+)?
+ ) | (?:
+ v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )?
+ |
+ (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)?
+ )
+ )/x;
+
+# hide optional CPAN::Meta modules from prereq scanner
+# and check if they are available
+my $cpan_meta = "CPAN::Meta";
+my $cpan_meta_pre = "CPAN::Meta::Prereqs";
+my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic
+
+# Verify requirements?
+my $DO_VERIFY_PREREQS = 1;
+
+sub _max {
+ my $max = shift;
+ $max = ( $_ > $max ) ? $_ : $max for @_;
+ return $max;
+}
+
+sub _merge_prereqs {
+ my ($collector, $prereqs) = @_;
+
+ # CPAN::Meta::Prereqs object
+ if (ref $collector eq $cpan_meta_pre) {
+ return $collector->with_merged_prereqs(
+ CPAN::Meta::Prereqs->new( $prereqs )
+ );
+ }
+
+ # Raw hashrefs
+ for my $phase ( keys %$prereqs ) {
+ for my $type ( keys %{ $prereqs->{$phase} } ) {
+ for my $module ( keys %{ $prereqs->{$phase}{$type} } ) {
+ $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module};
+ }
+ }
+ }
+
+ return $collector;
+}
+
+my @include = qw(
+
+);
+
+my @exclude = qw(
+
+);
+
+# Add static prereqs to the included modules list
+my $static_prereqs = do 't/00-report-prereqs.dd';
+
+# Merge all prereqs (either with ::Prereqs or a hashref)
+my $full_prereqs = _merge_prereqs(
+ ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ),
+ $static_prereqs
+);
+
+# Add dynamic prereqs to the included modules list (if we can)
+my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
+if ( $source && $HAS_CPAN_META ) {
+ if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
+ $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
+ }
+}
+else {
+ $source = 'static metadata';
+}
+
+my @full_reports;
+my @dep_errors;
+my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs;
+
+# Add static includes into a fake section
+for my $mod (@include) {
+ $req_hash->{other}{modules}{$mod} = 0;
+}
+
+for my $phase ( qw(configure build test runtime develop other) ) {
+ next unless $req_hash->{$phase};
+ next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING});
+
+ for my $type ( qw(requires recommends suggests conflicts modules) ) {
+ next unless $req_hash->{$phase}{$type};
+
+ my $title = ucfirst($phase).' '.ucfirst($type);
+ my @reports = [qw/Module Want Have/];
+
+ for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) {
+ next if $mod eq 'perl';
+ next if grep { $_ eq $mod } @exclude;
+
+ my $file = $mod;
+ $file =~ s{::}{/}g;
+ $file .= ".pm";
+ my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC;
+
+ my $want = $req_hash->{$phase}{$type}{$mod};
+ $want = "undef" unless defined $want;
+ $want = "any" if !$want && $want == 0;
+
+ my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required";
+
+ if ($prefix) {
+ my $have = MM->parse_version( File::Spec->catfile($prefix, $file) );
+ $have = "undef" unless defined $have;
+ push @reports, [$mod, $want, $have];
+
+ if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) {
+ if ( $have !~ /\A$lax_version_re\z/ ) {
+ push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)";
+ }
+ elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) {
+ push @dep_errors, "$mod version '$have' is not in required range '$want'";
+ }
+ }
+ }
+ else {
+ push @reports, [$mod, $want, "missing"];
+
+ if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) {
+ push @dep_errors, "$mod is not installed ($req_string)";
+ }
+ }
+ }
+
+ if ( @reports ) {
+ push @full_reports, "=== $title ===\n\n";
+
+ my $ml = _max( map { length $_->[0] } @reports );
+ my $wl = _max( map { length $_->[1] } @reports );
+ my $hl = _max( map { length $_->[2] } @reports );
+
+ if ($type eq 'modules') {
+ splice @reports, 1, 0, ["-" x $ml, "", "-" x $hl];
+ push @full_reports, map { sprintf(" %*s %*s\n", -$ml, $_->[0], $hl, $_->[2]) } @reports;
+ }
+ else {
+ splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
+ push @full_reports, map { sprintf(" %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
+ }
+
+ push @full_reports, "\n";
+ }
+ }
+}
+
+if ( @full_reports ) {
+ diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
+}
+
+if ( @dep_errors ) {
+ diag join("\n",
+ "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
+ "The following REQUIRED prerequisites were not satisfied:\n",
+ @dep_errors,
+ "\n"
+ );
+}
+
+pass;
+
+# vim: ts=4 sts=4 sw=4 et:
diff --git a/t/15-case.t b/t/15-case.t
index 75b2959..ff02112 100644
--- a/t/15-case.t
+++ b/t/15-case.t
@@ -54,9 +54,9 @@ BEGIN {
params => $arglist{$args},
spec => $speclist{$spec},
expect => (
- $ignore_case ? $ok_sub
+ $ignore_case ? $ok_sub
: $args eq $spec ? $ok_sub
- : $nok_sub
+ : $nok_sub
),
ignore_case => $ignore_case
};
diff --git a/t/18-depends.t b/t/18-depends.t
index fa2fa36..a94d3bf 100644
--- a/t/18-depends.t
+++ b/t/18-depends.t
@@ -42,8 +42,10 @@ use Test::More;
# positive, no depends (single, multiple)
my @args = ( bar => 1 );
eval { validate( @args, \%spec ) };
- is( $@, q{},
- "validate() multiple depends(1): no depends, single arg, positive" );
+ is(
+ $@, q{},
+ "validate() multiple depends(1): no depends, single arg, positive"
+ );
@args = ( bar => 1, baz => 1 );
eval { validate( @args, \%spec ) };
@@ -61,7 +63,8 @@ use Test::More;
@args = ( foo => 1, bar => 1 );
eval { validate( @args, \%spec ) };
- ok( $@,
+ ok(
+ $@,
"validate() multiple depends(4.a): with depends, negative, multiple missing"
);
like(
@@ -73,7 +76,8 @@ use Test::More;
@args = ( foo => 1 );
eval { validate( @args, \%spec ) };
- ok( $@,
+ ok(
+ $@,
"validate() multiple depends(5.a): with depends, negative, multiple missing"
);
like(
@@ -117,8 +121,10 @@ use Test::More;
my @args = qw(1 1);
eval { validate_pos( @args, @spec ) };
- is( $@, q{},
- "validate_pos() single depends (1): with depends, positive" );
+ is(
+ $@, q{},
+ "validate_pos() single depends (1): with depends, positive"
+ );
}
{
@@ -148,7 +154,8 @@ use Test::More;
my @args = qw(1);
eval { validate_pos( @args, @spec ) };
- ok( $@,
+ ok(
+ $@,
"validate_pos() multiple depends (1.a): with depends, bad args negative"
);
like(
diff --git a/t/22-overload-can-bug.t b/t/22-overload-can-bug.t
index c038a75..44d81e8 100644
--- a/t/22-overload-can-bug.t
+++ b/t/22-overload-can-bug.t
@@ -5,7 +5,6 @@ use Params::Validate qw(validate);
use Test::More;
{
-
package Overloaded;
use overload 'bool' => sub {0};
diff --git a/t/24-tied.t b/t/24-tied.t
index c558813..85b6825 100644
--- a/t/24-tied.t
+++ b/t/24-tied.t
@@ -5,7 +5,6 @@ use Params::Validate qw(validate validate_pos SCALAR);
use Test::More;
{
-
package Tie::SimpleArray;
use Tie::Array;
use base 'Tie::StdArray';
@@ -26,7 +25,8 @@ use Test::More;
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with tied params array and regular hashref spec'
);
}
@@ -43,7 +43,8 @@ SKIP:
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with regular params array and tied hashref spec'
);
}
@@ -60,7 +61,8 @@ SKIP:
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with tied params array and tied hashref spec'
);
}
@@ -74,7 +76,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with tied params array and regular hashref spec'
);
}
@@ -91,7 +94,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with regular params array and tied hashref spec'
);
}
@@ -108,7 +112,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with tied params array and tied hashref spec'
);
}
diff --git a/t/27-string-as-type.t b/t/27-string-as-type.t
index f00c445..45795cd 100644
--- a/t/27-string-as-type.t
+++ b/t/27-string-as-type.t
@@ -9,7 +9,8 @@ use Test::More;
eval { validate( @p, { foo => { type => 'SCALAR' } }, ); };
- like( $@,
+ like(
+ $@,
qr/\QThe 'foo' parameter ("1") has a type specification which is not a number. It is a string - SCALAR/
);
}
@@ -19,7 +20,8 @@ use Test::More;
eval { validate( @p, { foo => { type => undef } }, ); };
- like( $@,
+ like(
+ $@,
qr/\QThe 'foo' parameter ("1") has a type specification which is not a number. It is undef/
);
diff --git a/t/32-regex-as-value.t b/t/32-regex-as-value.t
index f7797ba..bbd0640 100644
--- a/t/32-regex-as-value.t
+++ b/t/32-regex-as-value.t
@@ -29,8 +29,7 @@ done_testing();
sub v {
validate(
- @_,
- {
+ @_, {
foo => { type => SCALAR | SCALARREF },
},
);
diff --git a/t/34-recursive-validation.t b/t/34-recursive-validation.t
index 8719fbe..fbf26e6 100644
--- a/t/34-recursive-validation.t
+++ b/t/34-recursive-validation.t
@@ -28,10 +28,10 @@ use Test::More;
# catch die signal
local $SIG{__DIE__} = sub {
- # we died from within Params::Validate (because of wrong_Arg) we call
- # Foo::test_foo with OK args, but it'll die, because
- # Params::ValidatePP::options is still set to the options of the Bar
- # package, and so it won't retreive the one from Foo.
+ # we died from within Params::Validate (because of wrong_Arg) we
+ # call Foo::test_foo with OK args, but it'll die, because
+ # Params::Validate::PP::options is still set to the options of the
+ # Bar package, and so it won't retreive the one from Foo.
Foo::test_foo( arg1 => 1, extra_arg => 2 );
};
diff --git a/t/35-large-arrays.t b/t/36-large-arrays.t
similarity index 96%
rename from t/35-large-arrays.t
rename to t/36-large-arrays.t
index 87e38a4..7014e0d 100644
--- a/t/35-large-arrays.t
+++ b/t/36-large-arrays.t
@@ -11,8 +11,7 @@ use Test::More;
sub v1 {
my %p = validate(
- @_,
- {
+ @_, {
array => {
callbacks => {
'checking array contents' => sub {
diff --git a/t/37-exports.t b/t/37-exports.t
new file mode 100644
index 0000000..4715090
--- /dev/null
+++ b/t/37-exports.t
@@ -0,0 +1,52 @@
+use strict;
+use warnings;
+
+use Test::More;
+use Params::Validate ();
+
+my @types = qw(
+ SCALAR
+ ARRAYREF
+ HASHREF
+ CODEREF
+ GLOB
+ GLOBREF
+ SCALARREF
+ HANDLE
+ BOOLEAN
+ UNDEF
+ OBJECT
+);
+
+my @subs = qw(
+ validate
+ validate_pos
+ validation_options
+ validate_with
+);
+
+is_deeply(
+ [ sort @Params::Validate::EXPORT_OK ],
+ [ sort @types, @subs, 'set_options' ],
+ '@EXPORT_OK'
+);
+
+is_deeply(
+ [ sort keys %Params::Validate::EXPORT_TAGS ],
+ [qw( all types )],
+ 'keys %EXPORT_TAGS'
+);
+
+is_deeply(
+ [ sort @{ $Params::Validate::EXPORT_TAGS{all} } ],
+ [ sort @types, @subs ],
+ '$EXPORT_TAGS{all}',
+);
+
+is_deeply(
+ [ sort @{ $Params::Validate::EXPORT_TAGS{types} } ],
+ [ sort @types ],
+ '$EXPORT_TAGS{types}',
+);
+
+done_testing();
diff --git a/t/38-callback-message.t b/t/38-callback-message.t
new file mode 100644
index 0000000..c330d58
--- /dev/null
+++ b/t/38-callback-message.t
@@ -0,0 +1,113 @@
+use strict;
+use warnings;
+
+use Test::More;
+use Params::Validate qw( validate );
+
+{
+ my $e = _test_args(
+ pos_int => 42,
+ string => 'foo',
+ );
+ is(
+ $e,
+ q{},
+ 'no error with good args'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 42,
+ string => [],
+ );
+ like(
+ $e,
+ qr/The 'string' parameter \("ARRAY\(.+\)"\) to main::validate1 did not pass the 'string' callback: ARRAY\(.+\) is not a string/,
+ 'got error for bad string'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 0,
+ string => 'foo',
+ );
+ like(
+ $e,
+ qr/\QThe 'pos_int' parameter ("0") to main::validate1 did not pass the 'pos_int' callback: 0 is not a positive integer/,
+ 'got error for bad pos int (0)'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 'bar',
+ string => 'foo',
+ );
+ like(
+ $e,
+ qr/\QThe 'pos_int' parameter ("bar") to main::validate1 did not pass the 'pos_int' callback: bar is not a positive integer/,
+ 'got error for bad pos int (bar)'
+ );
+}
+
+{
+ my $e = do {
+ local $@;
+ eval { validate2( string => [] ); };
+ $@;
+ };
+
+ is_deeply(
+ $e,
+ { error => 'not a string' },
+ 'ref thrown by callback is preserved, not stringified'
+ );
+}
+
+sub _test_args {
+ local $@;
+ eval { validate1(@_) };
+ return $@;
+}
+
+sub validate1 {
+ validate(
+ @_, {
+ pos_int => {
+ callbacks => {
+ pos_int => sub {
+ $_[0] =~ /^[1-9][0-9]*$/
+ or die "$_[0] is not a positive integer\n";
+ },
+ },
+ },
+ string => {
+ callbacks => {
+ string => sub {
+ ( defined $_[0] && !ref $_[0] && length $_[0] )
+ or die "$_[0] is not a string\n";
+ },
+ },
+ },
+ }
+ );
+}
+
+sub validate2 {
+ validate(
+ @_, {
+ string => {
+ callbacks => {
+ string => sub {
+ ( defined $_[0] && !ref $_[0] && length $_[0] )
+ or die { error => 'not a string' };
+ },
+ },
+ },
+ }
+ );
+}
+
+done_testing();
diff --git a/t/release-no-tabs.t b/t/author-eol.t
similarity index 79%
copy from t/release-no-tabs.t
copy to t/author-eol.t
index 8994560..81242fa 100644
--- a/t/release-no-tabs.t
+++ b/t/author-eol.t
@@ -1,18 +1,18 @@
BEGIN {
- unless ($ENV{RELEASE_TESTING}) {
+ unless ($ENV{AUTHOR_TESTING}) {
require Test::More;
- Test::More::plan(skip_all => 'these tests are for release candidate testing');
+ Test::More::plan(skip_all => 'these tests are for testing by the author');
}
}
use strict;
use warnings;
-# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.07
+# this test was generated with Dist::Zilla::Plugin::Test::EOL 0.17
use Test::More 0.88;
-use Test::NoTabs;
+use Test::EOL;
my @files = (
'lib/Attribute/Params/Validate.pm',
@@ -22,6 +22,9 @@ my @files = (
'lib/Params/Validate/XS.pm',
'lib/Params/ValidatePP.pm',
'lib/Params/ValidateXS.pm',
+ 't/00-compile.t',
+ 't/00-report-prereqs.dd',
+ 't/00-report-prereqs.t',
't/01-validate.t',
't/02-noop.t',
't/03-attribute.t',
@@ -56,7 +59,12 @@ my @files = (
't/33-keep-errsv.t',
't/34-recursive-validation.t',
't/35-default-xs-bug.t',
- 't/35-large-arrays.t',
+ 't/36-large-arrays.t',
+ 't/37-exports.t',
+ 't/38-callback-message.t',
+ 't/author-eol.t',
+ 't/author-no-tabs.t',
+ 't/author-pod-spell.t',
't/lib/PVTests.pm',
't/lib/PVTests/Callbacks.pm',
't/lib/PVTests/Defaults.pm',
@@ -64,13 +72,12 @@ my @files = (
't/lib/PVTests/Standard.pm',
't/lib/PVTests/With.pm',
't/release-cpan-changes.t',
- 't/release-eol.t',
- 't/release-no-tabs.t',
+ 't/release-memory-leak.t',
't/release-pod-coverage.t',
't/release-pod-linkcheck.t',
't/release-pod-no404s.t',
- 't/release-pod-spell.t',
't/release-pod-syntax.t',
+ 't/release-portability.t',
't/release-pp-01-validate.t',
't/release-pp-02-noop.t',
't/release-pp-03-attribute.t',
@@ -105,11 +112,15 @@ my @files = (
't/release-pp-33-keep-errsv.t',
't/release-pp-34-recursive-validation.t',
't/release-pp-35-default-xs-bug.t',
- 't/release-pp-35-large-arrays.t',
+ 't/release-pp-36-large-arrays.t',
+ 't/release-pp-37-exports.t',
+ 't/release-pp-38-callback-message.t',
't/release-pp-is-loaded.t',
+ 't/release-synopsis.t',
+ 't/release-test-version.t',
't/release-xs-is-loaded.t',
't/release-xs-segfault.t'
);
-notabs_ok($_) foreach @files;
+eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;
done_testing;
diff --git a/t/release-no-tabs.t b/t/author-no-tabs.t
similarity index 83%
rename from t/release-no-tabs.t
rename to t/author-no-tabs.t
index 8994560..bdc5bf7 100644
--- a/t/release-no-tabs.t
+++ b/t/author-no-tabs.t
@@ -1,15 +1,15 @@
BEGIN {
- unless ($ENV{RELEASE_TESTING}) {
+ unless ($ENV{AUTHOR_TESTING}) {
require Test::More;
- Test::More::plan(skip_all => 'these tests are for release candidate testing');
+ Test::More::plan(skip_all => 'these tests are for testing by the author');
}
}
use strict;
use warnings;
-# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.07
+# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.13
use Test::More 0.88;
use Test::NoTabs;
@@ -22,6 +22,9 @@ my @files = (
'lib/Params/Validate/XS.pm',
'lib/Params/ValidatePP.pm',
'lib/Params/ValidateXS.pm',
+ 't/00-compile.t',
+ 't/00-report-prereqs.dd',
+ 't/00-report-prereqs.t',
't/01-validate.t',
't/02-noop.t',
't/03-attribute.t',
@@ -56,7 +59,12 @@ my @files = (
't/33-keep-errsv.t',
't/34-recursive-validation.t',
't/35-default-xs-bug.t',
- 't/35-large-arrays.t',
+ 't/36-large-arrays.t',
+ 't/37-exports.t',
+ 't/38-callback-message.t',
+ 't/author-eol.t',
+ 't/author-no-tabs.t',
+ 't/author-pod-spell.t',
't/lib/PVTests.pm',
't/lib/PVTests/Callbacks.pm',
't/lib/PVTests/Defaults.pm',
@@ -64,13 +72,12 @@ my @files = (
't/lib/PVTests/Standard.pm',
't/lib/PVTests/With.pm',
't/release-cpan-changes.t',
- 't/release-eol.t',
- 't/release-no-tabs.t',
+ 't/release-memory-leak.t',
't/release-pod-coverage.t',
't/release-pod-linkcheck.t',
't/release-pod-no404s.t',
- 't/release-pod-spell.t',
't/release-pod-syntax.t',
+ 't/release-portability.t',
't/release-pp-01-validate.t',
't/release-pp-02-noop.t',
't/release-pp-03-attribute.t',
@@ -105,8 +112,12 @@ my @files = (
't/release-pp-33-keep-errsv.t',
't/release-pp-34-recursive-validation.t',
't/release-pp-35-default-xs-bug.t',
- 't/release-pp-35-large-arrays.t',
+ 't/release-pp-36-large-arrays.t',
+ 't/release-pp-37-exports.t',
+ 't/release-pp-38-callback-message.t',
't/release-pp-is-loaded.t',
+ 't/release-synopsis.t',
+ 't/release-test-version.t',
't/release-xs-is-loaded.t',
't/release-xs-segfault.t'
);
diff --git a/t/author-pod-spell.t b/t/author-pod-spell.t
new file mode 100644
index 0000000..d701c94
--- /dev/null
+++ b/t/author-pod-spell.t
@@ -0,0 +1,55 @@
+
+BEGIN {
+ unless ($ENV{AUTHOR_TESTING}) {
+ require Test::More;
+ Test::More::plan(skip_all => 'these tests are for testing by the author');
+ }
+}
+
+use strict;
+use warnings;
+use Test::More;
+
+# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006008
+use Test::Spelling 0.12;
+use Pod::Wordlist;
+
+
+add_stopwords(<DATA>);
+all_pod_files_spelling_ok( qw( bin lib ) );
+__DATA__
+DROLSKY
+DROLSKY's
+Rolsky
+Rolsky's
+API
+CPAN
+GLOBREF
+OO
+PayPal
+SCALARREF
+ValidatePos
+baz
+onwards
+pre
+runtime
+Dave
+autarch
+Ilya
+Martynov
+ilya
+and
+Mash
+jmash
+Olivier
+Mengué
+dolmen
+lib
+Attribute
+Params
+Validate
+Constants
+PP
+XS
+ValidatePP
+ValidateXS
diff --git a/t/lib/PVTests/Defaults.pm b/t/lib/PVTests/Defaults.pm
index 20a7262..5d22099 100644
--- a/t/lib/PVTests/Defaults.pm
+++ b/t/lib/PVTests/Defaults.pm
@@ -157,8 +157,10 @@ sub foo {
sub bar {
my @params = ( 1, 2 );
- return validate_pos( @params, 1, { default => 99 }, { default => 42 },
- { default => 0 } );
+ return validate_pos(
+ @params, 1, { default => 99 }, { default => 42 },
+ { default => 0 }
+ );
}
1;
diff --git a/t/lib/PVTests/Standard.pm b/t/lib/PVTests/Standard.pm
index 6813618..0c82ed4 100644
--- a/t/lib/PVTests/Standard.pm
+++ b/t/lib/PVTests/Standard.pm
@@ -673,12 +673,16 @@ sub run_tests {
if ( eval { %{ $test->{return} } } ) {
my %r = @r;
- is_deeply( \%r, $test->{return},
- "check return value for $sub - hash" );
+ is_deeply(
+ \%r, $test->{return},
+ "check return value for $sub - hash"
+ );
}
else {
- is_deeply( \@r, $test->{return},
- "check return value for $sub - array" );
+ is_deeply(
+ \@r, $test->{return},
+ "check return value for $sub - array"
+ );
}
}
diff --git a/t/release-cpan-changes.t b/t/release-cpan-changes.t
index bb5bd1d..214650f 100644
--- a/t/release-cpan-changes.t
+++ b/t/release-cpan-changes.t
@@ -8,8 +8,12 @@ BEGIN {
}
-use Test::More;
-eval 'use Test::CPAN::Changes';
-plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
-changes_ok();
+use strict;
+use warnings;
+
+use Test::More 0.96 tests => 2;
+use_ok('Test::CPAN::Changes');
+subtest 'changes_ok' => sub {
+ changes_file_ok('Changes');
+};
done_testing();
diff --git a/t/release-memory-leak.t b/t/release-memory-leak.t
new file mode 100644
index 0000000..0543aab
--- /dev/null
+++ b/t/release-memory-leak.t
@@ -0,0 +1,105 @@
+
+BEGIN {
+ unless ($ENV{RELEASE_TESTING}) {
+ require Test::More;
+ Test::More::plan(skip_all => 'these tests are for release candidate testing');
+ }
+}
+
+use strict;
+use warnings;
+
+use Test::More;
+
+BEGIN {
+ plan skip_all => q{Test::LeakTrace doesn't install with blead (as of 5.21.8)}
+ if $] >= 5.021008;
+}
+
+use Test::LeakTrace qw( no_leaks_ok );
+
+use Params::Validate qw( validate );
+
+subtest(
+ 'callback with default error' => sub {
+ no_leaks_ok( sub { val1( foo => 42 ); }, 'validation passes' );
+ local $TODO = 'Not sure if all the leaks are in Carp or not';
+ no_leaks_ok(
+ sub {
+ eval { val1( foo => 'forty two' ) };
+ },
+ 'validation fails'
+ );
+ },
+);
+
+subtest(
+ 'callback that dies with string' => sub {
+ no_leaks_ok( sub { val2( foo => 42 ); }, 'validation passes' );
+ local $TODO = 'Not sure if all the leaks are in Carp or not';
+ no_leaks_ok(
+ sub {
+ eval { val2( foo => 'forty two' ) };
+ },
+ 'validation fails'
+ );
+ },
+);
+
+subtest(
+ 'callback that dies with object' => sub {
+ no_leaks_ok( sub { val3( foo => 42 ); }, 'validation passes' );
+ no_leaks_ok(
+ sub {
+ eval { val3( foo => 'forty two' ) };
+ },
+ 'validation fails'
+ );
+ },
+);
+
+done_testing();
+
+sub val1 {
+ validate(
+ @_,
+ {
+ foo => {
+ callbacks => {
+ 'is int' => sub { $_[0] =~ /^[0-9]+$/ }
+ }
+ },
+ },
+ );
+}
+
+sub val2 {
+ validate(
+ @_,
+ {
+ foo => {
+ callbacks => {
+ 'is int' => sub {
+ $_[0] =~ /^[0-9]+$/ or die "$_[0] is not an integer";
+ }
+ }
+ },
+ },
+ );
+}
+
+sub val3 {
+ validate(
+ @_,
+ {
+ foo => {
+ callbacks => {
+ 'is int' => sub {
+ $_[0] =~ /^[0-9]+$/
+ or die { error => "$_[0] is not an integer" };
+ }
+ }
+ },
+ },
+ );
+}
diff --git a/t/release-pod-coverage.t b/t/release-pod-coverage.t
index 85d2c24..249d365 100644
--- a/t/release-pod-coverage.t
+++ b/t/release-pod-coverage.t
@@ -1,3 +1,4 @@
+#!perl
BEGIN {
unless ($ENV{RELEASE_TESTING}) {
@@ -6,21 +7,47 @@ BEGIN {
}
}
-use strict;
-use warnings;
+# This file was automatically generated by Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable.
-use Test::More;
+use Test::Pod::Coverage 1.08;
+use Test::More 0.88;
-eval "use Test::Pod::Coverage 1.04";
-plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage"
- if $@;
-
-pod_coverage_ok(
- 'Params::Validate', {
- trustme => [
- qr/(?:UNKNOWN|set_options|validate(?:_pos|_with)?|validation_options)/
- ]
+BEGIN {
+ if ( $] <= 5.008008 ) {
+ plan skip_all => 'These tests require Pod::Coverage::TrustPod, which only works with Perl 5.8.9+';
}
-);
+}
+use Pod::Coverage::TrustPod;
+
+my %skip = map { $_ => 1 } qw( Params::Validate::Constants Params::Validate::PP Params::Validate::XS Params::ValidatePP Params::ValidateXS );
+
+my @modules;
+for my $module ( all_modules() ) {
+ next if $skip{$module};
+
+ push @modules, $module;
+}
+
+plan skip_all => 'All the modules we found were excluded from POD coverage test.'
+ unless @modules;
+
+plan tests => scalar @modules;
+
+my %trustme = (
+ 'Params::Validate' => [
+ qr/^(?:UNKNOWN|set_options|validate(?:_pos|_with)?|validation_options)$/
+ ]
+ );
+
+for my $module ( sort @modules ) {
+ pod_coverage_ok(
+ $module,
+ {
+ coverage_class => 'Pod::Coverage::TrustPod',
+ trustme => $trustme{$module} || [],
+ },
+ "pod coverage for $module"
+ );
+}
done_testing();
diff --git a/t/release-pod-spell.t b/t/release-pod-spell.t
deleted file mode 100644
index 501264c..0000000
--- a/t/release-pod-spell.t
+++ /dev/null
@@ -1,46 +0,0 @@
-
-BEGIN {
- unless ($ENV{RELEASE_TESTING}) {
- require Test::More;
- Test::More::plan(skip_all => 'these tests are for release candidate testing');
- }
-}
-
-use strict;
-use warnings;
-
-use Test::More;
-
-eval "use Test::Spelling";
-plan skip_all => "Test::Spelling required for testing POD coverage"
- if $@;
-
-my @stopwords;
-for (<DATA>) {
- chomp;
- push @stopwords, $_
- unless /\A (?: \# | \s* \z)/msx; # skip comments, whitespace
-}
-
-add_stopwords(@stopwords);
-set_spell_cmd('aspell list -l en');
-
-# This prevents a weird segfault from the aspell command - see
-# https://bugs.launchpad.net/ubuntu/+source/aspell/+bug/71322
-local $ENV{LC_ALL} = 'C';
-all_pod_files_spelling_ok();
-
-__DATA__
-API
-CPAN
-GLOBREF
-Martynov
-OO
-PayPal
-Rolsky
-SCALARREF
-ValidatePos
-baz
-onwards
-pre
-runtime
diff --git a/t/release-eol.t b/t/release-portability.t
similarity index 57%
rename from t/release-eol.t
rename to t/release-portability.t
index 4ce4ad8..ad285b4 100644
--- a/t/release-eol.t
+++ b/t/release-portability.t
@@ -1,3 +1,4 @@
+#!perl
BEGIN {
unless ($ENV{RELEASE_TESTING}) {
@@ -6,11 +7,14 @@ BEGIN {
}
}
+
use strict;
use warnings;
+
use Test::More;
-eval 'use Test::EOL';
-plan skip_all => 'Test::EOL required' if $@;
+eval 'use Test::Portability::Files';
+plan skip_all => 'Test::Portability::Files required for testing portability'
+ if $@;
-all_perl_files_ok({ trailing_whitespace => 1 });
+run_tests();
diff --git a/t/release-pp-01-validate.t b/t/release-pp-01-validate.t
index 2e568db..da6a1fd 100644
--- a/t/release-pp-01-validate.t
+++ b/t/release-pp-01-validate.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-02-noop.t b/t/release-pp-02-noop.t
index 42b754c..bcac392 100644
--- a/t/release-pp-02-noop.t
+++ b/t/release-pp-02-noop.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-03-attribute.t b/t/release-pp-03-attribute.t
index 4442dd2..9c6a208 100644
--- a/t/release-pp-03-attribute.t
+++ b/t/release-pp-03-attribute.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-04-defaults.t b/t/release-pp-04-defaults.t
index a894ba0..8ed39d4 100644
--- a/t/release-pp-04-defaults.t
+++ b/t/release-pp-04-defaults.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-05-noop_default.t b/t/release-pp-05-noop_default.t
index 62636e0..82b2c00 100644
--- a/t/release-pp-05-noop_default.t
+++ b/t/release-pp-05-noop_default.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-06-options.t b/t/release-pp-06-options.t
index daace0f..a18c245 100644
--- a/t/release-pp-06-options.t
+++ b/t/release-pp-06-options.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-07-with.t b/t/release-pp-07-with.t
index 668e4a6..1b3bdf0 100644
--- a/t/release-pp-07-with.t
+++ b/t/release-pp-07-with.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-08-noop_with.t b/t/release-pp-08-noop_with.t
index f99e6f3..7705999 100644
--- a/t/release-pp-08-noop_with.t
+++ b/t/release-pp-08-noop_with.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-09-regex.t b/t/release-pp-09-regex.t
index 4970d41..ddaed55 100644
--- a/t/release-pp-09-regex.t
+++ b/t/release-pp-09-regex.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-10-noop_regex.t b/t/release-pp-10-noop_regex.t
index 8caa113..b7f8e2b 100644
--- a/t/release-pp-10-noop_regex.t
+++ b/t/release-pp-10-noop_regex.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-11-cb.t b/t/release-pp-11-cb.t
index c12cf3d..a8b9d41 100644
--- a/t/release-pp-11-cb.t
+++ b/t/release-pp-11-cb.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-12-noop_cb.t b/t/release-pp-12-noop_cb.t
index 40c0e03..62a6fbb 100644
--- a/t/release-pp-12-noop_cb.t
+++ b/t/release-pp-12-noop_cb.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-13-taint.t b/t/release-pp-13-taint.t
index 0487dac..659addd 100644
--- a/t/release-pp-13-taint.t
+++ b/t/release-pp-13-taint.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-14-no_validate.t b/t/release-pp-14-no_validate.t
index 5cbce90..3549bbf 100644
--- a/t/release-pp-14-no_validate.t
+++ b/t/release-pp-14-no_validate.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-15-case.t b/t/release-pp-15-case.t
index 9eb1ab7..7c5bd04 100644
--- a/t/release-pp-15-case.t
+++ b/t/release-pp-15-case.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -66,9 +66,9 @@ BEGIN {
params => $arglist{$args},
spec => $speclist{$spec},
expect => (
- $ignore_case ? $ok_sub
+ $ignore_case ? $ok_sub
: $args eq $spec ? $ok_sub
- : $nok_sub
+ : $nok_sub
),
ignore_case => $ignore_case
};
diff --git a/t/release-pp-16-normalize.t b/t/release-pp-16-normalize.t
index 0fb622d..de2a994 100644
--- a/t/release-pp-16-normalize.t
+++ b/t/release-pp-16-normalize.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-17-callbacks.t b/t/release-pp-17-callbacks.t
index b55625e..6fdaa86 100644
--- a/t/release-pp-17-callbacks.t
+++ b/t/release-pp-17-callbacks.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-18-depends.t b/t/release-pp-18-depends.t
index 0b7bbaa..c1f31b6 100644
--- a/t/release-pp-18-depends.t
+++ b/t/release-pp-18-depends.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -54,8 +54,10 @@ use Test::More;
# positive, no depends (single, multiple)
my @args = ( bar => 1 );
eval { validate( @args, \%spec ) };
- is( $@, q{},
- "validate() multiple depends(1): no depends, single arg, positive" );
+ is(
+ $@, q{},
+ "validate() multiple depends(1): no depends, single arg, positive"
+ );
@args = ( bar => 1, baz => 1 );
eval { validate( @args, \%spec ) };
@@ -73,7 +75,8 @@ use Test::More;
@args = ( foo => 1, bar => 1 );
eval { validate( @args, \%spec ) };
- ok( $@,
+ ok(
+ $@,
"validate() multiple depends(4.a): with depends, negative, multiple missing"
);
like(
@@ -85,7 +88,8 @@ use Test::More;
@args = ( foo => 1 );
eval { validate( @args, \%spec ) };
- ok( $@,
+ ok(
+ $@,
"validate() multiple depends(5.a): with depends, negative, multiple missing"
);
like(
@@ -129,8 +133,10 @@ use Test::More;
my @args = qw(1 1);
eval { validate_pos( @args, @spec ) };
- is( $@, q{},
- "validate_pos() single depends (1): with depends, positive" );
+ is(
+ $@, q{},
+ "validate_pos() single depends (1): with depends, positive"
+ );
}
{
@@ -160,7 +166,8 @@ use Test::More;
my @args = qw(1);
eval { validate_pos( @args, @spec ) };
- ok( $@,
+ ok(
+ $@,
"validate_pos() multiple depends (1.a): with depends, bad args negative"
);
like(
diff --git a/t/release-pp-19-untaint.t b/t/release-pp-19-untaint.t
index 2dc5db5..42ee82d 100644
--- a/t/release-pp-19-untaint.t
+++ b/t/release-pp-19-untaint.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-21-can.t b/t/release-pp-21-can.t
index 908ede8..2c81979 100644
--- a/t/release-pp-21-can.t
+++ b/t/release-pp-21-can.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-22-overload-can-bug.t b/t/release-pp-22-overload-can-bug.t
index 0ce6c97..44acf60 100644
--- a/t/release-pp-22-overload-can-bug.t
+++ b/t/release-pp-22-overload-can-bug.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -17,7 +17,6 @@ use Params::Validate qw(validate);
use Test::More;
{
-
package Overloaded;
use overload 'bool' => sub {0};
diff --git a/t/release-pp-23-readonly.t b/t/release-pp-23-readonly.t
index a266124..8c4a521 100644
--- a/t/release-pp-23-readonly.t
+++ b/t/release-pp-23-readonly.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-24-tied.t b/t/release-pp-24-tied.t
index 0e0eee4..2522b60 100644
--- a/t/release-pp-24-tied.t
+++ b/t/release-pp-24-tied.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -17,7 +17,6 @@ use Params::Validate qw(validate validate_pos SCALAR);
use Test::More;
{
-
package Tie::SimpleArray;
use Tie::Array;
use base 'Tie::StdArray';
@@ -38,7 +37,8 @@ use Test::More;
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with tied params array and regular hashref spec'
);
}
@@ -55,7 +55,8 @@ SKIP:
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with regular params array and tied hashref spec'
);
}
@@ -72,7 +73,8 @@ SKIP:
eval { validate( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate() call succeeded with tied params array and tied hashref spec'
);
}
@@ -86,7 +88,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with tied params array and regular hashref spec'
);
}
@@ -103,7 +106,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with regular params array and tied hashref spec'
);
}
@@ -120,7 +124,8 @@ SKIP:
eval { validate_pos( @p, \%spec ) };
warn $@ if $@;
- is( $@, q{},
+ is(
+ $@, q{},
'validate_pos() call succeeded with tied params array and tied hashref spec'
);
}
diff --git a/t/release-pp-25-undef-regex.t b/t/release-pp-25-undef-regex.t
index 52f4e79..7f20da4 100644
--- a/t/release-pp-25-undef-regex.t
+++ b/t/release-pp-25-undef-regex.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-26-isa.t b/t/release-pp-26-isa.t
index 154edf9..f95fdd5 100644
--- a/t/release-pp-26-isa.t
+++ b/t/release-pp-26-isa.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-27-string-as-type.t b/t/release-pp-27-string-as-type.t
index 6565344..bb19f37 100644
--- a/t/release-pp-27-string-as-type.t
+++ b/t/release-pp-27-string-as-type.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -21,7 +21,8 @@ use Test::More;
eval { validate( @p, { foo => { type => 'SCALAR' } }, ); };
- like( $@,
+ like(
+ $@,
qr/\QThe 'foo' parameter ("1") has a type specification which is not a number. It is a string - SCALAR/
);
}
@@ -31,7 +32,8 @@ use Test::More;
eval { validate( @p, { foo => { type => undef } }, ); };
- like( $@,
+ like(
+ $@,
qr/\QThe 'foo' parameter ("1") has a type specification which is not a number. It is undef/
);
diff --git a/t/release-pp-28-readonly-return.t b/t/release-pp-28-readonly-return.t
index b2038d1..1dedca0 100644
--- a/t/release-pp-28-readonly-return.t
+++ b/t/release-pp-28-readonly-return.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-29-taint-mode.t b/t/release-pp-29-taint-mode.t
index d438b0a..6e8b60d 100644
--- a/t/release-pp-29-taint-mode.t
+++ b/t/release-pp-29-taint-mode.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-30-hashref-alteration.t b/t/release-pp-30-hashref-alteration.t
index dbea6fc..d1571cb 100644
--- a/t/release-pp-30-hashref-alteration.t
+++ b/t/release-pp-30-hashref-alteration.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-31-incorrect-spelling.t b/t/release-pp-31-incorrect-spelling.t
index 186243a..98f32c2 100644
--- a/t/release-pp-31-incorrect-spelling.t
+++ b/t/release-pp-31-incorrect-spelling.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-32-regex-as-value.t b/t/release-pp-32-regex-as-value.t
index 8e4db5f..4eb0d05 100644
--- a/t/release-pp-32-regex-as-value.t
+++ b/t/release-pp-32-regex-as-value.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -41,8 +41,7 @@ done_testing();
sub v {
validate(
- @_,
- {
+ @_, {
foo => { type => SCALAR | SCALARREF },
},
);
diff --git a/t/release-pp-33-keep-errsv.t b/t/release-pp-33-keep-errsv.t
index fed060c..24f3ded 100644
--- a/t/release-pp-33-keep-errsv.t
+++ b/t/release-pp-33-keep-errsv.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-34-recursive-validation.t b/t/release-pp-34-recursive-validation.t
index 45493ec..9dc6194 100644
--- a/t/release-pp-34-recursive-validation.t
+++ b/t/release-pp-34-recursive-validation.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -40,10 +40,10 @@ use Test::More;
# catch die signal
local $SIG{__DIE__} = sub {
- # we died from within Params::Validate (because of wrong_Arg) we call
- # Foo::test_foo with OK args, but it'll die, because
- # Params::ValidatePP::options is still set to the options of the Bar
- # package, and so it won't retreive the one from Foo.
+ # we died from within Params::Validate (because of wrong_Arg) we
+ # call Foo::test_foo with OK args, but it'll die, because
+ # Params::Validate::PP::options is still set to the options of the
+ # Bar package, and so it won't retreive the one from Foo.
Foo::test_foo( arg1 => 1, extra_arg => 2 );
};
diff --git a/t/release-pp-35-default-xs-bug.t b/t/release-pp-35-default-xs-bug.t
index aa3f016..feec141 100644
--- a/t/release-pp-35-default-xs-bug.t
+++ b/t/release-pp-35-default-xs-bug.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
diff --git a/t/release-pp-35-large-arrays.t b/t/release-pp-36-large-arrays.t
similarity index 90%
rename from t/release-pp-35-large-arrays.t
rename to t/release-pp-36-large-arrays.t
index c8434d8..6301d91 100644
--- a/t/release-pp-35-large-arrays.t
+++ b/t/release-pp-36-large-arrays.t
@@ -4,7 +4,7 @@ use Test::More;
BEGIN {
unless ( $ENV{RELEASE_TESTING} ) {
- plan skip_all => 'these tests are for testing by the release';
+ plan skip_all => 'these tests are for release testing';
}
$ENV{PV_TEST_PERL} = 1;
@@ -23,8 +23,7 @@ use Test::More;
sub v1 {
my %p = validate(
- @_,
- {
+ @_, {
array => {
callbacks => {
'checking array contents' => sub {
diff --git a/t/release-pp-37-exports.t b/t/release-pp-37-exports.t
new file mode 100644
index 0000000..607aefc
--- /dev/null
+++ b/t/release-pp-37-exports.t
@@ -0,0 +1,65 @@
+
+
+use Test::More;
+
+BEGIN {
+ unless ( $ENV{RELEASE_TESTING} ) {
+ plan skip_all => 'these tests are for release testing';
+ }
+
+ $ENV{PV_TEST_PERL} = 1;
+}
+
+use strict;
+use warnings;
+
+use Test::More;
+use Params::Validate ();
+
+my @types = qw(
+ SCALAR
+ ARRAYREF
+ HASHREF
+ CODEREF
+ GLOB
+ GLOBREF
+ SCALARREF
+ HANDLE
+ BOOLEAN
+ UNDEF
+ OBJECT
+);
+
+my @subs = qw(
+ validate
+ validate_pos
+ validation_options
+ validate_with
+);
+
+is_deeply(
+ [ sort @Params::Validate::EXPORT_OK ],
+ [ sort @types, @subs, 'set_options' ],
+ '@EXPORT_OK'
+);
+
+is_deeply(
+ [ sort keys %Params::Validate::EXPORT_TAGS ],
+ [qw( all types )],
+ 'keys %EXPORT_TAGS'
+);
+
+is_deeply(
+ [ sort @{ $Params::Validate::EXPORT_TAGS{all} } ],
+ [ sort @types, @subs ],
+ '$EXPORT_TAGS{all}',
+);
+
+is_deeply(
+ [ sort @{ $Params::Validate::EXPORT_TAGS{types} } ],
+ [ sort @types ],
+ '$EXPORT_TAGS{types}',
+);
+
+done_testing();
+
diff --git a/t/release-pp-38-callback-message.t b/t/release-pp-38-callback-message.t
new file mode 100644
index 0000000..8e1f2c2
--- /dev/null
+++ b/t/release-pp-38-callback-message.t
@@ -0,0 +1,126 @@
+
+
+use Test::More;
+
+BEGIN {
+ unless ( $ENV{RELEASE_TESTING} ) {
+ plan skip_all => 'these tests are for release testing';
+ }
+
+ $ENV{PV_TEST_PERL} = 1;
+}
+
+use strict;
+use warnings;
+
+use Test::More;
+use Params::Validate qw( validate );
+
+{
+ my $e = _test_args(
+ pos_int => 42,
+ string => 'foo',
+ );
+ is(
+ $e,
+ q{},
+ 'no error with good args'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 42,
+ string => [],
+ );
+ like(
+ $e,
+ qr/The 'string' parameter \("ARRAY\(.+\)"\) to main::validate1 did not pass the 'string' callback: ARRAY\(.+\) is not a string/,
+ 'got error for bad string'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 0,
+ string => 'foo',
+ );
+ like(
+ $e,
+ qr/\QThe 'pos_int' parameter ("0") to main::validate1 did not pass the 'pos_int' callback: 0 is not a positive integer/,
+ 'got error for bad pos int (0)'
+ );
+}
+
+{
+ my $e = _test_args(
+ pos_int => 'bar',
+ string => 'foo',
+ );
+ like(
+ $e,
+ qr/\QThe 'pos_int' parameter ("bar") to main::validate1 did not pass the 'pos_int' callback: bar is not a positive integer/,
+ 'got error for bad pos int (bar)'
+ );
+}
+
+{
+ my $e = do {
+ local $@;
+ eval { validate2( string => [] ); };
+ $@;
+ };
+
+ is_deeply(
+ $e,
+ { error => 'not a string' },
+ 'ref thrown by callback is preserved, not stringified'
+ );
+}
+
+sub _test_args {
+ local $@;
+ eval { validate1(@_) };
+ return $@;
+}
+
+sub validate1 {
+ validate(
+ @_, {
+ pos_int => {
+ callbacks => {
+ pos_int => sub {
+ $_[0] =~ /^[1-9][0-9]*$/
+ or die "$_[0] is not a positive integer\n";
+ },
+ },
+ },
+ string => {
+ callbacks => {
+ string => sub {
+ ( defined $_[0] && !ref $_[0] && length $_[0] )
+ or die "$_[0] is not a string\n";
+ },
+ },
+ },
+ }
+ );
+}
+
+sub validate2 {
+ validate(
+ @_, {
+ string => {
+ callbacks => {
+ string => sub {
+ ( defined $_[0] && !ref $_[0] && length $_[0] )
+ or die { error => 'not a string' };
+ },
+ },
+ },
+ }
+ );
+}
+
+done_testing();
+
diff --git a/t/release-cpan-changes.t b/t/release-synopsis.t
similarity index 53%
copy from t/release-cpan-changes.t
copy to t/release-synopsis.t
index bb5bd1d..2d9b8ee 100644
--- a/t/release-cpan-changes.t
+++ b/t/release-synopsis.t
@@ -8,8 +8,6 @@ BEGIN {
}
-use Test::More;
-eval 'use Test::CPAN::Changes';
-plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
-changes_ok();
-done_testing();
+use Test::Synopsis;
+
+all_synopsis_ok();
diff --git a/t/release-test-version.t b/t/release-test-version.t
new file mode 100644
index 0000000..f453957
--- /dev/null
+++ b/t/release-test-version.t
@@ -0,0 +1,30 @@
+
+BEGIN {
+ unless ($ENV{RELEASE_TESTING}) {
+ require Test::More;
+ Test::More::plan(skip_all => 'these tests are for release candidate testing');
+ }
+}
+
+use strict;
+use warnings;
+use Test::More;
+
+# generated by Dist::Zilla::Plugin::Test::Version 0.003001
+use Test::Version;
+
+my @imports = ( 'version_all_ok' );
+
+my $params = {
+ is_strict => 1,
+ has_version => 1,
+};
+
+push @imports, $params
+ if version->parse( $Test::Version::VERSION ) >= version->parse('1.002');
+
+
+Test::Version->import(@imports);
+
+version_all_ok;
+done_testing;
diff --git a/tidyall.ini b/tidyall.ini
new file mode 100644
index 0000000..f346233
--- /dev/null
+++ b/tidyall.ini
@@ -0,0 +1,19 @@
+[PerlTidy]
+select = **/*.{pl,pm,t,psgi}
+ignore = t/00-*
+ignore = t/author-*
+ignore = t/release-*
+ignore = blib/**/*
+ignore = .build/**/*
+ignore = Params-Validate-*/**/*
+argv = --profile=$ROOT/perltidyrc
+
+[PerlCritic]
+select = **/*.{pl,pm,t,psgi}
+ignore = t/00-*
+ignore = t/author-*
+ignore = t/release-*
+ignore = blib/**/*
+ignore = .build/**/*
+ignore = Params-Validate-*/**/*
+argv = --profile $ROOT/perlcriticrc --program-extensions .pl --program-extensions .t --program-extensions .psgi
diff --git a/weaver.ini b/weaver.ini
new file mode 100644
index 0000000..90c76a6
--- /dev/null
+++ b/weaver.ini
@@ -0,0 +1,17 @@
+[@CorePrep]
+
+[Name]
+[Version]
+
+[Region / prelude]
+
+[Generic / SYNOPSIS]
+[Generic / DESCRIPTION]
+
+[Leftovers]
+
+[Region / postlude]
+
+[Authors]
+[Contributors]
+[Legal]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libparams-validate-perl.git
More information about the Pkg-perl-cvs-commits
mailing list