write_xlsx 1.09.3 → 1.11.2

data/lib/write_xlsx/chartsheet.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 ###############################################################################
 #
 # Chartsheet - A class for writing the Excel XLSX Chartsheet files.
@@ -52,6 +54,8 @@ module Writexlsx
           write_header_footer
           # Write the drawing element.
           write_drawings
+          # Write the legaacyDrawingHF element.
+          write_legacy_drawing_hf
           # Close the worksheet tag.
         end
       end
@@ -60,21 +64,21 @@ module Writexlsx
     def protect(password = '', user_options = nil, options = {})
       # Objects are default on for chartsheets.
       if user_options
-        if user_options.has_key?(:objects)
-          if ptrue?(user_options[:objects])
-            options[:objects] = 0
-          else
-            options[:objects] = 1
-          end
-        else
-          options[:objects] = 0
-        end
-
-        if user_options.has_key?(:content)
-          options[:content] = user_options[:content]
-        else
-          options[:content] = 1
-        end
+        options[:objects] = if user_options.has_key?(:objects)
+                              if ptrue?(user_options[:objects])
+                                0
+                              else
+                                1
+                              end
+                            else
+                              0
+                            end
+
+        options[:content] = if user_options.has_key?(:content)
+                              user_options[:content]
+                            else
+                              1
+                            end
       else
         options[:objects] = 0
         options[:content] = 1
@@ -82,9 +86,7 @@ module Writexlsx
 
       # Is objects and content are off then the chartsheet isn't locked.
       # except if it has a password.
-      if password == '' && ptrue?(options[:objects]) && !ptrue?(options[:content])
-        return
-      end
+      return if password == '' && ptrue?(options[:objects]) && !ptrue?(options[:content])
 
       @chart.protection = 1
 
@@ -95,7 +97,6 @@ module Writexlsx
       super(password, options)
     end
 
-
     ###############################################################################
     #
     # Encapsulated Chart methods.
@@ -146,6 +147,10 @@ module Writexlsx
       @chart.show_blanks_as(*args)
     end
 
+    def show_na_as_empty_cell
+      @chart.show_na_as_empty_cell(*args)
+    end
+
     def show_hidden_data(*args)
       @chart.show_hidden_data(*args)
     end
@@ -173,20 +178,23 @@ module Writexlsx
     #
     # Set up chart/drawings.
     #
-    def prepare_chart(index, chart_id, drawing_id) # :nodoc:
+    def prepare_chart(_index, chart_id, drawing_id) # :nodoc:
       @chart.id = chart_id - 1
 
       drawings  = Drawings.new
       @drawings = drawings
       @drawings.orientation = @page_setup.orientation
 
-      @external_drawing_links << [ '/drawing', "../drawings/drawing#{drawing_id}.xml" ]
+      @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
 
-      @drawing_links << [ '/chart', "../charts/chart#{chart_id}.xml"]
+      @drawing_links << ['/chart', "../charts/chart#{chart_id}.xml"]
     end
 
     def external_links
-      [@external_drawing_links]
+      [
+        @external_drawing_links,
+        @external_vml_links
+      ]
     end
 
     private
@@ -194,30 +202,23 @@ module Writexlsx
     #
     # Write the <chartsheet> element. This is the root element of Chartsheet.
     #
-    def write_chartsheet # :nodoc:
+    def write_chartsheet(&block) # :nodoc:
       schema                 = 'http://schemas.openxmlformats.org/'
       xmlns                  = schema + 'spreadsheetml/2006/main'
       xmlns_r                = schema + 'officeDocument/2006/relationships'
-      xmlns_mc               = schema + 'markup-compatibility/2006'
-      xmlns_mv               = 'urn:schemas-microsoft-com:mac:vml'
-      mc_ignorable           = 'mv'
-      mc_preserve_attributes = 'mv:*'
 
       attributes = [
         ['xmlns',   xmlns],
         ['xmlns:r', xmlns_r]
       ]
 
-      @writer.tag_elements('chartsheet', attributes) do
-        yield
-      end
+      @writer.tag_elements('chartsheet', attributes, &block)
     end
 
     #
     # Write the <sheetPr> element for Sheet level properties.
     #
     def write_sheet_pr # :nodoc:
-
       attributes = []
 
       attributes << ['filterMode', 1] if ptrue?(@filter_on)

data/lib/write_xlsx/col_name.rb

@@ -1,16 +1,22 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'singleton'
 
 class ColName
   include Singleton
 
   def initialize
-    @col_str_table = Hash.new
+    @col_str_table = []
+    @row_str_table = []
   end
 
   def col_str(col)
-    @col_str_table[col] = col_str_build(col) unless @col_str_table[col]
-    @col_str_table[col]
+    @col_str_table[col] ||= col_str_build(col)
+  end
+
+  def row_str(row)
+    @row_str_table[row] ||= row.to_s
   end
 
   private

data/lib/write_xlsx/colors.rb

@@ -1,27 +1,29 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Colors
     COLORS = {
-      :aqua    => 0x0F,
-      :cyan    => 0x0F,
-      :black   => 0x08,
-      :blue    => 0x0C,
-      :brown   => 0x10,
-      :magenta => 0x0E,
-      :fuchsia => 0x0E,
-      :gray    => 0x17,
-      :grey    => 0x17,
-      :green   => 0x11,
-      :lime    => 0x0B,
-      :navy    => 0x12,
-      :orange  => 0x35,
-      :pink    => 0x21,
-      :purple  => 0x14,
-      :red     => 0x0A,
-      :silver  => 0x16,
-      :white   => 0x09,
-      :yellow  => 0x0D,
+      aqua:      0x0F,
+      cyan:      0x0F,
+      black:     0x08,
+      blue:      0x0C,
+      brown:     0x10,
+      magenta:   0x0E,
+      fuchsia:   0x0E,
+      gray:      0x17,
+      grey:      0x17,
+      green:     0x11,
+      lime:      0x0B,
+      navy:      0x12,
+      orange:    0x35,
+      pink:      0x21,
+      purple:    0x14,
+      red:       0x0A,
+      silver:    0x16,
+      white:     0x09,
+      yellow:    0x0D,
+      automatic: 0x40
     }   # :nodoc:
 
     ###############################################################################

data/lib/write_xlsx/compatibility.rb

@@ -1,4 +1,6 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 #
 # Why would we ever use Ruby 1.8.7 when we can backport with something
 # as simple as this?
@@ -6,18 +8,16 @@
 # copied from prawn.
 # modified by Hideo NAKAMURA
 #
-class String #:nodoc:
+class String # :nodoc:
   def first_line
-    self.each_line { |line| return line }
-  end
-  unless "".respond_to?(:lines)
-    alias_method :lines, :to_a
+    each_line { |line| return line }
   end
+  alias lines to_a unless "".respond_to?(:lines)
   unless "".respond_to?(:each_char)
-    def each_char #:nodoc:
+    def each_char(&block) # :nodoc:
       # copied from jcode
       if block_given?
-        scan(/./m) { |x| yield x }
+        scan(/./m, &block)
       else
         scan(/./m)
       end
@@ -26,7 +26,7 @@ class String #:nodoc:
 
   unless "".respond_to?(:bytesize)
     def bytesize # :nodoc:
-      self.length
+      length
     end
   end
 
@@ -38,34 +38,34 @@ class String #:nodoc:
 
   unless "".respond_to?(:ascii_only?)
     def ascii_only?
-      !!(self =~ /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/)
+      !!(self =~ %r{[^!"#$%&'()*+,\-./:;<=>?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]})
     end
   end
 end
 
 unless File.respond_to?(:binread)
-  def File.binread(file) #:nodoc:
-    File.open(file,"rb:utf-8:utf-8") { |f| f.read }
+  def File.binread(file) # :nodoc:
+    File.open(file, "rb:utf-8:utf-8") { |f| f.read }
   end
 end
 
 if RUBY_VERSION < "1.9"
 
-  def ruby_18 #:nodoc:
+  def ruby_18 # :nodoc:
     yield
   end
 
-  def ruby_19 #:nodoc:
+  def ruby_19 # :nodoc:
     false
   end
 
 else
 
-  def ruby_18 #:nodoc:
+  def ruby_18 # :nodoc:
     false
   end
 
-  def ruby_19 #:nodoc:
+  def ruby_19 # :nodoc:
     yield
   end
 end

data/lib/write_xlsx/drawing.rb

@@ -1,15 +1,27 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
 
 module Writexlsx
   class Drawing
-    attr_accessor :type, :dimensions, :width, :height, :description, :shape, :anchor, :rel_index, :url_rel_index
+    attr_accessor :type, :dimensions, :width, :height, :shape, :anchor, :rel_index, :url_rel_index, :name, :description
     attr_reader :tip, :decorative
 
-    def initialize(type, dimensions, width, height, description, shape, anchor, rel_index = nil, url_rel_index = nil, tip = nil, decorative = nil)
-      @type, @dimensions, @width, @height, @description, @shape, @anchor, @rel_index, @url_rel_index, @tip, @decorative =
-                                                                                                            type, dimensions, width, height, description, shape, anchor, rel_index, url_rel_index, tip, decorative
+    def initialize(type, dimensions, width, height, shape, anchor, rel_index = nil, url_rel_index = nil, tip = nil, name = nil, description = nil, decorative = nil)
+      @type = type
+      @dimensions = dimensions
+      @width = width
+      @height = height
+      @shape = shape
+      @anchor = anchor
+      @rel_index = rel_index
+      @url_rel_index = url_rel_index
+      @tip = tip
+      @name = name
+      @description = description
+      @decorative = decorative
     end
   end
 
@@ -67,14 +79,14 @@ module Writexlsx
     #
     # Write the <xdr:wsDr> element.
     #
-    def write_drawing_workspace
-      schema    = 'http://schemas.openxmlformats.org/drawingml/'
+    def write_drawing_workspace(&block)
+      schema = 'http://schemas.openxmlformats.org/drawingml/'
       attributes = [
         ['xmlns:xdr', "#{schema}2006/spreadsheetDrawing"],
         ['xmlns:a',    "#{schema}2006/main"]
       ]
 
-      @writer.tag_elements('xdr:wsDr', attributes) { yield }
+      @writer.tag_elements('xdr:wsDr', attributes, &block)
     end
 
     #
@@ -86,12 +98,13 @@ module Writexlsx
       type          = drawing.type
       width         = drawing.width
       height        = drawing.height
-      description   = drawing.description
       shape         = drawing.shape
       anchor        = drawing.anchor
       rel_index     = drawing.rel_index
       url_rel_index = drawing.url_rel_index
       tip           = drawing.tip
+      name          = drawing.name
+      description   = drawing.description
       decorative    = drawing.decorative
 
       col_from, row_from, col_from_offset, row_from_offset,
@@ -119,13 +132,13 @@ module Writexlsx
           # Graphic frame.
 
           # Write the xdr:graphicFrame element for charts.
-          write_graphic_frame(index, rel_index, description)
+          write_graphic_frame(index, rel_index, name, description, decorative)
         elsif type == 2
           # Write the xdr:pic element.
           write_pic(
             index,        rel_index,      col_absolute,
             row_absolute, width,          height,
-            description,  url_rel_index , tip, decorative
+            description,  url_rel_index, tip, decorative
           )
         else
           # Write the xdr:sp element for shapes.
@@ -143,19 +156,19 @@ module Writexlsx
     def write_absolute_anchor(index)
       @writer.tag_elements('xdr:absoluteAnchor') do
         # Different co-ordinates for horizonatal (= 0) and vertical (= 1).
-        if !ptrue?(@orientation)
-
+        if ptrue?(@orientation)
           # Write the xdr:pos element.
-          write_pos(0, 0)
+          write_pos(0, -47625)
 
           # Write the xdr:ext element.
-          write_xdr_ext(9308969, 6078325)
+          write_xdr_ext(6162675, 6124575)
         else
+
           # Write the xdr:pos element.
-          write_pos(0, -47625)
+          write_pos(0, 0)
 
           # Write the xdr:ext element.
-          write_xdr_ext(6162675, 6124575)
+          write_xdr_ext(9308969, 6078325)
         end
 
         # Write the xdr:graphicFrame element.
@@ -212,7 +225,6 @@ module Writexlsx
       @writer.data_element('xdr:colOff', data)
     end
 
-
     #
     # Write the <xdr:row> element.
     #
@@ -220,7 +232,6 @@ module Writexlsx
       @writer.data_element('xdr:row', data)
     end
 
-
     #
     # Write the <xdr:rowOff> element.
     #
@@ -255,14 +266,17 @@ module Writexlsx
     #
     # Write the <xdr:graphicFrame> element.
     #
-    def write_graphic_frame(index, rel_index, name = nil)
-      macro  = ''
+    def write_graphic_frame(
+          index, rel_index, name = nil,
+          description = nil, decorative = nil, macro = nil
+        )
+      macro  ||= ''
 
-      attributes = [ ['macro', macro] ]
+      attributes = [['macro', macro]]
 
       @writer.tag_elements('xdr:graphicFrame', attributes) do
         # Write the xdr:nvGraphicFramePr element.
-        write_nv_graphic_frame_pr(index, name)
+        write_nv_graphic_frame_pr(index, name, description, decorative)
         # Write the xdr:xfrm element.
         write_xfrm
         # Write the a:graphic element.
@@ -273,12 +287,16 @@ module Writexlsx
     #
     # Write the <xdr:nvGraphicFramePr> element.
     #
-    def write_nv_graphic_frame_pr(index, name = nil)
+    def write_nv_graphic_frame_pr(
+          index, name = nil, description = nil, decorative = nil
+        )
+
       name = "Chart #{index}" unless ptrue?(name)
 
       @writer.tag_elements('xdr:nvGraphicFramePr') do
         # Write the xdr:cNvPr element.
-        write_c_nv_pr( index + 1, name)
+        write_c_nv_pr(index + 1, name, description,
+                      nil, nil, decorative)
         # Write the xdr:cNvGraphicFramePr element.
         write_c_nv_graphic_frame_pr
       end
@@ -406,7 +424,7 @@ module Writexlsx
     def write_a_graphic_frame_locks
       no_grp = 1
 
-      attributes = [ ['noGrp', no_grp ] ]
+      attributes = [['noGrp', no_grp]]
 
       @writer.empty_tag('a:graphicFrameLocks', attributes)
     end
@@ -469,7 +487,7 @@ module Writexlsx
     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.
@@ -485,7 +503,6 @@ module Writexlsx
       xmlns_c = "#{schema}drawingml/2006/chart"
       xmlns_r = "#{schema}officeDocument/2006/relationships"
 
-
       attributes = [
         ['xmlns:c', xmlns_c],
         ['xmlns:r', xmlns_r]
@@ -506,24 +523,13 @@ module Writexlsx
     # Write the <xdr:sp> element.
     #
     def write_sp(index, col_absolute, row_absolute, width, height, shape)
-      if shape.connect != 0
-        attributes = [ [:macro,  ''] ]
-        @writer.tag_elements('xdr:cxnSp', attributes) do
-
-          # Write the xdr:nvCxnSpPr element.
-          write_nv_cxn_sp_pr(index, shape)
-
-          # Write the xdr:spPr element.
-          write_xdr_sp_pr(col_absolute, row_absolute, width, height, shape)
-        end
-      else
+      if shape.connect == 0
         # Add attribute for shapes.
         attributes = [
           [:macro, ''],
           [:textlink, '']
         ]
         @writer.tag_elements('xdr:sp', attributes) do
-
           # Write the xdr:nvSpPr element.
           write_nv_sp_pr(index, shape)
 
@@ -531,9 +537,16 @@ module Writexlsx
           write_xdr_sp_pr(col_absolute, row_absolute, width, height, shape)
 
           # Write the xdr:txBody element.
-          if shape.text != 0
-            write_tx_body(shape)
-          end
+          write_tx_body(shape) if shape.text != 0
+        end
+      else
+        attributes = [[:macro,  '']]
+        @writer.tag_elements('xdr:cxnSp', attributes) do
+          # Write the xdr:nvCxnSpPr element.
+          write_nv_cxn_sp_pr(index, shape)
+
+          # Write the xdr:spPr element.
+          write_xdr_sp_pr(col_absolute, row_absolute, width, height, shape)
         end
       end
     end
@@ -543,13 +556,11 @@ module Writexlsx
     #
     def write_nv_cxn_sp_pr(index, shape)
       @writer.tag_elements('xdr:nvCxnSpPr') do
-
         shape.name = [shape.type, index].join(' ') unless shape.name
         write_c_nv_pr(shape.id, shape.name)
 
         @writer.tag_elements('xdr:cNvCxnSpPr') do
-
-          attributes = [ [:noChangeShapeType, '1'] ]
+          attributes = [[:noChangeShapeType, '1']]
           @writer.empty_tag('a:cxnSpLocks', attributes)
 
           if shape.start
@@ -582,7 +593,7 @@ module Writexlsx
         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
@@ -609,7 +620,7 @@ module Writexlsx
     #
     # Write the <xdr:nvPicPr> element.
     #
-    def write_nv_pic_pr(index, rel_index, description, url_rel_index, tip, decorative)
+    def write_nv_pic_pr(index, _rel_index, description, url_rel_index, tip, decorative)
       @writer.tag_elements('xdr:nvPicPr') do
         # Write the xdr:cNvPr element.
         write_c_nv_pr(
@@ -637,7 +648,7 @@ module Writexlsx
     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
@@ -703,10 +714,9 @@ module Writexlsx
     # Write the <xdr:spPr> element for shapes.
     #
     def write_xdr_sp_pr(col_absolute, row_absolute, width, height, shape)
-      attributes = [ ['bwMode', 'auto'] ]
+      attributes = [%w[bwMode auto]]
 
       @writer.tag_elements('xdr:spPr', attributes) do
-
         # Write the a:xfrm element.
         write_a_xfrm(col_absolute, row_absolute, width, height, shape)
 
@@ -740,9 +750,9 @@ module Writexlsx
 
       @writer.tag_elements('a:xfrm', attributes) do
         # Write the a:off element.
-        write_a_off( col_absolute, row_absolute )
+        write_a_off(col_absolute, row_absolute)
         # Write the a:ext element.
-        write_a_ext( width, height )
+        write_a_ext(width, height)
       end
     end
 
@@ -758,7 +768,6 @@ module Writexlsx
       @writer.empty_tag('a:off', attributes)
     end
 
-
     #
     # Write the <a:ext> element.
     #
@@ -802,7 +811,7 @@ module Writexlsx
           adjustments.each do |adj|
             i += 1
             # Only connectors have multiple adjustments.
-            suffix = shape.connect != 0 ? i : ''
+            suffix = shape.connect == 0 ? '' : i
 
             # Scale Adjustments: 100,000 = 100%.
             adj_int = (adj * 1000).to_i
@@ -823,7 +832,7 @@ module Writexlsx
     # 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)
@@ -835,7 +844,7 @@ module Writexlsx
     #
     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
@@ -846,15 +855,15 @@ module Writexlsx
         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] ]
+        if shape.connect == 0
+          attributes = [['lim', 800000]]
           @writer.empty_tag('a:miter', attributes)
+        else
+          @writer.empty_tag('a:round')
         end
 
         @writer.empty_tag('a:headEnd')
@@ -889,7 +898,7 @@ module Writexlsx
             [:rtl, rotation]
           ]
           @writer.tag_elements('a:pPr', attributes) do
-            attributes = [ [:sz, "1000"] ]
+            attributes = [[:sz, "1000"]]
             @writer.empty_tag('a:defRPr', attributes)
           end
 
@@ -923,7 +932,7 @@ module Writexlsx
               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