diff options
author | Jason <jason@socialflow.com> | 2013-08-28 15:16:28 +0000 |
---|---|---|
committer | Jason <jason@socialflow.com> | 2013-08-28 15:16:28 +0000 |
commit | 2d06ee894a3e5cd139bde1a88095c33772283e99 (patch) | |
tree | 9547431e882c1454895b47dfd95a3ef3a939f1e9 /lib/Spreadsheet/Template/Helpers/Xslate.pm | |
parent | da21e2cca6a714c09b35115ac9e51f39f21f3d40 (diff) | |
download | spreadsheet-template-2d06ee894a3e5cd139bde1a88095c33772283e99.tar.gz spreadsheet-template-2d06ee894a3e5cd139bde1a88095c33772283e99.zip |
merge now supports formulas, and adjusted test
Diffstat (limited to 'lib/Spreadsheet/Template/Helpers/Xslate.pm')
-rw-r--r-- | lib/Spreadsheet/Template/Helpers/Xslate.pm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/Spreadsheet/Template/Helpers/Xslate.pm b/lib/Spreadsheet/Template/Helpers/Xslate.pm index d4238e9..bf9b435 100644 --- a/lib/Spreadsheet/Template/Helpers/Xslate.pm +++ b/lib/Spreadsheet/Template/Helpers/Xslate.pm @@ -32,13 +32,21 @@ sub format { } sub merge { - my ($package, $range, $contents, $format) = @_; - - return $JSON->encode({ - range => "$range", - contents => "$contents", - format => _formats($package, $format) - }); + my ($package, $contents, $format, $type, $range, %args) = @_; + + return $JSON->encode( + { + contents => "$contents", + format => _formats( $package, $format ), + type => $type, + range => "$range", + ( + defined $args{formula} + ? ( formula => $args{formula} ) + : () + ), + } + ); } sub c { |