! Attempting to solve the deep recursion from TravisCI in the new bugfix

+ Added perl 5.22 to TravisCI testing ! Fixed the failing TravisCI build
jandrew · Jun 11, 2015 · 0e076e5 · 0e076e5
1 parent ecd39ab
commit 0e076e5
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,10 @@ perl:
  - "5.16"
  - "5.18"
  - "5.20"
+ - "5.22"
 matrix:
   include:
-    - perl: 5.20
+    - perl: 5.22
       env: COVERAGE=1
 before_install:
   - eval $(curl https://travis-perl.github.io/init) --auto
diff --git a/Changes b/Changes
@@ -11,7 +11,13 @@ be method matched to Spreadsheet::ParseExcel prior to the 1.0 release.
 
 {{$NEXT}}
 
-	* Fixed the failing TravisCI build
+	* Another cool change
+
+v0.36.24  2015-06-10 19:44:32-07:00 America/Los_Angeles
+
+	! Attempting to solve the deep recursion from TravisCI in the new bugfix
+	+ Added perl 5.22 to TravisCI testing
+	! Fixed the failing TravisCI build
 
 v0.36.22  2015-06-10 17:11:39-07:00 America/Los_Angeles
 

diff --git a/META.json b/META.json
@@ -80,63 +80,63 @@
    "provides" : {
       "Spreadsheet::XLSX::Reader::LibXML" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::Cell" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::Error" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::FmtDefault" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::GetCell" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::ParseExcelFormatStrings" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::Types" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::CalcChain" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::Chartsheet" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::SharedStrings" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::Styles" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::Worksheet" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       },
       "Spreadsheet::XLSX::Reader::LibXML::XMLReader::XMLToPerlData" : {
          "file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm",
-         "version" : "v0.36.22"
+         "version" : "v0.36.24"
       }
    },
    "release_status" : "stable",
@@ -151,7 +151,7 @@
          "web" : "https://github.com/jandrew/Spreadsheet-XLSX-Reader-LibXML"
       }
    },
-   "version" : "v0.36.22",
+   "version" : "v0.36.24",
    "x_authority" : "cpan:JANDREW",
    "x_contributors" : [
       "Frank Maas <maas.frank@gmail.com>",

diff --git a/META.yml b/META.yml
@@ -39,49 +39,49 @@ name: Spreadsheet-XLSX-Reader-LibXML
 provides:
   Spreadsheet::XLSX::Reader::LibXML:
     file: lib/Spreadsheet/XLSX/Reader/LibXML.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::Cell:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::Error:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::FmtDefault:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::GetCell:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::ParseExcelFormatStrings:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::Types:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::CalcChain:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::Chartsheet:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::SharedStrings:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::Styles:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::Worksheet:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm
-    version: v0.36.22
+    version: v0.36.24
   Spreadsheet::XLSX::Reader::LibXML::XMLReader::XMLToPerlData:
     file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm
-    version: v0.36.22
+    version: v0.36.24
 requires:
   Archive::Zip: 0
   Carp: 0
@@ -112,7 +112,7 @@ resources:
   bugtracker: https://github.com/jandrew/Spreadsheet-XLSX-Reader-LibXML/issues
   homepage: https://github.com/jandrew/Spreadsheet-XLSX-Reader-LibXML
   repository: https://github.com/jandrew/Spreadsheet-XLSX-Reader-LibXML.git
-version: v0.36.22
+version: v0.36.24
 x_authority: cpan:JANDREW
 x_contributors:
   - 'Frank Maas <maas.frank@gmail.com>'

diff --git a/Makefile.PL b/Makefile.PL
@@ -72,7 +72,7 @@ my %WriteMakefileArgs = (
     "XML::LibXML::Reader" => 0,
     "version" => "0.77"
   },
-  "VERSION" => "v0.36.22",
+  "VERSION" => "v0.36.24",
   "test" => {
     "TESTS" => "t/Spreadsheet/XLSX/Reader/*.t t/Spreadsheet/XLSX/Reader/LibXML/*.t t/Spreadsheet/XLSX/Reader/LibXML/XMLReader/*.t"
   }

diff --git a/README.pod b/README.pod
@@ -19,7 +19,7 @@ Spreadsheet::XLSX::Reader::LibXML - Read xlsx spreadsheet files with LibXML
 </a>
 
 <a>
-	<img src="https://img.shields.io/badge/this version-0.36.22-brightgreen.svg" alt="this version">
+	<img src="https://img.shields.io/badge/this version-0.36.24-brightgreen.svg" alt="this version">
 </a>
 
 <a href="https://metacpan.org/pod/Spreadsheet::XLSX::Reader::LibXML">
@@ -1359,6 +1359,8 @@ L<Toby Inkster|https://github.com/morungos>
 
 L<Breno G. de Oliveira|https://github.com/garu>
 
+L<Bill Baker|https://github.com/wdbaker54>
+
 =back
 
 =head1 COPYRIGHT

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML.pm b/lib/Spreadsheet/XLSX/Reader/LibXML.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML;
-use version 0.77; our $VERSION = qv('v0.36.22');
+use version 0.77; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use	List::Util 1.33;
@@ -911,7 +911,7 @@ Spreadsheet::XLSX::Reader::LibXML - Read xlsx spreadsheet files with LibXML
 </a>
 
 <a>
-	<img src="https://img.shields.io/badge/this version-0.36.22-brightgreen.svg" alt="this version">
+	<img src="https://img.shields.io/badge/this version-0.36.24-brightgreen.svg" alt="this version">
 </a>
 
 <a href="https://metacpan.org/pod/Spreadsheet::XLSX::Reader::LibXML">
@@ -2251,6 +2251,8 @@ L<Toby Inkster|https://github.com/morungos>
 
 L<Breno G. de Oliveira|https://github.com/garu>
 
+L<Bill Baker|https://github.com/wdbaker54>
+
 =back
 
 =head1 COPYRIGHT

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::Cell;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 $| = 1;
 use 5.010;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use	Moose::Role;
 requires

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::Error;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use Moose;
 use Carp qw( cluck );

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::FmtDefault;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use	5.010;
 use	Moose::Role;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::GetCell;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use	Moose::Role;
 requires qw(

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::ParseExcelFormatStrings;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use Moose::Role;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::Types;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use strict;
 use warnings;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use Moose;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::CalcChain;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use Moose;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::Chartsheet;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 
 use	5.010;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::SharedStrings;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use Moose;
@@ -56,8 +56,16 @@ sub get_shared_string_position{
 	if( !$self->has_position ){
 		###LogSD	$phone->talk( level => 'debug', message => [
 		###LogSD		"Pulling the first cell" ] );
-		my $found_it = $self->next_element( 'si' );
-		if( $found_it < 1 ){
+		my $found_it;
+		eval '$found_it = $self->next_element( "si" )';
+		if( $@ ){
+			###LogSD	$phone->talk( level => 'debug', message => [
+			###LogSD		"Found an unexpected end of file: ", $@] );
+			$self->set_error( 'libxml2 error message' . $@ );
+			$self->_set_unique_count( 0 );
+			$self->_i_am_here( 0 );
+			return undef;
+		}elsif( defined $found_it and $found_it < 1 ){
 			$self->set_error( "No strings stored in the sharedStrings file" );
 			return undef;
 		}
@@ -68,14 +76,22 @@ sub get_shared_string_position{
 	while( $self->where_am_i < $position ){
 		###LogSD	$phone->talk( level => 'debug', message => [
 		###LogSD		"Pulling the next cell: " . ($self->where_am_i + 1) ] );
-		eval '$self->next_element( "si" )';
+		my $found_it;
+		eval '$found_it = $self->next_element( "si" )';
 		if( $@ ){
 			###LogSD	$phone->talk( level => 'debug', message => [
 			###LogSD		"Found an unexpected end of file: ", $@] );
 			$self->set_error( 'libxml2 error message' . $@ );
 			$self->_set_unique_count( $self->where_am_i + 1 );
 			$self->_i_am_here( 0 );
 			return undef;
+		}elsif( defined $found_it and $found_it < 1 ){
+			###LogSD	$phone->talk( level => 'debug', message => [
+			###LogSD		"Found an unexpected end of file: $found_it" ] );
+			$self->set_error( "Unexpected end of file found" );
+			$self->_set_unique_count( $self->where_am_i + 1 );
+			$self->_i_am_here( 0 );
+			return undef;
 		}
 		$self->_i_am_here( $self->where_am_i + 1 );
 	}

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::Styles;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use 5.010;
 use Moose;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::Worksheet;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use	5.010;
 use	Moose;

diff --git a/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm b/lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm
@@ -1,5 +1,5 @@
 package Spreadsheet::XLSX::Reader::LibXML::XMLReader::XMLToPerlData;
-use version; our $VERSION = qv('v0.36.22');
+use version; our $VERSION = qv('v0.36.24');
 
 use	Moose::Role;
 use 5.010;
@@ -216,7 +216,7 @@ sub _parse_element{
 			###LogSD		"Identified an empty string" ] );
 			$current_ref->{v} = {raw_text => ''};
 			delete $current_ref->{t};
-		}elsif( exists $current_ref->{t} and $current_ref->{t} eq '1' ){
+		}elsif( exists $current_ref->{t} and $current_ref->{t} and $current_ref->{t} eq '1' ){
 			###LogSD	$phone->talk( level => 'debug', message => [
 			###LogSD		"badly formed space record" ] );
 			$current_ref->{t} = {raw_text => $current_ref->{raw_text}};