This is an automated email from the git hooks/post-receive script. nickm-guest pushed a commit to branch master in repository libwww-search-perl.
commit 6536ec2a45bbcd3570f2e9e69e7057acb8ea1b91 Author: Nick Morrott <knowledgejun...@gmail.com> Date: Tue Jul 26 13:30:54 2016 +0100 Update WWW::Search::Ebay to 3.046 --- ebay/Changes | 8 +++++++ ebay/MANIFEST | 7 +++--- ebay/META.yml | 7 ++---- ebay/Makefile.PL | 8 +++---- ebay/inc/Module/Install.pm | 2 +- ebay/inc/Module/Install/Base.pm | 2 +- ebay/inc/Module/Install/Can.pm | 2 +- ebay/inc/Module/Install/Fetch.pm | 2 +- ebay/inc/Module/Install/Makefile.pm | 2 +- ebay/inc/Module/Install/Metadata.pm | 2 +- ebay/inc/Module/Install/PerlTar.pm | 45 ------------------------------------- ebay/inc/Module/Install/Win32.pm | 2 +- ebay/inc/Module/Install/WriteAll.pm | 2 +- ebay/lib/WWW/Search/Ebay.pm | 20 +++++++++++++---- ebay/t/ebay.t | 4 +++- ebay/{t => xt}/pod-coverage.t | 0 ebay/{t => xt}/pod.t | 0 17 files changed, 43 insertions(+), 72 deletions(-) diff --git a/ebay/Changes b/ebay/Changes index 97ef7cc..ac77775 100644 --- a/ebay/Changes +++ b/ebay/Changes @@ -1,3 +1,11 @@ +2016-02-07 Kingpin <martin@localhost.localdomain> + + * lib/WWW/Search/Ebay.pm (_parse_shipping): allow shipping to be "unknown" + +2015-09-22 Kingpin <Martin@EV-9D9> + + * lib/WWW/Search/Ebay.pm (_parse_tree): try harder to avoid returning "other" items + 2015-09-13 Kingpin <Martin@EV-9D9> * lib/WWW/Search/Ebay.pm: added warning if no results count found diff --git a/ebay/MANIFEST b/ebay/MANIFEST index 3fd8962..32603a9 100644 --- a/ebay/MANIFEST +++ b/ebay/MANIFEST @@ -6,7 +6,6 @@ inc/Module/Install/Can.pm inc/Module/Install/Fetch.pm inc/Module/Install/Makefile.pm inc/Module/Install/Metadata.pm -inc/Module/Install/PerlTar.pm inc/Module/Install/Win32.pm inc/Module/Install/WriteAll.pm lib/WWW/Search/Ebay.pm @@ -19,7 +18,7 @@ lib/WWW/Search/Ebay/Motors.pm lib/WWW/Search/Ebay/Stores.pm LICENSE Makefile.PL -MANIFEST This list of files +MANIFEST META.yml README README.md @@ -28,7 +27,7 @@ t/coverage.t t/ebay.t t/enddate.t t/itemnumber.t -t/pod-coverage.t -t/pod.t xt/buyitnow.t xt/bysellerid.t +xt/pod-coverage.t +xt/pod.t diff --git a/ebay/META.yml b/ebay/META.yml index 30fb789..5c4fcf9 100644 --- a/ebay/META.yml +++ b/ebay/META.yml @@ -13,7 +13,7 @@ configure_requires: ExtUtils::MakeMaker: 6.36 distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.14' +generated_by: 'Module::Install version 1.16' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -25,9 +25,6 @@ no_index: - inc - t - xt -recommends: - Test::Pod: 0 - Test::Pod::Coverage: 0 requires: Date::Manip: 0 HTML::TreeBuilder: 0 @@ -37,4 +34,4 @@ requires: perl: 5.005 resources: license: http://dev.perl.org/licenses/ -version: 3.042 +version: 3.046 diff --git a/ebay/Makefile.PL b/ebay/Makefile.PL index df64420..ba2ea8a 100644 --- a/ebay/Makefile.PL +++ b/ebay/Makefile.PL @@ -3,7 +3,7 @@ use inc::Module::Install; -version(3.042); +version(3.046); all_from('lib/WWW/Search/Ebay.pm'); requires(perl => 5.005); @@ -16,8 +16,6 @@ test_requires('IO::Capture::Stderr'); requires('LWP::Simple'); # Test::More is needed for `make test`: test_requires('Test::More'); -recommends('Test::Pod'); -recommends('Test::Pod::Coverage'); # We need the version that has methods named with leading underscore: requires('WWW::Search' => 2.557); # We need the version that has the bidder and seller methods: @@ -53,11 +51,11 @@ if (0 && $ENV{MTHURN_PERL_DEV}) { warn " EEE did not find DIRFILESEP in Makefile\n"; } # if - if ($s !~ s/(pm_to_blib\(){{\@ARGV}}/$1 . '{@ARGV}'/e) + if ($s !~ s/(pm_to_blib\()\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) { warn " EEE did not find pm_to_blib@ARGV in Makefile\n"; } # if - if ($s !~ s/(from_to\s+=>\s+){{\@ARGV}}/$1 . '{@ARGV}'/e) + if ($s !~ s/(from_to\s+=>\s+)\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) { warn " EEE did not find from_to@ARGV in Makefile\n"; } # if diff --git a/ebay/inc/Module/Install.pm b/ebay/inc/Module/Install.pm index ff767fa..f44ab4d 100644 --- a/ebay/inc/Module/Install.pm +++ b/ebay/inc/Module/Install.pm @@ -31,7 +31,7 @@ BEGIN { # 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 = '1.14'; + $VERSION = '1.16'; # Storage for the pseudo-singleton $MAIN = undef; diff --git a/ebay/inc/Module/Install/Base.pm b/ebay/inc/Module/Install/Base.pm index 4206347..5762a74 100644 --- a/ebay/inc/Module/Install/Base.pm +++ b/ebay/inc/Module/Install/Base.pm @@ -4,7 +4,7 @@ package Module::Install::Base; use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; } # Suspend handler for "redefined" warnings diff --git a/ebay/inc/Module/Install/Can.pm b/ebay/inc/Module/Install/Can.pm index 9929b1b..d859276 100644 --- a/ebay/inc/Module/Install/Can.pm +++ b/ebay/inc/Module/Install/Can.pm @@ -8,7 +8,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/ebay/inc/Module/Install/Fetch.pm b/ebay/inc/Module/Install/Fetch.pm index 3d8de76..41d3517 100644 --- a/ebay/inc/Module/Install/Fetch.pm +++ b/ebay/inc/Module/Install/Fetch.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/ebay/inc/Module/Install/Makefile.pm b/ebay/inc/Module/Install/Makefile.pm index 66993af..e9918d2 100644 --- a/ebay/inc/Module/Install/Makefile.pm +++ b/ebay/inc/Module/Install/Makefile.pm @@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/; use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/ebay/inc/Module/Install/Metadata.pm b/ebay/inc/Module/Install/Metadata.pm index e547fa0..9792685 100644 --- a/ebay/inc/Module/Install/Metadata.pm +++ b/ebay/inc/Module/Install/Metadata.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/ebay/inc/Module/Install/PerlTar.pm b/ebay/inc/Module/Install/PerlTar.pm deleted file mode 100644 index 1df3d44..0000000 --- a/ebay/inc/Module/Install/PerlTar.pm +++ /dev/null @@ -1,45 +0,0 @@ -#line 1 -package Module::Install::PerlTar; - -use 5.006001; -use strict; -use warnings; -use Module::Install::Base (); - -our @ISA = qw(Module::Install::Base); -our $VERSION = '1.001'; -$VERSION =~ s/_//ms; - -sub use_ptar { - my $self = shift; - # warn " DDD start use_ptar(), WWW Module::Install::AUTHOR is =$Module::Install::AUTHOR=\n"; # Martin - - if (! $Module::Install::AUTHOR) - { - warn " WWW bailing because Module::Install::AUTHOR is not set\n"; # Martin - return; - } - - eval { require Archive::Tar; 1; } or warn "Cannot find Archive::Tar\n"; - eval { require IO::Compress::Gzip; 1; } - or warn "Cannot find IO::Compress::Gzip\n"; - - my %args = ( - TAR => 'ptar', - TARFLAGS => 'cf', - COMPRESS => -q{perl -MIO::Compress::Gzip=gzip,:constants -e"my $$in = $$ARGV[0]; gzip($$in => qq($$in.gz), q(Level) => Z_BEST_COMPRESSION, q(BinModeIn) => 1) or die q(gzip failed); unlink $$in;"}, - ); - # use Data::Dumper; # Martin - # warn " DDD adding the following to makemaker_args: ", Dumper(\%args); # Martin - $self->makemaker_args( dist => \%args ); - - return 1; -} ## end sub use_ptar - -1; -__END__ - -=encoding utf-8 - -#line 75 diff --git a/ebay/inc/Module/Install/Win32.pm b/ebay/inc/Module/Install/Win32.pm index 9706e5f..218a66b 100644 --- a/ebay/inc/Module/Install/Win32.pm +++ b/ebay/inc/Module/Install/Win32.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/ebay/inc/Module/Install/WriteAll.pm b/ebay/inc/Module/Install/WriteAll.pm index dbedc00..530749b 100644 --- a/ebay/inc/Module/Install/WriteAll.pm +++ b/ebay/inc/Module/Install/WriteAll.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.14'; + $VERSION = '1.16'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff --git a/ebay/lib/WWW/Search/Ebay.pm b/ebay/lib/WWW/Search/Ebay.pm index 11d2cec..c8ec11b 100644 --- a/ebay/lib/WWW/Search/Ebay.pm +++ b/ebay/lib/WWW/Search/Ebay.pm @@ -1,11 +1,11 @@ -# $Id: Ebay.pm,v 2.271 2015-09-13 14:28:54 Martin Exp $ - package WWW::Search::Ebay; use strict; use warnings; +our $VERSION = 2.273; + =head1 NAME WWW::Search::Ebay - backend for searching www.ebay.com @@ -135,8 +135,6 @@ use WWW::Search qw( generic_option strip_tags ); use WWW::SearchResult 2.072; use WWW::Search::Result; -our -$VERSION = 2.272; our $MAINTAINER = 'Martin Thurn <mth...@cpan.org>'; my $cgi = new CGI; @@ -527,6 +525,11 @@ sub _parse_shipping $iPrice =~ s!Â!!g; $iPrice =~ s!�!!g; print STDERR " DDD raw shipping ===$iPrice===\n" if (DEBUG_COLUMNS || (1 < $self->{_debug})); + if ($iPrice =~ m/UNKNOWN/i) + { + # No shipping info provided: + return 1; + } # if if ($iPrice =~ m/FREE/i) { $iPrice = 0.00; @@ -1014,6 +1017,15 @@ sub _parse_tree push(@{$self->{cache}}, $hit); $self->{'_num_hits'}++; $iHits++; + + if ($self->approximate_result_count() <= $iHits) + { + # We've already scraped all the hits that eBay said there were. + # Stop scraping, so that we don't return hits that are not an + # exact match to the query but are just "related": + last TD; + } # if + # Delete this HTML element so that future searches go faster? $oTDtitle->detach; $oTDtitle->delete; diff --git a/ebay/t/ebay.t b/ebay/t/ebay.t index ea6c7f6..2893cf6 100644 --- a/ebay/t/ebay.t +++ b/ebay/t/ebay.t @@ -10,7 +10,7 @@ use Bit::Vector; use Data::Dumper; use Date::Manip; use ExtUtils::testlib; -use Test::More 'no_plan'; +use Test::More; use WWW::Search; use WWW::Search::Test; @@ -137,5 +137,7 @@ pass('no-op'); ALL_DONE: pass('all done'); +done_testing(); + __END__ diff --git a/ebay/t/pod-coverage.t b/ebay/xt/pod-coverage.t similarity index 100% rename from ebay/t/pod-coverage.t rename to ebay/xt/pod-coverage.t diff --git a/ebay/t/pod.t b/ebay/xt/pod.t similarity index 100% rename from ebay/t/pod.t rename to ebay/xt/pod.t -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwww-search-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits