axlsx 1.3.4 → 1.3.5

data/lib/axlsx/drawing/line_3D_chart.rb

@@ -9,7 +9,7 @@ module Axlsx
   #
   #   p = Axlsx::Package.new
   #   ws = p.workbook.add_worksheet
-  #   ws.add_row :values => ["This is a chart with no data in the sheet"]
+  #   ws.add_row ["This is a chart with no data in the sheet"]
   #
   #   chart = ws.add_chart(Axlsx::Line3DChart, :start_at=> [0,1], :end_at=>[0,6], :title=>"Most Popular Pets")
   #   chart.add_series :data => [1, 9, 10], :labels => ["Slimy Reptiles", "Fuzzy Bunnies", "Rottweiler"]
@@ -60,6 +60,7 @@ module Axlsx
     # @see Chart
     # @see View3D
     def initialize(frame, options={})
+      @vary_colors = false
       @gapDepth = nil
       @grouping = :standard
       @catAxId = rand(8 ** 8)
@@ -93,7 +94,7 @@ module Axlsx
       super(str) do |str_inner|
         str_inner << '<c:line3DChart>'
         str_inner << '<c:grouping val="' << grouping.to_s << '"/>'
-        str_inner << '<c:varyColors val="1"/>'
+        str_inner << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str_inner) }
         @d_lbls.to_xml_string(str) if @d_lbls
         str_inner << '<c:gapDepth val="' << @gapDepth.to_s << '"/>' unless @gapDepth.nil?

data/lib/axlsx/drawing/pic.rb

@@ -107,6 +107,12 @@ module Axlsx
       @anchor.drawing.charts.size + @anchor.drawing.images.index(self) + 1
     end
 
+    # Returns a relationship object for this object
+    # @return Axlsx::Relationship
+    def relationship
+      Relationship.new(IMAGE_R, "../#{pn}")
+    end
+
     # providing access to the anchor's width attribute
     # @param [Integer] v
     # @see OneCellAnchor.width

data/lib/axlsx/drawing/pie_3D_chart.rb

@@ -23,6 +23,7 @@ module Axlsx
     # @see Chart
     # @see View3D
     def initialize(frame, options={})
+      @vary_colors = true
       super(frame, options)
       @series_type = PieSeries
       @view_3D = View3D.new({:rot_x =>30, :perspective=>30}.merge(options))
@@ -36,7 +37,7 @@ module Axlsx
       super(str) do |str_inner|
 
         str_inner << '<c:pie3DChart>'
-        str_inner << '<c:varyColors val="1"/>'
+        str_inner << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str_inner) }
         d_lbls.to_xml_string(str) if @d_lbls
         str_inner << '</c:pie3DChart>'

data/lib/axlsx/drawing/scatter_chart.rb

@@ -24,6 +24,7 @@ module Axlsx
 
     # Creates a new scatter chart
     def initialize(frame, options={})
+      @vary_colors = 0
       @scatterStyle = :lineMarker
       @xValAxId = rand(8 ** 8)
       @yValAxId = rand(8 ** 8)
@@ -48,7 +49,7 @@ module Axlsx
       super(str) do |str_inner|
         str_inner << '<c:scatterChart>'
         str_inner << '<c:scatterStyle val="' << scatterStyle.to_s << '"/>'
-        str_inner << '<c:varyColors val="1"/>'
+        str_inner << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str_inner) }
         d_lbls.to_xml_string(str) if @d_lbls
         str_inner << '<c:axId val="' << @xValAxId.to_s << '"/>'

data/lib/axlsx/package.rb

@@ -192,6 +192,12 @@ module Axlsx
       workbook.tables.each do |table|
         parts << {:entry => "xl/#{table.pn}", :doc => table.to_xml_string, :schema => SML_XSD}
       end
+      workbook.pivot_tables.each do |pivot_table|
+        cache_definition = pivot_table.cache_definition
+        parts << {:entry => "xl/#{pivot_table.rels_pn}", :doc => pivot_table.relationships.to_xml_string, :schema => RELS_XSD}
+        parts << {:entry => "xl/#{pivot_table.pn}", :doc => pivot_table.to_xml_string} #, :schema => SML_XSD}
+        parts << {:entry => "xl/#{cache_definition.pn}", :doc => cache_definition.to_xml_string} #, :schema => SML_XSD}
+      end
 
       workbook.comments.each do|comment|
         if comment.size > 0
@@ -255,6 +261,13 @@ module Axlsx
                                        :ContentType => TABLE_CT)
       end
 
+      workbook.pivot_tables.each do |pivot_table|
+        c_types << Axlsx::Override.new(:PartName => "/xl/#{pivot_table.pn}",
+                                       :ContentType => PIVOT_TABLE_CT)
+        c_types << Axlsx::Override.new(:PartName => "/xl/#{pivot_table.cache_definition.pn}",
+                                       :ContentType => PIVOT_TABLE_CACHE_DEFINITION_CT)
+      end
+
       workbook.comments.each do |comment|
         if comment.size > 0
         c_types << Axlsx::Override.new(:PartName => "/xl/#{comment.pn}",

data/lib/axlsx/rels/relationship.rb

@@ -12,6 +12,7 @@ module Axlsx
     # @note Supported types are defined as constants in Axlsx:
     # @see XML_NS_R
     # @see TABLE_R
+    # @see PIVOT_TABLE_R
     # @see WORKBOOK_R
     # @see WORKSHEET_R
     # @see APP_R

data/lib/axlsx/stylesheet/styles.rb

@@ -153,9 +153,9 @@ module Axlsx
     #   # black text on a white background at 14pt with thin borders!
     #   title = ws.style.add_style(:bg_color => "FFFF0000", :fg_color=>"#FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
     #
-    #   ws.add_row :values => ["Least Popular Pets"]
-    #   ws.add_row :values => ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
-    #   ws.add_row :values => ["Votes", 6, 4, 1], :style=>Axlsx::STYLE_THIN_BORDER
+    #   ws.add_row ["Least Popular Pets"]
+    #   ws.add_row ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
+    #   ws.add_row ["Votes", 6, 4, 1], :style=>Axlsx::STYLE_THIN_BORDER
     #   f = File.open('example_you_got_style.xlsx', 'w')
     #   p.serialize(f)
     #
@@ -183,13 +183,13 @@ module Axlsx
     #                                 :border=>Axlsx::STYLE_THIN_BORDER)
     #
     #   # build your rows
-    #   ws.add_row :values => ["Genreated At:", Time.now], :styles=>[nil, date_time]
-    #   ws.add_row :values => ["Previous Year Quarterly Profits (JPY)"], :style=>title
-    #   ws.add_row :values => ["Quarter", "Profit", "% of Total"], :style=>title
-    #   ws.add_row :values => ["Q1", 4000, 40], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q2", 3000, 30], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q3", 1000, 10], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q4", 2000, 20], :style=>[title, currency, percent]
+    #   ws.add_row ["Genreated At:", Time.now], :styles=>[nil, date_time]
+    #   ws.add_row ["Previous Year Quarterly Profits (JPY)"], :style=>title
+    #   ws.add_row ["Quarter", "Profit", "% of Total"], :style=>title
+    #   ws.add_row ["Q1", 4000, 40], :style=>[title, currency, percent]
+    #   ws.add_row ["Q2", 3000, 30], :style=>[title, currency, percent]
+    #   ws.add_row ["Q3", 1000, 10], :style=>[title, currency, percent]
+    #   ws.add_row ["Q4", 2000, 20], :style=>[title, currency, percent]
     #   f = File.open('example_you_got_style.xlsx', 'w')
     #   p.serialize(f)
     #
@@ -207,13 +207,13 @@ module Axlsx
     #                              :fg_color=>"#FF000000",
     #                              :type => :dxf)
     #
-    #   ws.add_row :values => ["Genreated At:", Time.now], :styles=>[nil, date_time]
-    #   ws.add_row :values => ["Previous Year Quarterly Profits (JPY)"], :style=>title
-    #   ws.add_row :values => ["Quarter", "Profit", "% of Total"], :style=>title
-    #   ws.add_row :values => ["Q1", 4000, 40], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q2", 3000, 30], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q3", 1000, 10], :style=>[title, currency, percent]
-    #   ws.add_row :values => ["Q4", 2000, 20], :style=>[title, currency, percent]
+    #   ws.add_row ["Genreated At:", Time.now], :styles=>[nil, date_time]
+    #   ws.add_row ["Previous Year Quarterly Profits (JPY)"], :style=>title
+    #   ws.add_row ["Quarter", "Profit", "% of Total"], :style=>title
+    #   ws.add_row ["Q1", 4000, 40], :style=>[title, currency, percent]
+    #   ws.add_row ["Q2", 3000, 30], :style=>[title, currency, percent]
+    #   ws.add_row ["Q3", 1000, 10], :style=>[title, currency, percent]
+    #   ws.add_row ["Q4", 2000, 20], :style=>[title, currency, percent]
     #
     #   ws.add_conditional_formatting("A1:A7", { :type => :cellIs, :operator => :greaterThan, :formula => "2000", :dxfId => profitable, :priority => 1 })
     #   f = File.open('example_differential_styling', 'w')
@@ -308,6 +308,8 @@ module Axlsx
     # may include an :edges entry that references an array of symbols identifying which border edges 
     # you wish to apply the style or any other valid Border initializer options.
     # If the :edges entity is not provided the style is applied to all edges of cells that reference this style.
+	# Also available :border_top, :border_right, :border_bottom and :border_left options with :style and/or :color 
+	# key-value entries, which override :border values.
     # @example
     #   #apply a thick red border to the top and bottom
     #   { :border => { :style => :thick, :color => "FFFF0000", :edges => [:top, :bottom] }
@@ -319,7 +321,9 @@ module Axlsx
         raise ArgumentError, (ERR_INVALID_BORDER_OPTIONS % b_opts) unless b_opts.keys.include?(:style) && b_opts.keys.include?(:color)
         border = Border.new b_opts
         (b_opts[:edges] || [:left, :right, :top, :bottom]).each do |edge|
-          b_options = { :name => edge, :style => b_opts[:style], :color => Color.new(:rgb => b_opts[:color]) }
+          edge_options = options["border_#{edge}".to_sym] || {}
+          border_edge = b_opts.merge(edge_options)
+          b_options = { :name => edge, :style => border_edge[:style], :color => Color.new(:rgb => border_edge[:color]) }
           border.prs << BorderPr.new(b_options)
         end
         options[:type] == :dxf ? border : borders << border

data/lib/axlsx/util/accessors.rb

@@ -22,6 +22,21 @@ module Axlsx
         validated_attr_accessor(symbols, 'validate_string')
       end
 
+
+      # Creates one or more usigned integer attr_accessors
+      # @param [Array] symbols An array of symbols representing the
+      # names of the attributes you will add to your class
+      def unsigned_int_attr_accessor(*symbols)
+        validated_attr_accessor(symbols, 'validate_unsigned_int')
+      end
+
+      # Creates one or more float (double?) attr_accessors
+      # @param [Array] symbols An array of symbols representing the
+      # names of the attributes you will add to your class
+      def float_attr_accessor(*symbols)
+        validated_attr_accessor(symbols, 'validate_float')
+      end
+
       # Creates on or more boolean validated attr_accessors
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class.

data/lib/axlsx/util/constants.rb

@@ -51,6 +51,12 @@ module Axlsx
   # table rels namespace
   TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
 
+  # pivot table rels namespace
+  PIVOT_TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable"
+
+  # pivot table cache definition namespace
+  PIVOT_TABLE_CACHE_DEFINITION_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
+
   # workbook rels namespace
   WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
 
@@ -99,6 +105,12 @@ module Axlsx
   # table content type
   TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
 
+  # pivot table content type
+  PIVOT_TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
+
+  # pivot table cache definition content type
+  PIVOT_TABLE_CACHE_DEFINITION_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
+
   # workbook content type
   WORKBOOK_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
 
@@ -208,6 +220,15 @@ module Axlsx
   # drawing part
   TABLE_PN = "tables/table%d.xml"
 
+  # pivot table parts
+  PIVOT_TABLE_PN = "pivotTables/pivotTable%d.xml"
+
+  # pivot table cache definition part name
+  PIVOT_TABLE_CACHE_DEFINITION_PN = "pivotCache/pivotCacheDefinition%d.xml"
+
+  # pivot table rels parts
+  PIVOT_TABLE_RELS_PN = "pivotTables/_rels/pivotTable%d.xml.rels"
+
   # chart part
   CHART_PN = "charts/chart%d.xml"
 
@@ -268,9 +289,8 @@ module Axlsx
   # error message for sheets that use a name which is longer than 31 bytes
   ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be 31 characters (bytes) or less"
 
-  # error message for sheets that use a name which includes a colon
-
-  ERR_SHEET_NAME_COLON_FORBIDDEN = "Your worksheet name '%s' contains a colon, which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet."
+  # error message for sheets that use a name which include invalid characters
+  ERR_SHEET_NAME_CHARACTER_FORBIDDEN = "Your worksheet name '%s' contains a character which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet."
 
   # error message for duplicate sheet names
   ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name"
@@ -320,7 +340,7 @@ module Axlsx
   # x1E Information Separator Two
   # x1F Information Separator One
   #
-  # The following are not dealt with. 
+  # The following are not dealt with.
   # If you have this in your data, expect excel to blow up!
   #
   # x7F	Delete
@@ -365,7 +385,7 @@ module Axlsx
   # @see http://www.codetable.net/asciikeycodes
   pattern = "[\x0-\x08\x0B\x0C\x0E-\x1F]"
   pattern= pattern.respond_to?(:encode) ? pattern.encode('UTF-8') : pattern
-  
+
   # The regular expression used to remove control characters from worksheets
   CONTROL_CHAR_REGEX = Regexp.new(pattern, 'n')
 

data/lib/axlsx/util/validators.rb

@@ -41,6 +41,7 @@ module Axlsx
       raise ArgumentError, (ERR_REGEX % [v.inspect, regex.to_s]) unless (v.respond_to?(:to_s) && v.to_s.match(regex))
     end
   end
+
   # Validate that the class of the value provided is either an instance or the class of the allowed types and that any specified additional validation returns true.
   class DataTypeValidator
     # Perform validation
@@ -50,17 +51,18 @@ module Axlsx
     # @raise [ArugumentError] Raised if the class of the value provided is not in the specified array of types or the block passed returns false
     # @return [Boolean] true if validation succeeds.
     # @see validate_boolean
-    def self.validate(name, types, v, other= lambda{|arg| true })
+    def self.validate(name, types, v, other=false)
       types = [types] unless types.is_a? Array
-      valid_type = false
+      if other.is_a?(Proc)
+         raise ArgumentError, (ERR_TYPE % [v.inspect, name, types.inspect]) unless other.call(v)
+      end
       if v.class == Class
-        types.each { |t| valid_type = true if v.ancestors.include?(t) }
+        types.each { |t| return if v.ancestors.include?(t) }
       else
-        types.each { |t| valid_type = true if v.is_a?(t) }
+        types.each { |t| return if v.is_a?(t) }
       end
-      raise ArgumentError, (ERR_TYPE % [v.inspect, name, types.inspect]) unless (other.call(v) && valid_type)
+      raise ArgumentError, (ERR_TYPE % [v.inspect, name, types.inspect])
     end
-    true
   end
 
 
@@ -229,14 +231,14 @@ module Axlsx
   # TABLE_CT, WORKBOOK_CT, APP_CT, RELS_CT, STYLES_CT, XML_CT, WORKSHEET_CT, SHARED_STRINGS_CT, CORE_CT, CHART_CT, DRAWING_CT, COMMENT_CT are allowed
   # @param [Any] v The value validated
   def self.validate_content_type(v)
-    RestrictionValidator.validate :content_type, [TABLE_CT, WORKBOOK_CT, APP_CT, RELS_CT, STYLES_CT, XML_CT, WORKSHEET_CT, SHARED_STRINGS_CT, CORE_CT, CHART_CT, JPEG_CT, GIF_CT, PNG_CT, DRAWING_CT, COMMENT_CT, VML_DRAWING_CT], v
+    RestrictionValidator.validate :content_type, [TABLE_CT, WORKBOOK_CT, APP_CT, RELS_CT, STYLES_CT, XML_CT, WORKSHEET_CT, SHARED_STRINGS_CT, CORE_CT, CHART_CT, JPEG_CT, GIF_CT, PNG_CT, DRAWING_CT, COMMENT_CT, VML_DRAWING_CT, PIVOT_TABLE_CT, PIVOT_TABLE_CACHE_DEFINITION_CT], v
   end
 
   # Requires that the value is a valid relationship_type
   # XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R, HYPERLINK_R, SHARED_STRINGS_R are allowed
   # @param [Any] v The value validated
   def self.validate_relationship_type(v)
-    RestrictionValidator.validate :relationship_type, [XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R, HYPERLINK_R, SHARED_STRINGS_R, COMMENT_R, VML_DRAWING_R, COMMENT_R_NULL], v
+    RestrictionValidator.validate :relationship_type, [XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R, HYPERLINK_R, SHARED_STRINGS_R, COMMENT_R, VML_DRAWING_R, COMMENT_R_NULL, PIVOT_TABLE_R, PIVOT_TABLE_CACHE_DEFINITION_R], v
   end
 
   # Requires that the value is a valid table element type

data/lib/axlsx/version.rb

@@ -1,5 +1,5 @@
 module Axlsx
 
   # The current version
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/lib/axlsx/workbook/shared_strings_table.rb

@@ -58,7 +58,7 @@ module Axlsx
           cell.send :ssti=, index
         else
           cell.send :ssti=, @index
-          @shared_xml_string << '<si>' << cell.run_xml_string << '</si>'
+          @shared_xml_string << '<si>' << CellSerializer.run_xml_string(cell) << '</si>'
           @unique_cells[cell_hash] = @index
           @index += 1
         end

data/lib/axlsx/workbook/workbook.rb

@@ -5,6 +5,7 @@ require 'axlsx/workbook/worksheet/auto_filter/auto_filter.rb'
 require 'axlsx/workbook/worksheet/date_time_converter.rb'
 require 'axlsx/workbook/worksheet/protected_range.rb'
 require 'axlsx/workbook/worksheet/protected_ranges.rb'
+require 'axlsx/workbook/worksheet/cell_serializer.rb'
 require 'axlsx/workbook/worksheet/cell.rb'
 require 'axlsx/workbook/worksheet/page_margins.rb'
 require 'axlsx/workbook/worksheet/page_set_up_pr.rb'
@@ -40,9 +41,13 @@ require 'axlsx/workbook/defined_names.rb'
 require 'axlsx/workbook/worksheet/table_style_info.rb'
 require 'axlsx/workbook/worksheet/table.rb'
 require 'axlsx/workbook/worksheet/tables.rb'
+require 'axlsx/workbook/worksheet/pivot_table_cache_definition.rb'
+require 'axlsx/workbook/worksheet/pivot_table.rb'
+require 'axlsx/workbook/worksheet/pivot_tables.rb'
 require 'axlsx/workbook/worksheet/data_validation.rb'
 require 'axlsx/workbook/worksheet/data_validations.rb'
 require 'axlsx/workbook/worksheet/sheet_view.rb'
+require 'axlsx/workbook/worksheet/sheet_format_pr.rb'
 require 'axlsx/workbook/worksheet/pane.rb'
 require 'axlsx/workbook/worksheet/selection.rb'
   # The Workbook class is an xlsx workbook that manages worksheets, charts, drawings and styles.
@@ -121,10 +126,17 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @return [SimpleTypedList]
     attr_reader :tables
 
+    # A colllection of pivot tables associated with this workbook
+    # @note The recommended way to manage drawings is Worksheet#add_table
+    # @see Worksheet#add_table
+    # @see Table
+    # @return [SimpleTypedList]
+    attr_reader :pivot_tables
+
 
     # A collection of defined names for this workbook
     # @note The recommended way to manage defined names is Workbook#add_defined_name
-    # @see DefinedName 
+    # @see DefinedName
     # @return [DefinedNames]
     def defined_names
       @defined_names ||= DefinedNames.new
@@ -170,7 +182,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     #  w.parse_string :date1904, "//xmlns:workbookPr/@date1904"
     #  w
     #end
-    
+
     # Creates a new Workbook
     # The recomended way to work with workbooks is via Package#workbook
     # @option options [Boolean] date1904. If this is not specified, date1904 is set to false. Office 2011 for Mac defaults to false.
@@ -182,6 +194,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @images = SimpleTypedList.new Pic
       # Are these even used????? Check package serialization parts
       @tables = SimpleTypedList.new Table
+      @pivot_tables = SimpleTypedList.new PivotTable
       @comments = SimpleTypedList.new Comments
 
 
@@ -217,7 +230,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     def use_autowidth=(v=true) Axlsx::validate_boolean v; @use_autowidth = v; end
 
     # inserts a worksheet into this workbook at the position specified.
-    # It the index specified is out of range, the worksheet will be added to the end of the 
+    # It the index specified is out of range, the worksheet will be added to the end of the
     # worksheets collection
     # @return [Worksheet]
     # @param index The zero based position to insert the newly created worksheet
@@ -259,6 +272,9 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @worksheets.each do |sheet|
         r << Relationship.new(WORKSHEET_R, WORKSHEET_PN % (r.size+1))
       end
+      pivot_tables.each_with_index do |pivot_table, index|
+        r << Relationship.new(PIVOT_TABLE_CACHE_DEFINITION_R, PIVOT_TABLE_CACHE_DEFINITION_PN % (index+1))
+      end
       r << Relationship.new(STYLES_R,  STYLES_PN)
       if use_shared_strings
           r << Relationship.new(SHARED_STRINGS_R,  SHARED_STRINGS_PN)
@@ -300,6 +316,14 @@ require 'axlsx/workbook/worksheet/selection.rb'
       end
       str << '</sheets>'
       defined_names.to_xml_string(str)
+      unless pivot_tables.empty?
+        str << '<pivotCaches>'
+        pivot_tables.each_with_index do |pivot_table, index|
+          rId = "rId#{@worksheets.size + index + 1  }"
+          str << '<pivotCache cacheId="' << pivot_table.cache_definition.cache_id.to_s << '" r:id="' << rId << '"/>'
+        end
+        str << '</pivotCaches>'
+      end
       str << '</workbook>'
     end
 

data/lib/axlsx/workbook/worksheet/cell.rb

@@ -28,11 +28,13 @@ module Axlsx
     # @option options [Symbol] vertAlign must be one of :baseline, :subscript, :superscript
     # @option options [Integer] sz
     # @option options [String] color an 8 letter rgb specification
+    # @option options [Number] formula_value The value to cache for a formula cell.
     # @option options [Symbol] scheme must be one of :none, major, :minor
     def initialize(row, value="", options={})
       self.row=row
-      @value = @font_name = @charset = @family = @b = @i = @strike = @outline = @shadow = nil
-      @condense = @u = @vertAlign = @sz = @color = @scheme = @extend = @ssti = nil
+      @value = nil
+      #@value = @font_name = @charset = @family = @b = @i = @strike = @outline = @shadow = nil
+      #@formula_value = @condense = @u = @vertAlign = @sz = @color = @scheme = @extend = @ssti = nil
       @styles = row.worksheet.workbook.styles
       @row.cells << self
       parse_options options
@@ -41,6 +43,10 @@ module Axlsx
       @value = cast_value(value)
     end
 
+    # this is the cached value for formula cells. If you want the values to render in iOS/Mac OSX preview
+    # you need to set this.
+    attr_accessor :formula_value
+
     # An array of available inline styes.
     # TODO change this to a hash where each key defines attr name and validator (and any info the validator requires)
     # then move it out to a module so we can re-use in in other classes.
@@ -75,14 +81,14 @@ module Axlsx
     attr_reader :type
     # @see type
     def type=(v)
-      RestrictionValidator.validate "Cell.type", [:date, :time, :float, :integer, :string, :boolean], v
+      RestrictionValidator.validate "Cell.type", [:date, :time, :float, :integer, :string, :boolean, :iso_8601], v
       @type=v
       self.value = @value unless @value.nil?
     end
 
 
     # The value of this cell.
-    # @return [String, Integer, Float, Time] casted value based on cell's type attribute.
+    # @return [String, Integer, Float, Time, Boolean] casted value based on cell's type attribute.
     attr_reader :value
     # @see value
     def value=(v)
@@ -214,7 +220,7 @@ module Axlsx
     end
 
     # The inline sz property for the cell
-    # @return [Boolean]
+    # @return [Inteter]
     attr_reader :sz
     # @see sz
     def sz=(v) set_run_style :validate_unsigned_int, :sz, v; end
@@ -288,67 +294,15 @@ module Axlsx
       self.row.worksheet.merge_cells "#{self.r}:#{range_end}" unless range_end.nil?
     end
 
-    # builds an xml text run based on this cells attributes.
-    # @param [String] str The string instance this run will be concated to.
-    # @return [String]
-    def run_xml_string(str = '')
-      if is_text_run?
-        data = instance_values.reject{|key, value| value == nil || key == 'value' || key == 'type' }
-        keys = data.keys & INLINE_STYLES
-        str << "<r><rPr>"
-        keys.each do |key|
-          case key
-          when 'font_name'
-            str << "<rFont val='"<< @font_name << "'/>"
-          when 'color'
-            str << data[key].to_xml_string
-          else
-            str << "<" << key.to_s << " val='" << data[key].to_s << "'/>"
-          end
-        end
-        str << "</rPr>" << "<t>" << value.to_s << "</t></r>"
-      else
-        str << "<t>" << value.to_s << "</t>"
-      end
-      str
-    end
-
     # Serializes the cell
     # @param [Integer] r_index The row index for the cell
     # @param [Integer] c_index The cell index in the row.
     # @param [String] str The string index the cell content will be appended to. Defaults to empty string.
     # @return [String] xml text for the cell
     def to_xml_string(r_index, c_index, str = '')
-      str << '<c r="' << Axlsx::cell_r(c_index, r_index) << '" s="' << @style.to_s << '" '
-      return str << '/>' if @value.nil?
-
-      case @type
-
-      when :string
-        #parse formula
-        if @value.start_with?('=')
-          str  << 't="str"><f>' << @value.to_s.sub('=', '') << '</f>'
-        else
-          #parse shared
-          if @ssti
-            str << 't="s"><v>' << @ssti.to_s << '</v>'
-          else
-            str << 't="inlineStr"><is>' << run_xml_string << '</is>'
-          end
-        end
-      when :date
-        # TODO: See if this is subject to the same restriction as Time below
-        str << '><v>' << DateTimeConverter::date_to_serial(@value).to_s << '</v>'
-      when :time
-        str << '><v>' << DateTimeConverter::time_to_serial(@value).to_s << '</v>'
-      when :boolean
-        str << 't="b"><v>' << @value.to_s << '</v>'
-      else
-        str << '><v>' << @value.to_s << '</v>'
-      end
-      str << '</c>'
+      CellSerializer.to_xml_string r_index, c_index, self, str
     end
-
+   
     def is_formula?
       @type == :string && @value.to_s.start_with?('=')
     end
@@ -415,10 +369,15 @@ module Axlsx
         :time
       elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
         :boolean
-      elsif v.to_s.match(/\A[+-]?\d+?\Z/) #numeric
+      elsif v.to_s =~ /\A[+-]?\d+?\Z/ #numeric
         :integer
-      elsif v.to_s.match(/\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/) #float
+      elsif v.to_s =~ /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/ #float
         :float
+        # \A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])
+        # T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?
+        # (Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?\Z 
+      elsif v.to_s =~/\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?\Z/
+        :iso_8601
       else
         :string
       end
@@ -426,7 +385,7 @@ module Axlsx
 
     # Cast the value into this cells data type.
     # @note
-    #   About Time - Time in OOXML is *different* from what you might expect. The history as to why is interesting,  but you can safely assume that if you are generating docs on a mac, you will want to specify Workbook.1904 as true when using time typed values.
+    #   About Time - Time in OOXML is *different* from what you might expect. The history as to why is interesting, but you can safely assume that if you are generating docs on a mac, you will want to specify Workbook.1904 as true when using time typed values.
     # @see Axlsx#date1904
     def cast_value(v)
       return nil if v.nil?
@@ -442,13 +401,16 @@ module Axlsx
         v.to_i
       elsif @type == :boolean
         v ? 1 : 0
+      elsif @type == :iso_8601
+        #consumer is responsible for ensuring the iso_8601 format when specifying this type
+        v
       else
         @type = :string
-        v.to_s
         # TODO find a better way to do this as it accounts for 30% of
         # processing time in benchmarking...
-        ::CGI.escapeHTML(v.to_s)
+        Axlsx::trust_input ? v.to_s : ::CGI.escapeHTML(v.to_s)
       end
     end
+
   end
 end