caxlsx 3.3.0 → 4.0.0

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

@@ -1,11 +1,11 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # Selection options for worksheet panes.
   #
   # @note The recommended way to manage the selection pane options is via SheetView#add_selection
   # @see SheetView#add_selection
   class Selection
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -14,7 +14,7 @@ module Axlsx
     # @option options [Integer] active_cell_id Active Cell Index
     # @option options [Symbol] pane Pane
     # @option options [String] sqref Sequence of References
-    def initialize(options={})
+    def initialize(options = {})
       @active_cell = @active_cell_id = @pane = @sqref = nil
       parse_options options
     end
@@ -40,16 +40,16 @@ module Axlsx
 
     # Pane
     # The pane to which this selection belongs.
-    # Options are 
+    # Options are
     #  * bottom_left:  Bottom left pane, when both vertical and horizontal
     #                  splits are applied. This value is also used when only
-    #                  a horizontal split has been applied, dividing the pane 
-    #                  into upper and lower regions. In that case, this value 
+    #                  a horizontal split has been applied, dividing the pane
+    #                  into upper and lower regions. In that case, this value
     #                  specifies the bottom pane.
     #  * bottom_right: Bottom right pane, when both vertical and horizontal
     #                  splits are applied.
     #  * top_left:     Top left pane, when both vertical and horizontal splits
-    #                  are applied. This value is also used when only a horizontal 
+    #                  are applied. This value is also used when only a horizontal
     #                  split has been applied, dividing the pane into upper and lower
     #                  regions. In that case, this value specifies the top pane.
     #                  This value is also used when only a vertical split has
@@ -57,8 +57,8 @@ module Axlsx
     #                  regions. In that case, this value specifies the left pane
     #  * top_right:    Top right pane, when both vertical and horizontal
     #                  splits are applied. This value is also used when only
-    #                  a vertical split has been applied, dividing the pane 
-    #                  into right and left regions. In that case, this value 
+    #                  a vertical split has been applied, dividing the pane
+    #                  into right and left regions. In that case, this value
     #                  specifies the right pane.
     # @see type
     # @return [Symbol]
@@ -74,27 +74,27 @@ module Axlsx
 
     # @see active_cell
     def active_cell=(v)
-      cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)
+      cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v)
+      Axlsx.validate_string(cell)
       @active_cell = cell
     end
 
     # @see active_cell_id
-    def active_cell_id=(v); Axlsx::validate_unsigned_int(v); @active_cell_id = v end
+    def active_cell_id=(v); Axlsx.validate_unsigned_int(v); @active_cell_id = v end
 
     # @see pane
     def pane=(v)
-      Axlsx::validate_pane_type(v)
-      @pane = Axlsx::camel(v, false)
+      Axlsx.validate_pane_type(v)
+      @pane = Axlsx.camel(v, false)
     end
 
     # @see sqref
-    def sqref=(v); Axlsx::validate_string(v); @sqref = v end
+    def sqref=(v); Axlsx.validate_string(v); @sqref = v end
 
     # Serializes the data validation
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag 'selection', str
     end
   end

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

@@ -1,15 +1,16 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # the SheetCalcPr object for the worksheet
   # This object contains calculation properties for the worksheet.
   class SheetCalcPr
-   include Axlsx::OptionsParser
-   include Axlsx::SerializedAttributes
-   include Axlsx::Accessors
+    include Axlsx::OptionsParser
+    include Axlsx::SerializedAttributes
+    include Axlsx::Accessors
     # creates a new SheetCalcPr
     # @param [Hash] options Options for this object
     # @option [Boolean] full_calc_on_load @see full_calc_on_load
-    def initialize(options={})
+    def initialize(options = {})
       @full_calc_on_load = true
       parse_options options
     end
@@ -22,8 +23,10 @@ module Axlsx
     # @param [String] str the string to append this objects serialized
     # content to.
     # @return [String]
-    def to_xml_string(str='')
-      str << "<sheetCalcPr #{serialized_attributes}/>"
+    def to_xml_string(str = +'')
+      str << '<sheetCalcPr '
+      serialized_attributes(str)
+      str << '/>'
     end
   end
 end

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

@@ -1,27 +1,27 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # This class manages the serialization of rows for worksheets
   class SheetData
-
     # Creates a new SheetData object
     # @param [Worksheet] worksheet The worksheet that owns this sheet data.
     def initialize(worksheet)
       raise ArgumentError, "you must provide a worksheet" unless worksheet.is_a?(Worksheet)
+
       @worksheet = worksheet
     end
-    
+
     attr_reader :worksheet
 
     # Serialize the sheet data
     # @param [String] str the string this objects serializaton will be concacted to.
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<sheetData>'
-      worksheet.rows.each_with_index do |row, index| 
-        row.to_xml_string(index, str) 
+      worksheet.rows.each_with_index do |row, index|
+        row.to_xml_string(index, str)
       end
       str << '</sheetData>'
     end
-    
   end
 end

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

@@ -1,17 +1,18 @@
-module Axlsx
+# frozen_string_literal: true
 
-  #Sheet formatting properties
-  # <xsd:complexType name="CT_SheetFormatPr">
-  #   <xsd:attribute name="baseColWidth" type="xsd:unsignedInt" use="optional" default="8"/>
-  #   <xsd:attribute name="defaultColWidth" type="xsd:double" use="optional"/>
-  #   <xsd:attribute name="defaultRowHeight" type="xsd:double" use="required"/>
-  #   <xsd:attribute name="customHeight" type="xsd:boolean" use="optional" default="false"/>
-  #   <xsd:attribute name="zeroHeight" type="xsd:boolean" use="optional" default="false"/>
-  #   <xsd:attribute name="thickTop" type="xsd:boolean" use="optional" default="false"/>
-  #   <xsd:attribute name="thickBottom" type="xsd:boolean" use="optional" default="false"/>
-  #   <xsd:attribute name="outlineLevelRow" type="xsd:unsignedByte" use="optional" default="0"/>
-  #   <xsd:attribute name="outlineLevelCol" type="xsd:unsignedByte" use="optional" default="0"/>
-  #</xsd:complexType>
+module Axlsx
+  # Sheet formatting properties
+  # <xsd:complexType name="CT_SheetFormatPr">
+  #   <xsd:attribute name="baseColWidth" type="xsd:unsignedInt" use="optional" default="8"/>
+  #   <xsd:attribute name="defaultColWidth" type="xsd:double" use="optional"/>
+  #   <xsd:attribute name="defaultRowHeight" type="xsd:double" use="required"/>
+  #   <xsd:attribute name="customHeight" type="xsd:boolean" use="optional" default="false"/>
+  #   <xsd:attribute name="zeroHeight" type="xsd:boolean" use="optional" default="false"/>
+  #   <xsd:attribute name="thickTop" type="xsd:boolean" use="optional" default="false"/>
+  #   <xsd:attribute name="thickBottom" type="xsd:boolean" use="optional" default="false"/>
+  #   <xsd:attribute name="outlineLevelRow" type="xsd:unsignedByte" use="optional" default="0"/>
+  #   <xsd:attribute name="outlineLevelCol" type="xsd:unsignedByte" use="optional" default="0"/>
+  # </xsd:complexType>
 
   class SheetFormatPr
     include Axlsx::SerializedAttributes
@@ -29,29 +30,32 @@ module Axlsx
     # @option [Boolean] thick_bottom 'True' if rows have a thick bottom border by default.
     # @option [Integer] outline_level_row Highest number of outline level for rows in this sheet. These values shall be in synch with the actual sheet outline levels.
     # @option [Integer] outline_level_col Highest number of outline levels for columns in this sheet. These values shall be in synch with the actual sheet outline levels.
-    def initialize(options={})
+    def initialize(options = {})
       set_defaults
       parse_options options
     end
 
     serializable_attributes :base_col_width, :default_col_width, :default_row_height,
-      :custom_height, :zero_height, :thick_top, :thick_bottom,
-      :outline_level_row, :outline_level_col
+                            :custom_height, :zero_height, :thick_top, :thick_bottom,
+                            :outline_level_row, :outline_level_col
 
     float_attr_accessor :default_col_width, :default_row_height
 
     boolean_attr_accessor :custom_height, :zero_height, :thick_top, :thick_bottom
 
-    unsigned_int_attr_accessor :base_col_width, :outline_level_row, :outline_level_col 
+    unsigned_int_attr_accessor :base_col_width, :outline_level_row, :outline_level_col
 
     # serializes this object to an xml string
     # @param [String] str The string this objects serialization will be appended to
     # @return [String]
-    def to_xml_string(str='')
-      str << "<sheetFormatPr #{serialized_attributes}/>"
+    def to_xml_string(str = +'')
+      str << '<sheetFormatPr '
+      serialized_attributes(str)
+      str << '/>'
     end
 
     private
+
     def set_defaults
       @base_col_width = 8
       @default_row_height = 18

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

@@ -1,5 +1,6 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The SheetPr class manages serialization of a worksheet's sheetPr element.
   class SheetPr
     include Axlsx::OptionsParser
@@ -30,8 +31,9 @@ module Axlsx
 
     # Creates a new SheetPr object
     # @param [Worksheet] worksheet The worksheet that owns this SheetPr object
-    def initialize(worksheet, options={})
+    def initialize(worksheet, options = {})
       raise ArgumentError, "you must provide a worksheet" unless worksheet.is_a?(Worksheet)
+
       @worksheet = worksheet
       @outline_pr = nil
       parse_options options
@@ -48,9 +50,11 @@ module Axlsx
     # Serialize the object
     # @param [String] str serialized output will be appended to this object if provided.
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       update_properties
-      str << "<sheetPr #{serialized_attributes}>"
+      str << '<sheetPr '
+      serialized_attributes(str)
+      str << '>'
       tab_color.to_xml_string(str, 'tabColor') if tab_color
       outline_pr.to_xml_string(str) if @outline_pr
       page_setup_pr.to_xml_string(str)
@@ -62,7 +66,7 @@ module Axlsx
     def page_setup_pr
       @page_setup_pr ||= PageSetUpPr.new
     end
-    
+
     # The OutlinePr for this sheet pr object
     # @return [OutlinePr]
     def outline_pr
@@ -71,14 +75,14 @@ module Axlsx
 
     # @see tab_color
     def tab_color=(v)
-      @tab_color ||= Color.new(:rgb => v)
+      @tab_color = Color.new(rgb: v)
     end
 
     private
 
     def update_properties
       page_setup_pr.fit_to_page = worksheet.fit_to_page?
-      if worksheet.auto_filter.columns.size > 0
+      unless worksheet.auto_filter.columns.empty?
         self.filter_mode = 1
         self.enable_format_conditions_calculation = 1
       end

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

@@ -1,9 +1,8 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The SheetProtection object manages worksheet protection options per sheet.
   class SheetProtection
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
     include Axlsx::Accessors
@@ -26,7 +25,7 @@ module Axlsx
     # @option options [Boolean] pivot_tables @see SheetProtection#pivot_tables
     # @option options [Boolean] select_unlocked_cells @see SheetProtection#select_unlocked_cells
     # @option options [String] password. The password required for unlocking. @see SheetProtection#password=
-    def initialize(options={})
+    def initialize(options = {})
       @objects = @scenarios = @select_locked_cells = @select_unlocked_cells = false
       @sheet = @format_cells = @format_rows = @format_columns = @insert_columns = @insert_rows = @insert_hyperlinks = @delete_columns = @delete_rows = @sort = @auto_filter = @pivot_tables = true
       @password = nil
@@ -34,12 +33,12 @@ module Axlsx
     end
 
     boolean_attr_accessor :sheet, :objects, :scenarios, :format_cells, :format_columns, :format_rows,
-      :insert_columns, :insert_rows, :insert_hyperlinks, :delete_columns, :delete_rows,
-      :select_locked_cells, :sort, :auto_filter, :pivot_tables, :select_unlocked_cells
+                          :insert_columns, :insert_rows, :insert_hyperlinks, :delete_columns, :delete_rows,
+                          :select_locked_cells, :sort, :auto_filter, :pivot_tables, :select_unlocked_cells
 
     serializable_attributes :sheet, :objects, :scenarios, :format_cells, :format_columns, :format_rows,
-      :insert_columns, :insert_rows, :insert_hyperlinks, :delete_columns, :delete_rows,
-      :select_locked_cells, :sort, :auto_filter, :pivot_tables, :select_unlocked_cells, :salt, :password
+                            :insert_columns, :insert_rows, :insert_hyperlinks, :delete_columns, :delete_rows,
+                            :select_locked_cells, :sort, :auto_filter, :pivot_tables, :select_unlocked_cells, :salt, :password
 
     # Specifies the salt which was prepended to the user-supplied password before it was hashed using the hashing algorithm
     # @return [String]
@@ -50,9 +49,9 @@ module Axlsx
     # default nil
     attr_reader :password
 
-    # This block is intended to implement the salt_value, hash_value and spin count as per the ECMA-376 standard. 
-    # However, it does not seem to actually work in EXCEL - instead they are using their old retro algorithm shown below 
-    # defined in the transitional portion of the speck. I am leaving this code in in the hope that someday Ill be able to 
+    # This block is intended to implement the salt_value, hash_value and spin count as per the ECMA-376 standard.
+    # However, it does not seem to actually work in EXCEL - instead they are using their old retro algorithm shown below
+    # defined in the transitional portion of the speck. I am leaving this code in in the hope that someday Ill be able to
     # figure out why it does not work, and if Excel even supports it.
     #     def propper_password=(v)
     #       @algorithm_name = v == nil ? nil : 'SHA-1'
@@ -68,48 +67,50 @@ module Axlsx
 
     # encodes password for protection locking
     def password=(v)
-      return if v == nil
+      return if v.nil?
+
       @password = create_password_hash(v)
     end
 
     # Serialize the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('sheetProtection', str)
     end
 
     private
+
     # Creates a password hash for a given password
     # @return [String]
     def create_password_hash(password)
       encoded_password = encode_password(password)
 
       password_as_hex = [encoded_password].pack("v")
-      password_as_string = password_as_hex.unpack("H*").first.upcase
+      password_as_string = password_as_hex.unpack1("H*").upcase
 
       password_as_string[2..3] + password_as_string[0..1]
     end
 
     # Encodes a given password
     # Based on the algorithm provided by Daniel Rentz of OpenOffice.
-    # http://www.openoffice.org/sc/excelfileformat.pdf, Revision 1.42, page 115 (21.05.2012)
+    # https://www.openoffice.org/sc/excelfileformat.pdf, Revision 1.42, page 115 (21.05.2012)
     # @return [String]
     def encode_password(password)
       i = 0
-      chars = password.split(//)
+      chars = password.chars
       count = chars.size
 
       chars.collect! do |char|
         i += 1
-        char     = char.unpack('c')[0] << i #ord << i
+        char     = char.unpack1('c') << i # ord << i
         low_15   = char & 0x7fff
-        high_15  = char & 0x7fff << 15
+        high_15  = char & (0x7fff << 15)
         high_15  = high_15 >> 15
-        char     = low_15 | high_15
+        low_15 | high_15
       end
 
-      encoded_password  = 0x0000
+      encoded_password = 0x0000
       chars.each { |c| encoded_password ^= c }
       encoded_password ^= count
       encoded_password ^= 0xCE4B

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

@@ -1,11 +1,11 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # View options for a worksheet.
   #
   # @note The recommended way to manage the sheet view is via Worksheet#sheet_view
   # @see Worksheet#sheet_view
   class SheetView
-   
     include Axlsx::OptionsParser
     include Axlsx::Accessors
     include Axlsx::SerializedAttributes
@@ -30,8 +30,8 @@ module Axlsx
     # @option options [Integer] zoom_scale_normal Zoom Scale Normal View
     # @option options [Integer] zoom_scale_page_layout_view Zoom Scale Page Layout View
     # @option options [Integer] zoom_scale_sheet_layout_view Zoom Scale Page Break Preview
-    def initialize(options={})
-      #defaults
+    def initialize(options = {})
+      # defaults
       @color_id = @top_left_cell = @pane = nil
       @right_to_left = @show_formulas = @show_outline_symbols = @show_white_space = @tab_selected = @window_protection = false
       @default_grid_color = @show_grid_lines = @show_row_col_headers = @show_ruler = @show_zeros = true
@@ -42,16 +42,15 @@ module Axlsx
     end
 
     boolean_attr_accessor :default_grid_color, :right_to_left, :show_formulas, :show_grid_lines,
-      :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols
+                          :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols
 
     serializable_attributes :default_grid_color, :right_to_left, :show_formulas, :show_grid_lines,
-      :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols,
-      :zoom_scale_sheet_layout_view, :zoom_scale_page_layout_view, :zoom_scale_normal, :workbook_view_id,
-      :view, :top_left_cell, :color_id, :zoom_scale
-
+                            :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols,
+                            :zoom_scale_sheet_layout_view, :zoom_scale_page_layout_view, :zoom_scale_normal, :workbook_view_id,
+                            :view, :top_left_cell, :color_id, :zoom_scale
 
     # instance values that must be serialized as their own elements - e.g. not attributes.
-    CHILD_ELEMENTS = [ :pane, :selections ]
+    CHILD_ELEMENTS = [:pane, :selections].freeze
 
     # The pane object for the sheet view
     # @return [Pane]
@@ -66,11 +65,11 @@ module Axlsx
     # @return [Hash]
     attr_reader :selections
 
-    #  
+    #
     # Color Id
     # Index to the color value for row/column
-    # text headings and gridlines. This is an 
-    # 'index color value' (ICV) rather than 
+    # text headings and gridlines. This is an
+    # 'index color value' (ICV) rather than
     # rgb value.
     # @see type
     # @return [Integer]
@@ -78,18 +77,17 @@ module Axlsx
     attr_reader :color_id
 
     # Top Left Visible Cell
-    # Location of the top left visible cell Location 
+    # Location of the top left visible cell Location
     # of the top left visible cell in the bottom right
     # pane (when in Left-to-Right mode).
     # @see type
     # @return [String]
     # default nil
     attr_reader :top_left_cell
-    
-    
+
     # View Type
     # Indicates the view type.
-    # Options are 
+    # Options are
     #  * normal: Normal view
     #  * page_break_preview: Page break preview
     #  * page_layout: Page Layout View
@@ -99,62 +97,59 @@ module Axlsx
     attr_reader :view
 
     # Workbook View Index
-    # Zero-based index of this workbook view, pointing 
+    # Zero-based index of this workbook view, pointing
     # to a workbookView element in the bookViews collection.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :workbook_view_id
 
     # Zoom Scale
-    # Window zoom magnification for current view 
+    # Window zoom magnification for current view
     # representing percent values. This attribute
-    # is restricted to values ranging from 10 to 400. 
+    # is restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Current view can be Normal, Page Layout, or 
+    # Current view can be Normal, Page Layout, or
     # Page Break Preview.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 100
     attr_reader :zoom_scale
 
-
     # Zoom Scale Normal View
-    # Zoom magnification to use when in normal view, 
-    # representing percent values. This attribute is 
-    # restricted to values ranging from 10 to 400. 
+    # Zoom magnification to use when in normal view,
+    # representing percent values. This attribute is
+    # restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Applies for worksheets only; zero implies the 
+    # Applies for worksheets only; zero implies the
     # automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_normal
 
-
     # Zoom Scale Page Layout View
-    # Zoom magnification to use when in page layout 
-    # view, representing percent values. This attribute 
-    # is restricted to values ranging from 10 to 400. 
+    # Zoom magnification to use when in page layout
+    # view, representing percent values. This attribute
+    # is restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Applies for worksheets only; zero implies 
+    # Applies for worksheets only; zero implies
     # the automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_page_layout_view
 
-
     # Zoom Scale Page Break Preview
-    # Zoom magnification to use when in page break 
-    # preview, representing percent values. This 
-    # attribute is restricted to values ranging 
+    # Zoom magnification to use when in page break
+    # preview, representing percent values. This
+    # attribute is restricted to values ranging
     # from 10 to 400. Horizontal & Vertical scale
     # together.
-    # Applies for worksheet only; zero implies 
+    # Applies for worksheet only; zero implies
     # the automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_sheet_layout_view
 
@@ -163,47 +158,47 @@ module Axlsx
     # param [Hash] options
     # return [Selection]
     def add_selection(pane, options = {})
-      @selections[pane] = Selection.new(options.merge(:pane => pane))
+      @selections[pane] = Selection.new(options.merge(pane: pane))
     end
 
     # @see color_id
-    def color_id=(v); Axlsx::validate_unsigned_int(v); @color_id = v end
+    def color_id=(v); Axlsx.validate_unsigned_int(v); @color_id = v end
 
     # @see top_left_cell
     def top_left_cell=(v)
-      cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)  
+      cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v)
+      Axlsx.validate_string(cell)
       @top_left_cell = cell
     end
 
     # @see view
-    def view=(v); Axlsx::validate_sheet_view_type(v); @view = v end
+    def view=(v); Axlsx.validate_sheet_view_type(v); @view = v end
 
     # @see workbook_view_id
-    def workbook_view_id=(v); Axlsx::validate_unsigned_int(v); @workbook_view_id = v end
+    def workbook_view_id=(v); Axlsx.validate_unsigned_int(v); @workbook_view_id = v end
 
     # @see zoom_scale
-    def zoom_scale=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale = v end
+    def zoom_scale=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale = v end
 
     # @see zoom_scale_normal
-    def zoom_scale_normal=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_normal = v end
+    def zoom_scale_normal=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_normal = v end
 
     # @see zoom_scale_page_layout_view
-    def zoom_scale_page_layout_view=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_page_layout_view = v end
+    def zoom_scale_page_layout_view=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_page_layout_view = v end
 
     # @see zoom_scale_sheet_layout_view
-    def zoom_scale_sheet_layout_view=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_sheet_layout_view = v end
+    def zoom_scale_sheet_layout_view=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_sheet_layout_view = v end
 
     # Serializes the data validation
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<sheetViews>'
       str << '<sheetView '
       serialized_attributes str
       str << '>'
       @pane.to_xml_string(str) if @pane
-      @selections.each do |key, selection|
+      @selections.each_value do |selection|
         selection.to_xml_string(str)
       end
       str << '</sheetView>'