write_xlsx 1.09.5 → 1.10.1

data/lib/write_xlsx/colors.rb

@@ -1,27 +1,28 @@
 # -*- 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
     }   # :nodoc:
 
     ###############################################################################

data/lib/write_xlsx/compatibility.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 #
 # Why would we ever use Ruby 1.8.7 when we can backport with something

data/lib/write_xlsx/drawing.rb

@@ -1,24 +1,26 @@
 # -*- 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)
+    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
-      @description = description
       @shape = shape
       @anchor = anchor
       @rel_index = rel_index
       @url_rel_index = url_rel_index
       @tip = tip
+      @name = name
+      @description = description
       @decorative = decorative
     end
   end
@@ -96,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,
@@ -129,7 +132,7 @@ 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(
@@ -263,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]]
 
       @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.
@@ -281,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

data/lib/write_xlsx/format.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/utility'
 
@@ -658,6 +659,10 @@ module Writexlsx
       attributes
     end
 
+    def force_text_format?
+      @num_format == 49 # Text format ('@')
+    end
+
     private
 
     def write_font_shapes(writer)

data/lib/write_xlsx/formats.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 

data/lib/write_xlsx/gradient.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Writexlsx
   module Gradient
     def gradient_properties(args)

data/lib/write_xlsx/package/app.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/button.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/utility'
 
@@ -7,10 +8,13 @@ module Writexlsx
     class Button
       include Writexlsx::Utility
 
-      attr_accessor :font, :macro, :vertices
+      attr_accessor :font, :macro, :vertices, :description
 
       def v_shape_attributes(id, z_index)
-        attributes = v_shape_attributes_base(id, z_index)
+        attributes = v_shape_attributes_base(id)
+        attributes << ['alt', description] if description
+
+        attributes << ['style', (v_shape_style_base(z_index, vertices) + style_addition).join]
         attributes << ['o:button',    't']
         attributes << ['fillcolor',   color]
         attributes << ['strokecolor', 'windowText [64]']

data/lib/write_xlsx/package/comments.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/format'
 require 'write_xlsx/package/xml_writer_simple'
@@ -112,7 +113,8 @@ module Writexlsx
       end
 
       def v_shape_attributes(id, z_index)
-        attr = v_shape_attributes_base(id, z_index)
+        attr = v_shape_attributes_base(id)
+        attr << ['style', (v_shape_style_base(z_index, vertices) + style_addition).join]
         attr << ['fillcolor',   color]
         attr << ['o:insetmode', 'auto']
         attr

data/lib/write_xlsx/package/conditional_format.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   module Package
@@ -657,9 +658,9 @@ module Writexlsx
         # Set the default icon properties.
         total_icons.times do
           props << {
-            :criteria => 0,
-            :value    => 0,
-            :type     => 'percent'
+            criteria: 0,
+            value:    0,
+            type:     'percent'
           }
         end
 

data/lib/write_xlsx/package/content_types.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/core.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/custom.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/metadata.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/packager.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/relationships.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/shared_strings.rb

@@ -27,7 +27,7 @@ module Writexlsx
         unless @strings_index[string]
           # Only first time the string will be append to list
           # next time we only check and not #dup it
-          str = string.dup.freeze
+          str = string.frozen? ? string : string.freeze
           @strings << str
           @strings_index[str] = @strings.size - 1
         end

data/lib/write_xlsx/package/styles.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/table.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
@@ -247,14 +248,14 @@ module Writexlsx
                            .gsub(/\]/, "']")
 
         subtotals = {
-          :average   => 101,
-          :countNums => 102,
-          :count     => 103,
-          :max       => 104,
-          :min       => 105,
-          :stdDev    => 107,
-          :sum       => 109,
-          :var       => 110
+          average:   101,
+          countNums: 102,
+          count:     103,
+          max:       104,
+          min:       105,
+          stdDev:    107,
+          sum:       109,
+          var:       110
         }
 
         unless (func_num = subtotals[function.to_sym])

data/lib/write_xlsx/package/theme.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/vml.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -13,6 +13,11 @@ module Writexlsx
 
       def initialize
         @io = StringIO.new
+        # Will allocate new string once, then use allocated string
+        # Key is tag name
+        # Only tags without attributes will be cached
+        @tag_start_cache = {}
+        @tag_end_cache = {}
       end
 
       def set_xml_writer(filename = nil)
@@ -41,7 +46,16 @@ module Writexlsx
       end
 
       def start_tag_str(tag, attr = [])
-        "<#{tag}#{key_vals(attr)}>"
+        if attr.empty?
+          result = @tag_start_cache[tag]
+          unless result
+            result = "<#{tag}>"
+            @tag_start_cache[tag] = result
+          end
+        else
+          result = "<#{tag}#{key_vals(attr)}>"
+        end
+        result
       end
 
       def end_tag(tag)
@@ -49,7 +63,12 @@ module Writexlsx
       end
 
       def end_tag_str(tag)
-        "</#{tag}>"
+        result = @tag_end_cache[tag]
+        unless result
+          result = "</#{tag}>"
+          @tag_end_cache[tag] = result
+        end
+        result
       end
 
       def empty_tag(tag, attr = [])

data/lib/write_xlsx/shape.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   ###############################################################################
@@ -203,11 +204,11 @@ module Writexlsx
     def auto_locate_connectors(shapes, shape_hash)
       # Valid connector shapes.
       connector_shapes = {
-        :straightConnector => 1,
-        :Connector         => 1,
-        :bentConnector     => 1,
-        :curvedConnector   => 1,
-        :line              => 1
+        straightConnector: 1,
+        Connector:         1,
+        bentConnector:     1,
+        curvedConnector:   1,
+        line:              1
       }
 
       shape_base = @type.chop.to_sym # Remove the number of segments from end of type.

data/lib/write_xlsx/sheets.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'delegate'
 require 'write_xlsx/package/xml_writer_simple'
@@ -7,7 +8,7 @@ module Writexlsx
   class Sheets < DelegateClass(Array)
     include Writexlsx::Utility
 
-    BASE_NAME = { :sheet => 'Sheet', :chart => 'Chart' }  # :nodoc:
+    BASE_NAME = { sheet: 'Sheet', chart: 'Chart' }  # :nodoc:
 
     def initialize
       super([])