From 8251d109b4e351ee151eac1bb1227284297d9b07 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 22:48:58 +0100 Subject: [PATCH 01/10] Updated Changes to follow CPAN::Changes::Spec --- Changes | 13 ++++++++----- lib/XML/Parser/Lite.pm | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index 34e93e1..7ffb369 100644 --- a/Changes +++ b/Changes @@ -1,16 +1,19 @@ -Revision history for Perl extension XML::Parser::Lite. +Revision history for Perl module XML::Parser::Lite -0.720 Mon Sep 15 2014 +0.721 2015-05-?? PHRED + - Updated this file (Changes) to follow CPAN::Changes::Spec + +0.720 2014-09-15 PHRED - RT 96206 - add README - RT 96209 - add links to other parsers -0.719 Mon Dec 2 2013 +0.719 2013-12-02 PHRED - RT 90873 - restore test suite -0.718 Tue Nov 26 2013 +0.718 2013-11-26 PHRED - add skips for some dependencies - https://rt.cpan.org/Ticket/Display.html?id=87604 -0.717 Thu May 16 01:18:25 2013 +0.717 2013-05-16 PHRED - forked from SOAP::Lite 0.716 diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm index 92fc2e9..f0fa419 100644 --- a/lib/XML/Parser/Lite.pm +++ b/lib/XML/Parser/Lite.pm @@ -12,7 +12,7 @@ package XML::Parser::Lite; use strict; use warnings; -our $VERSION = 0.720; +our $VERSION = '0.721'; sub new { my $class = shift; From d01d4262c34f53744c661696c393464c5d9ebf31 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 22:56:09 +0100 Subject: [PATCH 02/10] Specified min perl version of 5.006 in module code and dist metadata --- Changes | 4 +++- Makefile.PL | 13 +++++++++++++ lib/XML/Parser/Lite.pm | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 7ffb369..90874d2 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Perl module XML::Parser::Lite -0.721 2015-05-?? PHRED +0.720_01 2015-05-13 NEILB + - Developer release (with PHRED's permission) to test changes + - Specified min perl version of 5.006 in Lite.pm and dist metadata - Updated this file (Changes) to follow CPAN::Changes::Spec 0.720 2014-09-15 PHRED diff --git a/Makefile.PL b/Makefile.PL index 2dfb328..ac80b19 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,6 +5,13 @@ use warnings; use ExtUtils::MakeMaker; +my $mm_ver = $ExtUtils::MakeMaker::VERSION; +if ($mm_ver =~ /_/) { + # developer release + $mm_ver = eval $mm_ver; + die $@ if $@; +} + WriteMakefile( NAME => 'XML::Parser::Lite', VERSION_FROM => 'lib/XML/Parser/Lite.pm', @@ -17,4 +24,10 @@ WriteMakefile( 'https://github.com/redhotpenguin/perl-XML-Parser-Lite', }, }, + + ($mm_ver >= 6.48 + ? (MIN_PERL_VERSION => 5.006) + : () + ), + ); diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm index f0fa419..b66ff5d 100644 --- a/lib/XML/Parser/Lite.pm +++ b/lib/XML/Parser/Lite.pm @@ -9,10 +9,11 @@ package XML::Parser::Lite; +use 5.006; use strict; use warnings; -our $VERSION = '0.721'; +our $VERSION = '0.720_01'; sub new { my $class = shift; From d74b1d5ddeab39b34e8b389007e1d0423fbd27ad Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:17:05 +0100 Subject: [PATCH 03/10] Fixed RT#98635 - skip the planned number of tests --- Changes | 3 ++- t/26-xmlrpc.t | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 90874d2..f535115 100644 --- a/Changes +++ b/Changes @@ -1,8 +1,9 @@ -Revision history for Perl module XML::Parser::Lite +evision history for Perl module XML::Parser::Lite 0.720_01 2015-05-13 NEILB - Developer release (with PHRED's permission) to test changes - Specified min perl version of 5.006 in Lite.pm and dist metadata + - Fixed RT#98635 - skip the planned number of tests - Updated this file (Changes) to follow CPAN::Changes::Spec 0.720 2014-09-15 PHRED diff --git a/t/26-xmlrpc.t b/t/26-xmlrpc.t index c747636..199b266 100644 --- a/t/26-xmlrpc.t +++ b/t/26-xmlrpc.t @@ -25,7 +25,7 @@ SKIP: { $r = $s->test_connection; unless ( defined $r && defined $r->envelope ) { - skip 'need XMLRPC::Lite', 8 if $@; + skip 'need XMLRPC::Lite', 6 if $@; print "1..0 # Skip: ", $s->transport->status, "\n"; exit; } From cac70911a810144069e46018a94a2aba7f4707b9 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:20:36 +0100 Subject: [PATCH 04/10] Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite --- Changes | 3 +++ lib/XML/Parser/Lite.pm | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index f535115..763a4af 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,9 @@ evision history for Perl module XML::Parser::Lite - Developer release (with PHRED's permission) to test changes - Specified min perl version of 5.006 in Lite.pm and dist metadata - Fixed RT#98635 - skip the planned number of tests + - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite + (XML::Parser::Lite was forked from SOAP::Lite - see 0.717 below). + RT#92756 - Updated this file (Changes) to follow CPAN::Changes::Spec 0.720 2014-09-15 PHRED diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm index b66ff5d..e8796c3 100644 --- a/lib/XML/Parser/Lite.pm +++ b/lib/XML/Parser/Lite.pm @@ -2,7 +2,7 @@ # # Copyright (C) 2000-2007 Paul Kulchenko (paulclinger@yahoo.com) # Copyright (C) 2008 Martin Kutter (martin.kutter@fen-net.de) -# SOAP::Lite is free software; you can redistribute it +# XML::Parser::Lite is free software; you can redistribute it # and/or modify it under the same terms as Perl itself. # # ====================================================================== @@ -262,8 +262,10 @@ not re-entrant). Constructor. -As (almost) all SOAP::Lite constructors, new() returns the object called on -when called as object method. This means that the following effectively is +The new() method returns the object called on when called as object method. +This behaviour was inherited from L, +which XML::Parser::Lite was split out from. +This means that the following effectively is a no-op if $obj is a object: $obj = $obj->new(); From fd0fc7607043f5e320591a7c07f7dab411928ca9 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:24:48 +0100 Subject: [PATCH 05/10] Refactored t/37-mod_xmlrpc.t to address RT#91434 --- Changes | 2 ++ t/37-mod_xmlrpc.t | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Changes b/Changes index 763a4af..4301b17 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,8 @@ evision history for Perl module XML::Parser::Lite 0.720_01 2015-05-13 NEILB - Developer release (with PHRED's permission) to test changes + - Refactored t/37-mod_xmlrpc.t to make the modules it uses optional, + using Test::Requires. RT#91434 - Specified min perl version of 5.006 in Lite.pm and dist metadata - Fixed RT#98635 - skip the planned number of tests - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite diff --git a/t/37-mod_xmlrpc.t b/t/37-mod_xmlrpc.t index 67d5370..3df86cf 100644 --- a/t/37-mod_xmlrpc.t +++ b/t/37-mod_xmlrpc.t @@ -5,15 +5,7 @@ use warnings; use Test::More; -BEGIN { plan tests => 17 } +use Test::Requires qw/ XMLRPC::Lite XMLRPC::Test /; -eval { require XMLRPC::Lite }; - -SKIP: { - - skip 'need XMLRPC::Lite', 17 if $@; - - XMLRPC::Test::Server::run_for( shift || 'http://localhost/mod_xmlrpc' ); - -} +XMLRPC::Test::Server::run_for( shift || 'http://localhost/mod_xmlrpc' ); From e1332e6448ec38d34f9e9eaedfca38149c898068 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:29:23 +0100 Subject: [PATCH 06/10] Specified required versions of XMLRPC::Lite and XMLRPC::Test. GH#4 --- Changes | 2 ++ t/37-mod_xmlrpc.t | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 4301b17..a2490b1 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,8 @@ evision history for Perl module XML::Parser::Lite - Developer release (with PHRED's permission) to test changes - Refactored t/37-mod_xmlrpc.t to make the modules it uses optional, using Test::Requires. RT#91434 + - Specified required versions of XMLRPC::Lite and XMLRPC::Test. + GH#4 - Specified min perl version of 5.006 in Lite.pm and dist metadata - Fixed RT#98635 - skip the planned number of tests - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite diff --git a/t/37-mod_xmlrpc.t b/t/37-mod_xmlrpc.t index 3df86cf..ca7c7d0 100644 --- a/t/37-mod_xmlrpc.t +++ b/t/37-mod_xmlrpc.t @@ -5,7 +5,10 @@ use warnings; use Test::More; -use Test::Requires qw/ XMLRPC::Lite XMLRPC::Test /; +use Test::Requires { + 'XMLRPC::Lite' => 0.717, + 'XMLRPC::Test' => 0.717, +}; XMLRPC::Test::Server::run_for( shift || 'http://localhost/mod_xmlrpc' ); From 4ed3a3f74ae8bc69b517f57cc797cee032d12793 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:31:33 +0100 Subject: [PATCH 07/10] Added license type 'perl' to dist metadata, to match the doc. --- Changes | 1 + Makefile.PL | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Changes b/Changes index a2490b1..60e60e1 100644 --- a/Changes +++ b/Changes @@ -11,6 +11,7 @@ evision history for Perl module XML::Parser::Lite - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite (XML::Parser::Lite was forked from SOAP::Lite - see 0.717 below). RT#92756 + - Added license type 'perl' to dist metadata, to match the doc. - Updated this file (Changes) to follow CPAN::Changes::Spec 0.720 2014-09-15 PHRED diff --git a/Makefile.PL b/Makefile.PL index ac80b19..f830a75 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -30,4 +30,6 @@ WriteMakefile( : () ), + ($mm_ver >= 6.31 ? (LICENSE => 'perl') : ()), + ); From 783e7f5ae2220e193d8edc08cdd2b320d8733783 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:40:11 +0100 Subject: [PATCH 08/10] Minor documentation improvements --- Changes | 2 ++ lib/XML/Parser/Lite.pm | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Changes b/Changes index 60e60e1..4f23685 100644 --- a/Changes +++ b/Changes @@ -11,6 +11,8 @@ evision history for Perl module XML::Parser::Lite - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite (XML::Parser::Lite was forked from SOAP::Lite - see 0.717 below). RT#92756 + - Doc tweaks: improved abstract, first paragraph of DESCRIPTION + and the SEE ALSO section. - Added license type 'perl' to dist metadata, to match the doc. - Updated this file (Changes) to follow CPAN::Changes::Spec diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm index e8796c3..d373260 100644 --- a/lib/XML/Parser/Lite.pm +++ b/lib/XML/Parser/Lite.pm @@ -221,7 +221,7 @@ __END__ =head1 NAME -XML::Parser::Lite - Lightweight regexp-based XML parser +XML::Parser::Lite - Lightweight pure-perl XML Parser (based on regexps) =head1 SYNOPSIS @@ -246,8 +246,8 @@ XML::Parser::Lite - Lightweight regexp-based XML parser =head1 DESCRIPTION -This Perl implements an XML parser with a interface similar to -XML::Parser. Though not all callbacks are supported, you should be able to +This module implements an XML parser with a interface similar to +L. Though not all callbacks are supported, you should be able to use it in the same way you use XML::Parser. Due to using experimental regexp features it'll work only on Perl 5.6 and above and may behave differently on different platforms. @@ -345,13 +345,14 @@ cleanup here. =head1 SEE ALSO - XML::Parser +L - a full-blown XML Parser, on which XML::Parser::Lite is based. +Requires a C compiler and the I XML parser. - XML::Parser::LiteCopy: a fork in XML::Parser::Lite::Tree +L - a fork in L. - YAX +L - another pure-perl module for XML parsing. - XML::Parser::REX: the almost original REX code +L - another module that parses XML with regular expressions. =head1 COPYRIGHT @@ -362,7 +363,8 @@ Copyright (C) 2008- Martin Kutter. All rights reserved. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. -This parser is based on "shallow parser" http://www.cs.sfu.ca/~cameron/REX.html +This parser is based on "shallow parser" +L Copyright (c) 1998, Robert D. Cameron. =head1 AUTHOR From 9653e95dfe7e266b12447c7bbe30e674fd4b1e35 Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Wed, 13 May 2015 23:51:35 +0100 Subject: [PATCH 09/10] Set PREREQ_PM, TEST_REQUIRES, and CONFIGURE_REQUIRES appropriately Only set TEST_REQUIRES and CONFIGURE_REQUIRES if your version of EUMM supports them. --- Changes | 2 ++ Makefile.PL | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 4f23685..b033034 100644 --- a/Changes +++ b/Changes @@ -11,6 +11,8 @@ evision history for Perl module XML::Parser::Lite - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite (XML::Parser::Lite was forked from SOAP::Lite - see 0.717 below). RT#92756 + - Set PREREQ_PM, TEST_REQUIRES, and CONFIGURE_REQUIRES depending on + whether your version of ExtUtils::MakeMaker supports them. - Doc tweaks: improved abstract, first paragraph of DESCRIPTION and the SEE ALSO section. - Added license type 'perl' to dist metadata, to match the doc. diff --git a/Makefile.PL b/Makefile.PL index f830a75..7639995 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,7 +3,7 @@ use strict; use warnings; -use ExtUtils::MakeMaker; +use ExtUtils::MakeMaker 6.30; my $mm_ver = $ExtUtils::MakeMaker::VERSION; if ($mm_ver =~ /_/) { @@ -12,10 +12,23 @@ if ($mm_ver =~ /_/) { die $@ if $@; } +my @REQUIRES = ( + 'strict' => 0, + 'warnings' => 0, +); + +my @TEST_REQUIRES = ( + 'Test::More' => 0.88, + 'Test::Requires' => 0.06, + 'diagnostics' => 0, +); + +push(@REQUIRES, @TEST_REQUIRES) if $mm_ver < 6.64; + WriteMakefile( NAME => 'XML::Parser::Lite', VERSION_FROM => 'lib/XML/Parser/Lite.pm', - PREREQ_PM => {}, + PREREQ_PM => { @REQUIRES }, ABSTRACT_FROM => 'lib/XML/Parser/Lite.pm', AUTHOR => 'Byrne Reese (byrne@majordojo.com)', META_MERGE => { @@ -32,4 +45,16 @@ WriteMakefile( ($mm_ver >= 6.31 ? (LICENSE => 'perl') : ()), + ($mm_ver >= 6.64 + ? (TEST_REQUIRES => { @TEST_REQUIRES }) + : () + ), + + ($mm_ver >= 6.52 + ? (CONFIGURE_REQUIRES => { + 'ExtUtils::MakeMaker' => 6.30, + }) + : () + ), + ); From ad16a9f1fa2c8d1f51cc995a2edcf77de6f7004b Mon Sep 17 00:00:00 2001 From: Neil Bowers Date: Sat, 16 May 2015 21:22:09 +0100 Subject: [PATCH 10/10] Bumped version to non-developer release --- Changes | 10 ++++++---- lib/XML/Parser/Lite.pm | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index b033034..3777182 100644 --- a/Changes +++ b/Changes @@ -1,11 +1,10 @@ -evision history for Perl module XML::Parser::Lite +Revision history for Perl module XML::Parser::Lite -0.720_01 2015-05-13 NEILB +0.721 2015-05-?? PHRED - Developer release (with PHRED's permission) to test changes - Refactored t/37-mod_xmlrpc.t to make the modules it uses optional, using Test::Requires. RT#91434 - - Specified required versions of XMLRPC::Lite and XMLRPC::Test. - GH#4 + - Specified required versions of XMLRPC::Lite and XMLRPC::Test. GH#4 - Specified min perl version of 5.006 in Lite.pm and dist metadata - Fixed RT#98635 - skip the planned number of tests - Changed copyright to refer to XML::Parser::Lite rather than SOAP::Lite @@ -18,6 +17,9 @@ evision history for Perl module XML::Parser::Lite - Added license type 'perl' to dist metadata, to match the doc. - Updated this file (Changes) to follow CPAN::Changes::Spec +0.720_01 2015-05-13 NEILB + - Developer release with all the changes subsequently released in 0.721. + 0.720 2014-09-15 PHRED - RT 96206 - add README - RT 96209 - add links to other parsers diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm index d373260..b13a012 100644 --- a/lib/XML/Parser/Lite.pm +++ b/lib/XML/Parser/Lite.pm @@ -13,7 +13,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '0.720_01'; +our $VERSION = '0.721'; sub new { my $class = shift;