write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/format.rb

@@ -325,31 +325,31 @@ def get_align_properties
 
       continuous = 'centerContinuous'
 
-      align << 'horizontal' << 'left'        if @text_h_align == 1
-      align << 'horizontal' << 'center'      if @text_h_align == 2
-      align << 'horizontal' << 'right'       if @text_h_align == 3
-      align << 'horizontal' << 'fill'        if @text_h_align == 4
-      align << 'horizontal' << 'justify'     if @text_h_align == 5
-      align << 'horizontal' << continuous    if @text_h_align == 6
-      align << 'horizontal' << 'distributed' if @text_h_align == 7
+      align << ['horizontal', 'left']        if @text_h_align == 1
+      align << ['horizontal', 'center']      if @text_h_align == 2
+      align << ['horizontal', 'right']       if @text_h_align == 3
+      align << ['horizontal', 'fill']        if @text_h_align == 4
+      align << ['horizontal', 'justify']     if @text_h_align == 5
+      align << ['horizontal', continuous]    if @text_h_align == 6
+      align << ['horizontal', 'distributed'] if @text_h_align == 7
 
-      align << 'justifyLastLine' << 1 if @just_distrib != 0
+      align << ['justifyLastLine', 1] if @just_distrib != 0
 
       # Property 'vertical' => 'bottom' is a default. It sets applyAlignment
       # without an alignment sub-element.
-      align << 'vertical' << 'top'         if @text_v_align == 1
-      align << 'vertical' << 'center'      if @text_v_align == 2
-      align << 'vertical' << 'justify'     if @text_v_align == 4
-      align << 'vertical' << 'distributed' if @text_v_align == 5
+      align << ['vertical', 'top']         if @text_v_align == 1
+      align << ['vertical', 'center']      if @text_v_align == 2
+      align << ['vertical', 'justify']     if @text_v_align == 4
+      align << ['vertical', 'distributed'] if @text_v_align == 5
 
-      align << 'indent' <<       @indent   if @indent   != 0
-      align << 'textRotation' << @rotation if @rotation != 0
+      align << ['indent',       @indent]   if @indent   != 0
+      align << ['textRotation', @rotation] if @rotation != 0
 
-      align << 'wrapText' <<     1 if @text_wrap != 0
-      align << 'shrinkToFit' <<  1 if @shrink    != 0
+      align << ['wrapText',     1] if @text_wrap != 0
+      align << ['shrinkToFit',  1] if @shrink    != 0
 
-      align << 'readingOrder' << 1 if @reading_order == 1
-      align << 'readingOrder' << 2 if @reading_order == 2
+      align << ['readingOrder', 1] if @reading_order == 1
+      align << ['readingOrder', 2] if @reading_order == 2
 
       return changed, align
     end
@@ -360,8 +360,8 @@ def get_align_properties
     def get_protection_properties
       attributes = []
 
-      attributes << 'locked' << 0 unless ptrue?(@locked)
-      attributes << 'hidden' << 1 if     ptrue?(@hidden)
+      attributes << ['locked', 0] unless ptrue?(@locked)
+      attributes << ['hidden', 1] if     ptrue?(@hidden)
 
       attributes.empty? ? nil : attributes
     end
@@ -743,7 +743,7 @@ def write_font(writer, worksheet, dxf_format = nil) #:nodoc:
 
         write_font_shapes(writer)
 
-        writer.empty_tag('sz', ['val', size]) unless dxf_format
+        writer.empty_tag('sz', [ ['val', size] ]) unless dxf_format
 
         if ptrue?(theme)
           write_color(writer, 'theme', theme)
@@ -757,7 +757,7 @@ def write_font(writer, worksheet, dxf_format = nil) #:nodoc:
         end
 
         unless ptrue?(dxf_format)
-          writer.empty_tag('name',   ['val', @font])
+          writer.empty_tag('name', [ ['val', @font] ])
           write_font_family_scheme(writer)
         end
       end
@@ -766,7 +766,7 @@ def write_font(writer, worksheet, dxf_format = nil) #:nodoc:
     def write_font_rpr(writer, worksheet) #:nodoc:
       writer.tag_elements('rPr') do
         write_font_shapes(writer)
-        writer.empty_tag('sz', ['val', size])
+        writer.empty_tag('sz', [ ['val', size] ])
 
         if ptrue?(theme)
           write_color(writer, 'theme', theme)
@@ -777,7 +777,7 @@ def write_font_rpr(writer, worksheet) #:nodoc:
           write_color(writer, 'theme', 1)
         end
 
-        writer.empty_tag('rFont',  ['val', @font])
+        writer.empty_tag('rFont', [ ['val', @font] ])
         write_font_family_scheme(writer)
       end
     end
@@ -799,10 +799,10 @@ def write_font_shapes(writer)
     end
 
     def write_font_family_scheme(writer)
-      writer.empty_tag('family', ['val', @font_family])
+      writer.empty_tag('family', [ ['val', @font_family] ])
 
       if @font == 'Calibri' && !ptrue?(@hyperlink)
-        writer.empty_tag('scheme', ['val', @font_scheme])
+        writer.empty_tag('scheme', [ ['val', @font_scheme] ])
       end
     end
 
@@ -821,11 +821,11 @@ def write_underline_attributes(underline)
       # Handle the underline variants.
       case underline
       when 2
-        [val, 'double']
+        [ [val, 'double'] ]
       when 33
-        [val, 'singleAccounting']
+        [ [val, 'singleAccounting'] ]
       when 34
-        [val, 'doubleAccounting']
+        [ [val, 'doubleAccounting'] ]
       else
         []
       end
@@ -835,21 +835,21 @@ def write_underline_attributes(underline)
     # Write the <vertAlign> font sub-element.
     #
     def write_vert_align(writer, val) #:nodoc:
-      writer.empty_tag('vertAlign', ['val', val])
+      writer.empty_tag('vertAlign', [ ['val', val] ])
     end
 
     #
     # Write the <condense> element.
     #
     def write_condense(writer)
-      writer.empty_tag('condense', ['val', 0])
+      writer.empty_tag('condense', [ ['val', 0] ])
     end
 
     #
     # Write the <extend> element.
     #
     def write_extend(writer)
-      writer.empty_tag('extend', ['val', 0])
+      writer.empty_tag('extend', [ ['val', 0] ])
     end
   end
 end

data/lib/write_xlsx/package/app.rb

@@ -20,22 +20,21 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_properties do
-          write_application
-          write_doc_security
-          write_scale_crop
-          write_heading_pairs
-          write_titles_of_parts
-          write_manager
-          write_company
-          write_links_up_to_date
-          write_shared_doc
-          write_hyperlinks_changed
-          write_app_version
+        write_xml_declaration do
+          write_properties do
+            write_application
+            write_doc_security
+            write_scale_crop
+            write_heading_pairs
+            write_titles_of_parts
+            write_manager
+            write_company
+            write_links_up_to_date
+            write_shared_doc
+            write_hyperlinks_changed
+            write_app_version
+          end
         end
-        @writer.crlf
-        @writer.close
       end
 
       def add_part_name(part_name)
@@ -57,10 +56,6 @@ def set_properties(properties)
 
       private
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <Properties> element.
       #
@@ -69,8 +64,8 @@ def write_properties
 
         schema   = 'http://schemas.openxmlformats.org/officeDocument/2006/'
         attributes = [
-            'xmlns',     "#{schema}extended-properties",
-            'xmlns:vt',  "#{schema}docPropsVTypes"
+            ['xmlns',     "#{schema}extended-properties"],
+            ['xmlns:vt',  "#{schema}docPropsVTypes"]
         ]
 
         @writer.tag_elements('Properties', attributes) { yield }
@@ -127,8 +122,8 @@ def write_titles_of_parts
       #
       def write_vt_vector(base_type, data)
         attributes = [
-          'size',     data.size,
-          'baseType', base_type
+          ['size',     data.size],
+          ['baseType', base_type]
         ]
 
         @writer.tag_elements('vt:vector', attributes) do

data/lib/write_xlsx/package/button.rb

@@ -10,11 +10,12 @@ class Button
       attr_accessor :font, :macro, :vertices
 
       def v_shape_attributes(id, z_index)
-        v_shape_attributes_base(id, z_index) <<
-          'o:button'    << 't'               <<
-          'fillcolor'   << color             <<
-          'strokecolor' << 'windowText [64]' <<
-          'o:insetmode' << 'auto'
+        attributes = v_shape_attributes_base(id, z_index)
+        attributes << ['o:button',    't']
+        attributes << ['fillcolor',   color]
+        attributes << ['strokecolor', 'windowText [64]']
+        attributes << ['o:insetmode', 'auto']
+        attributes
       end
 
       def type
@@ -49,8 +50,8 @@ def write_shape(writer, id, z_index)
       # attributes for <v:fill> element.
       def fill_attributes
         [
-         'color2',             'buttonFace [67]',
-         'o:detectmouseclick', 't'
+         ['color2',             'buttonFace [67]'],
+         ['o:detectmouseclick', 't']
         ]
       end
 
@@ -59,8 +60,8 @@ def fill_attributes
       #
       def write_rotation_lock
         attributes = [
-                      'v:ext',    'edit',
-                      'rotation', 't'
+                      ['v:ext',    'edit'],
+                      ['rotation', 't']
                      ]
         @writer.empty_tag('o:lock', attributes)
       end
@@ -69,7 +70,10 @@ def write_rotation_lock
       # Write the <v:textbox> element.
       #
       def write_textbox
-        attributes = ['style', 'mso-direction-alt:auto', 'o:singleclick', 'f']
+        attributes = [
+                      ['style', 'mso-direction-alt:auto'],
+                      ['o:singleclick', 'f']
+                     ]
 
         @writer.tag_elements('v:textbox', attributes) do
           # Write the div element.
@@ -81,7 +85,7 @@ def write_textbox
       # Write the <x:ClientData> element.
       #
       def write_client_data
-        attributes = ['ObjectType', 'Button']
+        attributes = [ ['ObjectType', 'Button'] ]
 
         @writer.tag_elements('x:ClientData', attributes) do
           # Write the x:Anchor element.
@@ -129,4 +133,3 @@ def write_text_valign
     end
   end
 end
-

data/lib/write_xlsx/package/comments.rb

@@ -118,9 +118,10 @@ def default_y_offset(row)
       end
 
       def v_shape_attributes(id, z_index)
-        v_shape_attributes_base(id, z_index) <<
-          'fillcolor'   << color             <<
-          'o:insetmode' << 'auto'
+        attr = v_shape_attributes_base(id, z_index)
+        attr << ['fillcolor',   color]
+        attr << ['o:insetmode', 'auto']
+        attr
       end
 
       def type
@@ -158,7 +159,9 @@ def visibility
       # Write the <v:fill> element.
       #
       def fill_attributes
-        ['color2', '#ffffe1']
+        [
+         ['color2', '#ffffe1']
+        ]
       end
 
       #
@@ -166,9 +169,9 @@ def fill_attributes
       #
       def write_shadow
         attributes = [
-            'on',       't',
-            'color',    'black',
-            'obscured', 't'
+            ['on',       't'],
+            ['color',    'black'],
+            ['obscured', 't']
         ]
 
         @writer.empty_tag('v:shadow', attributes)
@@ -178,7 +181,9 @@ def write_shadow
       # Write the <v:textbox> element.
       #
       def write_textbox
-        attributes = ['style', 'mso-direction-alt:auto']
+        attributes = [
+                      ['style', 'mso-direction-alt:auto']
+                     ]
 
         @writer.tag_elements('v:textbox', attributes) do
           # Write the div element.
@@ -190,7 +195,9 @@ def write_textbox
       # Write the <x:ClientData> element.
       #
       def write_client_data
-        attributes = ['ObjectType', 'Note']
+        attributes = [
+                      ['ObjectType', 'Note']
+                     ]
 
         @writer.tag_elements('x:ClientData', attributes) do
           @writer.empty_tag('x:MoveWithCells')
@@ -250,14 +257,12 @@ def set_xml_writer(filename)
       end
 
       def assemble_xml_file
-        write_xml_declaration
-        write_comments
-        write_authors(sorted_comments)
-        write_comment_list(sorted_comments)
-
-        @writer.end_tag('comments')
-        @writer.crlf
-        @writer.close
+        write_xml_declaration do
+          write_comments do
+            write_authors(sorted_comments)
+            write_comment_list(sorted_comments)
+          end
+        end
       end
 
       def sorted_comments
@@ -289,19 +294,17 @@ def comments_visible?
         @worksheet.comments_visible?
       end
 
-      def write_xml_declaration
-        @writer.xml_decl
-      end
-
       #
       # Write the <comments> element.
       #
       def write_comments
         xmlns = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'
 
-        attributes = [ 'xmlns', xmlns]
+        attributes = [
+                      ['xmlns', xmlns]
+                     ]
 
-        @writer.start_tag('comments', attributes)
+        @writer.tag_elements('comments', attributes) { yield }
       end
 
       #
@@ -346,10 +349,10 @@ def write_comment_list(comment_data)
       #
       def write_comment(comment)
         ref       = xl_rowcol_to_cell( comment.row, comment.col )
-        attributes = ['ref', ref]
+        attributes = [ ['ref', ref] ]
 
         author_id = (@author_ids[comment.author] if comment.author) || 0
-        attributes << 'authorId' << author_id
+        attributes << ['authorId', author_id]
 
         @writer.tag_elements('comment', attributes) do
           write_text(comment.string)
@@ -384,7 +387,7 @@ def write_text_r(text)
       def write_text_t(text)
         attributes = []
 
-        (attributes << 'xml:space' << 'preserve') if text =~ /^\s/ || text =~ /\s$/
+        attributes << ['xml:space', 'preserve'] if text =~ /^\s/ || text =~ /\s$/
 
         @writer.data_element('t', text, attributes)
       end
@@ -411,7 +414,7 @@ def write_r_pr
       def write_sz
         val  = 8
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('sz', attributes)
       end
@@ -420,7 +423,7 @@ def write_sz
       # Write the <color> element.
       #
       def write_color
-        @writer.empty_tag('color', ['indexed', 81])
+        @writer.empty_tag('color', [ ['indexed', 81] ])
       end
 
       #
@@ -429,7 +432,7 @@ def write_color
       def write_r_font
         val  = 'Tahoma'
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('rFont', attributes)
       end
@@ -440,7 +443,7 @@ def write_r_font
       def write_family
         val  = 2
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('family', attributes)
       end

data/lib/write_xlsx/package/conditional_format.rb

@@ -60,13 +60,17 @@ def write_formula_tag(data) #:nodoc:
       # Write the <cfvo> element.
       #
       def write_cfvo(type, val)
-        @writer.empty_tag('cfvo', ['type', type, 'val', val])
+        @writer.empty_tag('cfvo', [
+                                   ['type', type],
+                                   ['val', val]
+                                  ])
       end
 
       def attributes
-        attr = ['type' , type]
-        attr << 'dxfId'    << format   if format
-        attr << 'priority' << priority
+        attr = []
+        attr << ['type' , type]
+        attr << ['dxfId',    format]   if format
+        attr << ['priority', priority]
         attr
       end
 
@@ -476,7 +480,7 @@ def date_1904?
 
     class CellIsFormat < ConditionalFormat
       def attributes
-        super << 'operator' << criteria
+        super << ['operator', criteria]
       end
 
       def write_cf_rule
@@ -494,10 +498,10 @@ def write_cf_rule
     class AboveAverageFormat < ConditionalFormat
       def attributes
         attr = super
-        attr << 'aboveAverage' << 0 if criteria =~ /below/
-        attr << 'equalAverage' << 1 if criteria =~ /equal/
+        attr << ['aboveAverage', 0] if criteria =~ /below/
+        attr << ['equalAverage', 1] if criteria =~ /equal/
         if criteria =~ /([123]) std dev/
-          attr << 'stdDev'       << $~[1]
+          attr << ['stdDev', $~[1]]
         end
         attr
       end
@@ -506,9 +510,9 @@ def attributes
     class Top10Format < ConditionalFormat
       def attributes
         attr = super
-        attr << 'percent' << 1             if criteria == '%'
-        attr << 'bottom'  << 1             if direction
-        attr << 'rank'    << (value || 10)
+        attr << ['percent', 1]             if criteria == '%'
+        attr << ['bottom',  1]             if direction
+        attr << ['rank',    (value || 10)]
         attr
       end
     end
@@ -516,8 +520,8 @@ def attributes
     class TextOrWithFormat < ConditionalFormat
       def attributes
         attr = super
-        attr << 'operator' << criteria
-        attr << 'text'     << value
+        attr << ['operator', criteria]
+        attr << ['text',     value]
         attr
       end
 
@@ -528,7 +532,7 @@ def write_cf_rule
 
     class TimePeriodFormat < ConditionalFormat
       def attributes
-        super << 'timePeriod' << criteria
+        super << ['timePeriod', criteria]
       end
 
       def write_cf_rule