From 1df3e7607ac6b593a270b4155c89e1f8c9bbdffc Mon Sep 17 00:00:00 2001
From: Daniel Lockhart <daniel@lockyy.com>
Date: Tue, 16 Feb 2016 15:34:38 +0000
Subject: [PATCH] Update excel.rb to export as worksheet

This ensures that errors like http://i.imgur.com/UTUtwcq.png do not occur when opening in later versions of Office
---
 .../exportable_formats/excel.rb               | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/make_exportable/exportable_formats/excel.rb b/lib/make_exportable/exportable_formats/excel.rb
index e677078..ae9df3d 100644
--- a/lib/make_exportable/exportable_formats/excel.rb
+++ b/lib/make_exportable/exportable_formats/excel.rb
@@ -7,6 +7,7 @@ class Excel < ExportableFormat #:nodoc:
     
     attr_accessor :data_set, :data_headers
     
+
     def initialize(data_set, data_headers=[])
       self.long      = 'Microsoft Excel'
       self.mime_type = 'application/vnd.ms-excel; charset=utf-8;'
@@ -16,18 +17,31 @@ def initialize(data_set, data_headers=[])
 
     def generate
       generate_header_option(data_headers)
-      output = "<table>\n"
+      output = "<?xml version='1.0'?>\n"
+      output << "<Workbook xmlns='urn:schemas-microsoft-com:office:spreadsheet'\n"
+      output << "\txmlns:o='urn:schemas-microsoft-com:office:office'\n"
+      output << "\txmlns:x='urn:schemas-microsoft-com:office:excel'\n"
+      output << "\txmlns:ss='urn:schemas-microsoft-com:office:spreadsheet'\n"
+      output << "\txmlns:html='http://www.w3.org/TR/REC-html40'>\n"
+      output << "\t<Worksheet ss:Name='Sheet1'>\n"
+      output << "\t\t<Table>\n"
+
       unless data_headers.blank?
-        output << "\t<tr>\n"
-        output << data_headers.map {|h| "\t\t<th>#{sanitize(h.humanize.titleize)}</th>\n" }.join
-        output << "\t</tr>\n"
+        output << "\t\t\t<Row>\n"
+        output << data_headers.map {|h| "\t\t\t\t<Cell><Data ss:Type='String'>#{sanitize(h.humanize.titleize)}</Data></Cell>\n" }.join
+        output << "\t\t\t</Row>\n"
       end
+
       data_set.each do |row|
-        output << "\t<tr>\n"
-        output << row.map {|field| "\t\t<td>#{sanitize(field)}</td>\n"}.join
-        output << "\t</tr>\n"
+        output << "\t\t\t<Row>\n"
+        output << row.map {|field| "\t\t\t\t<Cell><Data ss:Type='String'>#{sanitize(field)}</Data></Cell>\n" }.join
+        output << "\t\t\t</Row>\n"
       end
-      output << "</table>\n"
+
+      output << "\t\t</Table>\n"
+      output << "\t</Worksheet>\n"
+      output << "</Workbook>\n"
+
       return output
     end