axlsx 1.1.7 → 1.1.8

data/lib/axlsx/package.rb

@@ -156,18 +156,18 @@ module Axlsx
     # @return [Zip::ZipOutputStream]
     def write_parts(zip)
       p = parts
-        p.each do |part|
-          unless part[:doc].nil?
-            zip.put_next_entry(part[:entry]);
-            entry = ['1.9.2', '1.9.3'].include?(RUBY_VERSION) ? part[:doc].force_encoding('BINARY') : part[:doc]
-            zip.puts(entry)
-          end
-          unless part[:path].nil?
-            zip.put_next_entry(part[:entry]);
-            # binread for 1.9.3
-            zip.write IO.respond_to?(:binread) ? IO.binread(part[:path]) : IO.read(part[:path])
-          end
+      p.each do |part|
+        unless part[:doc].nil?
+          zip.put_next_entry(part[:entry])
+          entry = ['1.9.2', '1.9.3'].include?(RUBY_VERSION) ? part[:doc].force_encoding('BINARY') : part[:doc]
+          zip.puts(entry)
         end
+        unless part[:path].nil?
+          zip.put_next_entry(part[:entry]);
+          # binread for 1.9.3
+          zip.write IO.respond_to?(:binread) ? IO.binread(part[:path]) : IO.read(part[:path])
+        end
+      end
       zip
     end
 

data/lib/axlsx/rels/relationship.rb

@@ -30,9 +30,9 @@ module Axlsx
     attr_reader :TargetMode
 
     # creates a new relationship
-    # @param [String] Type The type of the relationship
-    # @param [String] Target The target for the relationship
-    # @option [Symbol] target_mode only accepts :external.
+    # @param [String] type The type of the relationship
+    # @param [String] target The target for the relationship
+    # @option [Symbol] :target_mode only accepts :external.
     def initialize(type, target, options={})
       self.Target=target
       self.Type=type

data/lib/axlsx/stylesheet/styles.rb

@@ -133,7 +133,7 @@ module Axlsx
     # @option options [Integer] family The font family to use.
     # @option options [String] font_name The name of the font to use
     # @option options [Integer] num_fmt The number format to apply
-    # @option options [String] format_code The formatting to apply. If this is specified, num_fmt is ignored.
+    # @option options [String] format_code The formatting to apply. 
     # @option options [Integer|Hash] border The border style to use.
     # @option options [String] bg_color The background color to apply to the cell
     # @option options [Boolean] hidden Indicates if the cell should be hidden

data/lib/axlsx/util/constants.rb

@@ -249,6 +249,10 @@ 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 duplicate sheet names
   ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name"

data/lib/axlsx/util/simple_typed_list.rb

@@ -18,7 +18,7 @@ module Axlsx
 
     # Creats a new typed list
     # @param [Array, Class] type An array of Class objects or a single Class object
-    # @param [String] serialize The tag name to use in serialization
+    # @param [String] serialize_as The tag name to use in serialization
     # @raise [ArgumentError] if all members of type are not Class objects
     def initialize type, serialize_as=nil
       if type.is_a? Array
@@ -149,7 +149,7 @@ module Axlsx
 
     def to_xml_string(str = '')
       classname = @allowed_types[0].name.split('::').last
-      el_name = serialize_as || (classname[0,1].downcase + classname[1..-1])
+      el_name = serialize_as.to_s || (classname[0,1].downcase + classname[1..-1])
       str << '<' << el_name << ' count="' << @list.size.to_s << '">'
       @list.each { |item| item.to_xml_string(str) }
       str << '</' << el_name << '>'

data/lib/axlsx/util/validators.rb

@@ -181,7 +181,7 @@ module Axlsx
   # Requires that the value is a valid scatterStyle
   # must be one of :none | :line | :lineMarker | :marker | :smooth | :smoothMarker
   # must be one of "none" | "line" | "lineMarker" | "marker" | "smooth" | "smoothMarker"
-  # @param [Symbol|String] the value to validate
+  # @param [Symbol|String] v the value to validate
   def self.validate_scatter_style(v)
     Axlsx::RestrictionValidator.validate "ScatterChart.scatterStyle", [:none, :line, :lineMarker, :marker, :smooth, :smoothMarker], v.to_sym
   end
@@ -262,4 +262,4 @@ module Axlsx
   def self.validate_split_state_type(v)
     RestrictionValidator.validate :split_state_type, [:frozen, :frozen_split, :split], v
   end
-end
+end

data/lib/axlsx/version.rb

@@ -5,6 +5,6 @@ module Axlsx
   # When using bunle exec rake and referencing the gem on github or locally
   # it will use the gemspec, which preloads this constant for the gem's version.
   # We check to make sure that it has not already been loaded
-  VERSION="1.1.7" unless defined? Axlsx::VERSION
+  VERSION="1.1.8" unless defined? Axlsx::VERSION
 
 end

data/lib/axlsx/workbook/workbook.rb

@@ -2,6 +2,7 @@
 module Axlsx
 
 require 'axlsx/workbook/worksheet/date_time_converter.rb'
+require 'axlsx/workbook/worksheet/protected_range.rb'
 require 'axlsx/workbook/worksheet/cell.rb'
 require 'axlsx/workbook/worksheet/page_margins.rb'
 require 'axlsx/workbook/worksheet/page_setup.rb'
@@ -100,7 +101,6 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @return [SimpleTypedList]
     attr_reader :tables
 
-
     # A colllection of comments associated with this workbook
     # @note The recommended way to manage comments is Worksheet#add_comment
     # @see Worksheet#add_comment
@@ -143,7 +143,6 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @drawings = SimpleTypedList.new Drawing
       @charts = SimpleTypedList.new Chart
       @images = SimpleTypedList.new Pic
-
       # Are these even used????? Check package serialization parts
       @tables = SimpleTypedList.new Table
       @comments = SimpleTypedList.new Comments

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

@@ -142,7 +142,7 @@ module Axlsx
     # The inline color property for the cell
     # @return [Color]
     attr_reader :color
-    # @param [String] The 8 character representation for an rgb color #FFFFFFFF"
+    # @param [String] v The 8 character representation for an rgb color #FFFFFFFF"
     def color=(v)
       @color = v.is_a?(Color) ? v : Color.new(:rgb=>v)
       @is_text_run = true

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

@@ -65,7 +65,7 @@ module Axlsx
     def showValue=(v); Axlsx.validate_boolean(v); @showValue = v end
 
     # Sets the color for the data bars.
-    # @param [Color|String] The color object, or rgb string value to apply
+    # @param [Color|String] v The color object, or rgb string value to apply
     def color=(v)
       @color = v if v.is_a? Color
       self.color.rgb = v if v.is_a? String

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

@@ -92,6 +92,15 @@ module Axlsx
       [@fit_to_width, @fit_to_height]
     end
 
+
+    # helper method for worksheet to determine if the page setup is configured for fit to page printing
+    # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page. 
+    # @return [Boolean]
+    def fit_to_page?
+       # is there some better what to express this?
+       (fit_to_width != nil || fit_to_height != nil)
+    end
+
     # Serializes the page settings element.
     # @param [String] str
     # @return [String]

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

@@ -0,0 +1,46 @@
+module Axlsx
+  # The Protected Range class represents a set of cells in the worksheet
+  # @note the recommended way to manage protected ranges with via Worksheet#protect_range
+  # @see Worksheet#protect_range
+  class ProtectedRange
+
+    # The reference for the protected range
+    # @return [String]
+    attr_reader :sqref
+
+    # The name of the protected range
+    # @return [String]
+    attr_reader :name
+
+    # Initializes a new protected range object
+    # @option [String] sqref The cell range reference to protect. This can be an absolute or a relateve range however, it only applies to the current sheet.
+    # @option [String] name An optional name for the protected name.
+    def initialize(options={})
+      options.each do |o|
+        self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
+      end
+      yield self if block_given?
+    end
+    
+    # @see sqref
+    def sqref=(v)
+      Axlsx.validate_string(v)
+      @sqref = v
+    end
+
+    # @see name
+    def name=(v)
+      Axlsx.validate_string(v)
+      @name = v
+    end
+   
+    # serializes the proteted range
+    # @param [String] str if this string object is provided we append
+    # our output to that object. Use this - it helps limit the number of
+    # objects created during serialization
+    def to_xml_string(str="")
+      attrs = self.instance_values.reject{ |key, value| value == nil }
+      str << '<protectedRange ' << attrs.map { |key, value| '' << key << '="' << value.to_s << '"' }.join(' ') << '/>'
+    end 
+  end
+end

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

@@ -16,7 +16,13 @@ module Axlsx
       yield @sheet_protection if block_given?
       @sheet_protection
     end
-    
+
+    # A collection of protected ranges in the worksheet
+    # @note The recommended way to manage protected ranges is with Worksheet#protect_range
+    # @see Worksheet#protect_range
+    # @return [SimpleTypedList] The protected ranges for this worksheet
+    attr_reader :protected_ranges
+
     # The sheet view object for this worksheet
     # @return [SheetView]
     # @see [SheetView]
@@ -34,6 +40,8 @@ module Axlsx
     # @return [Array] of Table
     attr_reader :tables
 
+    # The comments associated with this worksheet
+    # @return [SimpleTypedList]
     attr_reader :comments
 
     # The rows in this worksheet
@@ -81,8 +89,9 @@ module Axlsx
     # If you want the worksheet to fit on more pages (e.g. 2x2), set {PageSetup#fit_to_width} and {PageSetup#fit_to_height} accordingly.
     # @return Boolean
     # @see #page_setup
-    def fit_to_page
-      (@page_setup != nil && (@page_setup.fit_to_width != nil || @page_setup.fit_to_height != nil))
+    def fit_to_page?
+      return false unless @page_setup
+      @page_setup.fit_to_page?
     end
 
 
@@ -110,7 +119,6 @@ module Axlsx
       @page_margins ||= PageMargins.new
       yield @page_margins if block_given?
       @page_margins
-
     end
 
     # Page setup settings for printing the worksheet.
@@ -188,7 +196,7 @@ module Axlsx
       @print_options = PrintOptions.new options[:print_options] if options[:print_options]
       @rows = SimpleTypedList.new Row
       @column_info = SimpleTypedList.new Col
-      # @cols = SimpleTypedList.new Cell
+      @protected_ranges = SimpleTypedList.new ProtectedRange
       @tables = SimpleTypedList.new Table
 
       options.each do |o|
@@ -217,7 +225,7 @@ module Axlsx
       cf.add_rules rules
       @conditional_formattings << cf
     end
-    
+
     # Add data validation to this worksheet.
     #
     # @param [String] cells The cells the validation will apply to.
@@ -237,23 +245,37 @@ module Axlsx
     #        worksheet.merge_cells worksheet.rows.first.cells[(2..4)]
     #        #alternatively you can do it from a single cell
     #        worksheet["C1"].merge worksheet["E1"]
-    # @param [Array, string]
+    # @param [Array, string] cells
     def merge_cells(cells)
       @merged_cells << if cells.is_a?(String)
                          cells
-                       elsif cells.is_a?(Array)
-                         cells = cells.sort { |x, y| [x.index, x.row.index] <=> [y.index, y.row.index] }
-                         "#{cells.first.r}:#{cells.last.r}"
-                       end
+      elsif cells.is_a?(Array)
+        cells = cells.sort { |x, y| [x.index, x.row.index] <=> [y.index, y.row.index] }
+        "#{cells.first.r}:#{cells.last.r}"
+      end
     end
 
+    # Adds a new protected cell range to the worksheet. Note that protected ranges are only in effect when sheet protection is enabled.
+    # @param [String|Array] cells The string reference for the cells to protect or an array of cells.
+    # @return [ProtectedRange]
+    # @note When using an array of cells, a contiguous range is created from the minimum top left to the maximum top bottom of the cells provided.
+    def protect_range(cells)
+      sqref = if cells.is_a?(String)
+                cells
+              elsif cells.is_a?(SimpleTypedList)
+                cells = cells.sort { |x, y| [x.index, x.row.index] <=> [y.index, y.row.index] }
+                "#{cells.first.r}:#{cells.last.r}"
+              end
+      @protected_ranges << ProtectedRange.new(:sqref => sqref, :name => 'Range#{@protected_ranges.size}')
+      @protected_ranges.last
+    end
 
     # The demensions of a worksheet. This is not actually a required element by the spec,
     # but at least a few other document readers expect this for conversion
     # @return [String] the A1:B2 style reference for the first and last row column intersection in the workbook
     def dimension
       dim_start = rows.first.cells.first == nil ? 'A1' : rows.first.cells.first.r
-      dim_end = rows.last.cells.last == nil ? 'AA:200' : rows.last.cells.last.r
+      dim_end = rows.last.cells.last == nil ? 'AA200' : rows.last.cells.last.r
       "#{dim_start}:#{dim_end}"
     end
 
@@ -281,7 +303,7 @@ module Axlsx
     # @return [Boolean]
     def fit_to_page=(v)
       warn('axlsx::DEPRECIATED: Worksheet#fit_to_page has been depreciated. This value will automatically be set for you when you use PageSetup#fit_to.')
-      fit_to_page
+      fit_to_page?
     end
 
 
@@ -300,6 +322,8 @@ module Axlsx
     def name=(v)
       DataTypeValidator.validate "Worksheet.name", String, v
       raise ArgumentError, (ERR_SHEET_NAME_TOO_LONG % v) if v.size > 31
+      raise ArgumentError, (ERR_SHEET_NAME_COLON_FORBIDDEN % v) if v.include? ':'
+      v = Axlsx::coder.encode(v) 
       sheet_names = @workbook.worksheets.map { |s| s.name }
       raise ArgumentError, (ERR_DUPLICATE_SHEET_NAME % v) if sheet_names.include?(v)
       @name=v
@@ -402,8 +426,9 @@ module Axlsx
 
     # Set the style for cells in a specific row
     # @param [Integer] index or range of indexes in the table
-    # @param [Integer] the cellXfs index
-    # @option options [Integer] col_offset only cells after this column will be updated.
+    # @param [Integer] style the cellXfs index
+    # @param [Hash] options the options used when applying the style
+    # @option [Integer] :col_offset only cells after this column will be updated.
     # @note You can also specify the style in the add_row call
     # @see Worksheet#add_row
     # @see README.md for an example
@@ -425,8 +450,9 @@ module Axlsx
 
     # Set the style for cells in a specific column
     # @param [Integer] index the index of the column
-    # @param [Integer] the cellXfs index
-    # @option options [Integer] row_offset only cells after this column will be updated.
+    # @param [Integer] style the cellXfs index
+    # @param [Hash] options
+    # @option [Integer] :row_offset only cells after this column will be updated.
     # @note You can also specify the style for specific columns in the call to add_row by using an array for the :styles option
     # @see Worksheet#add_row
     # @see README.md for an example
@@ -449,9 +475,9 @@ module Axlsx
     # @example This would set the first and third column widhts but leave the second column in autofit state.
     #      ws.column_widths 7.2, nil, 3
     # @note For updating only a single column it is probably easier to just set the width of the ws.column_info[col_index].width directly
-    # @param [Integer|Float|Fixnum|nil] values
-    def column_widths(*args)
-      args.each_with_index do |value, index|
+    # @param [Integer|Float|Fixnum|nil] widths
+    def column_widths(*widths)
+      widths.each_with_index do |value, index|
         next if value == nil
         Axlsx::validate_unsigned_numeric(value) unless value == nil
         @column_info[index] ||= Col.new index+1, index+1
@@ -493,55 +519,49 @@ module Axlsx
     end
 
     # Adds a media item to the worksheets drawing
-    # @param [Class] media_type
-    # @option options [] unknown
+    # @option [Hash] options options passed to drawing.add_image
     def add_image(options={})
       image = drawing.add_image(options)
       yield image if block_given?
       image
     end
 
-    # Serializes the object
-    # @param [String] str
+    # Serializes the worksheet object to an xml string
+    # This intentionally does not use nokogiri for performance reasons
     # @return [String]
     def to_xml_string
-      rels = relationships
       str = '<?xml version="1.0" encoding="UTF-8"?>'
-      str.concat "<worksheet xmlns=\"%s\" xmlns:r=\"%s\">" % [XML_NS, XML_NS_R]
-      str.concat "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page if fit_to_page
-      str.concat "<dimension ref=\"%s\"></dimension>" % dimension unless rows.size == 0
+      str << worksheet_node
+      str << sheet_pr_node
+      str << dimension_node
       @sheet_view.to_xml_string(str) if @sheet_view
-      if @column_info.size > 0
-        str << "<cols>"
-        @column_info.each { |col| col.to_xml_string(str) }
-        str.concat '</cols>'
-      end
-      str.concat '<sheetData>'
-      @rows.each_with_index { |row, index| row.to_xml_string(index, str) }
-      str.concat '</sheetData>'
-      str.concat "<autoFilter ref='%s'></autoFilter>" % @auto_filter if @auto_filter
+      str << cols_node
+      str << sheet_data_node
+
+      str << auto_filter_node
       @sheet_protection.to_xml_string(str) if @sheet_protection
-      str.concat "<mergeCells count='%s'>%s</mergeCells>" % [@merged_cells.size, @merged_cells.reduce('') { |memo, obj| memo += "<mergeCell ref='%s'></mergeCell>" % obj } ] unless @merged_cells.empty?
-      print_options.to_xml_string(str) if @print_options
+      str << protected_ranges_node
+      str << merged_cells_node
+      @print_options.to_xml_string(str) if @print_options
       page_margins.to_xml_string(str) if @page_margins
       page_setup.to_xml_string(str) if @page_setup
-      str << "<drawing r:id='rId" << (rels.index{ |r| r.Type == DRAWING_R } + 1).to_s << "'/>" if @drawing
-      str << "<legacyDrawing r:id='rId" << (rels.index{ |r| r.Type == VML_DRAWING_R } + 1).to_s << "'/>" if @comments.size > 0
-     unless @tables.empty?
-       str.concat "<tableParts count='%s'>%s</tableParts>" % [@tables.size, @tables.reduce('') { |memo, obj| memo += "<tablePart r:id='%s'/>" % obj.rId }]
-     end
-     @conditional_formattings.each do |cf|
-       str.concat cf.to_xml_string
-     end
-     
-     unless @data_validations.empty?
-       str.concat "<dataValidations count=\"#{@data_validations.size}\">"
-       @data_validations.each do |df|
-         str.concat df.to_xml_string
-       end
-       str.concat '</dataValidations>'
-     end
-     str + '</worksheet>'
+      str << drawing_node
+      str << legacy_drawing_node
+      str << table_parts_node
+      str << conditional_formattings_node
+      str << data_validations_node 
+      str << '</worksheet>'
+      # User reported that when parsing some old data that had control characters excel chokes.
+      # All of the following are defined as illegal xml characters in the xml spec, but for now I am only dealing with control 
+      # characters. Thanks to asakusarb and @hsbt's flash of code on the screen!
+      # [#x1-#x8], [#xB-#xC], [#xE-#x1F], [#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF],
+      # [#x1FFFE-#x1FFFF], [#x2FFFE-#x2FFFF], [#x3FFFE-#x3FFFF],
+      # [#x4FFFE-#x4FFFF], [#x5FFFE-#x5FFFF], [#x6FFFE-#x6FFFF],
+      # [#x7FFFE-#x7FFFF], [#x8FFFE-#x8FFFF], [#x9FFFE-#x9FFFF],
+      # [#xAFFFE-#xAFFFF], [#xBFFFE-#xBFFFF], [#xCFFFE-#xCFFFF],
+      # [#xDFFFE-#xDFFFF], [#xEFFFE-#xEFFFF], [#xFFFFE-#xFFFFF],
+      # [#x10FFFE-#x10FFFF].
+      str.gsub(/[[:cntrl:]]/,'')
     end
 
     # The worksheet relationships. This is managed automatically by the worksheet
@@ -584,6 +604,110 @@ module Axlsx
 
     private
 
+    # Helper method for parsingout the root node for worksheet
+    # @return [String]
+    def worksheet_node
+      "<worksheet xmlns=\"%s\" xmlns:r=\"%s\">" % [XML_NS, XML_NS_R]
+    end
+
+    # Helper method fo parsing out the sheetPr node
+    # @return [String]
+    def sheet_pr_node
+      return '' unless fit_to_page?
+      "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page?
+    end
+
+    # Helper method for parsing out the demension node
+    # @return [String]
+    def dimension_node
+      return '' if rows.size == 0
+      "<dimension ref=\"%s\"></dimension>" % dimension
+    end
+
+    # Helper method for parsing out the sheetData node
+    # @return [String]
+    def sheet_data_node
+      str = '<sheetData>'
+      @rows.each_with_index { |row, index| row.to_xml_string(index, str) }
+      str << '</sheetData>'
+    end
+
+    # Helper method for parsing out the autoFilter node
+    # @return [String]
+    def auto_filter_node
+      return '' unless @auto_filter
+      "<autoFilter ref='%s'></autoFilter>" % @auto_filter
+    end
+
+    # Helper method for parsing out the cols node
+    # @return [String]
+    def cols_node
+      return '' if @column_info.empty?
+      str = "<cols>"
+      @column_info.each { |col| col.to_xml_string(str) }
+      str << '</cols>'
+    end 
+
+    # Helper method for parsing out the protectedRanges node
+    # @return [String]
+    def protected_ranges_node
+      return '' if @protected_ranges.empty?
+      str = '<protectedRanges>'
+      @protected_ranges.each { |pr| pr.to_xml_string(str) }
+      str << '</protectedRanges>'
+    end
+
+    # Helper method for parsing out the mergedCells node
+    # @return [String]
+    def merged_cells_node
+      return '' if @merged_cells.size == 0
+      str = "<mergeCells count='#{@merged_cells.size}'>"
+      @merged_cells.each { |merged_cell| str << "<mergeCell ref='#{merged_cell}'></mergeCell>" }
+      str << '</mergeCells>'
+    end
+
+    # Helper method for parsing out the drawing node
+    # @return [String]
+    def drawing_node
+      return '' unless @drawing
+      "<drawing r:id='rId" << (relationships.index{ |r| r.Type == DRAWING_R } + 1).to_s << "'/>" 
+    end
+
+    # Helper method for parsing out the legacyDrawing node required for comments
+    # @return [String]
+    def legacy_drawing_node
+      return '' if @comments.empty?
+      "<legacyDrawing r:id='rId" << (relationships.index{ |r| r.Type == VML_DRAWING_R } + 1).to_s << "'/>" 
+    end
+
+    # Helper method for parsing out the tableParts node
+    # @return [String]
+    def table_parts_node
+      return '' if @tables.empty?
+      str = "<tableParts count='#{@tables.size}'>"
+      @tables.each { |table| str << "<tablePart r:id='#{table.rId}'/>" }
+      str << '</tableParts>'
+    end
+
+    # Helper method for parsing out the conditional formattings
+    # @return [String]
+    def conditional_formattings_node
+      return '' if @conditional_formattings.size == 0
+      str = ''
+      @conditional_formattings.each { |conditional_formatting| str << conditional_formatting.to_xml_string }
+      str
+    end
+
+    # Helper method for parsing out the dataValidations node
+    # @return [String]
+    def data_validations_node
+      return '' if @data_validations.size == 0
+      str = "<dataValidations count='#{@data_validations.size}'>"
+      @data_validations.each { |data_validation| str << data_validation.to_xml_string }
+      str << '</dataValidations>'
+    end
+
+
     # assigns the owner workbook for this worksheet
     def workbook=(v) DataTypeValidator.validate "Worksheet.workbook", Workbook, v; @workbook = v; end