write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/package/content_types.rb

@@ -31,13 +31,12 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_types do
-          write_defaults
-          write_overrides
+        write_xml_declaration do
+          write_types do
+            write_defaults
+            write_overrides
+          end
         end
-        @writer.crlf
-        @writer.close
       end
       #
       # Add elements to the ContentTypes defaults.
@@ -146,10 +145,6 @@ def add_vba_project
 
       private
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       def change_the_workbook_xml_content_type_from_xlsx_to_xlsm
         @overrides.collect! do |arr|
           if arr[0] == '/xl/workbook.xml'
@@ -164,7 +159,11 @@ def change_the_workbook_xml_content_type_from_xlsx_to_xlsm
       #
       def write_defaults
         @defaults.each do |a|
-          @writer.empty_tag('Default', ['Extension', a[0], 'ContentType', a[1]])
+          @writer.empty_tag('Default',
+                            [
+                             ['Extension', a[0]],
+                             ['ContentType', a[1]]
+                            ])
         end
       end
 
@@ -173,7 +172,11 @@ def write_defaults
       #
       def write_overrides
         @overrides.each do |a|
-          @writer.empty_tag('Override', ['PartName', a[0], 'ContentType', a[1]])
+          @writer.empty_tag('Override',
+                            [
+                             ['PartName', a[0]],
+                             ['ContentType', a[1]]
+                            ])
         end
       end
 
@@ -182,7 +185,9 @@ def write_overrides
       #
       def write_types
         xmlns = 'http://schemas.openxmlformats.org/package/2006/content-types'
-        attributes = ['xmlns', xmlns]
+        attributes = [
+                      ['xmlns', xmlns]
+                     ]
 
         @writer.tag_elements('Types', attributes) { yield }
       end
@@ -192,8 +197,8 @@ def write_types
       #
       def write_default(extension, content_type)
         attributes = [
-          'Extension',   extension,
-          'ContentType', content_type
+          ['Extension',   extension],
+          ['ContentType', content_type]
         ]
 
         @writer.empty_tag('Default', attributes)
@@ -204,8 +209,8 @@ def write_default(extension, content_type)
       #
       def write_override(part_name, content_type)
         attributes = [
-          'PartName',    part_name,
-          'ContentType', content_type
+          ['PartName',    part_name],
+          ['ContentType', content_type]
         ]
 
         @writer.empty_tag('Override', attributes)

data/lib/write_xlsx/package/core.rb

@@ -22,21 +22,20 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_cp_core_properties do
-          write_dc_title
-          write_dc_subject
-          write_dc_creator
-          write_cp_keywords
-          write_dc_description
-          write_cp_last_modified_by
-          write_dcterms_created
-          write_dcterms_modified
-          write_cp_category
-          write_cp_content_status
+        write_xml_declaration do
+          write_cp_core_properties do
+            write_dc_title
+            write_dc_subject
+            write_dc_creator
+            write_cp_keywords
+            write_dc_description
+            write_cp_last_modified_by
+            write_dcterms_created
+            write_dcterms_modified
+            write_cp_category
+            write_cp_content_status
+          end
         end
-        @writer.crlf
-        @writer.close
       end
 
       def set_properties(properties)
@@ -54,10 +53,6 @@ def localtime_to_iso8601_date(local_time = nil)
         local_time.strftime('%Y-%m-%dT%H:%M:%SZ')
       end
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <cp:coreProperties> element.
       #
@@ -69,11 +64,11 @@ def write_cp_core_properties
         xmlns_xsi      = 'http://www.w3.org/2001/XMLSchema-instance'
 
         attributes = [
-            'xmlns:cp',       xmlns_cp,
-            'xmlns:dc',       xmlns_dc,
-            'xmlns:dcterms',  xmlns_dcterms,
-            'xmlns:dcmitype', xmlns_dcmitype,
-            'xmlns:xsi',      xmlns_xsi
+            ['xmlns:cp',       xmlns_cp],
+            ['xmlns:dc',       xmlns_dc],
+            ['xmlns:dcterms',  xmlns_dcterms],
+            ['xmlns:dcmitype', xmlns_dcmitype],
+            ['xmlns:xsi',      xmlns_xsi]
         ]
 
         @writer.tag_elements('cp:coreProperties', attributes) { yield }
@@ -108,7 +103,7 @@ def write_dcterms_modified
       end
 
       def write_dcterms(tag)
-        @writer.data_element(tag, dcterms_date, ['xsi:type', 'dcterms:W3CDTF'])
+        @writer.data_element(tag, dcterms_date, [ ['xsi:type', 'dcterms:W3CDTF'] ])
       end
 
       def dcterms_date

data/lib/write_xlsx/package/relationships.rb

@@ -23,10 +23,9 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_relationships
-        @writer.crlf
-        @writer.close
+        write_xml_declaration do
+          write_relationships
+        end
       end
 
       #
@@ -71,15 +70,13 @@ def add_worksheet_relationship(type, target, target_mode = nil)
 
       private
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <Relationships> element.
       #
       def write_relationships
-        attributes = ['xmlns', Package_schema]
+        attributes = [
+                      ['xmlns', Package_schema]
+                     ]
 
         @writer.tag_elements('Relationships', attributes) do
           @rels.each { |rel| write_relationship(*rel) }
@@ -91,13 +88,13 @@ def write_relationships
       #
       def write_relationship(type, target, target_mode = nil)
         attributes = [
-          'Id',     "rId#{@id}",
-          'Type',   type,
-          'Target', target
+          ['Id',     "rId#{@id}"],
+          ['Type',   type],
+          ['Target', target]
         ]
         @id += 1
 
-        attributes << 'TargetMode' << target_mode if target_mode
+        attributes << ['TargetMode', target_mode] if target_mode
 
         @writer.empty_tag('Relationship', attributes)
       end

data/lib/write_xlsx/package/shared_strings.rb

@@ -42,22 +42,14 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-
-        # Write the sst table.
-        write_sst { write_sst_strings }
-
-        # Close the sst tag.
-        @writer.crlf
-        @writer.close
+        write_xml_declaration do
+          # Write the sst table.
+          write_sst { write_sst_strings }
+        end
       end
 
       private
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <sst> element.
       #
@@ -66,9 +58,9 @@ def write_sst
 
         attributes =
           [
-           'xmlns',       schema + '/spreadsheetml/2006/main',
-           'count',       total_count,
-           'uniqueCount', unique_count
+           ['xmlns',       schema + '/spreadsheetml/2006/main'],
+           ['count',       total_count],
+           ['uniqueCount', unique_count]
           ]
 
         @writer.tag_elements('sst', attributes) { yield }
@@ -108,7 +100,7 @@ def write_si(string)
         end
 
         # Add attribute to preserve leading or trailing whitespace.
-        attributes << 'xml:space' << 'preserve' if string =~ /\A\s|\s\Z/
+        attributes << ['xml:space', 'preserve'] if string =~ /\A\s|\s\Z/
 
         # Write any rich strings without further tags.
         if string =~ %r{^<r>} && string =~ %r{</r>$}

data/lib/write_xlsx/package/styles.rb

@@ -25,21 +25,20 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_style_sheet do
-          write_num_fmts
-          write_fonts
-          write_fills
-          write_borders
-          write_cell_style_xfs
-          write_cell_xfs
-          write_cell_styles
-          write_dxfs
-          write_table_styles
-          write_colors
+        write_xml_declaration do
+          write_style_sheet do
+            write_num_fmts
+            write_fonts
+            write_fills
+            write_borders
+            write_cell_style_xfs
+            write_cell_xfs
+            write_cell_styles
+            write_dxfs
+            write_table_styles
+            write_colors
+          end
         end
-        @writer.crlf
-        @writer.close
       end
 
       #
@@ -81,7 +80,7 @@ def get_palette_color(index)
       def write_style_sheet
         xmlns = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'
 
-        attributes = ['xmlns', xmlns]
+        attributes = [ ['xmlns', xmlns] ]
 
         @writer.tag_elements('styleSheet', attributes) { yield }
       end
@@ -94,7 +93,7 @@ def write_num_fmts
 
         return if count == 0
 
-        attributes = ['count', count]
+        attributes = [ ['count', count] ]
 
         @writer.tag_elements('numFmts', attributes) do
           # Write the numFmts elements.
@@ -159,8 +158,8 @@ def write_num_fmt(num_fmt_id, format_code)
         end
 
         attributes = [
-          'numFmtId',   num_fmt_id,
-          'formatCode', format_code
+          ['numFmtId',   num_fmt_id],
+          ['formatCode', format_code]
         ]
 
         @writer.empty_tag('numFmt', attributes)
@@ -181,7 +180,7 @@ def write_fonts
       # Write the <color> element.
       #
       def write_color(name, value)
-        attributes = [name, value]
+        attributes = [ [name, value] ]
 
         @writer.empty_tag('color', attributes)
       end
@@ -192,7 +191,7 @@ def write_color(name, value)
       def write_fills
         count = @fill_count
 
-        attributes = ['count', count]
+        attributes = [ ['count', count] ]
 
         @writer.tag_elements('fills', attributes) do
           # Write the default fill element.
@@ -211,7 +210,7 @@ def write_fills
       #
       def write_default_fill(pattern_type)
         @writer.tag_elements('fill') do
-          @writer.empty_tag('patternFill', ['patternType', pattern_type])
+          @writer.empty_tag('patternFill', [ ['patternType', pattern_type] ])
         end
       end
 
@@ -257,20 +256,20 @@ def write_fill(format, dxf_format = nil)
           if dxf_format && format.pattern <= 1
             attributes = []
           else
-            attributes = ['patternType', patterns[format.pattern]]
+            attributes = [ ['patternType', patterns[format.pattern]] ]
           end
 
           @writer.tag_elements('patternFill', attributes) do
             if fg_color && fg_color != 0
               fg_color = get_palette_color(fg_color)
-              @writer.empty_tag('fgColor', ['rgb', fg_color])
+              @writer.empty_tag('fgColor', [ ['rgb', fg_color] ])
             end
 
             if bg_color && bg_color != 0
               bg_color = get_palette_color(bg_color)
-              @writer.empty_tag('bgColor', ['rgb', bg_color])
+              @writer.empty_tag('bgColor', [ ['rgb', bg_color] ])
             else
-              @writer.empty_tag('bgColor', ['indexed', 64]) if !dxf_format
+              @writer.empty_tag('bgColor', [ ['indexed', 64] ]) if !dxf_format
             end
           end
         end
@@ -288,7 +287,7 @@ def write_borders
       end
 
       def write_format_elements(elements, count)
-        attributes = ['count', count]
+        attributes = [ [ 'count', count] ]
 
         @writer.tag_elements(elements, attributes) do
           # Write the border elements for format objects that have them.
@@ -304,12 +303,12 @@ def write_border(format, dxf_format = nil)
 
         # Diagonal borders add attributes to the <border> element.
         if format.diag_type == 1
-          attributes << 'diagonalUp'   << 1
+          attributes << ['diagonalUp',   1]
         elsif format.diag_type == 2
-          attributes << 'diagonalDown' << 1
+          attributes << ['diagonalDown', 1]
         elsif format.diag_type == 3
-          attributes << 'diagonalUp'   << 1
-          attributes << 'diagonalDown' << 1
+          attributes << ['diagonalUp',   1]
+          attributes << ['diagonalDown', 1]
         end
 
         # Ensure that a default diag border is set if the diag type is set.
@@ -361,14 +360,14 @@ def write_sub_border(type, style = 0, color = nil)
           slantDashDot
         )
 
-        attributes = [:style, border_styles[style]]
+        attributes = [ [:style, border_styles[style]] ]
 
         @writer.tag_elements(type, attributes) do
           if color != 0
             color = get_palette_color(color)
-            @writer.empty_tag('color', ['rgb', color])
+            @writer.empty_tag('color', [ ['rgb', color] ])
           else
-            @writer.empty_tag('color', ['auto', 1])
+            @writer.empty_tag('color', [ ['auto', 1] ])
           end
         end
       end
@@ -377,7 +376,7 @@ def write_sub_border(type, style = 0, color = nil)
       # Write the <cellStyleXfs> element.
       #
       def write_cell_style_xfs
-        attributes = ['count', 1]
+        attributes = [ ['count', 1] ]
 
         @writer.tag_elements('cellStyleXfs', attributes) do
           # Write the style_xf element.
@@ -397,7 +396,7 @@ def write_cell_xfs
 
         formats.pop if last_format && last_format.font_only != 0
 
-        attributes = ['count', formats.size]
+        attributes = [ ['count', formats.size] ]
 
         @writer.tag_elements('cellXfs', attributes) do
           # Write the xf elements.
@@ -415,10 +414,10 @@ def write_style_xf
         border_id  = 0
 
         attributes = [
-          'numFmtId', num_fmt_id,
-          'fontId',   font_id,
-          'fillId',   fill_id,
-          'borderId', border_id
+          ['numFmtId', num_fmt_id],
+          ['fontId',   font_id],
+          ['fillId',   fill_id],
+          ['borderId', border_id]
         ]
 
         @writer.empty_tag('xf', attributes)
@@ -434,23 +433,23 @@ def write_xf(format)
         has_protect = false
 
         attributes = [
-            'numFmtId', format.num_format_index,
-            'fontId'  , format.font_index,
-            'fillId'  , format.fill_index,
-            'borderId', format.border_index,
-            'xfId'    , 0
+            ['numFmtId', format.num_format_index],
+            ['fontId'  , format.font_index],
+            ['fillId'  , format.fill_index],
+            ['borderId', format.border_index],
+            ['xfId'    , 0]
         ]
 
-        attributes << 'applyNumberFormat' << 1 if format.num_format_index > 0
+        attributes << ['applyNumberFormat', 1] if format.num_format_index > 0
 
         # Add applyFont attribute if XF format uses a font element.
-        attributes << 'applyFont' << 1 if format.font_index > 0
+        attributes << ['applyFont', 1] if format.font_index > 0
 
         # Add applyFill attribute if XF format uses a fill element.
-        attributes << 'applyFill' << 1 if format.fill_index > 0
+        attributes << ['applyFill', 1] if format.fill_index > 0
 
         # Add applyBorder attribute if XF format uses a border element.
-        attributes << 'applyBorder' << 1 if format.border_index > 0
+        attributes << ['applyBorder', 1] if format.border_index > 0
 
         # Check if XF format has alignment properties set.
         apply_align, align = format.get_align_properties
@@ -459,13 +458,13 @@ def write_xf(format)
         has_align = true if apply_align && !align.empty?
 
         # We can also have applyAlignment without a sub-element.
-        attributes << 'applyAlignment' << 1 if apply_align
+        attributes << ['applyAlignment', 1] if apply_align
 
         # Check for cell protection properties.
         protection = format.get_protection_properties
 
         if protection
-          attributes << 'applyProtection' << 1
+          attributes << ['applyProtection', 1]
           has_protect = true
         end
 
@@ -484,7 +483,7 @@ def write_xf(format)
       # Write the <cellStyles> element.
       #
       def write_cell_styles
-        attributes = ['count', 1]
+        attributes = [ ['count', 1] ]
 
         @writer.tag_elements('cellStyles', attributes) do
           # Write the cellStyle element.
@@ -501,9 +500,9 @@ def write_cell_style
         builtin_id = 0
 
         attributes = [
-            'name',      name,
-            'xfId',      xf_id,
-            'builtinId', builtin_id
+            ['name',      name],
+            ['xfId',      xf_id],
+            ['builtinId', builtin_id]
         ]
 
         @writer.empty_tag('cellStyle', attributes)
@@ -517,7 +516,7 @@ def write_dxfs
 
         count = formats.size
 
-        attributes = ['count', count]
+        attributes = [ ['count', count] ]
 
         if !formats.empty?
           @writer.tag_elements('dxfs', attributes) do
@@ -549,9 +548,9 @@ def write_table_styles
         default_pivot_style = 'PivotStyleLight16'
 
         attributes = [
-            'count',             count,
-            'defaultTableStyle', default_table_style,
-            'defaultPivotStyle', default_pivot_style
+            ['count',             count],
+            ['defaultTableStyle', default_table_style],
+            ['defaultPivotStyle', default_pivot_style]
         ]
 
         @writer.empty_tag('tableStyles', attributes)
@@ -588,17 +587,13 @@ def write_mru_colors(*args)
         end
       end
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <condense> element.
       #
       def write_condense
         val  = 0
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('condense', attributes)
       end
@@ -609,7 +604,7 @@ def write_condense
       def write_extend
         val  = 0
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('extend', attributes)
       end