r1349 - in packages/libspreadsheet-parseexcel-simple-perl/trunk: .
debian t
Gunnar Wolf
gwolf at costa.debian.org
Tue Sep 6 21:32:57 UTC 2005
Author: gwolf
Date: 2005-09-06 21:32:57 +0000 (Tue, 06 Sep 2005)
New Revision: 1349
Added:
packages/libspreadsheet-parseexcel-simple-perl/trunk/lib/
packages/libspreadsheet-parseexcel-simple-perl/trunk/t/pod-coverage.t
packages/libspreadsheet-parseexcel-simple-perl/trunk/t/pod.t
packages/libspreadsheet-parseexcel-simple-perl/trunk/test.xls
Removed:
packages/libspreadsheet-parseexcel-simple-perl/trunk/Simple.pm
Modified:
packages/libspreadsheet-parseexcel-simple-perl/trunk/Changes
packages/libspreadsheet-parseexcel-simple-perl/trunk/MANIFEST
packages/libspreadsheet-parseexcel-simple-perl/trunk/META.yml
packages/libspreadsheet-parseexcel-simple-perl/trunk/Makefile.PL
packages/libspreadsheet-parseexcel-simple-perl/trunk/README
packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/changelog
packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/watch
packages/libspreadsheet-parseexcel-simple-perl/trunk/t/01.t
Log:
New upstream version
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/Changes
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/Changes 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/Changes 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,5 +1,9 @@
Revision history for Perl extension Spreadsheet::ParseExcel::Simple.
+1.03 Sat Sep 3 22:32:22 UTC 2005
+ - Document accessing the underlying Spreadsheet::ParseExcel objects
+ - Tidy tests
+
1.02 Wed Mar 23 2005
- handle single row worksheets
(Josh Rosenbaum, John McNamara)
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/MANIFEST
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/MANIFEST 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/MANIFEST 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,8 +1,11 @@
Changes
-MANIFEST
+lib/Spreadsheet/ParseExcel/Simple.pm
Makefile.PL
+MANIFEST This list of files
+META.yml
README
-Simple.pm
t/01.t
t/02.t
-META.yml Module meta-data (added by MakeMaker)
+t/pod-coverage.t
+t/pod.t
+test.xls
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/META.yml
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/META.yml 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/META.yml 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,12 +1,12 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Spreadsheet-ParseExcel-Simple
-version: 1.02
-version_from: Simple.pm
+version: 1.03
+version_from: lib/Spreadsheet/ParseExcel/Simple.pm
installdirs: site
requires:
Spreadsheet::ParseExcel: 0.18
Test::More: 0.01
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.21
+generated_by: ExtUtils::MakeMaker version 6.17
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/Makefile.PL
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/Makefile.PL 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/Makefile.PL 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,13 +1,12 @@
use ExtUtils::MakeMaker;
WriteMakefile(
- 'NAME' => 'Spreadsheet::ParseExcel::Simple',
- 'VERSION_FROM' => 'Simple.pm', # finds $VERSION
- 'PREREQ_PM' => {
- 'Spreadsheet::ParseExcel' => 0.18,
- 'Test::More' => 0.01,
- },
- ($] >= 5.005 ?
- (ABSTRACT_FROM => 'Simple.pm', # retrieve abstract from module
- AUTHOR => 'Tony Bowden <kasei at tmtm.com>') : ()),
+ NAME => 'Spreadsheet::ParseExcel::Simple',
+ AUTHOR => 'Tony Bowden <kasei at tmtm.com>',
+ VERSION_FROM => 'lib/Spreadsheet/ParseExcel/Simple.pm',
+ ABSTRACT_FROM => 'lib/Spreadsheet/ParseExcel/Simple.pm',
+ PREREQ_PM => {
+ 'Spreadsheet::ParseExcel' => 0.18,
+ 'Test::More' => 0.01,
+ },
);
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/README
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/README 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/README 2005-09-06 21:32:57 UTC (rev 1349)
@@ -18,7 +18,7 @@
For anything more complex, you probably want to use
Spreadsheet::ParseExcel directly.
-METHODS
+BOOK METHODS
read
my $xls = Spreadsheet::ParseExcel::Simple->read('spreadsheet.xls');
@@ -32,6 +32,15 @@
all back. You can then iterate over them, or jump straight to the one
you wish to play with.
+ book
+ my $book = $xls->book;
+
+ The Spreadsheet::ParseExcel object we are working with. You can use this
+ if you need to manipulate it in ways that this interface doesn't allow.
+
+SHEET METHODS
+ These methods can be called on each sheet returned from $xls->sheets:
+
has_data
if ($sheet->has_data) { ... }
@@ -44,15 +53,31 @@
Fetch the next row of data back.
+ sheet
+ my $obj = $sheet->sheet;
+
+ The underlying Spreadsheet::ParseExcel object for the worksheet. You can
+ use this if you need to manipulate it in ways that this interface
+ doesn't allow (e.g. asking it for the sheet's name).
+
AUTHOR
- Tony Bowden, <kasei at tmtm.com>.
+ Tony Bowden
+BUGS and QUERIES
+ Please direct all correspondence regarding this module to:
+ bug-Spreadsheet-ParseExcel-Simple at rt.cpan.org
+
+COPYRIGHT AND LICENSE
+ Copyright (C) 2001-2005 Tony Bowden.
+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License; either version 2 of the License,
+ or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.
+
SEE ALSO
Spreadsheet::ParseExcel.
-COPYRIGHT
- Copyright (C) 2001 Tony Bowden. All rights reserved.
-
- This module is free software; you can redistribute it and/or modify it
- under the same terms as Perl itself.
-
Deleted: packages/libspreadsheet-parseexcel-simple-perl/trunk/Simple.pm
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/Simple.pm 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/Simple.pm 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,118 +0,0 @@
-package Spreadsheet::ParseExcel::Simple;
-
-use strict;
-use Spreadsheet::ParseExcel;
-use vars qw/$VERSION/;
-$VERSION = '1.02';
-
-=head1 NAME
-
-Spreadsheet::ParseExcel::Simple - A simple interface to Excel data
-
-=head1 SYNOPSIS
-
- my $xls = Spreadsheet::ParseExcel::Simple->read('spreadsheet.xls');
- foreach my $sheet ($xls->sheets) {
- while ($sheet->has_data) {
- my @data = $sheet->next_row;
- }
- }
-
-=head1 DESCRIPTION
-
-This provides an abstraction to the Spreadsheet::ParseExcel module for
-simple reading of values.
-
-You simply loop over the sheets, and fetch rows to arrays.
-
-For anything more complex, you probably want to use
-Spreadsheet::ParseExcel directly.
-
-=head1 METHODS
-
-=head2 read
-
- my $xls = Spreadsheet::ParseExcel::Simple->read('spreadsheet.xls');
-
-This opens the spreadsheet specified for you. Returns undef if we cannot
-read the book.
-
-=head2 sheets
-
- @sheets = $xls->sheets;
-
-Each spreadsheet can contain one or more worksheets. This fetches them
-all back. You can then iterate over them, or jump straight to the one
-you wish to play with.
-
-=head2 has_data
-
- if ($sheet->has_data) { ... }
-
-This lets us know if there are more rows in this sheet that we haven't
-read yet. This allows us to differentiate between an empty row, and
-the end of the sheet.
-
-=head2 next_row
-
- my @data = $sheet->next_row;
-
-Fetch the next row of data back.
-
-=head1 AUTHOR
-
-Tony Bowden
-
-=head1 BUGS and QUERIES
-
-Please direct all correspondence regarding this module to:
- bug-Spreadsheet-ParseExcel-Simple at rt.cpan.org
-
-=head1 COPYRIGHT and LICENSE
-
-Copyright (C) 2001-2004 Tony Bowden. All rights reserved.
-
-This module is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=head1 SEE ALSO
-
-L<Spreadsheet::ParseExcel>.
-
-=cut
-
-sub read {
- my $class = shift;
- my $book = Spreadsheet::ParseExcel->new->Parse(shift) or return;
- bless { book => $book }, $class;
-}
-
-sub book { shift->{book} }
-
-sub sheets {
- map Spreadsheet::ParseExcel::Simple::_Sheet->new($_),
- @{shift->{book}->{Worksheet}};
-}
-
-package Spreadsheet::ParseExcel::Simple::_Sheet;
-
-sub new {
- my $class = shift;
- my $sheet = shift;
- bless {
- sheet => $sheet,
- row => $sheet->{MinRow} || 0,
- }, $class;
-}
-
-sub has_data {
- my $self = shift;
- defined $self->{sheet}->{MaxRow} and ($self->{row} <= $self->{sheet}->{MaxRow});
-}
-
-sub next_row {
- map { $_ ? $_->Value : "" } @{$_[0]->{sheet}->{Cells}[$_[0]->{row}++]};
-}
-
-1;
-
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/changelog
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/changelog 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/changelog 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,3 +1,11 @@
+libspreadsheet-parseexcel-simple-perl (1.03-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed debian/watch - It was including the trailing dot as part of
+ the version number
+
+ -- Gunnar Wolf <gwolf at debian.org> Tue, 6 Sep 2005 16:29:36 -0500
+
libspreadsheet-parseexcel-simple-perl (1.02-2) unstable; urgency=low
* Fixed maintainer field - Sorry
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/watch
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/watch 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/debian/watch 2005-09-06 21:32:57 UTC (rev 1349)
@@ -1,3 +1,3 @@
# format version number, currently 2; this line is compulsory!
version=2
-http://www.cpan.org/modules/by-module/Spreadsheet/Spreadsheet-ParseExcel-Simple-(.*)(.tar.gz|.tar|.tgz)
+http://www.cpan.org/modules/by-module/Spreadsheet/Spreadsheet-ParseExcel-Simple-(.*)\.(tar.gz|tar|tgz)
Copied: packages/libspreadsheet-parseexcel-simple-perl/trunk/lib (from rev 1347, packages/libspreadsheet-parseexcel-simple-perl/branches/upstream/current/lib)
Modified: packages/libspreadsheet-parseexcel-simple-perl/trunk/t/01.t
===================================================================
--- packages/libspreadsheet-parseexcel-simple-perl/trunk/t/01.t 2005-09-06 21:30:39 UTC (rev 1348)
+++ packages/libspreadsheet-parseexcel-simple-perl/trunk/t/01.t 2005-09-06 21:32:57 UTC (rev 1349)
@@ -2,58 +2,55 @@
use strict;
use Spreadsheet::ParseExcel::Simple;
-use Test::More tests => 11;
+use Test::More;
-eval {
- require File::Temp;
- require Spreadsheet::WriteExcel::Simple;
-};
+BEGIN {
+ eval "use File::Temp; use Spreadsheet::WriteExcel::Simple 1.03";
+ plan $@
+ ? (skip_all =>
+ 'tests need Spreadsheet::WriteExcel::Simple 1.03 + File::Temp')
+ : (tests => 11);
+}
-if ($@) {
- ok(1, "Need File::Temp and Spreadsheet::WriteExcel::Simple");
- ok(1, " for sensible testing.");
- ok(1, " - skipping tests") for (1 .. 9);
-} else {
- File::Temp->import(qw/tempfile tempdir/);
- my $dir1 = tempdir(CLEANUP => 1);
- my ($fh1, $name1) = tempfile(DIR => $dir1);
-
- my @row1 = qw/foo bar baz/;
- my @row2 = qw/1 fred 2001-01-01/;
- my @row3 = ();
- my @row4 = (2, undef, "2001-03-01");
+File::Temp->import(qw/tempfile tempdir/);
+my $dir1 = tempdir(CLEANUP => 1);
+my ($fh1, $name1) = tempfile(DIR => $dir1);
- # Write our our test file.
- my $ss = Spreadsheet::WriteExcel::Simple->new;
- $ss->write_bold_row(\@row1);
- $ss->write_row(\@row2);
- $ss->write_row(\@row3);
- $ss->write_row(\@row4);
- print $fh1 $ss->data;
- close $fh1;
+my @row1 = qw/foo bar baz/;
+my @row2 = qw/1 fred 2001-01-01/;
+my @row3 = ();
+my @row4 = (2, undef, "2001-03-01");
- # Now read it back in
- my $xls = Spreadsheet::ParseExcel::Simple->read($name1);
- my @sheets = $xls->sheets;
- is scalar @sheets, 1, "We have one sheet";
- my $sheet = $sheets[0];
+# Write our our test file.
+my $ss = Spreadsheet::WriteExcel::Simple->new;
+$ss->write_bold_row(\@row1);
+$ss->write_row(\@row2);
+$ss->write_row(\@row3);
+$ss->write_row(\@row4);
+$ss->save($name1);
- ok $sheet->has_data, "We have data to read";
- my @fetch1 = $sheet->next_row;
- ok eq_array(\@fetch1, \@row1), "Header OK";
+# Now read it back in
+my $xls = Spreadsheet::ParseExcel::Simple->read($name1);
+my @sheets = $xls->sheets;
+is scalar @sheets, 1, "We have one sheet";
+my $sheet = $sheets[0];
- ok $sheet->has_data, "We still have data to read";
- my @fetch2 = $sheet->next_row;
- ok eq_array(\@fetch2, \@row2), "Row 2";
+ok $sheet->has_data, "We have data to read";
+my @fetch1 = $sheet->next_row;
+is_deeply \@fetch1, \@row1, "Header OK";
- ok $sheet->has_data, "We still have data to read";
- my @fetch3 = $sheet->next_row;
- ok eq_array(\@fetch3, \@row3), "Row 3 (blank)";
+ok $sheet->has_data, "We still have data to read";
+my @fetch2 = $sheet->next_row;
+is_deeply \@fetch2, \@row2, "Row 2";
- ok $sheet->has_data, "We still have data to read";
- my @fetch4 = $sheet->next_row;
- ok eq_array(\@fetch4, \@row4), "Row 4";
+ok $sheet->has_data, "We still have data to read";
+my @fetch3 = $sheet->next_row;
+is_deeply \@fetch3, \@row3, "Row 3 (blank)";
- ok !$sheet->has_data, "No more data to read";
- ok !$sheet->next_row, "So, can't read any";
-}
+ok $sheet->has_data, "We still have data to read";
+my @fetch4 = $sheet->next_row;
+local $row4[1] = ""; # undefs come back as empty string
+is_deeply \@fetch4, \@row4, "Row 4";
+
+ok !$sheet->has_data, "No more data to read";
+ok !$sheet->next_row, "So, can't read any";
Copied: packages/libspreadsheet-parseexcel-simple-perl/trunk/t/pod-coverage.t (from rev 1347, packages/libspreadsheet-parseexcel-simple-perl/branches/upstream/current/t/pod-coverage.t)
Copied: packages/libspreadsheet-parseexcel-simple-perl/trunk/t/pod.t (from rev 1347, packages/libspreadsheet-parseexcel-simple-perl/branches/upstream/current/t/pod.t)
Copied: packages/libspreadsheet-parseexcel-simple-perl/trunk/test.xls (from rev 1347, packages/libspreadsheet-parseexcel-simple-perl/branches/upstream/current/test.xls)
More information about the Pkg-perl-cvs-commits
mailing list