From 87df644e3dfe5c34bfb0b03e020a119e64628c0a Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 4 Dec 2015 00:03:58 -0500
Subject: style nits

---
 lib/Spreadsheet/ParseXLSX.pm | 20 +++++++++-----------
 t/target-abspath.t           | 10 ++--------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm
index f8daaae..52f2858 100644
--- a/lib/Spreadsheet/ParseXLSX.pm
+++ b/lib/Spreadsheet/ParseXLSX.pm
@@ -714,7 +714,7 @@ sub _extract_files {
     my $wb_name = ($rels->find_nodes(
         qq<//Relationship[\@Type="$type_base/officeDocument"]>
     ))[0]->att('Target');
-    $wb_name =~ s/^\///;
+    $wb_name =~ s{^/}{};
     my $wb_xml = $self->_parse_xml($zip, $wb_name);
 
     my $path_base = $self->_base_path_for($wb_name);
@@ -725,33 +725,31 @@ sub _extract_files {
 
     my $get_path = sub {
         my ($p) = @_;
-        if ($p !~ /^\//) {
-            return $path_base . $p;
-        } else {
-            $p =~ s/^\///;
-            return $p;
-        }
+
+        return $p =~ s{^/}{}
+            ? $p
+            : $path_base . $p;
     };
 
     my ($strings_xml) = map {
-        $zip->memberNamed(&$get_path($_->att('Target')))->contents
+        $zip->memberNamed($get_path->($_->att('Target')))->contents
     } $wb_rels->find_nodes(qq<//Relationship[\@Type="$type_base/sharedStrings"]>);
 
     my $styles_xml = $self->_parse_xml(
         $zip,
-        &$get_path(($wb_rels->find_nodes(
+        $get_path->(($wb_rels->find_nodes(
             qq<//Relationship[\@Type="$type_base/styles"]>
         ))[0]->att('Target'))
     );
 
     my %worksheet_xml = map {
-        if ( my $sheetfile = $zip->memberNamed(&$get_path($_->att('Target')))->contents ) {
+        if ( my $sheetfile = $zip->memberNamed($get_path->($_->att('Target')))->contents ) {
             ( $_->att('Id') => $sheetfile );
         }
     } $wb_rels->find_nodes(qq<//Relationship[\@Type="$type_base/worksheet"]>);
 
     my %themes_xml = map {
-        $_->att('Id') => $self->_parse_xml($zip, &$get_path($_->att('Target')))
+        $_->att('Id') => $self->_parse_xml($zip, $get_path->($_->att('Target')))
     } $wb_rels->find_nodes(qq<//Relationship[\@Type="$type_base/theme"]>);
 
     return {
diff --git a/t/target-abspath.t b/t/target-abspath.t
index e79445b..9e9786c 100644
--- a/t/target-abspath.t
+++ b/t/target-abspath.t
@@ -5,13 +5,7 @@ use Test::More;
 
 use Spreadsheet::ParseXLSX;
 
-my $wb;
-eval {
-    $wb = Spreadsheet::ParseXLSX->new->parse('t/data/target-abspath.xlsx');
-};
-if ($@) {
-    diag $@;
-}
-ok((not $@), "parsing target-abspath.xlsx ok");
+my $wb = Spreadsheet::ParseXLSX->new->parse('t/data/target-abspath.xlsx');
+is($wb->worksheet(0)->get_cell(1, 0)->value, '10213.576');
 
 done_testing;
-- 
cgit v1.2.3-54-g00ecf