Skip to content

Commit

Permalink
+ Surpressed a misleading error when value coercion is not succesful
Browse files Browse the repository at this point in the history
  • Loading branch information
jandrew committed Jun 24, 2015
1 parent c912095 commit f356426
Show file tree
Hide file tree
Showing 19 changed files with 111 additions and 103 deletions.
6 changes: 5 additions & 1 deletion Changes
View file
Expand Up @@ -10,9 +10,13 @@ NOTE: This software is designated as beta quality until this notice is removed.
be method matched to Spreadsheet::ParseExcel prior to the 1.0 release.

{{$NEXT}}

* Another cool change

v0.36.28 2015-06-24 14:41:34-07:00 America/Los_Angeles

+ Surpressed a misleading error when value coercion is not succesful

v0.36.26 2015-06-23 19:01:21-07:00 America/Los_Angeles

! Closed #42 in github
Expand Down
34 changes: 17 additions & 17 deletions META.json
View file
Expand Up @@ -25,7 +25,6 @@
"Archive::Zip" : "0",
"Carp" : "0",
"Clone" : "0",
"Data::Dumper" : "0",
"DateTime::Format::Flexible" : "0",
"DateTimeX::Format::Excel" : "0.012",
"IO::File" : "0",
Expand Down Expand Up @@ -55,6 +54,7 @@
"Capture::Tiny" : "0",
"Carp" : "0",
"Clone" : "0",
"Data::Dumper" : "0",
"DateTime::Format::Flexible" : "0",
"DateTimeX::Format::Excel" : "0.012",
"ExtUtils::MakeMaker" : "7.04",
Expand All @@ -80,63 +80,63 @@
"provides" : {
"Spreadsheet::XLSX::Reader::LibXML" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::Cell" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::Error" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::FmtDefault" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::GetCell" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::ParseExcelFormatStrings" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::Types" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::CalcChain" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::Chartsheet" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::SharedStrings" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::Styles" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::Worksheet" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
},
"Spreadsheet::XLSX::Reader::LibXML::XMLReader::XMLToPerlData" : {
"file" : "lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm",
"version" : "v0.36.26"
"version" : "v0.36.28"
}
},
"release_status" : "stable",
Expand All @@ -151,7 +151,7 @@
"web" : "https://github.com/jandrew/Spreadsheet-XLSX-Reader-LibXML"
}
},
"version" : "v0.36.26",
"version" : "v0.36.28",
"x_authority" : "cpan:JANDREW",
"x_contributors" : [
"Frank Maas <maas.frank@gmail.com>",
Expand Down
34 changes: 17 additions & 17 deletions META.yml
View file
Expand Up @@ -7,6 +7,7 @@ build_requires:
Capture::Tiny: 0
Carp: 0
Clone: 0
Data::Dumper: 0
DateTime::Format::Flexible: 0
DateTimeX::Format::Excel: 0.012
ExtUtils::MakeMaker: 7.04
Expand Down Expand Up @@ -39,54 +40,53 @@ name: Spreadsheet-XLSX-Reader-LibXML
provides:
Spreadsheet::XLSX::Reader::LibXML:
file: lib/Spreadsheet/XLSX/Reader/LibXML.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::Cell:
file: lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow:
file: lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::Error:
file: lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::FmtDefault:
file: lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::GetCell:
file: lib/Spreadsheet/XLSX/Reader/LibXML/GetCell.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::ParseExcelFormatStrings:
file: lib/Spreadsheet/XLSX/Reader/LibXML/ParseExcelFormatStrings.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::Types:
file: lib/Spreadsheet/XLSX/Reader/LibXML/Types.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::CalcChain:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/CalcChain.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::Chartsheet:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Chartsheet.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::SharedStrings:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/SharedStrings.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::Styles:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Styles.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::Worksheet:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/Worksheet.pm
version: v0.36.26
version: v0.36.28
Spreadsheet::XLSX::Reader::LibXML::XMLReader::XMLToPerlData:
file: lib/Spreadsheet/XLSX/Reader/LibXML/XMLReader/XMLToPerlData.pm
version: v0.36.26
version: v0.36.28
requires:
Archive::Zip: 0
Carp: 0
Clone: 0
Data::Dumper: 0
DateTime::Format::Flexible: 0
DateTimeX::Format::Excel: 0.012
IO::File: 0
Expand All @@ -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.26
version: v0.36.28
x_authority: cpan:JANDREW
x_contributors:
- 'Frank Maas <maas.frank@gmail.com>'
Expand Down
4 changes: 2 additions & 2 deletions Makefile.PL
View file
Expand Up @@ -26,7 +26,6 @@ my %WriteMakefileArgs = (
"Archive::Zip" => 0,
"Carp" => 0,
"Clone" => 0,
"Data::Dumper" => 0,
"DateTime::Format::Flexible" => 0,
"DateTimeX::Format::Excel" => "0.012",
"IO::File" => 0,
Expand All @@ -53,6 +52,7 @@ my %WriteMakefileArgs = (
"Capture::Tiny" => 0,
"Carp" => 0,
"Clone" => 0,
"Data::Dumper" => 0,
"DateTime::Format::Flexible" => 0,
"DateTimeX::Format::Excel" => "0.012",
"ExtUtils::MakeMaker" => "7.04",
Expand All @@ -72,7 +72,7 @@ my %WriteMakefileArgs = (
"XML::LibXML::Reader" => 0,
"version" => "0.77"
},
"VERSION" => "v0.36.26",
"VERSION" => "v0.36.28",
"test" => {
"TESTS" => "t/Spreadsheet/XLSX/Reader/*.t t/Spreadsheet/XLSX/Reader/LibXML/*.t t/Spreadsheet/XLSX/Reader/LibXML/XMLReader/*.t"
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Spreadsheet/XLSX/Reader/LibXML.pm
View file
@@ -1,5 +1,5 @@
package Spreadsheet::XLSX::Reader::LibXML;
use version 0.77; our $VERSION = qv('v0.36.26');
use version 0.77; our $VERSION = qv('v0.36.28');

use 5.010;
use List::Util 1.33;
Expand All @@ -19,7 +19,7 @@ use Types::Standard qw(
);
use MooseX::ShortCut::BuildInstance 1.032 qw( build_instance should_re_use_classes );
use lib '../../../../lib',;
use Data::Dumper;
#~ use Data::Dumper;
###LogSD with 'Log::Shiras::LogSpace';
###LogSD use Log::Shiras::Telephone;
###LogSD use Log::Shiras::UnhideDebug;
Expand Down
62 changes: 41 additions & 21 deletions lib/Spreadsheet/XLSX/Reader/LibXML/Cell.pm
View file
@@ -1,5 +1,5 @@
package Spreadsheet::XLSX::Reader::LibXML::Cell;
use version; our $VERSION = qv('v0.36.26');
use version; our $VERSION = qv('v0.36.28');

$| = 1;
use 5.010;
Expand Down Expand Up @@ -165,26 +165,12 @@ sub value{
###LogSD 'Reached the -value- function' ] );
###LogSD $phone->talk( level => 'trace', message => [ "Cell:", $self ] );
my $unformatted = $self->unformatted;
my $formatted = $unformatted;
if( !$self->has_coercion ){
return $unformatted;
}elsif( !defined $unformatted ){
$self->set_error( "The cell does not have a value" );
}elsif( $unformatted eq '' ){
$self->set_error( "The cell has the empty string for a value" );
}else{
###LogSD $phone->talk( level => 'debug', message => [
###LogSD "Attempting to return the value of the cell formatted to " .
###LogSD (($self->has_coercion) ? $self->coercion_name : 'No conversion available' ) ] );
eval '$formatted = $self->get_coercion->assert_coerce( $unformatted )';
$self->set_error( $@ ) if( $@ );
}
$formatted =~ s/\\//g if $formatted;
###LogSD $phone->talk( level => 'debug', message => [
###LogSD "Format is:", $self->coercion_name,
###LogSD "Returning the formated value: " .
###LogSD ( $formatted ? $formatted : '' ), ] );
return $formatted;
return $self->_return_value_only(
$unformatted,
$self->get_coercion,
$self->_get_error_inst,
###LogSD $self->get_log_space,
);
}

#~ sub get_merge_range{
Expand Down Expand Up @@ -234,6 +220,40 @@ after 'set_coercion' => sub{
$self->_set_cell_type( 'Custom' );
};

sub _return_value_only{
my ( $self, $unformatted, $coercion, $error_inst, $log_space ) = @_;# To be used by GetCell too
###LogSD my $phone = Log::Shiras::Telephone->new( name_space =>
###LogSD ($log_space . '::_return_value_only' ), );
###LogSD $phone->talk( level => 'debug', message =>[
###LogSD "Returning the coerced value of: " . ($unformatted ? $unformatted : ''),
###LogSD ($coercion ? ( '..using coercion:' , $coercion ) : ''), ] );
my $formatted = $unformatted;
if( !$coercion ){
###LogSD $phone->talk( level => 'debug', message => [
###LogSD "No coercion passed" ) ] );
return $unformatted;
}elsif( !defined $unformatted ){
$error_inst->set_error( "The cell does not have a value" );
}elsif( $unformatted eq '' ){
$error_inst->set_error( "The cell has the empty string for a value" );
}else{
###LogSD $phone->talk( level => 'debug', message => [
###LogSD "Attempting to return the value of the cell formatted to " .
###LogSD (($coercion) ? $coercion->display_name : 'No conversion available' ) ] );
my $sig_warn = $SIG{__WARN__};
$SIG{__WARN__} = sub{};
eval '$formatted = $coercion->assert_coerce( $unformatted )';
$error_inst->set_error( $@ ) if( $@ );
$SIG{__WARN__} = $sig_warn;
}
$formatted =~ s/\\//g if $formatted;
###LogSD $phone->talk( level => 'debug', message => [
###LogSD "Format is:", $coercion->display_name,
###LogSD "Returning the formated value: " .
###LogSD ( $formatted ? $formatted : '' ), ] );
return $formatted;
}

#########1 Private Methods 3#########4#########5#########6#########7#########8#########9

sub DEMOLISH{
Expand Down
2 changes: 1 addition & 1 deletion lib/Spreadsheet/XLSX/Reader/LibXML/CellToColumnRow.pm
View file
@@ -1,5 +1,5 @@
package Spreadsheet::XLSX::Reader::LibXML::CellToColumnRow;
use version; our $VERSION = qv('v0.36.26');
use version; our $VERSION = qv('v0.36.28');

use Moose::Role;
requires
Expand Down
2 changes: 1 addition & 1 deletion lib/Spreadsheet/XLSX/Reader/LibXML/Error.pm
View file
@@ -1,5 +1,5 @@
package Spreadsheet::XLSX::Reader::LibXML::Error;
use version; our $VERSION = qv('v0.36.26');
use version; our $VERSION = qv('v0.36.28');

use Moose;
use Carp qw( cluck );
Expand Down
2 changes: 1 addition & 1 deletion lib/Spreadsheet/XLSX/Reader/LibXML/FmtDefault.pm
View file
@@ -1,5 +1,5 @@
package Spreadsheet::XLSX::Reader::LibXML::FmtDefault;
use version; our $VERSION = qv('v0.36.26');
use version; our $VERSION = qv('v0.36.28');

use 5.010;
use Moose::Role;
Expand Down

0 comments on commit f356426

Please sign in to comment.