write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/chart/axis.rb

@@ -74,8 +74,8 @@ def write_number_format(writer) # :nodoc:
         end
 
         attributes = [
-                      'formatCode',   @num_format,
-                      'sourceLinked', source_linked
+                      ['formatCode',   @num_format],
+                      ['sourceLinked', source_linked]
                      ]
 
         writer.empty_tag('c:numFmt', attributes)
@@ -106,8 +106,8 @@ def write_cat_number_format(writer, cat_has_num_fmt)
         end
 
         attributes = [
-                      'formatCode',   @num_format,
-                      'sourceLinked', source_linked,
+                      ['formatCode',   @num_format],
+                      ['sourceLinked', source_linked]
                      ]
 
         writer.empty_tag('c:numFmt', attributes)

data/lib/write_xlsx/chart/bar.rb

@@ -70,7 +70,7 @@ def write_chart_type(params)
       def write_bar_dir
         val  = 'bar'
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:barDir', attributes)
       end

data/lib/write_xlsx/chart/column.rb

@@ -55,7 +55,7 @@ def write_chart_type(params)
       def write_bar_dir
         val  = 'col'
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:barDir', attributes)
       end

data/lib/write_xlsx/chart/pie.rb

@@ -141,7 +141,7 @@ def write_a_p_legend
       def write_a_p_pr_legend
         rtl  = 0
 
-        attributes = ['rtl', rtl]
+        attributes = [ ['rtl', rtl] ]
 
         @writer.tag_elements('a:pPr', attributes) do
           # Write the a:defRPr element.
@@ -155,7 +155,7 @@ def write_a_p_pr_legend
       def write_vary_colors
         val  = 1
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:varyColors', attributes)
       end
@@ -166,7 +166,7 @@ def write_vary_colors
       def write_first_slice_ang
         val  = 0
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:firstSliceAng', attributes)
       end

data/lib/write_xlsx/chart/radar.rb

@@ -85,7 +85,7 @@ def write_radar_style
           val = 'filled'
         end
 
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:radarStyle', attributes)
       end

data/lib/write_xlsx/chart/scatter.rb

@@ -227,7 +227,7 @@ def write_y_val(series)
       # Write the <c:scatterStyle> element.
       #
       def write_scatter_style(val)
-        attributes = ['val', val]
+        attributes = [ ['val', val] ]
 
         @writer.empty_tag('c:scatterStyle', attributes)
       end

data/lib/write_xlsx/chart/series.rb

@@ -59,38 +59,6 @@ def aref_to_formula(data) # :nodoc:
     xl_range_formula(*data)
   end
 
-  #
-  # Convert user defined line properties to the structure required internally.
-  #
-  def line_properties(line) # :nodoc:
-    return { :_defined => 0 } unless line
-
-    dash_types = {
-      :solid               => 'solid',
-      :round_dot           => 'sysDot',
-      :square_dot          => 'sysDash',
-      :dash                => 'dash',
-      :dash_dot            => 'dashDot',
-      :long_dash           => 'lgDash',
-      :long_dash_dot       => 'lgDashDot',
-      :long_dash_dot_dot   => 'lgDashDotDot',
-      :dot                 => 'dot',
-      :system_dash_dot     => 'sysDashDot',
-      :system_dash_dot_dot => 'sysDashDotDot'
-    }
-
-    # Check the dash type.
-    dash_type = line[:dash_type]
-
-    if dash_type
-      line[:dash_type] = value_or_raise(dash_types, dash_type, 'dash type')
-    end
-
-    line[:_defined] = 1
-
-    line
-  end
-
   #
   # Convert user defined fill properties to the structure required internally.
   #
@@ -299,9 +267,4 @@ def labels_properties(labels) # :nodoc:
 
     labels
   end
-
-  def value_or_raise(hash, key, msg)
-    raise "Unknown #{msg} '#{key}'" unless hash[key.to_sym]
-    hash[key.to_sym]
-  end
 end

data/lib/write_xlsx/chartsheet.rb

@@ -32,41 +32,29 @@ def initialize(workbook, index, name)
     #
     def assemble_xml_file # :nodoc:
       return unless @writer
-      @writer.xml_decl
 
-      # Write the root chartsheet element.
-      write_chartsheet
-
-      # Write the worksheet properties.
-      write_sheet_pr
-
-      # Write the sheet view properties.
-      write_sheet_views
-
-      # Write the sheetProtection element.
-      write_sheet_protection
-
-      # Write the printOptions element.
-      write_print_options
-
-      # Write the worksheet page_margins.
-      write_page_margins
-
-      # Write the worksheet page setup.
-      write_page_setup
-
-      # Write the headerFooter element.
-      write_header_footer
-
-      # Write the drawing element.
-      write_drawings
-
-      # Close the worksheet tag.
-      @writer.end_tag('chartsheet')
-
-      # Close the XML writer object and filehandle.
-      @writer.crlf
-      @writer.close
+      write_xml_declaration do
+        # Write the root chartsheet element.
+        write_chartsheet
+        # Write the worksheet properties.
+        write_sheet_pr
+        # Write the sheet view properties.
+        write_sheet_views
+        # Write the sheetProtection element.
+        write_sheet_protection
+        # Write the printOptions element.
+        write_print_options
+        # Write the worksheet page_margins.
+        write_page_margins
+        # Write the worksheet page setup.
+        write_page_setup
+        # Write the headerFooter element.
+        write_header_footer
+        # Write the drawing element.
+        write_drawings
+        # Close the worksheet tag.
+        @writer.end_tag('chartsheet')
+      end
     end
 
     def protect(password = '', options = {})
@@ -188,8 +176,8 @@ def write_chartsheet # :nodoc:
       mc_preserve_attributes = 'mv:*'
 
       attributes = [
-                    'xmlns',   xmlns,
-                    'xmlns:r', xmlns_r
+                    ['xmlns',   xmlns],
+                    ['xmlns:r', xmlns_r]
                    ]
 
       @writer.start_tag('chartsheet', attributes)
@@ -202,7 +190,7 @@ def write_sheet_pr # :nodoc:
 
       attributes = []
 
-      attributes << {'filterMode' => 1} if ptrue?(@filter_on)
+      attributes << ['filterMode', 1] if ptrue?(@filter_on)
 
       if ptrue?(@fit_page) || ptrue?(@tab_color)
         @writer.tag_elements('sheetPr', attributes) do

data/lib/write_xlsx/col_name.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+require 'singleton'
+
+class ColName
+  include Singleton
+
+  def initialize
+    @col_str_table = Hash.new
+  end
+
+  def col_str(col)
+    @col_str_table[col] = col_str_build(col) unless @col_str_table[col]
+    @col_str_table[col]
+  end
+
+  private
+
+  def col_str_build(col)
+    # Change from 0-indexed to 1 indexed.
+    col += 1
+    col_str = ''
+
+    while col > 0
+      # Set remainder from 1 .. 26
+      remainder = col % 26
+      remainder = 26 if remainder == 0
+
+      # Convert the remainder to a character. C-ishly.
+      col_letter = ("A".ord + remainder - 1).chr
+
+      # Accumulate the column letters, right to left.
+      col_str = col_letter + col_str
+
+      # Get the next order of magnitude.
+      col = (col - 1) / 26
+    end
+
+    col_str
+  end
+end

data/lib/write_xlsx/drawing.rb

@@ -27,30 +27,22 @@ def set_xml_writer(filename)
     # Assemble and write the XML file.
     #
     def assemble_xml_file
-      @writer.xml_decl
-
-      # Write the xdr:wsDr element.
-      write_drawing_workspace
-
-      if @embedded
-        index = 0
-        @drawings.each do |dimensions|
-          # Write the xdr:twoCellAnchor element.
-          index += 1
-
-          write_two_cell_anchor(index, *(dimensions.flatten))
+      write_xml_declaration do
+        # Write the xdr:wsDr element.
+        write_drawing_workspace do
+          if @embedded
+            index = 0
+            @drawings.each do |dimensions|
+              # Write the xdr:twoCellAnchor element.
+              index += 1
+              write_two_cell_anchor(index, *(dimensions.flatten))
+            end
+          else
+            # Write the xdr:absoluteAnchor element.
+            write_absolute_anchor(1)
+          end
         end
-      else
-        index = 0
-
-        # Write the xdr:absoluteAnchor element.
-        index += 1
-        write_absolute_anchor(index)
       end
-
-      @writer.end_tag('xdr:wsDr')
-      @writer.crlf
-      @writer.close
     end
 
     #
@@ -68,11 +60,11 @@ def add_drawing_object(*args)
     def write_drawing_workspace
       schema    = 'http://schemas.openxmlformats.org/drawingml/'
       attributes = [
-          'xmlns:xdr', "#{schema}2006/spreadsheetDrawing",
-          'xmlns:a',    "#{schema}2006/main"
+          ['xmlns:xdr', "#{schema}2006/spreadsheetDrawing"],
+          ['xmlns:a',    "#{schema}2006/main"]
       ]
 
-      @writer.start_tag('xdr:wsDr', attributes)
+      @writer.tag_elements('xdr:wsDr', attributes) { yield }
     end
 
     #
@@ -86,10 +78,10 @@ def write_two_cell_anchor(*args)
       attributes      = []
 
       # Add attribute for images.
-      attributes << :editAs << 'oneCell' if type == 2
+      attributes << [:editAs, 'oneCell'] if type == 2
 
       # Add attribute for shapes.
-      attributes << :editAs << shape.edit_as if shape && !shape.edit_as.nil?
+      attributes << [:editAs, shape.edit_as] if shape && !shape.edit_as.nil?
 
       @writer.tag_elements('xdr:twoCellAnchor', attributes) do
         # Write the xdr:from element.
@@ -213,8 +205,8 @@ def write_row_off(data)
     #
     def write_pos(x, y)
       attributes = [
-                    'x', x,
-                    'y', y
+                    ['x', x],
+                    ['y', y]
                    ]
 
       @writer.empty_tag('xdr:pos', attributes)
@@ -225,8 +217,8 @@ def write_pos(x, y)
     #
     def write_ext(cx, cy)
       attributes = [
-                    'cx', cx,
-                    'cy', cy
+                    ['cx', cx],
+                    ['cy', cy]
                    ]
 
       @writer.empty_tag('xdr:ext', attributes)
@@ -238,7 +230,7 @@ def write_ext(cx, cy)
     def write_graphic_frame(index, name = nil)
       macro  = ''
 
-      attributes = ['macro', macro]
+      attributes = [ ['macro', macro] ]
 
       @writer.tag_elements('xdr:graphicFrame', attributes) do
         # Write the xdr:nvGraphicFramePr element.
@@ -269,12 +261,12 @@ def write_nv_graphic_frame_pr(index, name = nil)
     #
     def write_c_nv_pr(id, name, descr = nil)
       attributes = [
-          'id',   id,
-          'name', name
+          ['id',   id],
+          ['name', name]
       ]
 
       # Add description attribute for images.
-      attributes << 'descr' << descr if descr
+      attributes << ['descr', descr] if descr
 
       @writer.empty_tag('xdr:cNvPr', attributes)
     end
@@ -300,7 +292,7 @@ def write_c_nv_graphic_frame_pr
     def write_a_graphic_frame_locks
       no_grp = 1
 
-      attributes = ['noGrp', no_grp ]
+      attributes = [ ['noGrp', no_grp ] ]
 
       @writer.empty_tag('a:graphicFrameLocks', attributes)
     end
@@ -325,8 +317,8 @@ def write_xfrm_offset
       y    = 0
 
       attributes = [
-        'x', x,
-        'y', y
+        ['x', x],
+        ['y', y]
       ]
 
       @writer.empty_tag('a:off', attributes)
@@ -340,8 +332,8 @@ def write_xfrm_extension
       y    = 0
 
       attributes = [
-        'cx', x,
-        'cy', y
+        ['cx', x],
+        ['cy', y]
       ]
 
       @writer.empty_tag('a:ext', attributes)
@@ -363,7 +355,7 @@ def write_atag_graphic(index)
     def write_atag_graphic_data(index)
       uri   = 'http://schemas.openxmlformats.org/drawingml/2006/chart'
 
-      attributes = ['uri', uri]
+      attributes = [ ['uri', uri] ]
 
       @writer.tag_elements('a:graphicData', attributes) do
         # Write the c:chart element.
@@ -380,8 +372,11 @@ def write_c_chart(id)
       xmlns_r = "#{schema}officeDocument/2006/relationships"
 
 
-      attributes = ['xmlns:c', xmlns_c, 'xmlns:r', xmlns_r]
-      attributes += r_id_attributes(id)
+      attributes = [
+                    ['xmlns:c', xmlns_c],
+                    ['xmlns:r', xmlns_r]
+                   ]
+      attributes << r_id_attributes(id)
 
       @writer.empty_tag('c:chart', attributes)
     end
@@ -398,7 +393,7 @@ def write_client_data
     #
     def write_sp(index, col_absolute, row_absolute, width, height, shape)
       if shape.connect != 0
-        attributes = [:macro,  '']
+        attributes = [ [:macro,  ''] ]
         @writer.tag_elements('xdr:cxnSp', attributes) do
 
           # Write the xdr:nvCxnSpPr element.
@@ -409,7 +404,10 @@ def write_sp(index, col_absolute, row_absolute, width, height, shape)
         end
       else
         # Add attribute for shapes.
-        attributes = [:macro, '', :textlink, '']
+        attributes = [
+                      [:macro, ''],
+                      [:textlink, '']
+                     ]
         @writer.tag_elements('xdr:sp', attributes) do
 
           # Write the xdr:nvSpPr element.
@@ -437,16 +435,22 @@ def write_nv_cxn_sp_pr(index, shape)
 
         @writer.tag_elements('xdr:cNvCxnSpPr') do
 
-          attributes = [:noChangeShapeType, '1']
+          attributes = [ [:noChangeShapeType, '1'] ]
           @writer.empty_tag('a:cxnSpLocks', attributes)
 
           if shape.start
-            attributes = ['id', shape.start, 'idx', shape.start_index]
+            attributes = [
+                          ['id', shape.start],
+                          ['idx', shape.start_index]
+                         ]
             @writer.empty_tag('a:stCxn', attributes)
           end
 
           if shape.end
-            attributes = ['id', shape.end, 'idx', shape.end_index]
+            attributes = [
+                          ['id', shape.end],
+                          ['idx', shape.end_index]
+                         ]
             @writer.empty_tag('a:endCxn', attributes)
           end
         end
@@ -458,13 +462,13 @@ def write_nv_cxn_sp_pr(index, shape)
     #
     def write_nv_sp_pr(index, shape)
       attributes = []
-      attributes << 'txBox' << 1 if shape.tx_box
+      attributes << ['txBox', 1] if shape.tx_box
 
       @writer.tag_elements('xdr:nvSpPr') do
         write_c_nv_pr(shape.id, "#{shape.type} #{index}")
 
         @writer.tag_elements('xdr:cNvSpPr', attributes) do
-          @writer.empty_tag('a:spLocks', [:noChangeArrowheads, '1'])
+          @writer.empty_tag('a:spLocks', [ [:noChangeArrowheads, '1'] ])
         end
       end
     end
@@ -516,7 +520,7 @@ def write_c_nv_pic_pr
     def write_a_pic_locks
       no_change_aspect = 1
 
-      attributes = ['noChangeAspect', no_change_aspect]
+      attributes = [ ['noChangeAspect', no_change_aspect] ]
 
       @writer.empty_tag('a:picLocks', attributes)
     end
@@ -542,8 +546,8 @@ def write_a_blip(index)
       r_embed = "rId#{index}"
 
       attributes = [
-        'xmlns:r', xmlns_r,
-        'r:embed', r_embed
+        ['xmlns:r', xmlns_r],
+        ['r:embed', r_embed]
       ]
 
       @writer.empty_tag('a:blip', attributes)
@@ -582,7 +586,7 @@ def write_sp_pr(col_absolute, row_absolute, width, height, shape = {})
     # Write the <xdr:spPr> element for shapes.
     #
     def write_xdr_sp_pr(index, col_absolute, row_absolute, width, height, shape)
-      attributes = ['bwMode', 'auto']
+      attributes = [ ['bwMode', 'auto'] ]
 
       @writer.tag_elements('xdr:spPr', attributes) do
 
@@ -613,9 +617,9 @@ def write_a_xfrm(col_absolute, row_absolute, width, height, shape = nil)
       rotation = shape ? shape.rotation : 0
       rotation *= 60000
 
-      attributes << 'rot' << rotation if rotation != 0
-      attributes << 'flipH' << 1      if shape && ptrue?(shape.flip_h)
-      attributes << 'flipV' << 1      if shape && ptrue?(shape.flip_v)
+      attributes << ['rot', rotation] if rotation != 0
+      attributes << ['flipH', 1]      if shape && ptrue?(shape.flip_h)
+      attributes << ['flipV', 1]      if shape && ptrue?(shape.flip_v)
 
       @writer.tag_elements('a:xfrm', attributes) do
         # Write the a:off element.
@@ -630,8 +634,8 @@ def write_a_xfrm(col_absolute, row_absolute, width, height, shape = nil)
     #
     def write_a_off(x, y)
       attributes = [
-        'x', x,
-        'y', y
+        ['x', x],
+        ['y', y]
       ]
 
       @writer.empty_tag('a:off', attributes)
@@ -643,8 +647,8 @@ def write_a_off(x, y)
     #
     def write_a_ext(cx, cy)
       attributes = [
-        'cx', cx,
-        'cy', cy
+        ['cx', cx],
+        ['cy', cy]
       ]
 
       @writer.empty_tag('a:ext', attributes)
@@ -655,7 +659,7 @@ def write_a_ext(cx, cy)
     #
     def write_a_prst_geom(shape = {})
       attributes = []
-      attributes << 'prst' << shape.type if shape.type
+      attributes << ['prst', shape.type] if shape.type
 
       @writer.tag_elements('a:prstGeom', attributes) do
         # Write the a:avLst element.
@@ -686,7 +690,10 @@ def write_a_av_lst(shape = {})
             # Scale Adjustments: 100,000 = 100%.
             adj_int = (adj * 1000).to_i
 
-            attributes = [:name, "adj#{suffix}", :fmla, "val #{adj_int}"]
+            attributes = [
+                          [:name, "adj#{suffix}"],
+                          [:fmla, "val #{adj_int}"]
+                         ]
             @writer.empty_tag('a:gd', attributes)
           end
         end
@@ -699,7 +706,7 @@ def write_a_av_lst(shape = {})
     # Write the <a:solidFill> element.
     #
     def write_a_solid_fill(rgb = '000000')
-      attributes = ['val', rgb]
+      attributes = [ ['val', rgb] ]
 
       @writer.tag_elements('a:solidFill') do
         @writer.empty_tag('a:srgbClr', attributes)
@@ -711,7 +718,7 @@ def write_a_solid_fill(rgb = '000000')
     #
     def write_a_ln(shape = {})
       weight = shape.line_weight || 0
-      attributes = ['w', weight * 9525]
+      attributes = [ ['w', weight * 9525] ]
       @writer.tag_elements('a:ln', attributes) do
         line = shape.line || 0
         if line.to_s.bytesize > 1
@@ -722,14 +729,14 @@ def write_a_ln(shape = {})
         end
 
         if shape.line_type != ''
-          attributes = ['val', shape.line_type]
+          attributes = [ ['val', shape.line_type] ]
           @writer.empty_tag('a:prstDash', attributes)
         end
 
         if shape.connect != 0
           @writer.empty_tag('a:round')
         else
-          attributes = ['lim', 800000]
+          attributes = [ ['lim', 800000] ]
           @writer.empty_tag('a:miter', attributes)
         end
 
@@ -743,14 +750,14 @@ def write_a_ln(shape = {})
     #
     def write_txBody(col_absolute, row_absolute, width, height, shape)
       attributes = [
-                    :vertOverflow, "clip",
-                    :wrap,         "square",
-                    :lIns,         "27432",
-                    :tIns,         "22860",
-                    :rIns,         "27432",
-                    :bIns,         "22860",
-                    :anchor,       shape.valign,
-                    :upright,      "1"
+                    [:vertOverflow, "clip"],
+                    [:wrap,         "square"],
+                    [:lIns,         "27432"],
+                    [:tIns,         "22860"],
+                    [:rIns,         "27432"],
+                    [:bIns,         "22860"],
+                    [:anchor,       shape.valign],
+                    [:upright,      "1"]
                    ]
       @writer.tag_elements('xdr:txBody') do
         @writer.empty_tag('a:bodyPr', attributes)
@@ -760,9 +767,12 @@ def write_txBody(col_absolute, row_absolute, width, height, shape)
           rotation = shape.format[:rotation] || 0
           rotation *= 60000
 
-          attributes = [:algn, shape.align, :rtl, rotation]
+          attributes = [
+                        [:algn, shape.align],
+                        [:rtl, rotation]
+                       ]
           @writer.tag_elements('a:pPr', attributes) do
-            attributes = [:sz, "1000"]
+            attributes = [ [:sz, "1000"] ]
             @writer.empty_tag('a:defRPr', attributes)
           end
 
@@ -776,13 +786,13 @@ def write_txBody(col_absolute, row_absolute, width, height, shape)
             strike    = ptrue?(shape.format[:font_strikeout]) ? 'Strike' : 'noStrike'
 
             attributes = [
-                          :lang,     "en-US",
-                          :sz,       size,
-                          :b,        bold,
-                          :i,        italic,
-                          :u,        underline,
-                          :strike,   strike,
-                          :baseline, 0
+                          [:lang,     "en-US"],
+                          [:sz,       size],
+                          [:b,        bold],
+                          [:i,        italic],
+                          [:u,        underline],
+                          [:strike,   strike],
+                          [:baseline, 0]
                          ]
             @writer.tag_elements('a:rPr', attributes) do
               color = shape.format[:color]
@@ -796,7 +806,7 @@ def write_txBody(col_absolute, row_absolute, width, height, shape)
               write_a_solid_fill(color)
 
               font = shape.format[:font] || 'Calibri'
-              attributes = [:typeface, font]
+              attributes = [ [:typeface, font] ]
               @writer.empty_tag('a:latin', attributes)
               @writer.empty_tag('a:cs', attributes)
             end