r2308 - in packages/libxml-feed-perl/trunk: . debian inc
inc/ExtUtils inc/Module inc/Module/Install lib/XML
lib/XML/Feed t t/samples
Jaldhar H. Vyas
jaldhar at costa.debian.org
Fri Mar 10 21:44:47 UTC 2006
Author: jaldhar
Date: 2006-03-10 21:44:16 +0000 (Fri, 10 Mar 2006)
New Revision: 2308
Added:
packages/libxml-feed-perl/trunk/inc/HTML/
packages/libxml-feed-perl/trunk/inc/LWP.pm
packages/libxml-feed-perl/trunk/inc/Module/AutoInstall.pm
packages/libxml-feed-perl/trunk/t/samples/rss10-invalid-date.xml
Modified:
packages/libxml-feed-perl/trunk/Changes
packages/libxml-feed-perl/trunk/MANIFEST
packages/libxml-feed-perl/trunk/META.yml
packages/libxml-feed-perl/trunk/Makefile.PL
packages/libxml-feed-perl/trunk/README
packages/libxml-feed-perl/trunk/debian/changelog
packages/libxml-feed-perl/trunk/inc/ExtUtils/AutoInstall.pm
packages/libxml-feed-perl/trunk/inc/Module/Install.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/AutoInstall.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Base.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Build.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Can.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Fetch.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Include.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Makefile.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Metadata.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/Win32.pm
packages/libxml-feed-perl/trunk/inc/Module/Install/WriteAll.pm
packages/libxml-feed-perl/trunk/lib/XML/Feed.pm
packages/libxml-feed-perl/trunk/lib/XML/Feed/Atom.pm
packages/libxml-feed-perl/trunk/lib/XML/Feed/RSS.pm
packages/libxml-feed-perl/trunk/t/01-parse.t
Log:
New upstream version XML::Feed 0.08
Modified: packages/libxml-feed-perl/trunk/Changes
===================================================================
--- packages/libxml-feed-perl/trunk/Changes 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/Changes 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,7 +1,16 @@
-# $Id: Changes 1872 2005-08-12 04:28:42Z btrott $
+# $Id: Changes 1924 2006-03-03 17:34:15Z btrott $
Revision history for XML::Feed
+0.08 2006.03.03
+ - $feed->author wasn't being converted properly by Feed->convert. Thanks
+ to Tatsuhiko Miyagawa for the patch.
+ - Added eval around Entry->issued calls, to properly catch invalid
+ date formats, and just return undef, rather than dying. Thanks to
+ Tatsuhiko Miyagawa for the spot.
+ - Fixed issued/modified format issue with dates in timezones other than
+ UTC. Thanks to Tatsuhiko Miyagawa for the patch.
+
0.07 2005.08.11
- Added XML::Feed::splice method, to make feed splicing easier.
- Fixed some unitialized value warnings.
Modified: packages/libxml-feed-perl/trunk/MANIFEST
===================================================================
--- packages/libxml-feed-perl/trunk/MANIFEST 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/MANIFEST 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,6 +1,9 @@
Build.PL
Changes
inc/ExtUtils/AutoInstall.pm
+inc/HTML/TokeParser.pm
+inc/LWP.pm
+inc/Module/AutoInstall.pm
inc/Module/Install.pm
inc/Module/Install/AutoInstall.pm
inc/Module/Install/Base.pm
@@ -26,6 +29,7 @@
t/02-create.t
t/04-splice.t
t/samples/atom.xml
+t/samples/rss10-invalid-date.xml
t/samples/rss10.xml
t/samples/rss20-no-summary.xml
t/samples/rss20.xml
Modified: packages/libxml-feed-perl/trunk/META.yml
===================================================================
--- packages/libxml-feed-perl/trunk/META.yml 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/META.yml 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,24 +1,25 @@
-name: XML-Feed
-version: 0.07
abstract: XML Syndication Feed Support
author: Six Apart <cpan at sixapart.com>
+build_requires:
+ HTML::TokeParser: 0
+ LWP: 0
+distribution_type: module
+generated_by: Module::Install version 0.57
license: perl
-distribution_type: module
+name: XML-Feed
+no_index:
+ directory:
+ - t
+ - inc
+ - t
requires:
Class::ErrorHandler: 0
- Feed::Find: 0
- URI::Fetch: 0
- XML::RSS: 1.01
- XML::Atom: 0.08
- LWP: 0
- HTML::Parser: 0
- URI: 0
DateTime: 0
DateTime::Format::Mail: 0
DateTime::Format::W3CDTF: 0
+ Feed::Find: 0
List::Util: 0
-no_index:
- directory:
- - t
- - inc
-generated_by: Module::Install version 0.36
+ URI::Fetch: 0
+ XML::Atom: 0.08
+ XML::RSS: 1.01
+version: 0.08
Modified: packages/libxml-feed-perl/trunk/Makefile.PL
===================================================================
--- packages/libxml-feed-perl/trunk/Makefile.PL 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/Makefile.PL 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL 1869 2005-08-10 00:02:25Z btrott $
+# $Id: Makefile.PL 1925 2006-03-03 17:37:50Z btrott $
use inc::Module::Install;
@@ -17,13 +17,12 @@
requires('URI::Fetch');
requires('XML::RSS' => 1.01);
requires('XML::Atom' => 0.08);
-requires('LWP');
-requires('HTML::Parser');
-requires('URI');
requires('DateTime');
requires('DateTime::Format::Mail');
requires('DateTime::Format::W3CDTF');
requires('List::Util');
+build_requires('LWP');
+build_requires('HTML::TokeParser');
auto_include();
auto_install();
Modified: packages/libxml-feed-perl/trunk/README
===================================================================
--- packages/libxml-feed-perl/trunk/README 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/README 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,4 +1,4 @@
-$Id: README 1869 2005-08-10 00:02:25Z btrott $
+$Id: README 1925 2006-03-03 17:37:50Z btrott $
This is XML::Feed, an abstraction above the RSS and Atom syndication
feed formats. It supports both parsing and autodiscovery of feeds.
@@ -8,9 +8,6 @@
* Class::ErrorHandler
* XML::RSS
* XML::Atom
- * LWP
- * HTML::Parser
- * URI
* DateTime
* DateTime::Format::Mail
* DateTime::Format::W3CDTF
Modified: packages/libxml-feed-perl/trunk/debian/changelog
===================================================================
--- packages/libxml-feed-perl/trunk/debian/changelog 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/debian/changelog 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,3 +1,9 @@
+libxml-feed-perl (0.08-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Jaldhar H. Vyas <jaldhar at debian.org> Fri, 10 Mar 2006 16:42:07 -0500
+
libxml-feed-perl (0.07-1) unstable; urgency=low
* Initial release. (Closes: #350054)
Modified: packages/libxml-feed-perl/trunk/inc/ExtUtils/AutoInstall.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/ExtUtils/AutoInstall.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/ExtUtils/AutoInstall.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -9,7 +9,7 @@
use Cwd ();
use ExtUtils::MakeMaker ();
-#line 282
+#line 281
# special map on pre-defined feature sets
my %FeatureMap = (
@@ -628,4 +628,4 @@
__END__
-#line 929
+#line 928
Copied: packages/libxml-feed-perl/trunk/inc/HTML (from rev 2307, packages/libxml-feed-perl/branches/upstream/current/inc/HTML)
Copied: packages/libxml-feed-perl/trunk/inc/LWP.pm (from rev 2307, packages/libxml-feed-perl/branches/upstream/current/inc/LWP.pm)
Copied: packages/libxml-feed-perl/trunk/inc/Module/AutoInstall.pm (from rev 2307, packages/libxml-feed-perl/branches/upstream/current/inc/Module/AutoInstall.pm)
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/AutoInstall.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/AutoInstall.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/AutoInstall.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,7 +1,13 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /Library/Perl/5.8.1/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /Library/Perl/5.8.6/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
+
+$VERSION = '0.57';
+
+use strict;
+
sub AutoInstall { $_[0] }
sub run {
@@ -18,45 +24,35 @@
my $self = shift;
return if $self->{done}++;
-# ExtUtils::AutoInstall Bootstrap Code, version 7.
-AUTO:{my$p='ExtUtils::AutoInstall';my$v=0.49;$p->VERSION||0>=$v
-or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL};
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or
-eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
-);1"and exit)and print"==> $p $v required. Install it from CP".
-"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and
-do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo',
-$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1"
-||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{
-require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{
-require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please
-manually install $p $v from cpan.org first...\n"}}}
-
# Flatten array of arrays into a single array
my @core = map @$_, map @$_, grep ref,
$self->build_requires, $self->requires;
- while ( @core and @_ > 1 and $_[0] =~ /^-\w+$/ ) {
- push @core, splice(@_, 0, 2);
- }
+ my @config = @_;
- ExtUtils::AutoInstall->import(
- (@core ? (-core => \@core) : ()), @_, $self->features
+ # We'll need Module::AutoInstall
+ $self->include('Module::AutoInstall');
+ require Module::AutoInstall;
+
+ Module::AutoInstall->import(
+ (@config ? (-config => \@config) : ()),
+ (@core ? (-core => \@core) : ()),
+ $self->features,
);
- $self->makemaker_args( ExtUtils::AutoInstall::_make_args() );
+ $self->makemaker_args( Module::AutoInstall::_make_args() );
my $class = ref($self);
$self->postamble(
"# --- $class section:\n" .
- ExtUtils::AutoInstall::postamble()
+ Module::AutoInstall::postamble()
);
}
sub auto_install_now {
my $self = shift;
- $self->auto_install;
- ExtUtils::AutoInstall::do_install();
+ $self->auto_install(@_);
+ Module::AutoInstall::do_install();
}
1;
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Base.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Base.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Base.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,41 +1,52 @@
-#line 1 "inc/Module/Install/Base.pm - /Library/Perl/5.8.1/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /Library/Perl/5.8.6/Module/Install/Base.pm"
package Module::Install::Base;
-#line 28
+$VERSION = '0.57';
+# Suspend handler for "redefined" warnings
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
+
+### This is the ONLY module that shouldn't have strict on
+# use strict;
+
+#line 41
+
sub new {
my ($class, %args) = @_;
- foreach my $method (qw(call load)) {
+ foreach my $method ( qw(call load) ) {
*{"$class\::$method"} = sub {
- +shift->_top->$method(@_);
+ shift()->_top->$method(@_);
} unless defined &{"$class\::$method"};
}
- bless(\%args, $class);
+ bless( \%args, $class );
}
-#line 46
+#line 61
sub AUTOLOAD {
my $self = shift;
- goto &{$self->_top->autoload};
+ local $@;
+ my $autoload = eval { $self->_top->autoload } or return;
+ goto &$autoload;
}
-#line 57
+#line 76
sub _top { $_[0]->{_top} }
-#line 68
+#line 89
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -44,11 +55,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
+
sub DESTROY {}
+# Restore warning handler
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
+
1;
-__END__
-
-#line 112
+#line 138
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Build.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Build.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Build.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,9 +1,12 @@
-#line 1 "inc/Module/Install/Build.pm - /Library/Perl/5.8.1/Module/Install/Build.pm"
+#line 1 "inc/Module/Install/Build.pm - /Library/Perl/5.8.6/Module/Install/Build.pm"
package Module::Install::Build;
-$VERSION = '0.01';
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
+$VERSION = '0.57';
+
use strict;
-use vars qw(@ISA);
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
sub Build { $_[0] }
@@ -14,13 +17,14 @@
my %args;
my $build;
- $args{dist_name} = $self->name || $self->determine_NAME($self->{args});
- $args{license} = $self->license;
- $args{dist_version} = $self->version || $self->determine_VERSION($self->{args});
+ $args{dist_name} = $self->name || $self->determine_NAME($self->{args});
+ $args{license} = $self->license;
+ $args{test_files} = $self->tests;
+ $args{dist_version} = $self->version || $self->determine_VERSION($self->{args});
$args{dist_abstract} = $self->abstract;
- $args{dist_author} = $self->author;
- $args{sign} = $self->sign;
- $args{no_index} = $self->no_index;
+ $args{dist_author} = $self->author;
+ $args{sign} = $self->sign;
+ $args{no_index} = $self->no_index;
foreach my $key (qw(build_requires requires recommends conflicts)) {
my $val = eval "\$self->$key" or next;
@@ -55,9 +59,8 @@
# <DrMath> ingy: then my $build = new MyBuilder( ...parameters... );
# $build->write_build_script;
-
1;
__END__
-#line 175
+#line 177
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Can.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Can.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Can.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,13 +1,33 @@
-#line 1 "inc/Module/Install/Can.pm - /Library/Perl/5.8.1/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /Library/Perl/5.8.6/Module/Install/Can.pm"
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
+$VERSION = '0.57';
+
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
+# This may introduce a 5.005 dependency, or at the very least it may
+# not bootstrap properly under 5.004.
+use File::Spec ();
+
+# check if we can load some module
+sub can_use {
+ my ($self, $mod, $ver) = @_;
+ $mod =~ s{::|\\}{/}g;
+ $mod .= ".pm" unless $mod =~ /\.pm$/i;
+
+ my $pkg = $mod;
+ $pkg =~ s{/}{::}g;
+ $pkg =~ s{\.pm$}{}i;
+
+ local $@;
+ eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+}
+
# check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -35,4 +55,21 @@
return;
}
+# Fix Cygwin bug on maybe_command();
+if ($^O eq 'cygwin') {
+ require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ *ExtUtils::MM_Cygwin::maybe_command = sub {
+ my ($self, $file) = @_;
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ ExtUtils::MM_Win32->maybe_command($file);
+ }
+ else {
+ ExtUtils::MM_Unix->maybe_command($file);
+ }
+ }
+ }
+}
+
1;
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Fetch.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Fetch.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Fetch.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,15 +1,17 @@
-#line 1 "inc/Module/Install/Fetch.pm - /Library/Perl/5.8.1/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /Library/Perl/5.8.6/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+$VERSION = '0.57';
+
sub get_file {
my ($self, %args) = @_;
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Include.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Include.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Include.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,10 +1,31 @@
-#line 1 "inc/Module/Install/Include.pm - /Library/Perl/5.8.1/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /Library/Perl/5.8.6/Module/Install/Include.pm"
package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-sub include { +shift->admin->include(@_) };
-sub include_deps { +shift->admin->include_deps(@_) };
-sub auto_include { +shift->admin->auto_include(@_) };
-sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+$VERSION = '0.57';
+
+use strict;
+
+sub include {
+ shift()->admin->include(@_);
+}
+
+sub include_deps {
+ shift()->admin->include_deps(@_);
+}
+
+sub auto_include {
+ shift()->admin->auto_include(@_);
+}
+
+sub auto_include_deps {
+ shift()->admin->auto_include_deps(@_);
+}
+
+sub auto_include_dependent_dists {
+ shift()->admin->auto_include_dependent_dists(@_);
+}
+
1;
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Makefile.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Makefile.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Makefile.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,17 +1,19 @@
-#line 1 "inc/Module/Install/Makefile.pm - /Library/Perl/5.8.1/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /Library/Perl/5.8.6/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
-
use strict 'vars';
-use vars '$VERSION';
-
+use Module::Install::Base;
use ExtUtils::MakeMaker ();
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.57';
+ @ISA = qw{Module::Install::Base};
+}
+
sub Makefile { $_[0] }
-sub prompt {
+sub prompt {
shift;
goto &ExtUtils::MakeMaker::prompt;
}
@@ -23,18 +25,37 @@
$args;
}
+# For mm args that take multiple space-seperated args,
+# append an argument to the current list.
+sub makemaker_append {
+ my $self = shift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
+}
+
+sub build_subdirs {
+ my $self = shift;
+ my $subdirs = $self->makemaker_args->{DIR} ||= [];
+ for my $subdir (@_) {
+ push @$subdirs, $subdir;
+ }
+}
+
sub clean_files {
- my $self = shift;
+ my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
%$clean,
- FILES => join(" ", grep length, $clean->{FILES}, @_),
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
);
}
sub libs {
my $self = shift;
- my $libs = ref $_[0] ? shift : [shift];
+ my $libs = ref $_[0] ? shift : [ shift ];
$self->makemaker_args( LIBS => $libs );
}
@@ -54,15 +75,17 @@
$args->{VERSION} = $self->version || $self->determine_VERSION($args);
$args->{NAME} =~ s/-/::/g;
+ $args->{test} = {TESTS => $self->tests} if $self->tests;
+
if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
+ $args->{ABSTRACT} = $self->abstract;
+ $args->{AUTHOR} = $self->author;
}
if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
$args->{NO_META} = 1;
}
if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 ) {
- $args->{SIGN} = 1 if $self->sign;
+ $args->{SIGN} = 1 if $self->sign;
}
delete $args->{SIGN} unless $self->is_admin;
@@ -72,10 +95,13 @@
($self->build_requires, $self->requires) );
# merge both kinds of requires into prereq_pm
- my $dir = ($args->{DIR} ||= []);
+ my $subdirs = ($args->{DIR} ||= []);
if ($self->bundles) {
- push @$dir, map "$_->[1]", @{$self->bundles};
- delete $prereq->{$_->[0]} for @{$self->bundles};
+ foreach my $bundle (@{ $self->bundles }) {
+ my ($file, $dir) = @$bundle;
+ push @$subdirs, $dir if -d $dir;
+ delete $prereq->{$file};
+ }
}
if (my $perl_version = $self->perl_version) {
@@ -106,9 +132,10 @@
my $postamble = "# Postamble by $top_class $top_version\n" .
($self->postamble || '');
+ local *MAKEFILE;
open MAKEFILE, '< Makefile' or die $!;
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE;
+ close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
@@ -118,8 +145,10 @@
$makefile =~ s/^(PERL = .*)/$1 -Iinc/m;
open MAKEFILE, '> Makefile' or die $!;
- print MAKEFILE "$preamble$makefile$postamble";
- close MAKEFILE;
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
@@ -130,7 +159,6 @@
sub postamble {
my ($self, $text) = @_;
-
$self->{postamble} ||= $self->admin->postamble;
$self->{postamble} .= $text if defined $text;
$self->{postamble}
@@ -140,4 +168,4 @@
__END__
-#line 273
+#line 295
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Metadata.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Metadata.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Metadata.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,25 +1,31 @@
-#line 1 "inc/Module/Install/Metadata.pm - /Library/Perl/5.8.1/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /Library/Perl/5.8.6/Module/Install/Metadata.pm"
package Module::Install::Metadata;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.04';
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
+$VERSION = '0.57';
+
use strict 'vars';
-use vars qw($VERSION);
-sub Meta { shift }
+my @scalar_keys = qw{
+ name module_name abstract author version license
+ distribution_type perl_version tests
+};
-my @scalar_keys = qw(
- name module_name version abstract author license
- distribution_type sign perl_version
-);
-my @tuple_keys = qw(build_requires requires recommends bundles);
+my @tuple_keys = qw{
+ build_requires requires recommends bundles
+};
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
+
foreach my $key (@scalar_keys) {
*$key = sub {
my $self = shift;
- return $self->{'values'}{$key} unless @_;
- $self->{'values'}{$key} = shift;
+ return $self->{values}{$key} if defined wantarray and !@_;
+ $self->{values}{$key} = shift;
return $self;
};
}
@@ -27,122 +33,161 @@
foreach my $key (@tuple_keys) {
*$key = sub {
my $self = shift;
- return $self->{'values'}{$key} unless @_;
+ return $self->{values}{$key} unless @_;
+
my @rv;
while (@_) {
- my $module = shift or last;
+ my $module = shift or last;
my $version = shift || 0;
- if ($module eq 'perl') {
+ if ( $module eq 'perl' ) {
$version =~ s{^(\d+)\.(\d+)\.(\d+)}
{$1 + $2/1_000 + $3/1_000_000}e;
$self->perl_version($version);
next;
}
- my $rv = [$module, $version];
- push @{$self->{'values'}{$key}}, $rv;
+ my $rv = [ $module, $version ];
push @rv, $rv;
}
- return @rv;
+ push @{ $self->{values}{$key} }, @rv;
+ @rv;
};
}
-sub features {
+sub sign {
my $self = shift;
- while (my ($name, $mods) = splice(@_, 0, 2)) {
- my $count = 0;
- push @{$self->{'values'}{'features'}}, ($name => [
- map { (++$count % 2 and ref($_) and ($count += $#$_)) ? @$_ : $_ } @$mods
- ] );
+ return $self->{'values'}{'sign'} if defined wantarray and !@_;
+ $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
+ return $self;
+}
+
+sub dynamic_config {
+ my $self = shift;
+ unless ( @_ ) {
+ warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ return $self;
+ }
+ $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0;
+ return $self;
+}
+
+sub all_from {
+ my ( $self, $file ) = @_;
+
+ unless ( defined($file) ) {
+ my $name = $self->name
+ or die "all_from called with no args without setting name() first";
+ $file = join('/', 'lib', split(/-/, $name)) . '.pm';
+ $file =~ s{.*/}{} unless -e $file;
+ die "all_from: cannot find $file from $name" unless -e $file;
}
- return @{$self->{'values'}{'features'}};
+
+ $self->version_from($file) unless $self->version;
+ $self->perl_version_from($file) unless $self->perl_version;
+
+ # The remaining probes read from POD sections; if the file
+ # has an accompanying .pod, use that instead
+ my $pod = $file;
+ if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) {
+ $file = $pod;
+ }
+
+ $self->author_from($file) unless $self->author;
+ $self->license_from($file) unless $self->license;
+ $self->abstract_from($file) unless $self->abstract;
}
-sub no_index {
- my $self = shift;
- my $type = shift;
- push @{$self->{'values'}{'no_index'}{$type}}, @_ if $type;
- return $self->{'values'}{'no_index'};
+sub provides {
+ my $self = shift;
+ my $provides = ( $self->{values}{provides} ||= {} );
+ %$provides = (%$provides, @_) if @_;
+ return $provides;
}
-sub _dump {
+sub auto_provides {
my $self = shift;
- my $package = ref($self->_top);
- my $version = $self->_top->VERSION;
- my %values = %{$self->{'values'}};
+ return $self unless $self->is_admin;
- delete $values{sign};
- if (my $perl_version = delete $values{perl_version}) {
- # Always canonical to three-dot version
- $perl_version =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2), int($3))}e
- if $perl_version >= 5.006;
- $values{requires} = [
- [perl => $perl_version],
- @{$values{requires}||[]},
- ];
+ unless (-e 'MANIFEST') {
+ warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
+ return $self;
}
- warn "No license specified, setting license = 'unknown'\n"
- unless $values{license};
+ # Avoid spurious warnings as we are not checking manifest here.
- $values{license} ||= 'unknown';
- $values{distribution_type} ||= 'module';
- $values{name} ||= do {
- my $name = $values{module_name};
- $name =~ s/::/-/g;
- $name;
- } if $values{module_name};
+ local $SIG{__WARN__} = sub {1};
+ require ExtUtils::Manifest;
+ local *ExtUtils::Manifest::manicheck = sub { return };
- if ($values{name} =~ /::/) {
- my $name = $values{name};
- $name =~ s/::/-/g;
- die "Error in name(): '$values{name}' should be '$name'!\n";
- }
+ require Module::Build;
+ my $build = Module::Build->new(
+ dist_name => $self->{name},
+ dist_version => $self->{version},
+ license => $self->{license},
+ );
+ $self->provides(%{ $build->find_dist_packages || {} });
+}
- my $dump = '';
- foreach my $key (@scalar_keys) {
- $dump .= "$key: $values{$key}\n" if exists $values{$key};
+sub feature {
+ my $self = shift;
+ my $name = shift;
+ my $features = ( $self->{values}{features} ||= [] );
+
+ my $mods;
+
+ if ( @_ == 1 and ref( $_[0] ) ) {
+ # The user used ->feature like ->features by passing in the second
+ # argument as a reference. Accomodate for that.
+ $mods = $_[0];
+ } else {
+ $mods = \@_;
}
- foreach my $key (@tuple_keys) {
- next unless exists $values{$key};
- $dump .= "$key:\n";
- foreach (@{$values{$key}}) {
- $dump .= " $_->[0]: $_->[1]\n";
- }
- }
- if (my $no_index = $values{no_index}) {
- push @{$no_index->{'directory'}}, 'inc';
- require YAML;
- local $YAML::UseHeader = 0;
- $dump .= YAML::Dump({ no_index => $no_index});
+ my $count = 0;
+ push @$features, (
+ $name => [
+ map {
+ ref($_) ? ( ref($_) eq 'HASH' ) ? %$_
+ : @$_
+ : $_
+ } @$mods
+ ]
+ );
+
+ return @$features;
+}
+
+sub features {
+ my $self = shift;
+ while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
+ $self->feature( $name, @$mods );
}
- else {
- $dump .= << "META";
-no_index:
- directory:
- - inc
-META
- }
-
- $dump .= "generated_by: $package version $version\n";
- return $dump;
+ return @{ $self->{values}{features} };
}
+sub no_index {
+ my $self = shift;
+ my $type = shift;
+ push @{ $self->{values}{no_index}{$type} }, @_ if $type;
+ return $self->{values}{no_index};
+}
+
sub read {
my $self = shift;
$self->include_deps( 'YAML', 0 );
+
require YAML;
- my $data = YAML::LoadFile( 'META.yml' );
+ my $data = YAML::LoadFile('META.yml');
+
# Call methods explicitly in case user has already set some values.
- while ( my ($key, $value) = each %$data ) {
- next unless $self->can( $key );
- if (ref $value eq 'HASH') {
- while (my ($module, $version) = each %$value) {
- $self->$key( $module => $version );
+ while ( my ( $key, $value ) = each %$data ) {
+ next unless $self->can($key);
+ if ( ref $value eq 'HASH' ) {
+ while ( my ( $module, $version ) = each %$value ) {
+ $self->can($key)->($self, $module => $version );
}
}
else {
- $self->$key( $value );
+ $self->can($key)->($self, $value);
}
}
return $self;
@@ -151,37 +196,113 @@
sub write {
my $self = shift;
return $self unless $self->is_admin;
-
- META_NOT_OURS: {
- local *FH;
- if (open FH, "META.yml") {
- while (<FH>) {
- last META_NOT_OURS if /^generated_by: Module::Install\b/;
- }
- return $self if -s FH;
- }
- }
-
- warn "Writing META.yml\n";
- open META, "> META.yml" or warn "Cannot write to META.yml: $!";
- print META $self->_dump;
- close META;
+ $self->admin->write_meta;
return $self;
}
sub version_from {
- my ($self, $version_from) = @_;
+ my ( $self, $file ) = @_;
require ExtUtils::MM_Unix;
- $self->version(ExtUtils::MM_Unix->parse_version($version_from));
+ $self->version( ExtUtils::MM_Unix->parse_version($file) );
}
sub abstract_from {
- my ($self, $abstract_from) = @_;
+ my ( $self, $file ) = @_;
require ExtUtils::MM_Unix;
$self->abstract(
- bless( { DISTNAME => $self->name }, 'ExtUtils::MM_Unix')
- ->parse_abstract($abstract_from)
- );
+ bless(
+ { DISTNAME => $self->name },
+ 'ExtUtils::MM_Unix'
+ )->parse_abstract($file)
+ );
}
+sub _slurp {
+ my ( $self, $file ) = @_;
+
+ local *FH;
+ open FH, "< $file" or die "Cannot open $file.pod: $!";
+ do { local $/; <FH> };
+}
+
+sub perl_version_from {
+ my ( $self, $file ) = @_;
+
+ if (
+ $self->_slurp($file) =~ m/
+ ^
+ use \s*
+ v?
+ ([\d\.]+)
+ \s* ;
+ /ixms
+ )
+ {
+ $self->perl_version($1);
+ }
+ else {
+ warn "Cannot determine perl version info from $file\n";
+ return;
+ }
+}
+
+sub author_from {
+ my ( $self, $file ) = @_;
+ my $content = $self->_slurp($file);
+ if ($content =~ m/
+ =head \d \s+ (?:authors?)\b \s*
+ ([^\n]*)
+ |
+ =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
+ .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
+ ([^\n]*)
+ /ixms) {
+ my $author = $1 || $2;
+ $author =~ s{E<lt>}{<}g;
+ $author =~ s{E<gt>}{>}g;
+ $self->author($author);
+ }
+ else {
+ warn "Cannot determine author info from $file\n";
+ }
+}
+
+sub license_from {
+ my ( $self, $file ) = @_;
+
+ if (
+ $self->_slurp($file) =~ m/
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ (.*?)
+ (=head\\d.*|=cut.*|)
+ \z
+ /ixms
+ )
+ {
+ my $license_text = $1;
+ my @phrases = (
+ 'under the same (?:terms|license) as perl itself' => 'perl',
+ 'GNU public license' => 'gpl',
+ 'GNU lesser public license' => 'gpl',
+ 'BSD license' => 'bsd',
+ 'Artistic license' => 'artistic',
+ 'GPL' => 'gpl',
+ 'LGPL' => 'lgpl',
+ 'BSD' => 'bsd',
+ 'Artistic' => 'artistic',
+ );
+ while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
+ $pattern =~ s{\s+}{\\s+}g;
+ if ( $license_text =~ /\b$pattern\b/i ) {
+ $self->license($license);
+ return 1;
+ }
+ }
+ }
+
+ warn "Cannot determine license info from $file\n";
+ return 'unknown';
+}
+
1;
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/Win32.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/Win32.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/Win32.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,9 +1,11 @@
-#line 1 "inc/Module/Install/Win32.pm - /Library/Perl/5.8.1/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /Library/Perl/5.8.6/Module/Install/Win32.pm"
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.02';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+$VERSION = '0.57';
+
use strict;
# determine if the user needs nmake, and download it if needed
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install/WriteAll.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install/WriteAll.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install/WriteAll.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,33 +1,37 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /Library/Perl/5.8.1/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /Library/Perl/5.8.6/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
+$VERSION = '0.57';
+
+use strict;
+
sub WriteAll {
my $self = shift;
my %args = (
- meta => 1,
- sign => 0,
- inline => 0,
+ meta => 1,
+ sign => 0,
+ inline => 0,
check_nmake => 1,
@_
);
- $self->sign(1) if $args{sign};
- $self->Meta->write if $args{meta};
+ $self->sign(1) if $args{sign};
+ $self->Meta->write if $args{meta};
$self->admin->WriteAll(%args) if $self->is_admin;
- if ($0 =~ /Build.PL$/i) {
- $self->Build->write;
- }
- else {
- $self->check_nmake if $args{check_nmake};
- $self->makemaker_args( PL_FILES => {} )
- unless $self->makemaker_args->{'PL_FILES'};
-
+ if ( $0 =~ /Build.PL$/i ) {
+ $self->Build->write;
+ } else {
+ $self->check_nmake if $args{check_nmake};
+ unless ( $self->makemaker_args->{'PL_FILES'} ) {
+ $self->makemaker_args( PL_FILES => {} );
+ }
if ($args{inline}) {
$self->Inline->write;
- }
- else {
+ } else {
$self->Makefile->write;
}
}
Modified: packages/libxml-feed-perl/trunk/inc/Module/Install.pm
===================================================================
--- packages/libxml-feed-perl/trunk/inc/Module/Install.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/inc/Module/Install.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,8 +1,23 @@
-#line 1 "inc/Module/Install.pm - /Library/Perl/5.8.1/Module/Install.pm"
+#line 1 "/Users/btrott/devel/cpan/xml-feed/inc/Module/Install.pm - /Library/Perl/5.8.6/Module/Install.pm"
package Module::Install;
-$VERSION = '0.36';
-die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'};
+use 5.004;
+use strict 'vars';
+
+use vars qw{$VERSION};
+BEGIN {
+ # All Module::Install core packages now require synchronised versions.
+ # This will be used to ensure we don't accidentally load old or
+ # different versions of modules.
+ # 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.57';
+}
+
+# inc::Module::Install must be loaded first
+unless ( $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'} ) {
+ die <<"END_DIE";
Please invoke ${\__PACKAGE__} with:
use inc::${\__PACKAGE__};
@@ -11,23 +26,40 @@
use ${\__PACKAGE__};
-.
+END_DIE
+}
-use strict 'vars';
-use Cwd ();
+use Cwd ();
use File::Find ();
use File::Path ();
+use FindBin;
- at inc::Module::Install::ISA = 'Module::Install';
*inc::Module::Install::VERSION = *VERSION;
+ at inc::Module::Install::ISA = 'Module::Install';
-#line 129
+sub autoload {
+ my $self = shift;
+ my $caller = $self->_caller;
+ my $cwd = Cwd::cwd();
+ my $sym = "$caller\::AUTOLOAD";
+ $sym->{$cwd} = sub {
+ my $pwd = Cwd::cwd();
+ if ( my $code = $sym->{$pwd} ) {
+ # delegate back to parent dirs
+ goto &$code unless $cwd eq $pwd;
+ }
+ $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller - $sym";
+ unshift @_, ($self, $1);
+ goto &{$self->can('call')} unless uc($1) eq $1;
+ };
+}
+
sub import {
my $class = shift;
- my $self = $class->new(@_);
+ my $self = $class->new(@_);
- if (not -f $self->{file}) {
+ unless ( -f $self->{file} ) {
require "$self->{path}/$self->{dispatch}.pm";
File::Path::mkpath("$self->{prefix}/$self->{author}");
$self->{admin} =
@@ -37,71 +69,87 @@
goto &{"$self->{name}::import"};
}
- *{caller(0) . "::AUTOLOAD"} = $self->autoload;
+ *{$self->_caller . "::AUTOLOAD"} = $self->autoload;
+ $self->preload;
# Unregister loader and worker packages so subdirs can use them again
delete $INC{"$self->{file}"};
delete $INC{"$self->{path}.pm"};
}
-#line 156
+sub preload {
+ my ($self) = @_;
-sub autoload {
- my $self = shift;
- my $caller = caller;
+ unless ( $self->{extensions} ) {
+ $self->load_extensions(
+ "$self->{prefix}/$self->{path}", $self
+ );
+ }
- my $cwd = Cwd::cwd();
- my $sym = "$caller\::AUTOLOAD";
+ my @exts = @{$self->{extensions}};
+ unless ( @exts ) {
+ my $admin = $self->{admin};
+ @exts = $admin->load_all_extensions;
+ }
- $sym->{$cwd} = sub {
- my $pwd = Cwd::cwd();
- if (my $code = $sym->{$pwd}) {
- goto &$code unless $cwd eq $pwd; # delegate back to parent dirs
+ my %seen;
+ foreach my $obj ( @exts ) {
+ while (my ($method, $glob) = each %{ref($obj) . '::'}) {
+ next unless defined *{$glob}{CODE};
+ next if $method =~ /^_/;
+ next if $method eq uc($method);
+ $seen{$method}++;
}
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller";
- unshift @_, ($self, $1);
- goto &{$self->can('call')} unless uc($1) eq $1;
- };
+ }
+
+ my $caller = $self->_caller;
+ foreach my $name ( sort keys %seen ) {
+ *{"${caller}::$name"} = sub {
+ ${"${caller}::AUTOLOAD"} = "${caller}::$name";
+ goto &{"${caller}::AUTOLOAD"};
+ };
+ }
}
-#line 181
-
sub new {
my ($class, %args) = @_;
+ # ignore the prefix on extension modules built from top level.
+ my $base_path = Cwd::abs_path($FindBin::Bin);
+ unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+ delete $args{prefix};
+ }
+
return $args{_self} if $args{_self};
$args{dispatch} ||= 'Admin';
$args{prefix} ||= 'inc';
$args{author} ||= '.author';
$args{bundle} ||= 'inc/BUNDLES';
+ $args{base} ||= $base_path;
$class =~ s/^\Q$args{prefix}\E:://;
$args{name} ||= $class;
$args{version} ||= $class->VERSION;
- unless ($args{path}) {
+ unless ( $args{path} ) {
$args{path} = $args{name};
$args{path} =~ s!::!/!g;
}
- $args{file} ||= "$args{prefix}/$args{path}.pm";
+ $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
bless(\%args, $class);
}
-#line 210
-
sub call {
my $self = shift;
my $method = shift;
- my $obj = $self->load($method) or return;
+ my $obj = $self->load($method) or return;
unshift @_, $obj;
goto &{$obj->can($method)};
}
-#line 225
-
sub load {
my ($self, $method) = @_;
@@ -113,10 +161,10 @@
return $obj if $obj->can($method);
}
- my $admin = $self->{admin} or die << "END";
+ my $admin = $self->{admin} or die <<"END_DIE";
The '$method' method does not exist in the '$self->{prefix}' path!
Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END
+END_DIE
my $obj = $admin->load($method, 1);
push @{$self->{extensions}}, $obj;
@@ -124,8 +172,6 @@
$obj;
}
-#line 255
-
sub load_extensions {
my ($self, $path, $top_obj) = @_;
@@ -137,33 +183,46 @@
my ($file, $pkg) = @{$rv};
next if $self->{pathnames}{$pkg};
- eval { require $file; 1 } or (warn($@), next);
+ local $@;
+ my $new = eval { require $file; $pkg->can('new') };
+ unless ( $new ) {
+ warn $@ if $@;
+ next;
+ }
$self->{pathnames}{$pkg} = delete $INC{$file};
- push @{$self->{extensions}}, $pkg->new( _top => $top_obj );
+ push @{$self->{extensions}}, &{$new}($pkg, _top => $top_obj );
}
+
+ $self->{extensions} ||= [];
}
-#line 279
-
sub find_extensions {
my ($self, $path) = @_;
+
my @found;
-
- File::Find::find(sub {
+ File::Find::find( sub {
my $file = $File::Find::name;
return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
return if $1 eq $self->{dispatch};
$file = "$self->{path}/$1.pm";
my $pkg = "$self->{name}::$1"; $pkg =~ s!/!::!g;
- push @found, [$file, $pkg];
- }, $path) if -d $path;
+ push @found, [ $file, $pkg ];
+ }, $path ) if -d $path;
@found;
}
-1;
+sub _caller {
+ my $depth = 0;
+ my $caller = caller($depth);
-__END__
+ while ($caller eq __PACKAGE__) {
+ $depth++;
+ $caller = caller($depth);
+ }
-#line 617
+ $caller;
+}
+
+1;
Modified: packages/libxml-feed-perl/trunk/lib/XML/Feed/Atom.pm
===================================================================
--- packages/libxml-feed-perl/trunk/lib/XML/Feed/Atom.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/lib/XML/Feed/Atom.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,4 +1,4 @@
-# $Id: Atom.pm 1865 2005-08-09 20:15:31Z btrott $
+# $Id: Atom.pm 1924 2006-03-03 17:34:15Z btrott $
package XML::Feed::Atom;
use strict;
@@ -7,6 +7,7 @@
use XML::Atom::Feed;
use XML::Atom::Util qw( iso2dt );
use List::Util qw( first );
+use DateTime::Format::W3CDTF;
sub init_empty {
my $feed = shift;
@@ -56,7 +57,7 @@
sub modified {
my $feed = shift;
if (@_) {
- $feed->{atom}->modified($_[0]->iso8601 . 'Z');
+ $feed->{atom}->modified(DateTime::Format::W3CDTF->format_datetime($_[0]));
} else {
iso2dt($feed->{atom}->modified);
}
@@ -159,7 +160,7 @@
sub issued {
my $entry = shift;
if (@_) {
- $entry->{entry}->issued($_[0]->iso8601 . 'Z') if $_[0];
+ $entry->{entry}->issued(DateTime::Format::W3CDTF->format_datetime($_[0])) if $_[0];
} else {
$entry->{entry}->issued ? iso2dt($entry->{entry}->issued) : undef;
}
@@ -168,7 +169,7 @@
sub modified {
my $entry = shift;
if (@_) {
- $entry->{entry}->modified($_[0]->iso8601 . 'Z') if $_[0];
+ $entry->{entry}->modified(DateTime::Format::W3CDTF->format_datetime($_[0])) if $_[0];
} else {
$entry->{entry}->modified ? iso2dt($entry->{entry}->modified) : undef;
}
Modified: packages/libxml-feed-perl/trunk/lib/XML/Feed/RSS.pm
===================================================================
--- packages/libxml-feed-perl/trunk/lib/XML/Feed/RSS.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/lib/XML/Feed/RSS.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,4 +1,4 @@
-# $Id: RSS.pm 1865 2005-08-09 20:15:31Z btrott $
+# $Id: RSS.pm 1917 2006-02-07 07:11:44Z btrott $
package XML::Feed::RSS;
use strict;
@@ -209,13 +209,18 @@
$item->{dc}{date} = DateTime::Format::W3CDTF->format_datetime($_[0]);
$item->{pubDate} = DateTime::Format::Mail->format_datetime($_[0]);
} else {
- if (my $ts = $item->{pubDate}) {
- my $parser = DateTime::Format::Mail->new;
- $parser->loose;
- return $parser->parse_datetime($ts);
- } elsif ($ts = $item->{dc}{date}) {
- return DateTime::Format::W3CDTF->parse_datetime($ts);
- }
+ ## Either of these could die if the format is invalid.
+ my $date;
+ eval {
+ if (my $ts = $item->{pubDate}) {
+ my $parser = DateTime::Format::Mail->new;
+ $parser->loose;
+ $date = $parser->parse_datetime($ts);
+ } elsif ($ts = $item->{dc}{date}) {
+ $date = DateTime::Format::W3CDTF->parse_datetime($ts);
+ }
+ };
+ return $date;
}
}
@@ -226,7 +231,7 @@
DateTime::Format::W3CDTF->format_datetime($_[0]);
} else {
if (my $ts = $item->{'http://purl.org/rss/1.0/modules/dcterms/'}{modified}) {
- return DateTime::Format::W3CDTF->parse_datetime($ts);
+ return eval { DateTime::Format::W3CDTF->parse_datetime($ts) };
}
}
}
Modified: packages/libxml-feed-perl/trunk/lib/XML/Feed.pm
===================================================================
--- packages/libxml-feed-perl/trunk/lib/XML/Feed.pm 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/lib/XML/Feed.pm 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,4 +1,4 @@
-# $Id: Feed.pm 1872 2005-08-12 04:28:42Z btrott $
+# $Id: Feed.pm 1920 2006-02-28 00:00:56Z btrott $
package XML::Feed;
use strict;
@@ -8,7 +8,7 @@
use URI::Fetch;
use Carp;
-our $VERSION = '0.07';
+our $VERSION = '0.08';
sub new {
my $class = shift;
@@ -97,7 +97,7 @@
my $feed = shift;
my($format) = @_;
my $new = __PACKAGE__->new($format);
- for my $field (qw( title link description language copyright modified generator )) {
+ for my $field (qw( title link description language author copyright modified generator )) {
my $val = $feed->$field();
next unless defined $val;
$new->$field($val);
Modified: packages/libxml-feed-perl/trunk/t/01-parse.t
===================================================================
--- packages/libxml-feed-perl/trunk/t/01-parse.t 2006-03-10 21:42:15 UTC (rev 2307)
+++ packages/libxml-feed-perl/trunk/t/01-parse.t 2006-03-10 21:44:16 UTC (rev 2308)
@@ -1,7 +1,7 @@
-# $Id: 01-parse.t 1867 2005-08-09 20:41:15Z btrott $
+# $Id: 01-parse.t 1921 2006-02-28 02:50:52Z btrott $
use strict;
-use Test::More tests => 70;
+use Test::More tests => 72;
use XML::Feed;
use URI;
@@ -68,3 +68,9 @@
my $entry = ($feed->entries)[0];
ok(!$entry->summary->body);
like($entry->content->body, qr/<p>This is a test.<\/p>/);
+
+$feed = XML::Feed->parse('t/samples/rss10-invalid-date.xml')
+ or die XML::Feed->errstr;
+$entry = ($feed->entries)[0];
+ok(!$entry->issued); ## Should return undef, but not die.
+ok(!$entry->modified); ## Same.
Copied: packages/libxml-feed-perl/trunk/t/samples/rss10-invalid-date.xml (from rev 2307, packages/libxml-feed-perl/branches/upstream/current/t/samples/rss10-invalid-date.xml)
More information about the Pkg-perl-cvs-commits
mailing list