Huge refactoring

Do not create huge strings
Let Row inherit from SimpleTypedList
Optimized sanitizing
Optimized validation
And more..

1 files changed, 17 insertions, 24 deletions

diff --git a/lib/axlsx/workbook/worksheet/pivot_table.rb b/lib/axlsx/workbook/worksheet/pivot_table.rb
index 63819da5..0d5f34e8 100644
--- a/lib/axlsx/workbook/worksheet/pivot_table.rb
+++ b/lib/axlsx/workbook/worksheet/pivot_table.rb
@@ -159,9 +159,9 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"  dataOnRows="1" applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
-      str <<   '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
-      str <<   '<pivotFields count="' << header_cells_count.to_s << '">'
+      str << ('<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"  dataOnRows="1" applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">')
+      str << (  '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>')
+      str << (  '<pivotFields count="' << header_cells_count.to_s << '">')
       header_cell_values.each do |cell_value|
         str <<   pivot_field_for(cell_value)
       end
@@ -170,12 +170,12 @@ module Axlsx
         str << '<rowFields count="1"><field x="-2"/></rowFields>'
         str << '<rowItems count="2"><i><x/></i> <i i="1"><x v="1"/></i></rowItems>'
       else
-        str << '<rowFields count="' << rows.size.to_s << '">'
+        str << ('<rowFields count="' << rows.size.to_s << '">')
         rows.each do |row_value|
-          str << '<field x="' << header_index_of(row_value).to_s << '"/>'
+          str << ('<field x="' << header_index_of(row_value).to_s << '"/>')
         end
         str << '</rowFields>'
-        str << '<rowItems count="' << rows.size.to_s << '">'
+        str << ('<rowItems count="' << rows.size.to_s << '">')
         rows.size.times do |i|
           str << '<i/>'
         end
@@ -184,16 +184,16 @@ module Axlsx
       if columns.empty?
         str << '<colItems count="1"><i/></colItems>'
       else
-        str << '<colFields count="' << columns.size.to_s << '">'
+        str << ('<colFields count="' << columns.size.to_s << '">')
         columns.each do |column_value|
-          str << '<field x="' << header_index_of(column_value).to_s << '"/>'
+          str << ('<field x="' << header_index_of(column_value).to_s << '"/>')
         end
         str << '</colFields>'
       end
       unless pages.empty?
-        str << '<pageFields count="' << pages.size.to_s << '">'
+        str << ('<pageFields count="' << pages.size.to_s << '">')
         pages.each do |page_value|
-          str << '<pageField fld="' << header_index_of(page_value).to_s << '"/>'
+          str << ('<pageField fld="' << header_index_of(page_value).to_s << '"/>')
         end
         str << '</pageFields>'
       end
@@ -243,31 +243,24 @@ module Axlsx
 
     def pivot_field_for(cell_ref)
       if rows.include? cell_ref
-        '<pivotField axis="axisRow" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' <<
-          '<items count="1"><item t="default"/></items>' <<
-        '</pivotField>'
+        '<pivotField axis="axisRow" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' + '<items count="1"><item t="default"/></items>' + '</pivotField>'
       elsif columns.include? cell_ref
-        '<pivotField axis="axisCol" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' <<
-          '<items count="1"><item t="default"/></items>' <<
-        '</pivotField>'
+        '<pivotField axis="axisCol" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' + '<items count="1"><item t="default"/></items>' + '</pivotField>'
       elsif pages.include? cell_ref
-        '<pivotField axis="axisCol" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' <<
-          '<items count="1"><item t="default"/></items>' <<
-        '</pivotField>'
+        '<pivotField axis="axisCol" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' + '<items count="1"><item t="default"/></items>' + '</pivotField>'
       elsif data_refs.include? cell_ref
-        '<pivotField dataField="1" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' <<
-        '</pivotField>'
+        '<pivotField dataField="1" compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' + '</pivotField>'
       else
-        '<pivotField compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' <<
-        '</pivotField>'
+        '<pivotField compact="0" outline="0" subtotalTop="0" showAll="0" includeNewItemsInFilter="1">' + '</pivotField>'
       end
     end
+    
     def data_refs
       data.map { |hash| hash[:ref] }
     end
+    
     def header_range
       range.gsub(/^(\w+?)(\d+)\:(\w+?)\d+$/, '\1\2:\3\2')
     end
-
   end
 end