axlsx 2.0.1 → 3.0.0.pre

data/lib/axlsx/util/simple_typed_list.rb

@@ -8,7 +8,7 @@ module Axlsx
     # @param [Array, Class] type An array of Class objects or a single Class object
     # @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
+    def initialize type, serialize_as=nil, start_size = 0
       if type.is_a? Array
         type.each { |item| raise ArgumentError, "All members of type must be Class objects" unless item.is_a? Class }
         @allowed_types = type
@@ -16,9 +16,8 @@ module Axlsx
         raise ArgumentError, "Type must be a Class object or array of Class objects" unless type.is_a? Class
         @allowed_types = [type]
       end
-      @list = []
-      @locked_at = nil
-      @serialize_as = serialize_as
+      @serialize_as = serialize_as unless serialize_as.nil?
+      @list = Array.new(start_size)
     end
 
     # The class constants of allowed types
@@ -27,7 +26,9 @@ module Axlsx
 
     # The index below which items cannot be removed
     # @return [Integer]
-    attr_reader :locked_at
+    def locked_at
+      defined?(@locked_at) ? @locked_at : nil
+    end
 
     # The tag name to use when serializing this object
     # by default the parent node for all items in the list is the classname of the first allowed type with the first letter in lowercase.
@@ -54,6 +55,7 @@ module Axlsx
       end
       result
     end
+    
     # Lock this list at the current size
     # @return [self]
     def lock
@@ -61,18 +63,18 @@ module Axlsx
       self
     end
 
-    def to_ary
-      @list
-    end
-
-    alias :to_a :to_ary
-
     # Unlock the list
     # @return [self]
     def unlock
       @locked_at = nil
       self
     end
+    
+    def to_ary
+      @list
+    end
+
+    alias :to_a :to_ary
 
     # join operator
     # @param [Array] v the array to join
@@ -81,7 +83,7 @@ module Axlsx
     # @return [SimpleTypedList]
     def +(v)
       v.each do |item| 
-        DataTypeValidator.validate "SimpleTypedList.+", @allowed_types, item
+        DataTypeValidator.validate :SimpleTypedList_plus, @allowed_types, item
         @list << item 
       end
     end
@@ -91,19 +93,21 @@ module Axlsx
     # @raise [ArgumentError] if the value being added is not one fo the allowed types
     # @return [Integer] returns the index of the item added.
     def <<(v)
-      DataTypeValidator.validate "SimpleTypedList.<<", @allowed_types, v
+      DataTypeValidator.validate :SimpleTypedList_push, @allowed_types, v
       @list << v
       @list.size - 1
-    end
+    end 
+    
     alias :push :<<
+    
 
     # delete the item from the list
     # @param [Any] v The item to be deleted.
     # @raise [ArgumentError] if the item's index is protected by locking
     # @return [Any] The item deleted
     def delete(v)
-      return unless @list.include? v
-      raise ArgumentError, "Item is protected and cannot be deleted" if protected? @list.index(v)
+      return unless include? v
+      raise ArgumentError, "Item is protected and cannot be deleted" if protected? index(v)
       @list.delete v
     end
 
@@ -122,7 +126,7 @@ module Axlsx
     # @raise [ArgumentError] if the index is protected by locking
     # @raise [ArgumentError] if the item is not one of the allowed types
     def []=(index, v)
-      DataTypeValidator.validate "SimpleTypedList.<<", @allowed_types, v
+      DataTypeValidator.validate :SimpleTypedList_insert, @allowed_types, v
       raise ArgumentError, "Item is protected and cannot be changed" if protected? index
       @list[index] = v
       v
@@ -134,7 +138,7 @@ module Axlsx
     # @raise [ArgumentError] if the index is protected by locking
     # @raise [ArgumentError] if the index is not one of the allowed types
     def insert(index, v)
-      DataTypeValidator.validate "SimpleTypedList.<<", @allowed_types, v
+      DataTypeValidator.validate :SimpleTypedList_insert, @allowed_types, v
       raise ArgumentError, "Item is protected and cannot be changed" if protected? index
       @list.insert(index, v)
       v
@@ -143,38 +147,10 @@ module Axlsx
     # determines if the index is protected
     # @param [Integer] index
     def protected? index
-      return false unless @locked_at.is_a? Fixnum
-      index < @locked_at
+      return false unless locked_at.is_a? Integer
+      index < locked_at
     end
 
-    # override the equality method so that this object can be compared to a simple array.
-    # if this object's list is equal to the specifiec array, we return true.
-    def ==(v)
-      v == @list
-    end
-    # method_mission override to pass allowed methods to the list.
-    # @note
-    #  the following methods are not allowed
-    #   :replace
-    #   :insert
-    #   :collect!
-    #   :map!
-    #   :pop
-    #   :delete_if
-    #   :reverse!
-    #   :shift
-    #   :shuffle!
-    #   :slice!
-    #   :sort!
-    #   :uniq!
-    #   :unshift
-    #   :zip
-    #   :flatten!
-    #   :fill
-    #   :drop
-    #   :drop_while
-    #   :delete_if
-    #   :clear
     DESTRUCTIVE = ['replace', 'insert', 'collect!', 'map!', 'pop', 'delete_if',
                    'reverse!', 'shift', 'shuffle!', 'slice!', 'sort!', 'uniq!',
                    'unshift', 'zip', 'flatten!', 'fill', 'drop', 'drop_while',
@@ -188,13 +164,13 @@ module Axlsx
         end
       }
     end
-
+                   
     def to_xml_string(str = '')
       classname = @allowed_types[0].name.split('::').last
       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 << '>'
+      str << ('<' << el_name << ' count="' << size.to_s << '">')
+      each { |item| item.to_xml_string(str) }
+      str << ('</' << el_name << '>')
     end
 
   end

data/lib/axlsx/util/storage.rb

@@ -6,14 +6,14 @@ module Axlsx
 
     # Packing for the Storage when pushing an array of items into a byte stream
     # Name, name length, type, color, left sibling, right sibling, child, classid, state, created, modified, sector, size
-    PACKING = "s32 s1 c2 l3 x16 x4 q2 l q"
+    PACKING = "s32 s1 c2 l3 x16 x4 q2 l q".freeze
 
     # storage types
     TYPES = {
       :root=>5,
       :stream=>2,
       :storage=>1
-    }
+    }.freeze
 
     # Creates a byte string for this storage
     # @return [String] 
@@ -45,7 +45,7 @@ module Axlsx
     # Sets the color for this storage
     # @param [Integer] v Must be one of the COLORS constant hash values
     def color=(v)
-      RestrictionValidator.validate "Storage.color", COLORS.values, v      
+      RestrictionValidator.validate :storage_color, COLORS.values, v      
       @color = v
     end
 
@@ -116,7 +116,7 @@ module Axlsx
     # Sets the type for this storage. 
     # @param [Integer] v the type to specify must be one of the TYPES constant hash values. 
     def type=(v)
-      RestrictionValidator.validate "Storage.type", TYPES.values, v      
+      RestrictionValidator.validate :storage_type, TYPES.values, v      
       @type = v
     end
 

data/lib/axlsx/util/validators.rb

@@ -52,14 +52,12 @@ module Axlsx
     # @return [Boolean] true if validation succeeds.
     # @see validate_boolean
     def self.validate(name, types, v, other=false)
-      types = [types] unless types.is_a? Array
       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| return if v.ancestors.include?(t) }
-      else
-        types.each { |t| return if v.is_a?(t) }
+      v_class = v.is_a?(Class) ? v : v.class
+      Array(types).each do |t|
+        return if v_class <= t
       end
       raise ArgumentError, (ERR_TYPE % [v.inspect, name, types.inspect])
     end
@@ -80,34 +78,38 @@ module Axlsx
   def self.validate_angle(v)
     raise ArgumentError, (ERR_ANGLE % v.inspect) unless (v.to_i >= -5400000 && v.to_i <= 5400000)
   end
-  # Requires that the value is a Fixnum or Integer and is greater or equal to 0
+
+  # Validates an unsigned intger
+  UINT_VALIDATOR = lambda { |arg| arg.respond_to?(:>=) && arg >= 0 }
+
+  # Requires that the value is a Integer and is greater or equal to 0
   # @param [Any] v The value validated
-  # @raise [ArgumentError] raised if the value is not a Fixnum or Integer value greater or equal to 0
+  # @raise [ArgumentError] raised if the value is not a Integer value greater or equal to 0
   # @return [Boolean] true if the data is valid
   def self.validate_unsigned_int(v)
-    DataTypeValidator.validate(:unsigned_int, [Fixnum, Integer], v, lambda { |arg| arg.respond_to?(:>=) && arg >= 0 })
+    DataTypeValidator.validate(:unsigned_int, Integer, v, UINT_VALIDATOR)
   end
 
-  # Requires that the value is a Fixnum Integer or Float and is greater or equal to 0
+  # Requires that the value is a Integer or Float and is greater or equal to 0
   # @param [Any] v The value validated
   # @raise [ArgumentError] raised if the value is not a Fixnun, Integer, Float value greater or equal to 0
   # @return [Boolean] true if the data is valid
   def self.validate_unsigned_numeric(v)
-    DataTypeValidator.validate("Invalid column width", [Fixnum, Integer, Float], v, lambda { |arg| arg.respond_to?(:>=) && arg.to_i >= 0 })
+    DataTypeValidator.validate(:unsigned_numeric, Numeric, v, UINT_VALIDATOR)
   end
 
-  # Requires that the value is a Fixnum or Integer
+  # Requires that the value is a Integer
   # @param [Any] v The value validated
   def self.validate_int(v)
-    DataTypeValidator.validate :unsigned_int, [Fixnum, Integer], v
+    DataTypeValidator.validate :signed_int, Integer, v
   end
 
   # Requires that the value is a form that can be evaluated as a boolean in an xml document.
-  # The value must be an instance of Fixnum, String, Integer, Symbol, TrueClass or FalseClass and
+  # The value must be an instance of String, Integer, Symbol, TrueClass or FalseClass and
   # it must be one of 0, 1, "true", "false", :true, :false, true, false, "0", or "1"
   # @param [Any] v The value validated
   def self.validate_boolean(v)
-    DataTypeValidator.validate(:boolean, [Fixnum, String, Integer, Symbol, TrueClass, FalseClass], v, lambda { |arg| [0, 1, "true", "false", :true, :false, true, false, "0", "1"].include?(arg) })
+    DataTypeValidator.validate(:boolean, [String, Integer, Symbol, TrueClass, FalseClass], v, lambda { |arg| [0, 1, "true", "false", :true, :false, true, false, "0", "1"].include?(arg) })
   end
 
   # Requires that the value is a String
@@ -130,12 +132,12 @@ module Axlsx
 
   # Requires that the value is an integer ranging from 10 to 400.
   def self.validate_scale_10_400(v)
-    DataTypeValidator.validate "page_scale", [Fixnum, Integer], v, lambda { |arg| arg >= 10 && arg <= 400 }
+    DataTypeValidator.validate "page_scale", Integer, v, lambda { |arg| arg >= 10 && arg <= 400 }
   end
 
   # Requires that the value is an integer ranging from 10 to 400 or 0.
   def self.validate_scale_0_10_400(v)
-    DataTypeValidator.validate "page_scale", [Fixnum, Integer], v, lambda { |arg| arg == 0 || (arg >= 10 && arg <= 400) }
+    DataTypeValidator.validate "page_scale", Integer, v, lambda { |arg| arg == 0 || (arg >= 10 && arg <= 400) }
   end
 
   # Requires that the value is one of :default, :landscape, or :portrait.
@@ -147,7 +149,7 @@ module Axlsx
     RestrictionValidator.validate "cell run style u", [:none, :single, :double, :singleAccounting, :doubleAccounting], v
   end
 
-  # validates cell style family which must be between 1 and 5 
+  # validates cell style family which must be between 1 and 5
   def self.validate_family(v)
     RestrictionValidator.validate "cell run style family", 1..5, v
   end
@@ -297,4 +299,14 @@ module Axlsx
   def self.validate_display_blanks_as(v)
     RestrictionValidator.validate :display_blanks_as, [:gap, :span, :zero], v
   end
+
+  # Requires that the value is one of :visible, :hidden, :very_hidden
+  def self.validate_view_visibility(v)
+    RestrictionValidator.validate :visibility, [:visible, :hidden, :very_hidden], v
+  end
+
+  # Requires that the value is one of :default, :circle, :dash, :diamond, :dot, :picture, :plus, :square, :star, :triangle, :x
+  def self.validate_marker_symbol(v)
+    RestrictionValidator.validate :marker_symbol, [:default, :circle, :dash, :diamond, :dot, :picture, :plus, :square, :star, :triangle, :x], v
+  end
 end

data/lib/axlsx/version.rb

@@ -1,5 +1,5 @@
 module Axlsx
 
   # The current version
-  VERSION = "2.0.1"
+  VERSION = "3.0.0.pre"
 end

data/lib/axlsx/workbook/defined_name.rb

@@ -24,16 +24,16 @@
 # </xsd:simpleContent>
 
 module Axlsx
-  # This element defines the defined names that are defined within this workbook. 
+  # This element defines the defined names that are defined within this workbook.
   # Defined names are descriptive text that is used to represents a cell, range of cells, formula, or constant value.
   # Use easy-to-understand names, such as Products, to refer to hard to understand ranges, such as Sales!C20:C30.
-  # A defined name in a formula can make it easier to understand the purpose of the formula. 
+  # A defined name in a formula can make it easier to understand the purpose of the formula.
   # @example
   #     The formula =SUM(FirstQuarterSales) might be easier to identify than =SUM(C20:C30
   #
   # Names are available to any sheet.
   # @example
-  #     If the name ProjectedSales refers to the range A20:A30 on the first worksheet in a workbook, 
+  #     If the name ProjectedSales refers to the range A20:A30 on the first worksheet in a workbook,
   #     you can use the name ProjectedSales on any other sheet in the same workbook to refer to range A20:A30 on the first worksheet.
   # Names can also be used to represent formulas or values that do not change (constants).
   #
@@ -71,7 +71,7 @@ module Axlsx
     #                                         applied. This represents the source data range, unfiltered.
     #                                      b. This defined name refers to a range to which an AutoFilter has been
     #                                         applied.
-    #                           _xlnm.Extract: this defined name refers to the range containing the filtered output 
+    #                           _xlnm.Extract: this defined name refers to the range containing the filtered output
     #                                           values resulting from applying an advanced filter criteria to a source range.
     #                         Miscellaneous
     #                           _xlnm.Consolidate_Area: the defined name refers to a consolidation area.
@@ -88,14 +88,14 @@ module Axlsx
     #                             This attribute is used when there is an add-in or other code project associated with the file.
     # @option [Boolean] vb_proceedure - Specifies a boolean value that indicates whether the defined name is related to an external function, command, or other executable code.
     # @option [Boolean] xlm - Specifies a boolean value that indicates whether the defined name is related to an external function, command, or other executable code.
-    # @option [Integer] function_group_id - Specifies the function group index if the defined name refers to a function. 
+    # @option [Integer] function_group_id - Specifies the function group index if the defined name refers to a function.
     #                                       The function group defines the general category for the function.
     #                                       This attribute is used when there is an add-in or other code project associated with the file.
     #                                       See Open Office XML Part 1 for more info.
     # @option [String] short_cut_key - Specifies the keyboard shortcut for the defined name.
-    # @option [Boolean] publish_to_server - Specifies a boolean value that indicates whether the defined name is included in the 
+    # @option [Boolean] publish_to_server - Specifies a boolean value that indicates whether the defined name is included in the
     #                                       version of the workbook that is published to or rendered on a Web or application server.
-    # @option [Boolean] workbook_parameter - Specifies a boolean value that indicates that the name is used as a workbook parameter on a 
+    # @option [Boolean] workbook_parameter - Specifies a boolean value that indicates that the name is used as a workbook parameter on a
     #                                        version of the workbook that is published to or rendered on a Web or application server.
     def initialize(formula, options={})
       @formula = formula
@@ -116,14 +116,13 @@ module Axlsx
     boolean_attr_accessor :workbook_parameter, :publish_to_server, :xlm, :vb_proceedure, :function, :hidden
 
     serializable_attributes :short_cut_key, :status_bar, :help, :description, :custom_menu, :comment,
-      :workbook_parameter, :publish_to_server, :xlm, :vb_proceedure, :function, :hidden, :name, :local_sheet_id
+      :workbook_parameter, :publish_to_server, :xlm, :vb_proceedure, :function, :hidden, :local_sheet_id
 
     def to_xml_string(str='')
-      raise ArgumentError, 'you must specify the name for this defined name. Please read the documentation for Axlsx::DefinedName for more details' unless name 
-      str << '<definedName '
+      raise ArgumentError, 'you must specify the name for this defined name. Please read the documentation for Axlsx::DefinedName for more details' unless name
+      str << ('<definedName ' << 'name="' << name << '" ')
       serialized_attributes str
-      str << '>' << @formula
-      str << '</definedName>'
+      str << ('>' << @formula << '</definedName>')
     end
   end
 end

data/lib/axlsx/workbook/defined_names.rb

@@ -11,8 +11,8 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      return if @list.empty?
-      str << "<definedNames>"
+      return if empty?
+      str << '<definedNames>'
       each { |defined_name| defined_name.to_xml_string(str) }
       str << '</definedNames>'
     end

data/lib/axlsx/workbook/shared_strings_table.rb

@@ -38,7 +38,7 @@ module Axlsx
       @xml_space = xml_space
       @unique_cells = {}
       @shared_xml_string = ""
-      shareable_cells = cells.flatten.select{ |cell| cell.plain_string? }
+      shareable_cells = cells.flatten.select{ |cell| cell.plain_string? || cell.contains_rich_text? }
       @count = shareable_cells.size
       resolve(shareable_cells)
     end
@@ -47,10 +47,10 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str='')
-      str << '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '"'
-      str << ' count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '"'
-      str << ' xml:space="' << xml_space.to_s << '">' << @shared_xml_string << '</sst>'
-      str = Axlsx::sanitize(str)
+      Axlsx::sanitize(@shared_xml_string)
+      str << ('<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '"')
+      str << (' count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '"')
+      str << (' xml:space="' << xml_space.to_s << '">' << @shared_xml_string << '</sst>')
     end
 
     private

data/lib/axlsx/workbook/workbook.rb

@@ -5,10 +5,13 @@ 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/rich_text_run'
+require 'axlsx/workbook/worksheet/rich_text'
 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'
+require 'axlsx/workbook/worksheet/outline_pr.rb'
 require 'axlsx/workbook/worksheet/page_setup.rb'
 require 'axlsx/workbook/worksheet/header_footer.rb'
 require 'axlsx/workbook/worksheet/print_options.rb'
@@ -37,7 +40,8 @@ require 'axlsx/workbook/worksheet/worksheet_hyperlinks'
 require 'axlsx/workbook/worksheet/break'
 require 'axlsx/workbook/worksheet/row_breaks'
 require 'axlsx/workbook/worksheet/col_breaks'
-
+require 'axlsx/workbook/workbook_view'
+require 'axlsx/workbook/workbook_views'
 
 
 require 'axlsx/workbook/worksheet/worksheet.rb'
@@ -93,6 +97,15 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @use_shared_strings = v
     end
 
+    # If true reverse the order in which the workbook is serialized
+    # @return [Boolean]
+    attr_reader :is_reversed
+
+    def is_reversed=(v)
+      Axlsx::validate_boolean(v)
+      @is_reversed = v
+    end
+
 
    # A collection of worksheets associated with this workbook.
     # @note The recommended way to manage worksheets is add_worksheet
@@ -139,6 +152,10 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @return [SimpleTypedList]
     attr_reader :pivot_tables
 
+    # A collection of views for this workbook
+    def views
+      @views ||= WorkbookViews.new
+    end
 
     # A collection of defined names for this workbook
     # @note The recommended way to manage defined names is Workbook#add_defined_name
@@ -263,6 +280,14 @@ require 'axlsx/workbook/worksheet/selection.rb'
       worksheet
     end
 
+    # Adds a new WorkbookView
+    # @return WorkbookViews
+    # @option options [Hash] options passed into the added WorkbookView
+    # @see WorkbookView#initialize
+    def add_view(options={})
+      views << WorkbookView.new(options)
+    end
+
     # Adds a defined name to this workbook
     # @return [DefinedName]
     # @param [String] formula @see DefinedName
@@ -283,7 +308,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
       end
       r << Relationship.new(self, STYLES_R,  STYLES_PN)
       if use_shared_strings
-          r << Relationship.new(self, SHARED_STRINGS_R,  SHARED_STRINGS_PN)
+          r << Relationship.new(self, SHARED_STRINGS_R, SHARED_STRINGS_PN)
       end
       r
     end
@@ -327,23 +352,23 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @param [String] str
     # @return [String]
     def to_xml_string(str='')
-      add_worksheet unless worksheets.size > 0
+      add_worksheet(name: 'Sheet1') unless worksheets.size > 0
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<workbook xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '">'
-      str << '<workbookPr date1904="' << @@date1904.to_s << '"/>'
+      str << ('<workbook xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '">')
+      str << ('<workbookPr date1904="' << @@date1904.to_s << '"/>')
+      views.to_xml_string(str)
       str << '<sheets>'
-      @worksheets.each_with_index do |sheet, index|
-        str << '<sheet name="' << sheet.name << '" sheetId="' << (index+1).to_s << '" r:id="' << sheet.rId << '"/>'
-        if defined_name = sheet.auto_filter.defined_name
-          add_defined_name defined_name, :name => '_xlnm._FilterDatabase', :local_sheet_id => index, :hidden => 1
-        end
+      if is_reversed
+        worksheets.reverse_each { |sheet| sheet.to_sheet_node_xml_string(str) }
+      else
+        worksheets.each { |sheet| sheet.to_sheet_node_xml_string(str) }
       end
       str << '</sheets>'
       defined_names.to_xml_string(str)
       unless pivot_tables.empty?
         str << '<pivotCaches>'
         pivot_tables.each do |pivot_table|
-          str << '<pivotCache cacheId="' << pivot_table.cache_definition.cache_id.to_s << '" r:id="' << pivot_table.cache_definition.rId << '"/>'
+          str << ('<pivotCache cacheId="' << pivot_table.cache_definition.cache_id.to_s << '" r:id="' << pivot_table.cache_definition.rId << '"/>')
         end
         str << '</pivotCaches>'
       end

data/lib/axlsx/workbook/workbook_view.rb

@@ -0,0 +1,80 @@
+# <xsd:complexType name="CT_BookView">
+#     <xsd:sequence>
+#       <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
+#     </xsd:sequence>
+#     <xsd:attribute name="visibility" type="ST_Visibility" use="optional" default="visible"/>
+#     <xsd:attribute name="minimized" type="xsd:boolean" use="optional" default="false"/>
+#     <xsd:attribute name="showHorizontalScroll" type="xsd:boolean" use="optional" default="true"/>
+#     <xsd:attribute name="showVerticalScroll" type="xsd:boolean" use="optional" default="true"/>
+#     <xsd:attribute name="showSheetTabs" type="xsd:boolean" use="optional" default="true"/>
+#     <xsd:attribute name="xWindow" type="xsd:int" use="optional"/>
+#     <xsd:attribute name="yWindow" type="xsd:int" use="optional"/>
+#     <xsd:attribute name="windowWidth" type="xsd:unsignedInt" use="optional"/>
+#     <xsd:attribute name="windowHeight" type="xsd:unsignedInt" use="optional"/>
+#     <xsd:attribute name="tabRatio" type="xsd:unsignedInt" use="optional" default="600"/>
+#     <xsd:attribute name="firstSheet" type="xsd:unsignedInt" use="optional" default="0"/>
+#     <xsd:attribute name="activeTab" type="xsd:unsignedInt" use="optional" default="0"/>
+#     <xsd:attribute name="autoFilterDateGrouping" type="xsd:boolean" use="optional"
+#     default="true"/>
+# </xsd:complexType>
+
+module Axlsx
+
+  # A BookView defines the display properties for a workbook.
+  # Units for window widths and other dimensions are expressed in twips.
+  # Twip measurements are portable between different display resolutions.
+  # The formula is (screen pixels) * (20 * 72) / (logical device dpi),
+  # where the logical device dpi can be different for x and y coordinates.
+  class WorkbookView
+
+    include Axlsx::SerializedAttributes
+    include Axlsx::OptionsParser
+    include Axlsx::Accessors
+
+
+    # Creates a new BookView object
+    # @param [Hash] options  A hash of key/value pairs that will be mapped to this instances attributes.
+    # @option [Symbol] visibility Specifies visible state of the workbook window. The default value for this attribute is :visible.
+    # @option [Boolean] minimized Specifies a boolean value that indicates whether the workbook window is minimized.
+    # @option [Boolean] show_horizontal_scroll Specifies a boolean value that indicates whether to display the horizontal scroll bar in the user interface.
+    # @option [Boolean] show_vertical_scroll Specifies a boolean value that indicates whether to display the vertical scroll bar.
+    # @option [Boolean] show_sheet_tabs Specifies a boolean value that indicates whether to display the sheet tabs in the user interface.
+    # @option [Integer] tab_ratio Specifies ratio between the workbook tabs bar and the horizontal scroll bar.
+    # @option [Integer] first_sheet Specifies the index to the first sheet in this book view.
+    # @option [Integer] active_tab Specifies an unsignedInt that contains the index to the active sheet in this book view.
+    # @option [Integer] x_window Specifies the X coordinate for the upper left corner of the workbook window. The unit of measurement for this value is twips.
+    # @option [Integer] y_window Specifies the Y coordinate for the upper left corner of the workbook window. The unit of measurement for this value is twips.
+    # @option [Integer] window_width Specifies the width of the workbook window. The unit of measurement for this value is twips.
+    # @option [Integer] window_height Specifies the height of the workbook window. The unit of measurement for this value is twips.
+    # @option [Boolean] auto_filter_date_grouping Specifies a boolean value that indicates whether to group dates when presenting the user with filtering options in the user interface.
+    def initialize(options={})
+      parse_options options
+      yield self if block_given?
+    end
+
+
+    unsigned_int_attr_accessor :x_window, :y_window, :window_width, :window_height,
+                               :tab_ratio, :first_sheet, :active_tab
+
+    validated_attr_accessor  [:visibility], :validate_view_visibility
+
+    serializable_attributes :visibility, :minimized,
+                            :show_horizontal_scroll, :show_vertical_scroll,
+                            :show_sheet_tabs, :tab_ratio, :first_sheet, :active_tab,
+                            :x_window, :y_window, :window_width, :window_height,
+                            :auto_filter_date_grouping
+
+    boolean_attr_accessor :minimized, :show_horizontal_scroll, :show_vertical_scroll,
+                          :show_sheet_tabs, :auto_filter_date_grouping
+
+
+    # Serialize the WorkbookView
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = '')
+       str << '<workbookView '
+       serialized_attributes str
+       str << '></workbookView>'
+    end
+  end
+end

data/lib/axlsx/workbook/workbook_views.rb

@@ -0,0 +1,22 @@
+module Axlsx
+  # a simple types list of BookView objects
+  class WorkbookViews < SimpleTypedList
+
+    # creates the book views object
+    def initialize
+      super WorkbookView
+    end
+
+    # Serialize to xml
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = '')
+      return if empty?
+      str << "<bookViews>"
+      each { |view| view.to_xml_string(str) }
+      str << '</bookViews>'
+    end
+  end
+end
+
+

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

@@ -47,8 +47,8 @@ module Axlsx
       columns.last
     end
 
-    # actually performs the filtering of rows who's cells do not 
-    # match the filter.  
+    # actually performs the filtering of rows who's cells do not
+    # match the filter.
     def apply
       first_cell, last_cell = range.split(':')
       start_point = Axlsx::name_to_indices(first_cell)

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

@@ -237,9 +237,7 @@ include Axlsx::SerializedAttributes
       # Serialize the object to xml
       # @param [String] str The string object this serialization will be concatenated to.
       def to_xml_string(str = '')
-        str << '<dateGroupItem '
-        serialized_attributes str
-        str << '/>'
+        serialized_tag('dateGroupItem', str)
       end
     end
   end