write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/package/table.rb

@@ -57,17 +57,14 @@ def set_xml_writer(filename)
       # Assemble and writes the XML file.
       #
       def assemble_xml_file
-        write_xml_declaration
-        # Write the table element.
-        @writer.tag_elements('table', write_table_attributes) do
-          write_auto_filter
-          write_table_columns
-          write_table_style_info
+        write_xml_declaration do
+          # Write the table element.
+          @writer.tag_elements('table', write_table_attributes) do
+            write_auto_filter
+            write_table_columns
+            write_table_style_info
+          end
         end
-
-        # Close the XML writer object and filehandle.
-        @writer.crlf
-        @writer.close
       end
 
       def add_the_table_columns
@@ -284,33 +281,26 @@ def set_the_autofilter_range
         @autofilter = @a_range if ptrue?(@param[:autofilter])
       end
 
-      #
-      # Write the XML declaration.
-      #
-      def write_xml_declaration
-        @writer.xml_decl('UTF-8', 1)
-      end
-
       def write_table_attributes
         schema           = 'http://schemas.openxmlformats.org/'
         xmlns            = "#{schema}spreadsheetml/2006/main"
 
         attributes = [
-                      'xmlns',       xmlns,
-                      'id',          @id,
-                      'name',        @name,
-                      'displayName', @name,
-                      'ref',         @range
+                      ['xmlns',       xmlns],
+                      ['id',          @id],
+                      ['name',        @name],
+                      ['displayName', @name],
+                      ['ref',         @range]
                      ]
 
         unless ptrue?(@header_row_count)
-          attributes << 'headerRowCount' << 0
+          attributes << ['headerRowCount', 0]
         end
 
         if ptrue?(@totals_row_shown)
-          attributes << 'totalsRowCount' << 1
+          attributes << ['totalsRowCount', 1]
         else
-          attributes << 'totalsRowShown' << 0
+          attributes << ['totalsRowShown', 0]
         end
       end
 
@@ -320,7 +310,7 @@ def write_table_attributes
       def write_auto_filter
         return unless ptrue?(@autofilter)
 
-        attributes = ['ref', @autofilter]
+        attributes = [ ['ref', @autofilter] ]
 
         @writer.empty_tag('autoFilter', attributes)
       end
@@ -331,7 +321,7 @@ def write_auto_filter
       def write_table_columns
         count = @columns.size
 
-        attributes = ['count', count]
+        attributes = [ ['count', count] ]
 
         @writer.tag_elements('tableColumns', attributes) do
           @columns.each {|col_data| write_table_column(col_data)}
@@ -343,18 +333,18 @@ def write_table_columns
       #
       def write_table_column(col_data)
         attributes = [
-                      'id',   col_data.id,
-                      'name', col_data.name
+                      ['id',   col_data.id],
+                      ['name', col_data.name]
                      ]
 
         if ptrue?(col_data.total_string)
-          attributes << :totalsRowLabel << col_data.total_string
+          attributes << [:totalsRowLabel, col_data.total_string]
         elsif ptrue?(col_data.total_function)
-          attributes << :totalsRowFunction << col_data.total_function
+          attributes << [:totalsRowFunction, col_data.total_function]
         end
 
         if col_data.format
-          attributes << :dataDxfId << col_data.format
+          attributes << [:dataDxfId, col_data.format]
         end
 
         if ptrue?(col_data.formula)
@@ -372,11 +362,11 @@ def write_table_column(col_data)
       #
       def write_table_style_info
         attributes = [
-                      'name',              @style,
-                      'showFirstColumn',   @show_first_col,
-                      'showLastColumn',    @show_last_col,
-                      'showRowStripes',    @show_row_stripes,
-                      'showColumnStripes', @show_col_stripes
+                      ['name',              @style],
+                      ['showFirstColumn',   @show_first_col],
+                      ['showLastColumn',    @show_last_col],
+                      ['showRowStripes',    @show_row_stripes],
+                      ['showColumnStripes', @show_col_stripes]
                      ]
 
         @writer.empty_tag('tableStyleInfo', attributes)

data/lib/write_xlsx/package/vml.rb

@@ -72,9 +72,9 @@ def write_xml_namespace
       def xml_attributes
         schema  = 'urn:schemas-microsoft-com:'
         [
-         'xmlns:v', "#{schema}vml",
-         'xmlns:o', "#{schema}office:office",
-         'xmlns:x', "#{schema}office:excel"
+         ['xmlns:v', "#{schema}vml"],
+         ['xmlns:o', "#{schema}office:office"],
+         ['xmlns:x', "#{schema}office:excel"]
         ]
       end
 
@@ -82,7 +82,9 @@ def xml_attributes
       # Write the <o:shapelayout> element.
       #
       def write_shapelayout(data_id)
-        attributes = ['v:ext', 'edit']
+        attributes = [
+                      ['v:ext', 'edit']
+                     ]
 
         @writer.tag_elements('o:shapelayout', attributes) do
           # Write the o:idmap element.
@@ -95,8 +97,8 @@ def write_shapelayout(data_id)
       #
       def write_idmap(data_id)
         attributes = [
-          'v:ext', 'edit',
-          'data',  data_id
+          ['v:ext', 'edit'],
+          ['data',  data_id]
         ]
 
         @writer.empty_tag('o:idmap', attributes)
@@ -107,10 +109,10 @@ def write_idmap(data_id)
       #
       def write_comment_shapetype
         attributes = [
-            'id',        '_x0000_t202',
-            'coordsize', '21600,21600',
-            'o:spt',     202,
-            'path',      'm,l,21600r21600,l21600,xe'
+            ['id',        '_x0000_t202'],
+            ['coordsize', '21600,21600'],
+            ['o:spt',     202],
+            ['path',      'm,l,21600r21600,l21600,xe']
         ]
 
         @writer.tag_elements('v:shapetype', attributes) do
@@ -126,10 +128,10 @@ def write_comment_shapetype
       #
       def write_button_shapetype
         attributes = [
-                      'id',        '_x0000_t201',
-                      'coordsize', '21600,21600',
-                      'o:spt',     201,
-                      'path',      'm,l,21600r21600,l21600,xe'
+                      ['id',        '_x0000_t201'],
+                      ['coordsize', '21600,21600'],
+                      ['o:spt',     201],
+                      ['path',      'm,l,21600r21600,l21600,xe']
                      ]
 
         @writer.tag_elements('v:shapetype', attributes) do
@@ -147,11 +149,11 @@ def write_button_shapetype
       #
       def write_button_path
         attributes = [
-                      'shadowok',      'f',
-                      'o:extrusionok', 'f',
-                      'strokeok',      'f',
-                      'fillok',        'f',
-                      'o:connecttype', 'rect'
+                      ['shadowok',      'f'],
+                      ['o:extrusionok', 'f'],
+                      ['strokeok',      'f'],
+                      ['fillok',        'f'],
+                      ['o:connecttype', 'rect']
                      ]
         @writer.empty_tag('v:path', attributes)
       end
@@ -161,8 +163,8 @@ def write_button_path
       #
       def write_shapetype_lock
         attributes = [
-                      'v:ext',     'edit',
-                      'shapetype', 't'
+                      ['v:ext',     'edit'],
+                      ['shapetype', 't']
                      ]
         @writer.empty_tag('o:lock', attributes)
       end

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -110,12 +110,9 @@ def key_val(key, val)
         %Q{ #{key}="#{val}"}
       end
 
-      def key_vals(attr)
-        array = []
-        (0 .. attr.size-1).step(2) do |i|
-          array << key_val(attr[i], escape_attributes(attr[i+1]))
-        end
-        array.join('')
+      def key_vals(attribute)
+        attribute.
+          inject('') { |str, attr| str + key_val(attr.first, escape_attributes(attr.last)) }
       end
 
       def escape_attributes(str = '')

data/lib/write_xlsx/sheets.rb

@@ -215,14 +215,14 @@ def write_sheet_files(dir, sheet, index)
 
     def write_sheet(writer, sheet, sheet_id) #:nodoc:
       attributes = [
-        'name',    sheet.name,
-        'sheetId', sheet_id
+        ['name',    sheet.name],
+        ['sheetId', sheet_id]
       ]
 
       if sheet.hidden?
-        attributes << 'state' << 'hidden'
+        attributes << ['state', 'hidden']
       end
-      attributes += r_id_attributes(sheet_id)
+      attributes << r_id_attributes(sheet_id)
       writer.empty_tag_encoded('sheet', attributes)
     end
   end

data/lib/write_xlsx/sparkline.rb

@@ -113,27 +113,27 @@ def group_attributes
       cust_min = cust_max_min(@min) if @min
 
       a = []
-      a << 'manualMax' << @max if @max && @max != 'group'
-      a << 'manualMin' << @min if @min && @min != 'group'
+      a << ['manualMax', @max] if @max && @max != 'group'
+      a << ['manualMin', @min] if @min && @min != 'group'
 
       # Ignore the default type attribute (line).
-      a << 'type'          << @type        if @type != 'line'
-
-      a << 'lineWeight'    << @weight      if @weight
-      a << 'dateAxis'      << 1            if @date_axis
-      a << 'displayEmptyCellsAs' << @empty if ptrue?(@empty)
-
-      a << 'markers'       << 1         if @markers
-      a << 'high'          << 1         if @high
-      a << 'low'           << 1         if @low
-      a << 'first'         << 1         if @first
-      a << 'last'          << 1         if @last
-      a << 'negative'      << 1         if @negative
-      a << 'displayXAxis'  << 1         if @axis
-      a << 'displayHidden' << 1         if @hidden
-      a << 'minAxisType'   << cust_min  if cust_min
-      a << 'maxAxisType'   << cust_max  if cust_max
-      a << 'rightToLeft'   << 1         if @reverse
+      a << ['type',          @type]        if @type != 'line'
+
+      a << ['lineWeight',    @weight]      if @weight
+      a << ['dateAxis',      1]            if @date_axis
+      a << ['displayEmptyCellsAs', @empty] if ptrue?(@empty)
+
+      a << ['markers',       1]         if @markers
+      a << ['high',          1]         if @high
+      a << ['low',           1]         if @low
+      a << ['first',         1]         if @first
+      a << ['last',          1]         if @last
+      a << ['negative',      1]         if @negative
+      a << ['displayXAxis',  1]         if @axis
+      a << ['displayHidden', 1]         if @hidden
+      a << ['minAxisType',   cust_min]  if cust_min
+      a << ['maxAxisType',   cust_max]  if cust_max
+      a << ['rightToLeft',   1]         if @reverse
       a
     end
 
@@ -272,9 +272,9 @@ def write_sparklines  # :nodoc:
     def write_spark_color(element, color)  # :nodoc:
       attr = []
 
-      attr << 'rgb'   << color[:_rgb]   if color[:_rgb]
-      attr << 'theme' << color[:_theme] if color[:_theme]
-      attr << 'tint'  << color[:_tint]  if color[:_tint]
+      attr << ['rgb',   color[:_rgb]]   if color[:_rgb]
+      attr << ['theme', color[:_theme]] if color[:_theme]
+      attr << ['tint',  color[:_tint]]  if color[:_tint]
 
       @writer.empty_tag(element, attr)
     end

data/lib/write_xlsx/utility.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'write_xlsx/col_name'
+
 module Writexlsx
   module Utility
     ROW_MAX  = 1048576  # :nodoc:
@@ -50,25 +52,7 @@ def xl_cell_to_rowcol(cell)
     end
 
     def xl_col_to_name(col, col_absolute)
-      # 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 = ColName.instance.col_str(col)
       "#{absolute_char(col_absolute)}#{col_str}"
     end
 
@@ -285,11 +269,11 @@ def substitute_cellref(cell, *args)       #:nodoc:
 
     def underline_attributes(underline)
       if underline == 2
-        ['val', 'double']
+        [['val', 'double']]
       elsif underline == 33
-        ['val', 'singleAccounting']
+        [['val', 'singleAccounting']]
       elsif underline == 34
-        ['val', 'doubleAccounting']
+        [['val', 'doubleAccounting']]
       else
         []    # Default to single underline.
       end
@@ -299,7 +283,7 @@ def underline_attributes(underline)
     # Write the <color> element.
     #
     def write_color(writer, name, value) #:nodoc:
-      attributes = [name, value]
+      attributes = [[name, value]]
 
       writer.empty_tag('color', attributes)
     end
@@ -378,9 +362,9 @@ def pixels_to_points(vertices)
 
     def v_shape_attributes_base(id, z_index)
       [
-       'id',          "_x0000_s#{id}",
-       'type',        type,
-       'style',       (v_shape_style_base(z_index, vertices) + style_addition).join,
+       ['id',          "_x0000_s#{id}"],
+       ['type',        type],
+       ['style',       (v_shape_style_base(z_index, vertices) + style_addition).join]
       ]
     end
 
@@ -425,8 +409,8 @@ def write_fill
     def write_comment_path(gradientshapeok, connecttype)
       attributes      = []
 
-      attributes << 'gradientshapeok' << 't' if gradientshapeok
-      attributes << 'o:connecttype' << connecttype
+      attributes << ['gradientshapeok', 't'] if gradientshapeok
+      attributes << ['o:connecttype', connecttype]
 
       @writer.empty_tag('v:path', attributes)
     end
@@ -453,7 +437,7 @@ def write_auto_fill
     #
     def write_div(align, font = nil)
       style = "text-align:#{align}"
-      attributes = ['style', style]
+      attributes = [['style', style]]
 
       @writer.tag_elements('div', attributes) do
         if font
@@ -473,9 +457,9 @@ def write_font(font)
       color   = '#000000'
 
       attributes = [
-                    'face',  face,
-                    'size',  size,
-                    'color', color
+                    ['face',  face],
+                    ['size',  size],
+                    ['color', color]
                    ]
       @writer.data_element('font', caption, attributes)
     end
@@ -484,7 +468,7 @@ def write_font(font)
     # Write the <v:stroke> element.
     #
     def write_stroke
-      attributes = ['joinstyle', 'miter']
+      attributes = [['joinstyle', 'miter']]
 
       @writer.empty_tag('v:stroke', attributes)
     end
@@ -492,5 +476,49 @@ def write_stroke
     def r_id_attributes(id)
       ['r:id', "rId#{id}"]
     end
+
+    def write_xml_declaration
+      @writer.xml_decl
+      yield
+      @writer.crlf
+      @writer.close
+    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
+
+    def value_or_raise(hash, key, msg)
+      raise "Unknown #{msg} '#{key}'" unless hash[key.to_sym]
+      hash[key.to_sym]
+    end
   end
 end