caxlsx 3.0.2 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1084b09a06fdcca750fa734735fe339c527327f
-  data.tar.gz: cb0849f0edbe032dc82e3d6766245e7a42ebf81f
+SHA256:
+  metadata.gz: ef44b04d373e873848cd74d5bebae4d327cd0d9cba06ee74de6d0aac35b51ab9
+  data.tar.gz: b54abdd82f277253216da4ad9d938c2508c9f1ed54abd080d4437e5523c470e1
 SHA512:
-  metadata.gz: 736a38bbbb7bebebc204e3e81778e84d7ee45f9794e21b0bfab39d42ed1afe1e1e2cc905345b32889fb8cf3ae3b11a3ac7656173f991016296064a5ca82e98a7
-  data.tar.gz: 4532801d92486550f8db5ab177acb8a72de3f0e209f2483db9e13df11a7e05ef3a63f97c9062099d478ca0469c86f1ebe7a7bc5cc8d5be8018a8a3abf49b8fe4
+  metadata.gz: bce9d28013a2ec3ffec4be335a2b933ba38fb508dbc4f486a3df135dc81122a236ff9439792ac8bc64c4150e523af261deea02c5a86b9f3838a38b2a26e0d537
+  data.tar.gz: 1bca0d82c582818a822feefbb499caef3b622f8d4203543a1c6d11f57876944df01db0bafb30d6238f9a268d731a0a78de0ed4efa97a205db43465d73dab7d74

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 CHANGELOG
 ---------
 
+- **September.22.21**: 3.1.1
+  - [PR #107](https://github.com/caxlsx/caxlsx/pull/107) - Add overlap to bar charts
+  - [PR #108](https://github.com/caxlsx/caxlsx/pull/108) - Fix gap depth and gap depth validators for bar charts and 3D bar charts
+
+- **March.27.21**: 3.1.0
+  - [PR #95](https://github.com/caxlsx/caxlsx/pull/95) - Replace mimemagic with marcel  
+  - [PR #87](https://github.com/caxlsx/caxlsx/pull/87) - Implement :offset option for worksheet#add_row
+  - [PR #79](https://github.com/caxlsx/caxlsx/pull/79) - Add support for format in pivot tables
+  - [PR #77](https://github.com/caxlsx/caxlsx/pull/77) - Fix special characters in table header
+  - [PR #57](https://github.com/caxlsx/caxlsx/pull/57) - Deprecate using #serialize with boolean argument: Calls like `Package#serialize("name.xlsx", false)` should be replaced with `Package#serialize("name.xlsx", confirm_valid: false)`.
+
+- **January.5.21**: 3.0.4
+  - [PR #72](https://github.com/caxlsx/caxlsx/pull/72) - Relax Ruby dependency to allow for Ruby 3. This required Travis to be upgraded from Ubuntu Trusty to Ubuntu Bionic. rbx-3 was dropped.
+  - [PR #71](https://github.com/caxlsx/caxlsx/pull/71) - Adds date type to validator so sheet.add_data_validation works with date type. Addresses [I #26](https://github.com/caxlsx/caxlsx/issues/26) - Date Data Validation not working
+  - [PR #70](https://github.com/caxlsx/caxlsx/pull/70) - Fix worksheet title length enforcement caused by switching from size to bytesize. Addresses [I #67](https://github.com/caxlsx/caxlsx/issues/67) - character length error in worksheet name when using Japanese, which was introduced by addressing [I #588](https://github.com/randym/axlsx/issues/588) in the old Axlsx repo.
+
+
+- **December.7.20**: 3.0.3
+  - [PR #62](https://github.com/caxlsx/caxlsx/pull/62) - Fix edge cases in format detection for objects whose string representation made them look like numbers but the object didn’t respond to `#to_i` or `#to_f`.
+  - [PR #56](https://github.com/caxlsx/caxlsx/pull/56) - Add `zip_command` option to `#serialize` for faster serialization of large Excel files by using a zip binary
+  - [PR #54](https://github.com/caxlsx/caxlsx/pull/54) - Fix type detection for floats with out-of-rage exponents
+  - [I #67](https://github.com/caxlsx/caxlsx/issues/67) - Fix regression in worksheet name length enforcement: Some unicode characters were counted incorrectly, so that names that previously worked fine now stopped working. (This was introduced in 3.0.2)
+
 - **July.16.20**: 3.0.2
   - [I #51](https://github.com/caxlsx/caxlsx/issues/51) - Images do not import on Windows. IO read set explicitly to binary mode.
   - [PR #53](https://github.com/caxlsx/caxlsx/pull/53) - Limit column width to 255. Maximum column width limit in MS Excel is 255 characters, see https://support.microsoft.com/en-us/office/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
@@ -133,7 +156,7 @@ CHANGELOG
    - added in interop requirements so that charts are properly exported
      to PDF from Libra Office
    - various readability improvements and work standardizing attribute
-     names to snake_case. Aliases are provided for backward compatiblity 
+     names to snake_case. Aliases are provided for backward compatiblity
 
 - **June.11.12**: 1.1.7
    - fix chart rendering issue when label offset is specified as a
@@ -174,23 +197,23 @@ in value caches
    - Added support for specifying the color of data series in charts.
    - bugfix using add_cell on row mismanaged calls to update_column_info.
 
-- ** April.25.12:**: 1.1.3
+- **April.25.12:**: 1.1.3
    - Primarily because I am stupid.....Updates to readme to properly report version, add in missing docs and restructure example directory.
 
-- ** April.25.12:**: 1.1.2
+- **April.25.12:**: 1.1.2
    - Conditional Formatting completely implemented.
    - refactoring / documentation for Style#add_style
    - added in label rotation for chart axis labels
    - bugfix to properly assign style and type info to cells when only partial information is provided in the types/style option
 
-- ** April.18.12**: 1.1.1
+- **April.18.12**: 1.1.1
    - bugfix for autowidth calculations across multiple rows
    - bugfix for dimension calculations with nil cells.
    - REMOVED RMAGICK dependency WOOT!
    - Update readme to show screenshot of gem output.
    - Cleanup benchmark and add benchmark rake task
 
-- ** April.3.12**: 1.1.0
+- **April.3.12**: 1.1.0
    - bugfix patch name_to_indecies to properly handle extended ranges.
    - bugfix properly serialize chart title.
    - lower rake minimum requirement for 1.8.7 apps that don't want to move on to 0.9 NOTE this will be reverted for 2.0.0 with workbook parsing!
@@ -205,7 +228,7 @@ in value caches
    - Major (like 7x faster!) performance updates.
    - Gem now supports for JRuby 1.6.7, as well as experimental support for Rubinius
 
-- ** March.5.12**: 1.0.18
+- **March.5.12**: 1.0.18
    https://github.com/randym/axlsx/compare/1.0.17...1.0.18
    - bugfix custom borders are not properly applied when using styles.add_style
    - interop worksheet names must be 31 characters or less or some versions of office complain about repairs
@@ -215,14 +238,14 @@ in value caches
    - added << alias for add_row
    - removed presetting of date1904 based on authoring platform. Now defaults to use 1900 epoch (date1904 = false)
 
-- ** February.14.12**: 1.0.17
+- **February.14.12**: 1.0.17
    https://github.com/randym/axlsx/compare/1.0.16...1.0.17
    - Added in support for serializing to StringIO
    - Added in support for using shared strings table. This makes most of the features in axlsx interoperable with iWorks Numbers
    - Added in support for fixed column_widths
    - Removed unneeded dependencies on active-support and i18n
 
-- ** February.2.12**: 1.0.16
+- **February.2.12**: 1.0.16
    https://github.com/randym/axlsx/compare/1.0.15...1.0.16
    - Bug fix for schema file locations when validating in rails
    - Added hyperlink to images

data/README.md

@@ -1,5 +1,9 @@
 # Caxlsx (Community Continued Version)
 [![Build Status](https://travis-ci.com/caxlsx/caxlsx.svg?branch=master)](https://travis-ci.com/caxlsx/caxlsx)
+[![Gem
+Version](https://badge.fury.io/rb/caxlsx.svg)](http://badge.fury.io/rb/caxlsx)
+![Total downloads](http://ruby-gem-downloads-badge.herokuapp.com/caxlsx?type=total)
+![Downloads for 3.1.1 (latest)](http://ruby-gem-downloads-badge.herokuapp.com/caxlsx/3.1.1?label=downloads%203.1.1)
 
 ## Notice: Community Axlsx Organization
 

data/examples/generate.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+files = if !ARGV.empty?
+          ARGV.select { |file| File.exist?(file) }
+        else
+          Dir['*_example.md']
+        end
+
+files.each do |file|
+  puts "Executing #{file.split('.')[0].tr('_', ' ')}"
+  code = File.read(file).match(/```ruby(?<code>.+)```/m)[:code]
+  unless code.nil?
+    eval(['$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"', code].join("\n"))
+  end
+end

data/lib/axlsx/drawing/bar_3D_chart.rb

@@ -31,17 +31,17 @@ module Axlsx
     alias :barDir :bar_dir
 
     # space between bar or column clusters, as a percentage of the bar or column width.
-    # @return [String]
+    # @return [Integer]
     attr_reader :gap_depth
     alias :gapDepth :gap_depth
 
     # space between bar or column clusters, as a percentage of the bar or column width.
-    # @return [String]
+    # @return [Integer]
     def gap_width
       @gap_width ||= 150
     end
     alias :gapWidth :gap_width
-    
+
     #grouping for a column, line, or area chart.
     # must be one of  [:percentStacked, :clustered, :standard, :stacked]
     # @return [Symbol]
@@ -56,9 +56,6 @@ module Axlsx
       @shape ||= :box
     end
 
-    # validation regex for gap amount percent
-    GAP_AMOUNT_PERCENT = /0*(([0-9])|([1-9][0-9])|([1-4][0-9][0-9])|500)%/
-
     # Creates a new bar chart object
     # @param [GraphicFrame] frame The workbook that owns this chart.
     # @option options [Cell, String] title
@@ -102,14 +99,14 @@ module Axlsx
 
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_width=(v)
-      RegexValidator.validate "Bar3DChart.gap_width", GAP_AMOUNT_PERCENT, v
+      RangeValidator.validate "Bar3DChart.gap_width", 0, 500, v
       @gap_width=(v)
     end
     alias :gapWidth= :gap_width=
 
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_depth=(v)
-      RegexValidator.validate "Bar3DChart.gap_didth", GAP_AMOUNT_PERCENT, v
+      RangeValidator.validate "Bar3DChart.gap_depth", 0, 500, v
       @gap_depth=(v)
     end
     alias :gapDepth= :gap_depth=

data/lib/axlsx/drawing/bar_chart.rb

@@ -31,12 +31,7 @@ module Axlsx
     alias :barDir :bar_dir
 
     # space between bar or column clusters, as a percentage of the bar or column width.
-    # @return [String]
-    attr_reader :gap_depth
-    alias :gapDepth :gap_depth
-
-    # space between bar or column clusters, as a percentage of the bar or column width.
-    # @return [String]
+    # @return [Integer]
     def gap_width
       @gap_width ||= 150
     end
@@ -49,6 +44,12 @@ module Axlsx
       @grouping ||= :clustered
     end
 
+    # Overlap between series
+    # @return [Integer]
+    def overlap
+      @overlap ||= 0
+    end
+
     # The shape of the bars or columns
     # must be one of  [:cone, :coneToMax, :box, :cylinder, :pyramid, :pyramidToMax]
     # @return [Symbol]
@@ -56,9 +57,6 @@ module Axlsx
       @shape ||= :box
     end
 
-    # validation regex for gap amount percent
-    GAP_AMOUNT_PERCENT = /0*(([0-9])|([1-9][0-9])|([1-4][0-9][0-9])|500)%/
-
     # Creates a new bar chart object
     # @param [GraphicFrame] frame The workbook that owns this chart.
     # @option options [Cell, String] title
@@ -66,12 +64,11 @@ module Axlsx
     # @option options [Symbol] bar_dir
     # @option options [Symbol] grouping
     # @option options [String] gap_width
-    # @option options [String] gap_depth
     # @option options [Symbol] shape
     # @see Chart
     def initialize(frame, options={})
       @vary_colors = true
-      @gap_width, @gap_depth, @shape = nil, nil, nil
+      @gap_width, @overlap, @shape = nil, nil, nil
       super(frame, options)
       @series_type = BarSeries
       @d_lbls = nil
@@ -94,17 +91,15 @@ module Axlsx
 
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_width=(v)
-      RegexValidator.validate "BarChart.gap_width", GAP_AMOUNT_PERCENT, v
+      RangeValidator.validate "BarChart.gap_width", 0, 500, v
       @gap_width=(v)
     end
     alias :gapWidth= :gap_width=
 
-    # space between bar or column clusters, as a percentage of the bar or column width.
-    def gap_depth=(v)
-      RegexValidator.validate "BarChart.gap_didth", GAP_AMOUNT_PERCENT, v
-      @gap_depth=(v)
+    def overlap=(v)
+      RangeValidator.validate "BarChart.overlap", -100, 100, v
+      @overlap=(v)
     end
-    alias :gapDepth= :gap_depth=
 
     # The shape of the bars or columns
     # must be one of  [:cone, :coneToMax, :box, :cylinder, :pyramid, :pyramidToMax]
@@ -124,8 +119,8 @@ module Axlsx
         str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
         @series.each { |ser| ser.to_xml_string(str) }
         @d_lbls.to_xml_string(str) if @d_lbls
+        str << ('<c:overlap val="' << @overlap.to_s << '"/>') unless @overlap.nil?
         str << ('<c:gapWidth val="' << @gap_width.to_s << '"/>') unless @gap_width.nil?
-        str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
         str << ('<c:shape val="' << @shape.to_s << '"/>') unless @shape.nil?
         axes.to_xml_string(str, :ids => true)
         str << '</c:barChart>'

data/lib/axlsx/drawing/bar_series.rb

@@ -22,12 +22,18 @@ module Axlsx
     # An array of rgb colors to apply to your bar chart.
     attr_reader :colors
 
+    # The fill color for this series.
+    # Red, green, and blue is expressed as sequence of hex digits, RRGGBB.
+    # @return [String]
+    attr_reader :series_color
+
     # Creates a new series
     # @option options [Array, SimpleTypedList] data
     # @option options [Array, SimpleTypedList] labels
     # @option options [String] title
     # @option options [String] shape
     # @option options [String] colors an array of colors to use when rendering each data point
+    # @option options [String] series_color a color to use when rendering series
     # @param [Chart] chart
     def initialize(chart, options={})
       @shape = :box
@@ -40,6 +46,10 @@ module Axlsx
     # @see colors
     def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
 
+    def series_color=(v)
+      @series_color = v
+    end
+
     # @see shape
     def shape=(v)
       RestrictionValidator.validate "BarSeries.shape", [:cone, :coneToMax, :box, :cylinder, :pyramid, :pyramidToMax], v
@@ -60,9 +70,16 @@ module Axlsx
           str << '</a:solidFill></c:spPr></c:dPt>'
         end
 
+        if series_color
+          str << '<c:spPr><a:solidFill>'
+          str << ('<a:srgbClr val="' << series_color << '"/>')
+          str << '</a:solidFill>'
+          str << '</c:spPr>'
+        end
+
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
-        # this is actually only required for shapes other than box 
+        # this is actually only required for shapes other than box
         str << ('<c:shape val="' << shape.to_s << '"></c:shape>')
       end
     end

data/lib/axlsx/drawing/pie_series.rb

@@ -47,7 +47,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       super(str) do
-        str << '<c:explosion val="' + @explosion + '"/>' unless @explosion.nil?
+        str << '<c:explosion val="' + @explosion.to_s + '"/>' unless @explosion.nil?
         colors.each_with_index do |c, index|
           str << '<c:dPt>'
           str << ('<c:idx val="' << index.to_s << '"/>')

data/lib/axlsx/package.rb

@@ -74,10 +74,14 @@ module Axlsx
     # Serialize your workbook to disk as an xlsx document.
     #
     # @param [String] output The name of the file you want to serialize your package to
-    # @param [Boolean] confirm_valid Validate the package prior to serialization.
+    # @param [Hash] options
+    # @option options [Boolean] :confirm_valid Validate the package prior to serialization.
+    # @option options [String] :zip_command When `nil`, `#serialize` with RubyZip to
+    #   zip the XLSX file contents. When a String, the provided zip command (e.g.,
+    #   "zip") is used to zip the file contents (may be faster for large files)
     # @return [Boolean] False if confirm_valid and validation errors exist. True if the package was serialized
     # @note A tremendous amount of effort has gone into ensuring that you cannot create invalid xlsx documents.
-    #   confirm_valid should be used in the rare case that you cannot open the serialized file.
+    #   options[:confirm_valid] should be used in the rare case that you cannot open the serialized file.
     # @see Package#validate
     # @example
     #   # This is how easy it is to create a valid xlsx file. Of course you might want to add a sheet or two, and maybe some data, styles and charts.
@@ -88,13 +92,24 @@ module Axlsx
     #   # ......add cool stuff to your workbook......
     #   p.serialize("example.xlsx")
     #
+    #   # Serialize to a file, using a system zip binary
+    #   p.serialize("example.xlsx", zip_command: "zip", confirm_valid: false)
+    #   p.serialize("example.xlsx", zip_command: "/path/to/zip")
+    #   p.serialize("example.xlsx", zip_command: "zip -1")
+    #
     #   # Serialize to a stream
     #   s = p.to_stream()
     #   File.open('example_streamed.xlsx', 'w') { |f| f.write(s.read) }
-    def serialize(output, confirm_valid=false)
+    def serialize(output, options = {}, secondary_options = nil)
+      confirm_valid, zip_command = parse_serialize_options(options, secondary_options)
       return false unless !confirm_valid || self.validate.empty?
+      zip_provider = if zip_command
+                       ZipCommand.new(zip_command)
+                     else
+                       Zip::OutputStream
+                     end
       Relationship.initialize_ids_cache
-      Zip::OutputStream.open(output) do |zip|
+      zip_provider.open(output) do |zip|
         write_parts(zip)
       end
       true
@@ -153,8 +168,8 @@ module Axlsx
     private
 
     # Writes the package parts to a zip archive.
-    # @param [Zip::OutputStream] zip
-    # @return [Zip::OutputStream]
+    # @param [Zip::OutputStream, ZipCommand] zip
+    # @return [Zip::OutputStream, ZipCommand]
     def write_parts(zip)
       p = parts
       p.each do |part|
@@ -346,5 +361,28 @@ module Axlsx
       rels.lock
       rels
     end
+
+    # Parse the arguments of `#serialize`
+    # @return [Boolean, (String or nil)] Returns an array where the first value is
+    #   `confirm_valid` and the second is the `zip_command`.
+    # @private
+    def parse_serialize_options(options, secondary_options)
+      if secondary_options
+        warn "[DEPRECATION] Axlsx::Package#serialize with 3 arguments is deprecated. " +
+          "Use keyword args instead e.g., package.serialize(output, confirm_valid: false, zip_command: 'zip')"
+      end
+      if options.is_a?(Hash)
+        options.merge!(secondary_options || {})
+        invalid_keys = options.keys - [:confirm_valid, :zip_command]
+        if invalid_keys.any?
+          raise ArgumentError.new("Invalid keyword arguments: #{invalid_keys}")
+        end
+        [options.fetch(:confirm_valid, false), options.fetch(:zip_command, nil)]
+      else
+        warn "[DEPRECATION] Axlsx::Package#serialize with confirm_valid as a boolean is deprecated. " +
+          "Use keyword args instead e.g., package.serialize(output, confirm_valid: false)"
+        parse_serialize_options((secondary_options || {}).merge(confirm_valid: options), nil)
+      end
+    end
   end
 end

data/lib/axlsx/util/constants.rb

@@ -393,7 +393,8 @@ module Axlsx
   ISO_8601_REGEX = /\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/.freeze
 
   # FLOAT recognition
-  FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\Z/.freeze
+  SAFE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]{1,2})?\Z/.freeze
+  MAYBE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+[eE](?<exp>[-+]?[0-9]{3})\Z/.freeze
 
   # Numeric recognition
   NUMERIC_REGEX = /\A[+-]?\d+?\Z/.freeze

data/lib/axlsx/util/mime_type_utils.rb

@@ -5,7 +5,7 @@ module Axlsx
     # @param [String] v File path
     # @return [String] File mime type
     def self.get_mime_type(v)
-      MimeMagic.by_magic(File.open(v)).to_s
+      Marcel::MimeType.for(Pathname.new(v))
     end
   end
 end

data/lib/axlsx/util/validators.rb

@@ -269,7 +269,7 @@ module Axlsx
   # valid types must be one of custom, data, decimal, list, none, textLength, time, whole
   # @param [Any] v The value validated
   def self.validate_data_validation_type(v)
-    RestrictionValidator.validate :data_validation_type, [:custom, :data, :decimal, :list, :none, :textLength, :time, :whole], v
+    RestrictionValidator.validate :data_validation_type, [:custom, :data, :decimal, :list, :none, :textLength, :date, :time, :whole], v
   end
 
   # Requires that the value is a valid sheet view type.

data/lib/axlsx/util/zip_command.rb

@@ -0,0 +1,73 @@
+# encoding: UTF-8
+require 'open3'
+require 'shellwords'
+
+module Axlsx
+
+  # The ZipCommand class supports zipping the Excel file contents using
+  # a binary zip program instead of RubyZip's `Zip::OutputStream`.
+  #
+  # The methods provided here mimic `Zip::OutputStream` so that `ZipCommand` can
+  # be used as a drop-in replacement. Note that method signatures are not
+  # identical to `Zip::OutputStream`, they are only sufficiently close so that
+  # `ZipCommand` and `Zip::OutputStream` can be interchangeably used within
+  # `caxlsx`.
+  class ZipCommand
+    # Raised when the zip command exits with a non-zero status.
+    class ZipError < StandardError; end
+
+    def initialize(zip_command)
+      @current_file = nil
+      @files = []
+      @zip_command = zip_command
+    end
+
+    # Create a temporary directory for writing files to.
+    #
+    # The directory and its contents are removed at the end of the block.
+    def open(output, &block)
+      Dir.mktmpdir do |dir|
+        @dir = dir
+        block.call(self)
+        write_file
+        zip_parts(output)
+      end
+    end
+
+    # Closes the current entry and opens a new for writing.
+    def put_next_entry(entry)
+      write_file
+      @current_file = "#{@dir}/#{entry.name}"
+      @files << entry.name
+      FileUtils.mkdir_p(File.dirname(@current_file))
+    end
+
+    # Write to a buffer that will be written to the current entry
+    def write(content)
+      @buffer << content
+    end
+    alias << write
+
+    private
+
+    def write_file
+      if @current_file
+        @buffer.rewind
+        File.open(@current_file, "wb") { |f| f.write @buffer.read }
+      end
+      @current_file = nil
+      @buffer = StringIO.new
+    end
+
+    def zip_parts(output)
+      output = Shellwords.shellescape(File.absolute_path(output))
+      inputs = Shellwords.shelljoin(@files)
+      escaped_dir = Shellwords.shellescape(@dir)
+      command = "cd #{escaped_dir} && #{@zip_command} #{output} #{inputs}"
+      stdout_and_stderr, status = Open3.capture2e(command)
+      if !status.success?
+        raise(ZipError.new(stdout_and_stderr))
+      end
+    end
+  end
+end

data/lib/axlsx/version.rb

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

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

@@ -451,9 +451,11 @@ module Axlsx
         :time
       elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
         :boolean
-      elsif v.to_s =~ Axlsx::NUMERIC_REGEX
+      elsif v.to_s =~ Axlsx::NUMERIC_REGEX && v.respond_to?(:to_i)
         :integer
-      elsif v.to_s =~ Axlsx::FLOAT_REGEX
+      elsif v.to_s =~ Axlsx::SAFE_FLOAT_REGEX && v.respond_to?(:to_f)
+        :float
+      elsif (matchdata = v.to_s.match(MAYBE_FLOAT_REGEX)) && (Float::MIN_10_EXP..Float::MAX_10_EXP).cover?(matchdata[:exp].to_i) && v.respond_to?(:to_f)
         :float
       elsif v.to_s =~ Axlsx::ISO_8601_REGEX
         :iso_8601
@@ -473,7 +475,11 @@ module Axlsx
       case type
       when :date
         self.style = STYLE_DATE if self.style == 0
-        v
+        if !v.is_a?(Date) && v.respond_to?(:to_date)
+          v.to_date
+        else
+          v
+        end
       when :time
         self.style = STYLE_DATE if self.style == 0
         if !v.is_a?(Time) && v.respond_to?(:to_time)

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

@@ -171,7 +171,7 @@ module Axlsx
     def formula1=(v); Axlsx::validate_string(v); @formula1 = v end
 
     # @see formula2
-    def formula2=(v); Axlsx::validate_string(v); @formula2 = v end 
+    def formula2=(v); Axlsx::validate_string(v); @formula2 = v end
 
     # @see allowBlank
     def allowBlank=(v); Axlsx::validate_boolean(v); @allowBlank = v end
@@ -216,8 +216,8 @@ module Axlsx
       valid_attributes = get_valid_attributes
 
       str << '<dataValidation '
-      str << instance_values.map do |key, value| 
-        '' << key << '="' << Axlsx.booleanize(value).to_s << '"' if (valid_attributes.include?(key.to_sym) && !CHILD_ELEMENTS.include?(key.to_sym)) 
+      str << instance_values.map do |key, value|
+        '' << key << '="' << Axlsx.booleanize(value).to_s << '"' if (valid_attributes.include?(key.to_sym) && !CHILD_ELEMENTS.include?(key.to_sym))
       end.join(' ')
       str << '>'
       str << ('<formula1>' << self.formula1 << '</formula1>') if @formula1 and valid_attributes.include?(:formula1)
@@ -229,7 +229,7 @@ module Axlsx
     def get_valid_attributes
       attributes = [:allowBlank, :error, :errorStyle, :errorTitle, :prompt, :promptTitle, :showErrorMessage, :showInputMessage, :sqref, :type ]
 
-      if [:whole, :decimal, :data, :time, :textLength].include?(@type)
+      if [:whole, :decimal, :data, :time, :date, :textLength].include?(@type)
         attributes << [:operator, :formula1]
         attributes << [:formula2] if [:between, :notBetween].include?(@operator)
       elsif @type == :list

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

@@ -111,8 +111,12 @@ module Axlsx
         if data_field.is_a? String
           data_field = {:ref => data_field}
         end
-        data_field.values.each do |value|
-          DataTypeValidator.validate "#{self.class}.data[]", [String], value
+        data_field.each do |key, value|
+          if key == :num_fmt
+            DataTypeValidator.validate "#{self.class}.data[]", [Integer], value
+          else
+            DataTypeValidator.validate "#{self.class}.data[]", [String], value
+          end
         end
         @data << data_field
       end
@@ -212,6 +216,7 @@ module Axlsx
         data.each do |datum_value|
           # The correct name prefix in ["Sum","Average", etc...]
           str << "<dataField name='#{(datum_value[:subtotal]||'')} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"
         end

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

@@ -53,7 +53,7 @@ module Axlsx
       str <<   '</cacheSource>'
       str << (  '<cacheFields count="' << pivot_table.header_cells_count.to_s << '">')
       pivot_table.header_cells.each do |cell|
-        str << (  '<cacheField name="' << cell.value << '" numFmtId="0">')
+        str << (  '<cacheField name="' << cell.clean_value << '" numFmtId="0">')
         str <<     '<sharedItems count="0">'
         str <<     '</sharedItems>'
         str <<   '</cacheField>'

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

@@ -25,11 +25,12 @@ module Axlsx
     # @option options [Array, Symbol] types
     # @option options [Array, Integer] style
     # @option options [Float] height the row's height (in points)
+    # @option options [Integer] offset - add empty columns before values
     # @see Row#array_to_cells
     # @see Cell
     def initialize(worksheet, values=[], options={})
       self.worksheet = worksheet
-      super(Cell, nil, values.size)
+      super(Cell, nil, values.size + options[:offset].to_i)
       self.height = options.delete(:height)
       worksheet.rows << self
       array_to_cells(values, options)
@@ -56,7 +57,7 @@ module Axlsx
     attr_reader :outline_level
     alias :outlineLevel :outline_level
 
-    # The style applied ot the row. This affects the entire row.
+    # The style applied to the row. This affects the entire row.
     # @return [Integer]
     attr_reader :s
 
@@ -147,14 +148,15 @@ module Axlsx
     # @option options [Array, Integer] style
     def array_to_cells(values, options={})
       DataTypeValidator.validate :array_to_cells, Array, values
-      types, style, formula_values, escape_formulas = options.delete(:types), options.delete(:style), options.delete(:formula_values), options.delete(:escape_formulas)
+      types, style, formula_values, escape_formulas, offset = options.delete(:types), options.delete(:style), options.delete(:formula_values), options.delete(:escape_formulas), options.delete(:offset)
+      offset.to_i.times { |index| self[index] = Cell.new(self) } if offset
       values.each_with_index do |value, index|
         options[:style] = style.is_a?(Array) ? style[index] : style if style
         options[:type] = types.is_a?(Array) ? types[index] : types if types
         options[:escape_formulas] = escape_formulas.is_a?(Array) ? escape_formulas[index] : escape_formulas if escape_formulas
         options[:formula_value] = formula_values[index] if formula_values.is_a?(Array)
 
-        self[index] = Cell.new(self, value, options)
+        self[index + offset.to_i] = Cell.new(self, value, options)
       end
     end
   end