r44282 - in /branches/upstream/libwww-wikipedia-perl/current: ./ inc/Module/ inc/Module/Install/ lib/WWW/ lib/WWW/Wikipedia/ t/
nhandler-guest at users.alioth.debian.org
nhandler-guest at users.alioth.debian.org
Sat Sep 19 13:21:42 UTC 2009
Author: nhandler-guest
Date: Sat Sep 19 13:21:30 2009
New Revision: 44282
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44282
Log:
[svn-upgrade] Integrating new upstream version, libwww-wikipedia-perl (1.96)
Modified:
branches/upstream/libwww-wikipedia-perl/current/Changes
branches/upstream/libwww-wikipedia-perl/current/META.yml
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Base.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Can.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Scripts.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia.pm
branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia/Entry.pm
branches/upstream/libwww-wikipedia-perl/current/t/15.entry.t
Modified: branches/upstream/libwww-wikipedia-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/Changes?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/Changes (original)
+++ branches/upstream/libwww-wikipedia-perl/current/Changes Sat Sep 19 13:21:30 2009
@@ -1,4 +1,8 @@
Revision history for Perl extension WWW::Wikipedia.
+
+1.96 Mon Sep 14 2009
+ - Add text_basic() and fulltext_basic() to Entry, which are the
+ same as the non _basic methods, but not run through Text::Autoformat
1.95 Wed Apr 29 2009
- Swap out CGI for URI::Escape
Modified: branches/upstream/libwww-wikipedia-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/META.yml?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/META.yml (original)
+++ branches/upstream/libwww-wikipedia-perl/current/META.yml Sat Sep 19 13:21:30 2009
@@ -8,7 +8,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.85'
+generated_by: 'Module::Install version 0.91'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,4 +24,4 @@
URI: 0
resources:
license: http://dev.perl.org/licenses/
-version: 1.95
+version: 1.96
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install.pm Sat Sep 19 13:21:30 2009
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.85';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +353,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Base.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Base.pm Sat Sep 19 13:21:30 2009
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
}
# Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
$SIG{__WARN__} = sub { $w };
}
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
sub new {
- my ($class, %args) = @_;
-
- foreach my $method ( qw(call load) ) {
- next if defined &{"$class\::$method"};
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- };
+ my $class = shift;
+ unless ( defined &{"${class}::call"} ) {
+ *{"${class}::call"} = sub { shift->_top->call(@_) };
}
-
- bless( \%args, $class );
+ unless ( defined &{"${class}::load"} ) {
+ *{"${class}::load"} = sub { shift->_top->load(@_) };
+ }
+ bless { @_ }, $class;
}
-#line 66
+#line 61
sub AUTOLOAD {
- my $self = shift;
local $@;
- my $autoload = eval {
- $self->_top->autoload
- } or return;
- goto &$autoload;
+ my $func = eval { shift->_top->autoload } or return;
+ goto &$func;
}
-#line 83
+#line 75
sub _top {
$_[0]->{_top};
}
-#line 98
+#line 90
sub admin {
$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
Module::Install::Base::FakeAdmin->new;
}
-#line 114
+#line 106
sub is_admin {
$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
1;
-#line 162
+#line 154
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Can.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Can.pm Sat Sep 19 13:21:30 2009
@@ -2,16 +2,16 @@
package Module::Install::Can;
use strict;
-use Module::Install::Base;
-use Config ();
-use File::Spec ();
-use ExtUtils::MakeMaker ();
+use Config ();
+use File::Spec ();
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
# check if we can load some module
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Fetch.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Fetch.pm Sat Sep 19 13:21:30 2009
@@ -2,13 +2,13 @@
package Module::Install::Fetch;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub get_file {
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Makefile.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Makefile.pm Sat Sep 19 13:21:30 2009
@@ -2,14 +2,14 @@
package Module::Install::Makefile;
use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub Makefile { $_[0] }
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Metadata.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Metadata.pm Sat Sep 19 13:21:30 2009
@@ -2,18 +2,17 @@
package Module::Install::Metadata;
use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
my @boolean_keys = qw{
sign
- mymeta
};
my @scalar_keys = qw{
@@ -440,21 +439,21 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl', 1,
- 'GNU general public license' => 'gpl', 1,
- 'GNU public license' => 'gpl', 1,
- 'GNU lesser general public license' => 'lgpl', 1,
- 'GNU lesser public license' => 'lgpl', 1,
- 'GNU library general public license' => 'lgpl', 1,
- 'GNU library public license' => 'lgpl', 1,
- 'BSD license' => 'bsd', 1,
- 'Artistic license' => 'artistic', 1,
- 'GPL' => 'gpl', 1,
- 'LGPL' => 'lgpl', 1,
- 'BSD' => 'bsd', 1,
- 'Artistic' => 'artistic', 1,
- 'MIT' => 'mit', 1,
- 'proprietary' => 'proprietary', 0,
+ 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
+ 'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
+ 'BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
}
}
+sub test_requires_from {
+ my $self = shift;
+ my $content = Module::Install::_readperl($_[0]);
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ while ( @requires ) {
+ my $module = shift @requires;
+ my $version = shift @requires;
+ $self->test_requires( $module => $version );
+ }
+}
+
# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
# numbers (eg, 5.006001 or 5.008009).
# Also, convert double-part versions (eg, 5.8)
sub _perl_version {
my $v = $_[-1];
- $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+ $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
if ( ref($v) ) {
- $v = $v + 0; # Numify
+ # Numify
+ $v = $v + 0;
}
return $v;
}
@@ -526,21 +537,56 @@
######################################################################
-# MYMETA.yml Support
+# MYMETA Support
sub WriteMyMeta {
die "WriteMyMeta has been deprecated";
}
-sub write_mymeta {
- my $self = shift;
-
- # If there's no existing META.yml there is nothing we can do
- return unless -f 'META.yml';
+sub write_mymeta_yaml {
+ my $self = shift;
# We need YAML::Tiny to write the MYMETA.yml file
unless ( eval { require YAML::Tiny; 1; } ) {
return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.yml\n";
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+ my $self = shift;
+
+ # We need JSON to write the MYMETA.json file
+ unless ( eval { require JSON; 1; } ) {
+ return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.json\n";
+ Module::Install::_write(
+ 'MYMETA.json',
+ JSON->new->pretty(1)->canonical->encode($meta),
+ );
+}
+
+sub _write_mymeta_data {
+ my $self = shift;
+
+ # If there's no existing META.yml there is nothing we can do
+ return undef unless -f 'META.yml';
+
+ # We need Parse::CPAN::Meta to load the file
+ unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+ return undef;
}
# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
}
# Load the advisory META.yml file
- my @yaml = YAML::Tiny::LoadFile('META.yml');
+ my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0];
# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
}
- # Save as the MYMETA.yml file
- print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ return $meta;
}
1;
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Scripts.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Scripts.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Scripts.pm Sat Sep 19 13:21:30 2009
@@ -2,13 +2,13 @@
package Module::Install::Scripts;
use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub install_script {
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Win32.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/Win32.pm Sat Sep 19 13:21:30 2009
@@ -2,12 +2,12 @@
package Module::Install::Win32;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/WriteAll.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/inc/Module/Install/WriteAll.pm Sat Sep 19 13:21:30 2009
@@ -2,11 +2,11 @@
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +41,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
Modified: branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia.pm Sat Sep 19 13:21:30 2009
@@ -8,7 +8,7 @@
use base qw( LWP::UserAgent );
-our $VERSION = '1.95';
+our $VERSION = '1.96';
use constant WIKIPEDIA_URL =>
'http://%s.wikipedia.org/w/index.php?title=%s&action=raw';
Modified: branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia/Entry.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia/Entry.pm?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia/Entry.pm (original)
+++ branches/upstream/libwww-wikipedia-perl/current/lib/WWW/Wikipedia/Entry.pm Sat Sep 19 13:21:30 2009
@@ -51,6 +51,11 @@
},
ref( $class ) || $class;
$self->_parse();
+
+ # store un-"pretty"-ed version of text
+ $self->{ fulltext_basic } = $self->{ fulltext };
+ $self->{ text_basic } = $self->{ text };
+
$self->{ fulltext } = _pretty( $self->{ fulltext } );
$self->{ text } = _pretty( $self->{ text } );
return ( $self );
@@ -74,6 +79,18 @@
return $self->fulltext();
}
+=head2 text_basic()
+
+The same as C<text()>, but not run through Text::Autoformat.
+
+=cut
+
+sub text_basic {
+ my $self = shift;
+ return $self->{ text_basic } if $self->{ text_basic };
+ return $self->fulltext_basic();
+}
+
=head2 fulltext()
Returns the full text for the entry, which can be extensive.
@@ -83,6 +100,17 @@
sub fulltext {
my $self = shift;
return $self->{ fulltext };
+}
+
+=head2 fulltext_basic()
+
+The same as C<fulltext()>, but not run through Text::Autoformat.
+
+=cut
+
+sub fulltext_basic {
+ my $self = shift;
+ return $self->{ fulltext_basic };
}
=head2 related()
Modified: branches/upstream/libwww-wikipedia-perl/current/t/15.entry.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-wikipedia-perl/current/t/15.entry.t?rev=44282&op=diff
==============================================================================
--- branches/upstream/libwww-wikipedia-perl/current/t/15.entry.t (original)
+++ branches/upstream/libwww-wikipedia-perl/current/t/15.entry.t Sat Sep 19 13:21:30 2009
@@ -1,6 +1,6 @@
use strict;
use warnings;
-use Test::More tests => 13;
+use Test::More tests => 14;
use_ok( 'WWW::Wikipedia::Entry' );
@@ -15,6 +15,7 @@
my $text = $entry->text();
like( $text, qr/'Perl', also 'Practical Extraction and Report Language'/,
'text()' );
+ok( $entry->text_basic(), 'text_basic()' );
is( $entry->headings(), 13, 'headings()' );
More information about the Pkg-perl-cvs-commits
mailing list