summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason <jason@socialflow.com>2013-08-28 16:01:42 +0000
committerJason <jason@socialflow.com>2013-08-28 16:01:42 +0000
commitf488bab9597a7c78773edfe1ee740525df5bb74e (patch)
tree36e63d3fd9ce94b2b43418b75fcb074afbe1e3a3
parent2bf66a5ae431e3072e4e890dc2324fe0af612d61 (diff)
downloadspreadsheet-template-f488bab9597a7c78773edfe1ee740525df5bb74e.tar.gz
spreadsheet-template-f488bab9597a7c78773edfe1ee740525df5bb74e.zip
fix to docs and removed output from test
-rw-r--r--lib/Spreadsheet/Template/Processor/Xslate.pm8
-rw-r--r--t/data/merge.json4
-rw-r--r--t/merge.t5
3 files changed, 5 insertions, 12 deletions
diff --git a/lib/Spreadsheet/Template/Processor/Xslate.pm b/lib/Spreadsheet/Template/Processor/Xslate.pm
index fa57380..38803c6 100644
--- a/lib/Spreadsheet/Template/Processor/Xslate.pm
+++ b/lib/Spreadsheet/Template/Processor/Xslate.pm
@@ -42,11 +42,11 @@ defaults to C<"string">.
=item merge($content, $format, $type, $first_row, $first_col, $last_row, $last_col, %args)
Returns representation of a range of cells to be merged. C<$content> is the
-content to be placed in the merged cell. C<$type> is either C<"string">, C<"number">,
-or C<"date_time">. C<$first_row>, C<$first_col>, C<$last_row>, C<$last_col> are zero-indexed
-Excel row, column numbers. C<$format> is the name of a format
+content to be placed in the merged cell.C<$format> is the name of a format
declared with the C<format> helper or a hashref of format options.
-C<%args> contains any other parameters (such as C<formula>,
+C<$type> is either C<"string">, C<"number">, or C<"date_time">.
+C<$first_row>, C<$first_col>, C<$last_row>, C<$last_col> are zero-indexed
+Excel row, column numbers. C<%args> contains any other parameters (such as C<formula>,
for instance) to declare for the cell.
=item true
diff --git a/t/data/merge.json b/t/data/merge.json
index f942b33..7f384ab 100644
--- a/t/data/merge.json
+++ b/t/data/merge.json
@@ -26,9 +26,7 @@
[% c($row.value4, "basic", "number") %]
],
%% }
- [
- [% c(0, "basic", "number" ) %]
- ]
+ []
],
"merge" : [
[% merge('Merged Header', 'basic', 'string', 0,0,0,3) %],
diff --git a/t/merge.t b/t/merge.t
index 0d270db..14e8909 100644
--- a/t/merge.t
+++ b/t/merge.t
@@ -62,11 +62,6 @@ my $data = do { local $/; local @ARGV = ('t/data/merge.json'); <> };
my $value2 = $ws->get_cell(2,0)->value;
my $sum = $value1 + $value2;
is($ws->get_cell(3,0)->value, $sum);
-
- open my $fh2, '>', 'out.xlsx';
- binmode $fh2;
- $fh2->print($excel);
- $fh2->close;
}
done_testing;