r57895 - in /trunk/libhtml-tidy-perl: Changes META.yml Makefile.PL Tidy.xs debian/changelog lib/HTML/Tidy.pm t/00-load.t t/roundtrip.t t/unicode.t t/version.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri May 14 01:16:59 UTC 2010
Author: jawnsy-guest
Date: Fri May 14 01:16:36 2010
New Revision: 57895
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57895
Log:
NOTE:
We will need to deal with Alien::Tidyp (a script that Andy
Lester maintains on github)...
* New upstream release
Modified:
trunk/libhtml-tidy-perl/Changes
trunk/libhtml-tidy-perl/META.yml
trunk/libhtml-tidy-perl/Makefile.PL
trunk/libhtml-tidy-perl/Tidy.xs
trunk/libhtml-tidy-perl/debian/changelog
trunk/libhtml-tidy-perl/lib/HTML/Tidy.pm
trunk/libhtml-tidy-perl/t/00-load.t
trunk/libhtml-tidy-perl/t/roundtrip.t
trunk/libhtml-tidy-perl/t/unicode.t
trunk/libhtml-tidy-perl/t/version.t
Modified: trunk/libhtml-tidy-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/Changes?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/Changes (original)
+++ trunk/libhtml-tidy-perl/Changes Fri May 14 01:16:36 2010
@@ -1,90 +1,23 @@
Revision history for Perl extension HTML::Tidy.
-1.50 NEXT
+1.52 Wed May 12 23:40:09 CDT 2010
+------------------------------------
+Now relies on Perl 5.8. I'm not at all interested in supporting
+ancient Perl versions.
- HTML::Tidy now relies on the libtidy that Andy Lester maintains on github.
+HTML::Tidy now relies on the libtidyp that Andy Lester maintains
+on github.
- http://github.com/petdance/libtidy
+http://github.com/petdance/libtidyp
+
+[ENHANCEMENTS]
+Now includes support for TIDY_INFO messages.
+
+Improve support for Windows platforms.
+
+[FIXES]
+Fixed a segfault if there are no errors.
+
+Allow for either "tidyp" or "HTML Tidy" as a program name in tests.
- [ENHANCEMENTS]
- Now includes support for TIDY_INFO messages.
-
- [FIXES]
- Fixed a segfault if there are no errors.
-
-
-1.08 Fri Apr 13 22:02:20 CDT 2007
- First new version with the massive changes from Jonathan Rockway.
-
-
-1.07_01 Fri Nov 10 22:12:59 CST 2006
-
- We dumped a lot of work in here. Suffice to say that it's
- radically different.
-
- [INTERNALS]
- * Added support for Perl::Critic, and a "make critic" target.
-
-1.06 Fri Aug 19 10:23:29 CDT 2005
- NO FUNCTIONAL CHANGES. Just a version bump and some doc fixes.
-
-
-1.05_02 Wed Apr 20 22:43:31 CDT 2005
- [FIXES]
- * Made clean() return undef if it has no input. Thanks to
- Dominique Quatravax. See RT #8051.
- * Removed line-endings so that we're happy cross-platform in
- the tests. Thanks to the anonymous contributor of RT #7836.
-
- [ENHANCEMENTS]
- * Added support for config files. Thanks to Anders Ardo!
- See RT #11120.
-
-
-1.05_01 Thu Sep 2 21:01:52 CDT 2004
- [FIXES]
- * Fixed some segfaults when calling $tidy->clean(). Thanks
- to Aaron Patterson, fixes CPAN #7254.
-
- * Made the Makefile.PL more portable under Mac OS X where
- libtidy had been installed by Fink. Also added some
- Debian and OS X notes to the README. Thanks to Dan
- Friedman.
-
-
-1.04 Wed May 12 15:18:37 CDT 2004
- [FIXES]
- * If for some reason, Tidy can't create the cleaned up doc,
- we don't segfault. Added a test to check for it with an HTML
- set that we know made it segfault in 1.02.
-
- [ENHANCEMENTS]
- * Portability enhancements from Dave Rolsky.
-
-
-1.02 Wed Mar 3 22:43:57 CST 2004
- [ENHANCEMENTS]
- * Added clean() method for cleaning up using the Tidy magic.
- Thanks to Ben Trott.
-
- [FIXES]
- * Message parsing is split on a Ctrl-J instead of \n now.
- This should fix the test problems on Win32.
-
- * Removed the #include "ppport.h" from Tidy.xs so it can compile
- on Win32. Thanks to crazyinsomniac.
-
- [MISCELLANEOUS]
- * Moved the install directions for tidylib into the README.
-
-
-1.00 Wed Feb 25 22:19:28 CST 2004
-
- First real version, released on an unsuspecting world.
-
- If you were one of the ones to get in on 0.01 thru 0.04, you may
- want to check your code. The API has changed some. I know that
- parse_file() is now parse(), for example. There may be others.
-
- Going forward, of course, I'll note any other API changes here.
Modified: trunk/libhtml-tidy-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/META.yml?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/META.yml (original)
+++ trunk/libhtml-tidy-perl/META.yml Fri May 14 01:16:36 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: HTML-Tidy
-version: 1.50
+version: 1.52
abstract: (X)HTML validation in a Perl object
author:
- Andy Lester <andy at petdance.com>
@@ -21,7 +21,7 @@
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.54
+generated_by: ExtUtils::MakeMaker version 6.56
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libhtml-tidy-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/Makefile.PL?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/Makefile.PL (original)
+++ trunk/libhtml-tidy-perl/Makefile.PL Fri May 14 01:16:36 2010
@@ -2,33 +2,47 @@
package main;
-use 5.006001;
+use 5.008000;
use strict;
use warnings;
use ExtUtils::MakeMaker;
use ExtUtils::Liblist;
+use Config;
-my @vars = ExtUtils::Liblist->ext( '-ltidy', 0, 1 );
-my $libs = $vars[2];
+my $libs = '-ltidyp';
+my $inc = "-I. -I/usr/include/tidyp -I/usr/local/include/tidyp -I$Config{usrinc}/tidyp";
-if ( !$libs ) {
- $libs = '-ltidy';
- print <<'EOF';
+eval { require Alien::Tidyp; };
-It seems that you don't have libtidy installed. HTML::Tidy does no
-real work on its own. It's just a wrapper aound libtidy.
+if ( !$@ ) {
+ print "Gonna use tidyp via Alien::Tidyp\n";
+ $libs = Alien::Tidyp->config('LIBS');
+ $inc = Alien::Tidyp->config('INC');
+}
+else {
+ print "Alien::Tidyp not found, gonna look for tidyp on your system\n";
+ my @vars = ExtUtils::Liblist->ext( '-L/usr/lib -L/usr/local/lib -ltidyp', 0, 1 );
+ $libs = $vars[2];
-HTML::Tidy is only tested to work with libtidy hosted at
-http://github.com/petdance/libtidy. This is mostly the same as the one
+ if ( !$libs ) {
+ $libs = '-ltidyp';
+ print <<'EOF';
+
+It seems that you don't have libtidyp installed. HTML::Tidy does no
+real work on its own. It's just a wrapper aound libtidyp.
+
+HTML::Tidy is only tested to work with libtidyp hosted at
+http://github.com/petdance/libtidyp. This is mostly the same as the one
at http://tidy.sourceforge.net/, with some changes, such as adding a
version number so that we can tell what version we're working with.
-If you do have libtidy installed, and I just haven't detected it,
+If you do have libtidyp installed, and I just haven't detected it,
go ahead and try building. If HTML::Tidy builds and tests correctly,
then please let Andy Lester know at andy at petdance.com so that he can
fix the library detection code.
EOF
+ }
}
eval { require LWP::Simple; };
@@ -58,7 +72,7 @@
LIBS => [$libs],
NEEDS_LINKING => 1,
- INC => '-I. -I/usr/include/tidy -I/usr/local/include/tidy -I/sw/include/tidy',
+ INC => $inc,
EXE_FILES => [qw(bin/webtidy)],
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
Modified: trunk/libhtml-tidy-perl/Tidy.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/Tidy.xs?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/Tidy.xs (original)
+++ trunk/libhtml-tidy-perl/Tidy.xs Fri May 14 01:16:36 2010
@@ -2,7 +2,7 @@
#include "perl.h"
#include "XSUB.h"
-#include <tidy.h>
+#include <tidyp.h>
#include <buffio.h>
#include <stdio.h>
#include <errno.h>
@@ -192,7 +192,7 @@
SV*
-_tidy_version()
+_tidyp_version()
PREINIT:
const char* version;
CODE:
Modified: trunk/libhtml-tidy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/debian/changelog?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/debian/changelog (original)
+++ trunk/libhtml-tidy-perl/debian/changelog Fri May 14 01:16:36 2010
@@ -1,3 +1,13 @@
+libhtml-tidy-perl (1.52-1) UNRELEASED; urgency=low
+
+ NOTE:
+ We will need to deal with Alien::Tidyp (a script that Andy
+ Lester maintains on github)...
+
+ * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org> Thu, 13 May 2010 21:51:57 -0400
+
libhtml-tidy-perl (1.50-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libhtml-tidy-perl/lib/HTML/Tidy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/lib/HTML/Tidy.pm?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/lib/HTML/Tidy.pm (original)
+++ trunk/libhtml-tidy-perl/lib/HTML/Tidy.pm Fri May 14 01:16:36 2010
@@ -13,11 +13,11 @@
=head1 VERSION
-Version 1.50
-
-=cut
-
-our $VERSION = '1.50';
+Version 1.52
+
+=cut
+
+our $VERSION = '1.52';
=head1 SYNOPSIS
@@ -67,18 +67,22 @@
This configuration file will be read and used when you clean or parse an HTML file.
-You can also pass options directly to libtidy.
+You can also pass options directly to libtidyp.
my $tidy = HTML::Tidy->new( {
output_xhtml => 1,
tidy_mark => 0,
} );
-See L<http://tidy.sourceforge.net/docs/quickref.html> or
-C<tidy -help-config> for the list of options supported by libtidy.
+See C<tidyp -help-config> for the list of options supported by libtidyp.
The following options are not supported by C<HTML::Tidy>:
-quiet
+
+=over 4
+
+=item * quiet
+
+=back
=cut
@@ -339,14 +343,14 @@
return 1;
}
-=head2 libtidy_version()
+=head2 libtidyp_version()
Returns the version of the underling tidy library.
=cut
-sub libtidy_version {
- my $version_str = _tidy_version();
+sub libtidyp_version {
+ my $version_str = _tidyp_version();
return $version_str;
}
@@ -358,12 +362,12 @@
__END__
-=head1 INSTALLING LIBTIDY
-
-L<HTML::Tidy|HTML::Tidy> requires that C<libtidy> be installed on your system.
-You can obtain libtidy through your distribution's package manager
+=head1 INSTALLING LIBTIDYP
+
+L<HTML::Tidy|HTML::Tidy> requires that C<libtidyp> be installed on your system.
+You can obtain libtidyp through your distribution's package manager
(make sure you install the development package with headers), or from
-the libtidy website at L<http://tidy.sourceforge.net/src/tidy_src.tgz>.
+the libtidyp website at L<http://github.com/petdance/libtidyp>.
=head1 CONVERTING FROM C<HTML::Lint>
@@ -373,11 +377,11 @@
=item * It's not pure Perl
-C<HTML::Tidy> is mostly a happy wrapper around libtidy.
+C<HTML::Tidy> is mostly a happy wrapper around libtidyp.
=item * The real work is done by someone else
-Changes to libtidy may come down the pipe that I don't have control over.
+Changes to libtidyp may come down the pipe that I don't have control over.
That's the price we pay for having it do a darn good job.
=item * It's no longer bundled with its C<Test::> counterpart
Modified: trunk/libhtml-tidy-perl/t/00-load.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/t/00-load.t?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/t/00-load.t (original)
+++ trunk/libhtml-tidy-perl/t/00-load.t Fri May 14 01:16:36 2010
@@ -12,5 +12,5 @@
}
eval {
# For better test reporting
- diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidylib " . HTML::Tidy->libtidy_version());
+ diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; libtidyp " . HTML::Tidy->libtidyp_version() );
}
Modified: trunk/libhtml-tidy-perl/t/roundtrip.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/t/roundtrip.t?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/t/roundtrip.t (original)
+++ trunk/libhtml-tidy-perl/t/roundtrip.t Fri May 14 01:16:36 2010
@@ -27,7 +27,7 @@
is( scalar @messages, 0, q{The cleaned stuff shouldn't have any errors} );
diag( 'But they do...', Dumper(\@messages) ) if @messages;
-$clean =~ s/"HTML Tidy.+w3\.org"/"Tidy"/;
+$clean =~ s/"(HTML Tidy|tidyp).+w3\.org"/"Tidy"/;
my $expected = do { local $/ = undef; <DATA> };
is( $clean, $expected, 'Cleaned up properly' );
Modified: trunk/libhtml-tidy-perl/t/unicode.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/t/unicode.t?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/t/unicode.t (original)
+++ trunk/libhtml-tidy-perl/t/unicode.t Fri May 14 01:16:36 2010
@@ -32,6 +32,7 @@
ok(utf8::is_utf8($clean), 'cleaned output is also unicode');
$clean =~ s/"HTML Tidy.+w3\.org"/"Tidy"/;
+$clean =~ s/"(HTML Tidy|tidyp).+w3\.org"/"Tidy"/;
is($clean, $reference, q{Cleanup didn't break anything});
my @messages = $tidy->messages;
Modified: trunk/libhtml-tidy-perl/t/version.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tidy-perl/t/version.t?rev=57895&op=diff
==============================================================================
--- trunk/libhtml-tidy-perl/t/version.t (original)
+++ trunk/libhtml-tidy-perl/t/version.t Fri May 14 01:16:36 2010
@@ -9,9 +9,7 @@
use_ok( 'HTML::Tidy' );
}
-my $version_string = HTML::Tidy->libtidy_version();
+my $version_string = HTML::Tidy->libtidyp_version();
like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
+cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
-my $version_nr = HTML::Tidy->libtidy_version( {numeric =>1 } );
-cmp_ok( $version_nr, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
-
More information about the Pkg-perl-cvs-commits
mailing list