write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.72.2"
+  VERSION = "0.72.3.beta1"
 end

data/lib/write_xlsx/workbook.rb

@@ -242,36 +242,33 @@ def assemble_xml_file  #:nodoc:
       # Prepare format object for passing to Style.rb.
       prepare_format_properties
 
-      write_xml_declaration
+      write_xml_declaration do
 
-      # Write the root workbook element.
-      write_workbook do
+        # Write the root workbook element.
+        write_workbook do
 
-        # Write the XLSX file version.
-        write_file_version
+          # Write the XLSX file version.
+          write_file_version
 
-        # Write the workbook properties.
-        write_workbook_pr
+          # Write the workbook properties.
+          write_workbook_pr
 
-        # Write the workbook view properties.
-        write_book_views
+          # Write the workbook view properties.
+          write_book_views
 
-        # Write the worksheet names and ids.
-        @worksheets.write_sheets(@writer)
+          # Write the worksheet names and ids.
+          @worksheets.write_sheets(@writer)
 
-        # Write the workbook defined names.
-        write_defined_names
+          # Write the workbook defined names.
+          write_defined_names
 
-        # Write the workbook calculation properties.
-        write_calc_pr
+          # Write the workbook calculation properties.
+          write_calc_pr
 
-        # Write the workbook extension storage.
-        #write_ext_lst
+          # Write the workbook extension storage.
+          #write_ext_lst
+        end
       end
-
-      # Close the XML writer object and filehandle.
-      @writer.crlf
-      @writer.close
     end
 
     #
@@ -1073,17 +1070,13 @@ def get_chart_range(range) #:nodoc:
       return [sheetname, row_start, col_start, row_end, col_end]
     end
 
-    def write_xml_declaration #:nodoc:
-      @writer.xml_decl
-    end
-
     def write_workbook #:nodoc:
       schema  = 'http://schemas.openxmlformats.org'
       attributes = [
-        'xmlns',
-        schema + '/spreadsheetml/2006/main',
-        'xmlns:r',
-        schema + '/officeDocument/2006/relationships'
+        ['xmlns',
+         schema + '/spreadsheetml/2006/main'],
+        ['xmlns:r',
+         schema + '/officeDocument/2006/relationships']
       ]
       @writer.tag_elements('workbook', attributes) do
         yield
@@ -1092,14 +1085,14 @@ def write_workbook #:nodoc:
 
     def write_file_version #:nodoc:
       attributes = [
-        'appName', 'xl',
-        'lastEdited', 4,
-        'lowestEdited', 4,
-        'rupBuild', 4505
+                    ['appName', 'xl'],
+                    ['lastEdited', 4],
+                    ['lowestEdited', 4],
+                    ['rupBuild', 4505]
                    ]
 
       if @vba_project
-        attributes << :codeName << '{37E998C4-C9E5-D4B9-71C8-EB1FF731991C}'
+        attributes << [:codeName, '{37E998C4-C9E5-D4B9-71C8-EB1FF731991C}']
       end
 
       @writer.empty_tag('fileVersion', attributes)
@@ -1107,9 +1100,9 @@ def write_file_version #:nodoc:
 
     def write_workbook_pr #:nodoc:
       attributes = []
-      attributes << 'codeName' << @vba_codename  if ptrue?(@vba_codename)
-      attributes << 'date1904' << 1              if date_1904?
-      attributes << 'defaultThemeVersion' << 124226
+      attributes << ['codeName', @vba_codename]  if ptrue?(@vba_codename)
+      attributes << ['date1904', 1]              if date_1904?
+      attributes << ['defaultThemeVersion', 124226]
       @writer.empty_tag('workbookPr', attributes)
     end
 
@@ -1119,25 +1112,28 @@ def write_book_views #:nodoc:
 
     def write_workbook_view #:nodoc:
       attributes = [
-        'xWindow',       @x_window,
-        'yWindow',       @y_window,
-        'windowWidth',   @window_width,
-        'windowHeight',  @window_height
+                    ['xWindow',       @x_window],
+                    ['yWindow',       @y_window],
+                    ['windowWidth',   @window_width],
+                    ['windowHeight',  @window_height]
                    ]
       if @tab_ratio != 500
-        attributes << 'tabRatio' << @tab_ratio
+        attributes << ['tabRatio', @tab_ratio]
       end
       if @firstsheet > 0
-        attributes << 'firstSheet' << @firstsheet + 1
+        attributes << ['firstSheet', @firstsheet + 1]
       end
       if @activesheet > 0
-        attributes << 'activeTab' << @activesheet
+        attributes << ['activeTab', @activesheet]
       end
       @writer.empty_tag('workbookView', attributes)
     end
 
     def write_calc_pr #:nodoc:
-      attributes = ['calcId', 124519, 'fullCalcOnLoad', 1]
+      attributes = [
+                    ['calcId', 124519],
+                    ['fullCalcOnLoad', 1]
+                   ]
       @writer.empty_tag('calcPr', attributes)
     end
 
@@ -1147,8 +1143,8 @@ def write_ext_lst #:nodoc:
 
     def write_ext #:nodoc:
       attributes = [
-        'xmlns:mx', "#{OFFICE_URL}mac/excel/2008/main",
-        'uri', uri
+        ['xmlns:mx', "#{OFFICE_URL}mac/excel/2008/main"],
+        ['uri', uri]
       ]
       @writer.tag_elements('ext', attributes) { write_mx_arch_id }
     end
@@ -1167,9 +1163,9 @@ def write_defined_names #:nodoc:
     def write_defined_name(defined_name) #:nodoc:
       name, id, range, hidden = defined_name
 
-      attributes = ['name', name]
-      attributes << 'localSheetId' << "#{id}" unless id == -1
-      attributes << 'hidden'       << '1'     if hidden
+      attributes = [ ['name', name] ]
+      attributes << ['localSheetId', "#{id}"] unless id == -1
+      attributes << ['hidden',       '1']     if hidden
 
       @writer.data_element('definedName', range, attributes)
     end

data/lib/write_xlsx/worksheet.rb

@@ -372,33 +372,32 @@ def set_xml_writer(filename) #:nodoc:
     end
 
     def assemble_xml_file #:nodoc:
-      @writer.xml_decl
-      @writer.tag_elements('worksheet', write_worksheet_attributes) do
-        write_sheet_pr
-        write_dimension
-        write_sheet_views
-        write_sheet_format_pr
-        write_cols
-        write_sheet_data
-        write_sheet_protection
-        write_auto_filter
-        write_merge_cells
-        write_conditional_formats
-        write_data_validations
-        write_hyperlinks
-        write_print_options
-        write_page_margins
-        write_page_setup
-        write_header_footer
-        write_row_breaks
-        write_col_breaks
-        write_drawings
-        write_legacy_drawing
-        write_table_parts
-        write_ext_sparklines
+      write_xml_declaration do
+        @writer.tag_elements('worksheet', write_worksheet_attributes) do
+          write_sheet_pr
+          write_dimension
+          write_sheet_views
+          write_sheet_format_pr
+          write_cols
+          write_sheet_data
+          write_sheet_protection
+          write_auto_filter
+          write_merge_cells
+          write_conditional_formats
+          write_data_validations
+          write_hyperlinks
+          write_print_options
+          write_page_margins
+          write_page_setup
+          write_header_footer
+          write_row_breaks
+          write_col_breaks
+          write_drawings
+          write_legacy_drawing
+          write_table_parts
+          write_ext_sparklines
+        end
       end
-      @writer.crlf
-      @writer.close
     end
 
     #
@@ -2559,7 +2558,7 @@ def write_url(*args)
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      hyperlink = Hyperlink.new(url, str)
+      hyperlink = Hyperlink.factory(url, str)
       hyperlink.tip = tip
 
       @hlink_count += 1
@@ -5681,7 +5680,12 @@ def write_cell_formula(formula = '') #:nodoc:
     # Write the cell array formula <f> element.
     #
     def write_cell_array_formula(formula, range) #:nodoc:
-      @writer.data_element('f', formula, ['t', 'array', 'ref', range])
+      @writer.data_element('f', formula,
+                           [
+                            ['t', 'array'],
+                            ['ref', range]
+                           ]
+                           )
     end
 
     def date_1904? #:nodoc:
@@ -5817,7 +5821,7 @@ def xml_str_of_rich_string(fragments)
           # Write the string fragment part, with whitespace handling.
           attributes = []
 
-          attributes << 'xml:space' << 'preserve' if token =~ /^\s/ || token =~ /\s$/
+          attributes << ['xml:space', 'preserve'] if token =~ /^\s/ || token =~ /\s$/
           writer.data_element('t', token, attributes)
           writer.end_tag('r')
         end
@@ -6337,13 +6341,13 @@ def encode_password(password) #:nodoc:
     def write_worksheet_attributes #:nodoc:
       schema = 'http://schemas.openxmlformats.org/'
       attributes = [
-                    'xmlns',    "#{schema}spreadsheetml/2006/main",
-                    'xmlns:r',  "#{schema}officeDocument/2006/relationships"
+                    ['xmlns',    "#{schema}spreadsheetml/2006/main"],
+                    ['xmlns:r',  "#{schema}officeDocument/2006/relationships"]
                    ]
       if @excel_version == 2010
-        attributes << 'xmlns:mc'     << "#{schema}markup-compatibility/2006"
-        attributes << 'xmlns:x14ac'  << "#{OFFICE_URL}spreadsheetml/2009/9/ac"
-        attributes << 'mc:Ignorable' << 'x14ac'
+        attributes << ['xmlns:mc',     "#{schema}markup-compatibility/2006"]
+        attributes << ['xmlns:x14ac',  "#{OFFICE_URL}spreadsheetml/2009/9/ac"]
+        attributes << ['mc:Ignorable', 'x14ac']
       end
       attributes
     end
@@ -6355,8 +6359,8 @@ def write_sheet_pr #:nodoc:
       return unless tab_outline_fit? || vba_codename? || filter_on?
 
       attributes = []
-      attributes << 'codeName'   << @vba_codename if vba_codename?
-      attributes << 'filterMode' << 1             if filter_on?
+      attributes << ['codeName',   @vba_codename] if vba_codename?
+      attributes << ['filterMode', 1]             if filter_on?
 
       if tab_outline_fit?
         @writer.tag_elements('sheetPr', attributes) do
@@ -6377,7 +6381,7 @@ def tab_outline_fit?
     # Write the <pageSetUpPr> element.
     #
     def write_page_set_up_pr #:nodoc:
-      @writer.empty_tag('pageSetUpPr', ['fitToPage', 1]) if fit_page?
+      @writer.empty_tag('pageSetUpPr', [ ['fitToPage', 1] ]) if fit_page?
     end
 
     # Write the <dimension> element. This specifies the range of cells in the
@@ -6409,7 +6413,7 @@ def write_dimension #:nodoc:
         cell_2 = xl_rowcol_to_cell(@dim_rowmax, @dim_colmax)
         ref = cell_1 + ':' + cell_2
       end
-      @writer.empty_tag('dimension', ['ref', ref])
+      @writer.empty_tag('dimension', [ ['ref', ref] ])
     end
     #
     # Write the <sheetViews> element.
@@ -6421,31 +6425,31 @@ def write_sheet_views #:nodoc:
     def write_sheet_view #:nodoc:
       attributes = []
       # Hide screen gridlines if required
-      attributes << 'showGridLines' << 0 unless @screen_gridlines
+      attributes << ['showGridLines', 0] unless @screen_gridlines
 
       # Hide zeroes in cells.
-      attributes << 'showZeros' << 0 unless show_zeros?
+      attributes << ['showZeros', 0] unless show_zeros?
 
       # Display worksheet right to left for Hebrew, Arabic and others.
-      attributes << 'rightToLeft' << 1 if @right_to_left
+      attributes << ['rightToLeft', 1] if @right_to_left
 
       # Show that the sheet tab is selected.
-      attributes << 'tabSelected' << 1 if @selected
+      attributes << ['tabSelected', 1] if @selected
 
       # Turn outlines off. Also required in the outlinePr element.
-      attributes << "showOutlineSymbols" << 0 if @outline_on
+      attributes << ["showOutlineSymbols", 0] if @outline_on
 
       # Set the page view/layout mode if required.
       # TODO. Add pageBreakPreview mode when requested.
-      (attributes << 'view' << 'pageLayout') if page_view?
+      attributes << ['view', 'pageLayout'] if page_view?
 
       # Set the zoom level.
       if @zoom != 100
-        (attributes << 'zoomScale' << @zoom) unless page_view?
-        (attributes << 'zoomScaleNormal' << @zoom) if zoom_scale_normal?
+        attributes << ['zoomScale', @zoom] unless page_view?
+        attributes << ['zoomScaleNormal', @zoom] if zoom_scale_normal?
       end
 
-      attributes << 'workbookViewId' << 0
+      attributes << ['workbookViewId', 0]
 
       if @panes.empty? && @selections.empty?
         @writer.empty_tag('sheetView', attributes)
@@ -6469,9 +6473,9 @@ def write_selections #:nodoc:
     #
     def write_selection(pane, active_cell, sqref) #:nodoc:
       attributes  = []
-      (attributes << 'pane' << pane) if pane
-      (attributes << 'activeCell' << active_cell) if active_cell
-      (attributes << 'sqref' << sqref) if sqref
+      attributes << ['pane', pane]              if pane
+      attributes << ['activeCell', active_cell] if active_cell
+      attributes << ['sqref', sqref]            if sqref
 
       @writer.empty_tag('selection', attributes)
     end
@@ -6482,19 +6486,21 @@ def write_selection(pane, active_cell, sqref) #:nodoc:
     def write_sheet_format_pr #:nodoc:
       base_col_width     = 10
 
-      attributes = ['defaultRowHeight', @default_row_height]
+      attributes = [
+                    ['defaultRowHeight', @default_row_height]
+                   ]
       if @default_row_height != 15
-        attributes << 'customHeight' << 1
+        attributes << ['customHeight', 1]
       end
 
       if ptrue?(@default_row_zeroed)
-        attributes << 'zeroHeight' << 1
+        attributes << ['zeroHeight', 1]
       end
 
-      attributes << 'outlineLevelRow' << @outline_row_level if @outline_row_level > 0
-      attributes << 'outlineLevelCol' << @outline_col_level if @outline_col_level > 0
+      attributes << ['outlineLevelRow', @outline_row_level] if @outline_row_level > 0
+      attributes << ['outlineLevelCol', @outline_col_level] if @outline_col_level > 0
       if @excel_version == 2010
-        attributes << 'x14ac:dyDescent' << '0.25'
+        attributes << ['x14ac:dyDescent', '0.25']
       end
       @writer.empty_tag('sheetFormatPr', attributes)
     end
@@ -6547,16 +6553,16 @@ def col_info_attributes(args)
       width = width.to_i if width - width.to_i == 0
 
       attributes = [
-          'min',   min + 1,
-          'max',   max + 1,
-          'width', width
+          ['min',   min + 1],
+          ['max',   max + 1],
+          ['width', width]
       ]
 
-      attributes << 'style'        << xf_index if xf_index != 0
-      attributes << 'hidden'       << 1        if hidden != 0
-      attributes << 'customWidth'  << 1        if custom_width
-      attributes << 'outlineLevel' << level    if level != 0
-      attributes << 'collapsed'    << 1        if collapsed != 0
+      attributes << ['style',        xf_index] if xf_index != 0
+      attributes << ['hidden',       1]        if hidden != 0
+      attributes << ['customWidth',  1]        if custom_width
+      attributes << ['outlineLevel', level]    if level != 0
+      attributes << ['collapsed',    1]        if collapsed != 0
       attributes
     end
 
@@ -6633,19 +6639,19 @@ def row_attributes(args)
       level     ||= 0
       xf_index = format ? format.get_xf_index : 0
 
-      attributes = ['r',  r + 1]
+      attributes = [['r',  r + 1]]
 
-      (attributes << 'spans'        << spans)    if spans
-      (attributes << 's'            << xf_index) if ptrue?(xf_index)
-      (attributes << 'customFormat' << 1    )    if ptrue?(format)
-      (attributes << 'ht'           << height)   if height != 15
-      (attributes << 'hidden'       << 1    )    if ptrue?(hidden)
-      (attributes << 'customHeight' << 1    )    if height != 15
-      (attributes << 'outlineLevel' << level)    if ptrue?(level)
-      (attributes << 'collapsed'    << 1    )    if ptrue?(collapsed)
+      attributes << ['spans',        spans]    if spans
+      attributes << ['s',            xf_index] if ptrue?(xf_index)
+      attributes << ['customFormat', 1]        if ptrue?(format)
+      attributes << ['ht',           height]   if height != 15
+      attributes << ['hidden',       1]        if ptrue?(hidden)
+      attributes << ['customHeight', 1]        if height != 15
+      attributes << ['outlineLevel', level]    if ptrue?(level)
+      attributes << ['collapsed',    1]        if ptrue?(collapsed)
 
       if @excel_version == 2010
-        attributes << 'x14ac:dyDescent' << '0.25'
+        attributes << ['x14ac:dyDescent', '0.25']
       end
       attributes
     end
@@ -6691,11 +6697,11 @@ def write_freeze_panes(row, col, top_row, left_col, type) #:nodoc:
       end
 
       attributes = []
-      (attributes << 'xSplit' << x_split) if x_split > 0
-      (attributes << 'ySplit' << y_split) if y_split > 0
-      attributes << 'topLeftCell' << top_left_cell
-      attributes << 'activePane'  << active_pane
-      attributes << 'state'       << state
+      attributes << ['xSplit',      x_split] if x_split > 0
+      attributes << ['ySplit',      y_split] if y_split > 0
+      attributes << ['topLeftCell', top_left_cell]
+      attributes << ['activePane',  active_pane]
+      attributes << ['state',       state]
 
       @writer.empty_tag('pane', attributes)
     end
@@ -6739,10 +6745,10 @@ def write_split_panes(row, col, top_row, left_col, type) #:nodoc:
       active_pane = set_active_pane_and_cell_selections(row, col, top_row, left_col, active_cell, sqref)
 
       attributes = []
-      (attributes << 'xSplit' << x_split) if x_split > 0
-      (attributes << 'ySplit' << y_split) if y_split > 0
-      attributes << 'topLeftCell' << top_left_cell
-      (attributes << 'activePane' << active_pane) if has_selection
+      attributes << ['xSplit', x_split] if x_split > 0
+      attributes << ['ySplit', y_split] if y_split > 0
+      attributes << ['topLeftCell', top_left_cell]
+      attributes << ['activePane', active_pane] if has_selection
 
       @writer.empty_tag('pane', attributes)
     end
@@ -6772,7 +6778,7 @@ def calculate_x_split_width(width) #:nodoc:
     # Write the <sheetCalcPr> element for the worksheet calculation properties.
     #
     def write_sheet_calc_pr #:nodoc:
-      @writer.empty_tag('sheetCalcPr', ['fullCalcOnLoad', 1])
+      @writer.empty_tag('sheetCalcPr', [ ['fullCalcOnLoad', 1] ])
     end
 
     #
@@ -6780,8 +6786,8 @@ def write_sheet_calc_pr #:nodoc:
     #
     def write_phonetic_pr #:nodoc:
       attributes = [
-                    'fontId', 1,
-                    'type',   'noConversion'
+                    ['fontId', 1],
+                    ['type',   'noConversion']
                    ]
 
       @writer.empty_tag('phoneticPr', attributes)
@@ -6813,7 +6819,7 @@ def write_merge_cells #:nodoc:
     def write_some_elements(tag, container)
       return if container.empty?
 
-      @writer.tag_elements(tag, ['count', container.size]) do
+      @writer.tag_elements(tag, [ ['count', container.size] ]) do
         yield
       end
     end
@@ -6828,7 +6834,7 @@ def write_merge_cell(merged_range) #:nodoc:
       cell_1 = xl_rowcol_to_cell(row_min, col_min)
       cell_2 = xl_rowcol_to_cell(row_max, col_max)
 
-      @writer.empty_tag('mergeCell', ['ref', "#{cell_1}:#{cell_2}"])
+      @writer.empty_tag('mergeCell', [ ['ref', "#{cell_1}:#{cell_2}"] ])
     end
 
     #
@@ -6874,7 +6880,10 @@ def write_breaks(tag) # :nodoc:
 
       return if page_breaks.empty?
 
-      attributes = ['count', count, 'manualBreakCount', count]
+      attributes = [
+                    ['count', count],
+                    ['manualBreakCount', count]
+                   ]
 
       @writer.tag_elements(tag, attributes) do
         page_breaks.each { |num| write_brk(num, max) }
@@ -6885,9 +6894,9 @@ def write_breaks(tag) # :nodoc:
     #
     def write_brk(id, max) #:nodoc:
       attributes = [
-        'id',  id,
-        'max', max,
-        'man', 1
+        ['id',  id],
+        ['max', max],
+        ['man', 1]
       ]
 
       @writer.empty_tag('brk', attributes)
@@ -6899,7 +6908,9 @@ def write_brk(id, max) #:nodoc:
     def write_auto_filter #:nodoc:
       return unless autofilter_ref?
 
-      attributes = ['ref', @autofilter_ref]
+      attributes = [
+                    ['ref', @autofilter_ref]
+                   ]
 
       if filter_on?
         # Autofilter defined active filters.
@@ -6936,7 +6947,7 @@ def write_autofilters #:nodoc:
     # Write the <filterColumn> element.
     #
     def write_filter_column(col_id, type, *filters) #:nodoc:
-      @writer.tag_elements('filterColumn', ['colId', col_id]) do
+      @writer.tag_elements('filterColumn', [ ['colId', col_id] ]) do
         if type == 1
           # Type == 1 is the new XLSX style filter.
           write_filters(*filters)
@@ -6953,7 +6964,7 @@ def write_filter_column(col_id, type, *filters) #:nodoc:
     def write_filters(*filters) #:nodoc:
       if filters.size == 1 && filters[0] == 'blanks'
         # Special case for blank cells only.
-        @writer.empty_tag('filters', ['blank', 1])
+        @writer.empty_tag('filters', [ ['blank', 1] ])
       else
         # General case.
         @writer.tag_elements('filters') do
@@ -6966,7 +6977,7 @@ def write_filters(*filters) #:nodoc:
     # Write the <filter> element.
     #
     def write_filter(val) #:nodoc:
-      @writer.empty_tag('filter', ['val', val])
+      @writer.empty_tag('filter', [ ['val', val] ])
     end
 
     #
@@ -6981,9 +6992,9 @@ def write_custom_filters(*tokens) #:nodoc:
 
         # Check if the "join" operand is "and" or "or".
         if tokens[2] == 0
-          attributes = ['and', 1]
+          attributes = [ ['and', 1] ]
         else
-          attributes = ['and', 0]
+          attributes = [ ['and', 0] ]
         end
 
         # Write the two custom filters.
@@ -7017,8 +7028,8 @@ def write_custom_filter(operator, val) #:nodoc:
 
       # The 'equal' operator is the default attribute and isn't stored.
       attributes = []
-      attributes << 'operator' << operator unless operator == 'equal'
-      attributes << 'val' << val
+      attributes << ['operator', operator] unless operator == 'equal'
+      attributes << ['val', val]
 
       @writer.empty_tag('customFilter', attributes)
     end
@@ -7096,7 +7107,10 @@ def write_hyperlink_internal(link, row, col)  #:nodoc:
     def write_tab_color #:nodoc:
       return unless tab_color?
 
-      @writer.empty_tag('tabColor', ['rgb', get_palette_color(@tab_color)])
+      @writer.empty_tag('tabColor',
+                        [
+                         ['rgb', get_palette_color(@tab_color)]
+                        ])
     end
 
     #
@@ -7106,10 +7120,10 @@ def write_outline_pr
       return unless outline_changed?
 
       attributes = []
-      attributes << "applyStyles"  << 1 if @outline_style != 0
-      attributes << "summaryBelow" << 0 if @outline_below == 0
-      attributes << "summaryRight" << 0 if @outline_right == 0
-      attributes << "showOutlineSymbols" << 0 if @outline_on == 0
+      attributes << ["applyStyles",  1] if @outline_style != 0
+      attributes << ["summaryBelow", 0] if @outline_below == 0
+      attributes << ["summaryRight", 0] if @outline_right == 0
+      attributes << ["showOutlineSymbols", 0] if @outline_on == 0
 
       @writer.empty_tag('outlinePr', attributes)
     end
@@ -7121,27 +7135,27 @@ def write_sheet_protection #:nodoc:
       return unless protect?
 
       attributes = []
-      attributes << "password"         << @protect[:password] if ptrue?(@protect[:password])
-      attributes << "sheet"            << 1 if ptrue?(@protect[:sheet])
-      attributes << "content"          << 1 if ptrue?(@protect[:content])
-      attributes << "objects"          << 1 unless ptrue?(@protect[:objects])
-      attributes << "scenarios"        << 1 unless ptrue?(@protect[:scenarios])
-      attributes << "formatCells"      << 0 if ptrue?(@protect[:format_cells])
-      attributes << "formatColumns"    << 0 if ptrue?(@protect[:format_columns])
-      attributes << "formatRows"       << 0 if ptrue?(@protect[:format_rows])
-      attributes << "insertColumns"    << 0 if ptrue?(@protect[:insert_columns])
-      attributes << "insertRows"       << 0 if ptrue?(@protect[:insert_rows])
-      attributes << "insertHyperlinks" << 0 if ptrue?(@protect[:insert_hyperlinks])
-      attributes << "deleteColumns"    << 0 if ptrue?(@protect[:delete_columns])
-      attributes << "deleteRows"       << 0 if ptrue?(@protect[:delete_rows])
-
-      attributes << "selectLockedCells" << 1 unless ptrue?(@protect[:select_locked_cells])
-
-      attributes << "sort"        << 0 if ptrue?(@protect[:sort])
-      attributes << "autoFilter"  << 0 if ptrue?(@protect[:autofilter])
-      attributes << "pivotTables" << 0 if ptrue?(@protect[:pivot_tables])
-
-      attributes << "selectUnlockedCells" << 1 unless ptrue?(@protect[:select_unlocked_cells])
+      attributes << ["password",         @protect[:password]] if ptrue?(@protect[:password])
+      attributes << ["sheet",            1] if ptrue?(@protect[:sheet])
+      attributes << ["content",          1] if ptrue?(@protect[:content])
+      attributes << ["objects",          1] unless ptrue?(@protect[:objects])
+      attributes << ["scenarios",        1] unless ptrue?(@protect[:scenarios])
+      attributes << ["formatCells",      0] if ptrue?(@protect[:format_cells])
+      attributes << ["formatColumns",    0] if ptrue?(@protect[:format_columns])
+      attributes << ["formatRows",       0] if ptrue?(@protect[:format_rows])
+      attributes << ["insertColumns",    0] if ptrue?(@protect[:insert_columns])
+      attributes << ["insertRows",       0] if ptrue?(@protect[:insert_rows])
+      attributes << ["insertHyperlinks", 0] if ptrue?(@protect[:insert_hyperlinks])
+      attributes << ["deleteColumns",    0] if ptrue?(@protect[:delete_columns])
+      attributes << ["deleteRows",       0] if ptrue?(@protect[:delete_rows])
+
+      attributes << ["selectLockedCells", 1] unless ptrue?(@protect[:select_locked_cells])
+
+      attributes << ["sort",        0] if ptrue?(@protect[:sort])
+      attributes << ["autoFilter",  0] if ptrue?(@protect[:autofilter])
+      attributes << ["pivotTables", 0] if ptrue?(@protect[:pivot_tables])
+
+      attributes << ["selectUnlockedCells", 1] unless ptrue?(@protect[:select_unlocked_cells])
 
       @writer.empty_tag('sheetProtection', attributes)
     end
@@ -7173,7 +7187,7 @@ def write_underline(writer, underline) #:nodoc:
     def write_table_parts
       return if @tables.empty?
 
-      @writer.tag_elements('tableParts', ['count', tables_count]) do
+      @writer.tag_elements('tableParts', [ ['count', tables_count] ]) do
         tables_count.times { increment_rel_id_and_write_r_id('tablePart') }
       end
     end
@@ -7182,7 +7196,7 @@ def write_table_parts
     # Write the <tablePart> element.
     #
     def write_table_part(id)
-      @writer.empty_tag('tablePart', r_id_attributes(id))
+      @writer.empty_tag('tablePart', [r_id_attributes(id)])
     end
 
     def increment_rel_id_and_write_r_id(tag)
@@ -7191,7 +7205,7 @@ def increment_rel_id_and_write_r_id(tag)
     end
 
     def write_r_id(tag, id)
-      @writer.empty_tag(tag, r_id_attributes(id))
+      @writer.empty_tag(tag, [r_id_attributes(id)])
     end
 
     #
@@ -7209,8 +7223,8 @@ def write_ext
 
     def write_ext_attributes
       [
-       'xmlns:x14', "#{OFFICE_URL}spreadsheetml/2009/9/main",
-       'uri',       '{05C60535-1F16-4fd2-B633-F4F36F0B64E0}'
+       ['xmlns:x14', "#{OFFICE_URL}spreadsheetml/2009/9/main"],
+       ['uri',       '{05C60535-1F16-4fd2-B633-F4F36F0B64E0}']
       ]
     end
 
@@ -7225,7 +7239,9 @@ def write_sparkline_groups
     end
 
     def sparkline_groups_attributes  # :nodoc:
-      ['xmlns:xm', "#{OFFICE_URL}excel/2006/main"]
+      [
+       ['xmlns:xm', "#{OFFICE_URL}excel/2006/main"]
+      ]
     end
 
     #
@@ -7250,7 +7266,7 @@ def write_conditional_formats  #:nodoc:
     # Write the <conditionalFormatting> element.
     #
     def write_conditional_formatting(range, cond_formats) #:nodoc:
-      @writer.tag_elements('conditionalFormatting', ['sqref', range]) do
+      @writer.tag_elements('conditionalFormatting', [ ['sqref', range] ]) do
         cond_formats.each { |cond_format| cond_format.write_cf_rule }
       end
     end