caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/workbook/worksheet/page_setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Page setup settings for printing a worksheet. All settings are optional.
   #
@@ -5,7 +7,6 @@ module Axlsx
   # @see Worksheet#print_options
   # @see Worksheet#initialize
   class PageSetup
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -18,7 +19,7 @@ module Axlsx
     # @option options [Integer] scale Print scaling (percent value, integer ranging from 10 to 400)
     # @option options [Integer] paper_size - the size of paper to use
     def initialize(options = {})
-       parse_options options
+      parse_options options
     end
 
     serializable_attributes :fit_to_height, :fit_to_width, :orientation, :paper_height, :paper_width, :scale, :paper_size
@@ -65,124 +66,123 @@ module Axlsx
     attr_reader :scale
 
     # The paper size to use in printing
-    #1 = Letter paper (8.5 in. by 11 in.)
-    #2 = Letter small paper (8.5 in. by 11 in.)
-    #3 = Tabloid paper (11 in. by 17 in.)
-    #4 = Ledger paper (17 in. by 11 in.)
-    #5 = Legal paper (8.5 in. by 14 in.)
-    #6 = Statement paper (5.5 in. by 8.5 in.)
-    #7 = Executive paper (7.25 in. by 10.5 in.)
-    #8 = A3 paper (297 mm by 420 mm)
-    #9 = A4 paper (210 mm by 297 mm)
-    #10 = A4 small paper (210 mm by 297 mm)
-    #11 = A5 paper (148 mm by 210 mm)
-    #12 = B4 paper (250 mm by 353 mm)
-    #13 = B5 paper (176 mm by 250 mm)
-    #14 = Folio paper (8.5 in. by 13 in.)
-    #15 = Quarto paper (215 mm by 275 mm)
-    #16 = Standard paper (10 in. by 14 in.)
-    #17 = Standard paper (11 in. by 17 in.)
-    #18 = Note paper (8.5 in. by 11 in.)
-    #19 = #9 envelope (3.875 in. by 8.875 in.)
-    #20 = #10 envelope (4.125 in. by 9.5 in.)
-    #21 = #11 envelope (4.5 in. by 10.375 in.)
-    #22 = #12 envelope (4.75 in. by 11 in.)
-    #23 = #14 envelope (5 in. by 11.5 in.) 24 = C paper (17 in. by 22 in.)
-    #25 = D paper (22 in. by 34 in.)
-    #26 = E paper (34 in. by 44 in.)
-    #27 = DL envelope (110 mm by 220 mm)
-    #28 = C5 envelope (162 mm by 229 mm)
-    #29 = C3 envelope (324 mm by 458 mm)
-    #30 = C4 envelope (229 mm by 324 mm)
-    #31 = C6 envelope (114 mm by 162 mm)
-    #32 = C65 envelope (114 mm by 229 mm)
-    #33 = B4 envelope (250 mm by 353 mm)
-    #34 = B5 envelope (176 mm by 250 mm)
-    #35 = B6 envelope (176 mm by 125 mm)
-    #36 = Italy envelope (110 mm by 230 mm)
-    #37 = Monarch envelope (3.875 in. by 7.5 in.). 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
-    #39 = US standard fanfold (14.875 in. by 11 in.)
-    #40 = German standard fanfold (8.5 in. by 12 in.)
-    #41 = German legal fanfold (8.5 in. by 13 in.)
-    #42 = ISO B4 (250 mm by 353 mm)
-    #43 = Japanese double postcard (200 mm by 148 mm)
-    #44 = Standard paper (9 in. by 11 in.)
-    #45 = Standard paper (10 in. by 11 in.)
-    #46 = Standard paper (15 in. by 11 in.)
-    #47 = Invite envelope (220 mm by 220 mm)
-    #50 = Letter extra paper (9.275 in. by 12 in.)
-    #51 = Legal extra paper (9.275 in. by 15 in.)
-    #52 = Tabloid extra paper (11.69 in. by 18 in.)
-    #53 = A4 extra paper (236 mm by 322 mm)
-    #54 = Letter transverse paper (8.275 in. by 11 in.)
-    #55 = A4 transverse paper (210 mm by 297 mm)
-    #56 = Letter extra transverse paper (9.275 in. by 12 in.)
-    #57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
-    #58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
-    #59 = Letter plus paper (8.5 in. by 12.69 in.)
-    #60 = A4 plus paper (210 mm by 330 mm)
-    #61 = A5 transverse paper (148 mm by 210 mm)
-    #62 = JIS B5 transverse paper (182 mm by 257 mm)
-    #63 = A3 extra paper (322 mm by 445 mm)
-    #64 = A5 extra paper (174 mm by 235 mm)
-    #65 = ISO B5 extra paper (201 mm by 276 mm)
-    #66 = A2 paper (420 mm by 594 mm)
-    #67 = A3 transverse paper (297 mm by 420 mm)
-    #68 = A3 extra transverse paper (322 mm by 445 mm)
-    #69 = Japanese Double Postcard (200 mm x 148 mm)
-    #70 = A6 (105 mm x 148 mm
-    #71 = Japanese Envelope Kaku #2
-    #72 = Japanese Envelope Kaku #3
-    #73 = Japanese Envelope Chou #3
-    #74 = Japanese Envelope Chou #4
-    #75 = Letter Rotated (11in x 8 1/2 11 in)
-    #76 = A3 Rotated (420 mm x 297 mm)
-    #77 = A4 Rotated (297 mm x 210 mm)
-    #78 = A5 Rotated (210 mm x 148 mm)
-    #79 = B4 (JIS) Rotated (364 mm x 257 mm)
-    #80 = B5 (JIS) Rotated (257 mm x 182 mm)
-    #81 = Japanese Postcard Rotated (148 mm x 100 mm)
-    #82 = Double Japanese Postcard Rotated (148 mm x 200 mm)
-    #83 = A6 Rotated (148 mm x 105 mm)
-    #84 = Japanese Envelope Kaku #2 Rotated
-    #85 = Japanese Envelope Kaku #3 Rotated
-    #86 = Japanese Envelope Chou #3 Rotated
-    #87 = Japanese Envelope Chou #4 Rotated
-    #88 = B6 (JIS) (128 mm x 182 mm)
-    #89 = B6 (JIS) Rotated (182 mm x 128 mm)
-    #90 = (12 in x 11 in)
-    #91 = Japanese Envelope You #4
-    #92 = Japanese Envelope You #4 Rotated
-    #93 = PRC 16K (146 mm x 215 mm)
-    #94 = PRC 32K (97 mm x 151 mm)
-    #95 = PRC 32K(Big) (97 mm x 151 mm)
-    #96 = PRC Envelope #1 (102 mm x 165 mm)
-    #97 = PRC Envelope #2 (102 mm x 176 mm)
-    #98 = PRC Envelope #3 (125 mm x 176 mm)
-    #99 = PRC Envelope #4 (110 mm x 208 mm)
-    #100 = PRC Envelope #5 (110 mm x 220 mm)
-    #101 = PRC Envelope #6 (120 mm x 230 mm)
-    #102 = PRC Envelope #7 (160 mm x 230 mm)
-    #103 = PRC Envelope #8 (120 mm x 309 mm)
-    #104 = PRC Envelope #9 (229 mm x 324 mm)
-    #105 = PRC Envelope #10 (324 mm x 458 mm)
-    #106 = PRC 16K Rotated
-    #107 = PRC 32K Rotated
-    #108 = PRC 32K(Big) Rotated
-    #109 = PRC Envelope #1 Rotated (165 mm x 102 mm)
-    #110 = PRC Envelope #2 Rotated (176 mm x 102 mm)
-    #111 = PRC Envelope #3 Rotated (176 mm x 125 mm)
-    #112 = PRC Envelope #4 Rotated (208 mm x 110 mm)
-    #113 = PRC Envelope #5 Rotated (220 mm x 110 mm)
-    #114 = PRC Envelope #6 Rotated (230 mm x 120 mm)
-    #115 = PRC Envelope #7 Rotated (230 mm x 160 mm)
-    #116 = PRC Envelope #8 Rotated (309 mm x 120 mm)
-    #117 = PRC Envelope #9 Rotated (324 mm x 229 mm)
-    #118 = PRC Envelope #10 Rotated (458 mm x 324 mm)
+    # 1 = Letter paper (8.5 in. by 11 in.)
+    # 2 = Letter small paper (8.5 in. by 11 in.)
+    # 3 = Tabloid paper (11 in. by 17 in.)
+    # 4 = Ledger paper (17 in. by 11 in.)
+    # 5 = Legal paper (8.5 in. by 14 in.)
+    # 6 = Statement paper (5.5 in. by 8.5 in.)
+    # 7 = Executive paper (7.25 in. by 10.5 in.)
+    # 8 = A3 paper (297 mm by 420 mm)
+    # 9 = A4 paper (210 mm by 297 mm)
+    # 10 = A4 small paper (210 mm by 297 mm)
+    # 11 = A5 paper (148 mm by 210 mm)
+    # 12 = B4 paper (250 mm by 353 mm)
+    # 13 = B5 paper (176 mm by 250 mm)
+    # 14 = Folio paper (8.5 in. by 13 in.)
+    # 15 = Quarto paper (215 mm by 275 mm)
+    # 16 = Standard paper (10 in. by 14 in.)
+    # 17 = Standard paper (11 in. by 17 in.)
+    # 18 = Note paper (8.5 in. by 11 in.)
+    # 19 = #9 envelope (3.875 in. by 8.875 in.)
+    # 20 = #10 envelope (4.125 in. by 9.5 in.)
+    # 21 = #11 envelope (4.5 in. by 10.375 in.)
+    # 22 = #12 envelope (4.75 in. by 11 in.)
+    # 23 = #14 envelope (5 in. by 11.5 in.) 24 = C paper (17 in. by 22 in.)
+    # 25 = D paper (22 in. by 34 in.)
+    # 26 = E paper (34 in. by 44 in.)
+    # 27 = DL envelope (110 mm by 220 mm)
+    # 28 = C5 envelope (162 mm by 229 mm)
+    # 29 = C3 envelope (324 mm by 458 mm)
+    # 30 = C4 envelope (229 mm by 324 mm)
+    # 31 = C6 envelope (114 mm by 162 mm)
+    # 32 = C65 envelope (114 mm by 229 mm)
+    # 33 = B4 envelope (250 mm by 353 mm)
+    # 34 = B5 envelope (176 mm by 250 mm)
+    # 35 = B6 envelope (176 mm by 125 mm)
+    # 36 = Italy envelope (110 mm by 230 mm)
+    # 37 = Monarch envelope (3.875 in. by 7.5 in.). 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
+    # 39 = US standard fanfold (14.875 in. by 11 in.)
+    # 40 = German standard fanfold (8.5 in. by 12 in.)
+    # 41 = German legal fanfold (8.5 in. by 13 in.)
+    # 42 = ISO B4 (250 mm by 353 mm)
+    # 43 = Japanese double postcard (200 mm by 148 mm)
+    # 44 = Standard paper (9 in. by 11 in.)
+    # 45 = Standard paper (10 in. by 11 in.)
+    # 46 = Standard paper (15 in. by 11 in.)
+    # 47 = Invite envelope (220 mm by 220 mm)
+    # 50 = Letter extra paper (9.275 in. by 12 in.)
+    # 51 = Legal extra paper (9.275 in. by 15 in.)
+    # 52 = Tabloid extra paper (11.69 in. by 18 in.)
+    # 53 = A4 extra paper (236 mm by 322 mm)
+    # 54 = Letter transverse paper (8.275 in. by 11 in.)
+    # 55 = A4 transverse paper (210 mm by 297 mm)
+    # 56 = Letter extra transverse paper (9.275 in. by 12 in.)
+    # 57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
+    # 58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
+    # 59 = Letter plus paper (8.5 in. by 12.69 in.)
+    # 60 = A4 plus paper (210 mm by 330 mm)
+    # 61 = A5 transverse paper (148 mm by 210 mm)
+    # 62 = JIS B5 transverse paper (182 mm by 257 mm)
+    # 63 = A3 extra paper (322 mm by 445 mm)
+    # 64 = A5 extra paper (174 mm by 235 mm)
+    # 65 = ISO B5 extra paper (201 mm by 276 mm)
+    # 66 = A2 paper (420 mm by 594 mm)
+    # 67 = A3 transverse paper (297 mm by 420 mm)
+    # 68 = A3 extra transverse paper (322 mm by 445 mm)
+    # 69 = Japanese Double Postcard (200 mm x 148 mm)
+    # 70 = A6 (105 mm x 148 mm
+    # 71 = Japanese Envelope Kaku #2
+    # 72 = Japanese Envelope Kaku #3
+    # 73 = Japanese Envelope Chou #3
+    # 74 = Japanese Envelope Chou #4
+    # 75 = Letter Rotated (11in x 8 1/2 11 in)
+    # 76 = A3 Rotated (420 mm x 297 mm)
+    # 77 = A4 Rotated (297 mm x 210 mm)
+    # 78 = A5 Rotated (210 mm x 148 mm)
+    # 79 = B4 (JIS) Rotated (364 mm x 257 mm)
+    # 80 = B5 (JIS) Rotated (257 mm x 182 mm)
+    # 81 = Japanese Postcard Rotated (148 mm x 100 mm)
+    # 82 = Double Japanese Postcard Rotated (148 mm x 200 mm)
+    # 83 = A6 Rotated (148 mm x 105 mm)
+    # 84 = Japanese Envelope Kaku #2 Rotated
+    # 85 = Japanese Envelope Kaku #3 Rotated
+    # 86 = Japanese Envelope Chou #3 Rotated
+    # 87 = Japanese Envelope Chou #4 Rotated
+    # 88 = B6 (JIS) (128 mm x 182 mm)
+    # 89 = B6 (JIS) Rotated (182 mm x 128 mm)
+    # 90 = (12 in x 11 in)
+    # 91 = Japanese Envelope You #4
+    # 92 = Japanese Envelope You #4 Rotated
+    # 93 = PRC 16K (146 mm x 215 mm)
+    # 94 = PRC 32K (97 mm x 151 mm)
+    # 95 = PRC 32K(Big) (97 mm x 151 mm)
+    # 96 = PRC Envelope #1 (102 mm x 165 mm)
+    # 97 = PRC Envelope #2 (102 mm x 176 mm)
+    # 98 = PRC Envelope #3 (125 mm x 176 mm)
+    # 99 = PRC Envelope #4 (110 mm x 208 mm)
+    # 100 = PRC Envelope #5 (110 mm x 220 mm)
+    # 101 = PRC Envelope #6 (120 mm x 230 mm)
+    # 102 = PRC Envelope #7 (160 mm x 230 mm)
+    # 103 = PRC Envelope #8 (120 mm x 309 mm)
+    # 104 = PRC Envelope #9 (229 mm x 324 mm)
+    # 105 = PRC Envelope #10 (324 mm x 458 mm)
+    # 106 = PRC 16K Rotated
+    # 107 = PRC 32K Rotated
+    # 108 = PRC 32K(Big) Rotated
+    # 109 = PRC Envelope #1 Rotated (165 mm x 102 mm)
+    # 110 = PRC Envelope #2 Rotated (176 mm x 102 mm)
+    # 111 = PRC Envelope #3 Rotated (176 mm x 125 mm)
+    # 112 = PRC Envelope #4 Rotated (208 mm x 110 mm)
+    # 113 = PRC Envelope #5 Rotated (220 mm x 110 mm)
+    # 114 = PRC Envelope #6 Rotated (230 mm x 120 mm)
+    # 115 = PRC Envelope #7 Rotated (230 mm x 160 mm)
+    # 116 = PRC Envelope #8 Rotated (309 mm x 120 mm)
+    # 117 = PRC Envelope #9 Rotated (324 mm x 229 mm)
+    # 118 = PRC Envelope #10 Rotated (458 mm x 324 mm)
     # @return [Integer]
     attr_reader :paper_size
 
-
     # Sets the paper size for printing.
     # @see PageSetup#paper_size
     # @return integer
@@ -191,49 +191,48 @@ module Axlsx
       @paper_size = size
     end
 
-     # Set some or all page settings at once.
+    # Set some or all page settings at once.
     # @param [Hash] options The page settings to set (possible keys are :fit_to_height, :fit_to_width, :orientation, :paper_height, :paper_width, and :scale).
     def set(options)
       parse_options options
     end
 
     # @see fit_to_height
-    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; end
+    def fit_to_height=(v); Axlsx.validate_unsigned_int(v); @fit_to_height = v; end
     # @see fit_to_width
-    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; end
+    def fit_to_width=(v); Axlsx.validate_unsigned_int(v); @fit_to_width = v; end
     # @see orientation
-    def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v; end
+    def orientation=(v); Axlsx.validate_page_orientation(v); @orientation = v; end
     # @see paper_height
-    def paper_height=(v); Axlsx::validate_number_with_unit(v); @paper_height = v; end
+    def paper_height=(v); Axlsx.validate_number_with_unit(v); @paper_height = v; end
     # @see paper_width
-    def paper_width=(v); Axlsx::validate_number_with_unit(v); @paper_width = v; end
+    def paper_width=(v); Axlsx.validate_number_with_unit(v); @paper_width = v; end
     # @see scale
-    def scale=(v); Axlsx::validate_scale_10_400(v); @scale = v; end
+    def scale=(v); Axlsx.validate_scale_10_400(v); @scale = v; end
 
     # convenience method to achieve sanity when setting fit_to_width and fit_to_height
     # as they both default to 1 if only their counterpart is specified.
     # @note This method will overwrite any value you explicitly set via the fit_to_height or fit_to_width methods.
     # @option options [Integer] width The number of pages to fit this worksheet on horizontally. Default 999
     # @option options [Integer] height The number of pages to fit this worksheet on vertically. Default 999
-    def fit_to(options={})
+    def fit_to(options = {})
       self.fit_to_width = options[:width] || 999
       self.fit_to_height = options[:height] || 999
       [@fit_to_width, @fit_to_height]
     end
 
-
     # helper method for worksheet to determine if the page setup is configured for fit to page printing
     # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page.
     # @return [Boolean]
     def fit_to_page?
-      # is there some better what to express this?
-      (fit_to_width != nil || fit_to_height != nil)
+      # is there some better way to express this?
+      (!fit_to_width.nil? || !fit_to_height.nil?)
     end
 
     # Serializes the page settings element.
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('pageSetup', str)
     end
   end

data/lib/axlsx/workbook/worksheet/pane.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Pane options for a worksheet.
   #
   # @note The recommended way to manage the pane options is via SheetView#pane
   # @see SheetView#pane
   class Pane
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
     # Creates a new {Pane} object
@@ -13,8 +14,8 @@ module Axlsx
     # @option options [Cell, String] top_left_cell Top Left Visible Cell
     # @option options [Integer] x_split Horizontal Split Position
     # @option options [Integer] y_split Vertical Split Position
-    def initialize(options={})
-      #defaults
+    def initialize(options = {})
+      # defaults
       @active_pane = @state = @top_left_cell = nil
       @x_split = @y_split = 0
       parse_options options
@@ -24,16 +25,16 @@ module Axlsx
 
     # Active Pane
     # The pane that is active.
-    # Options are 
+    # Options are
     #  * bottom_left:  Bottom left pane, when both vertical and horizontal
     #                  splits are applied. This value is also used when only
-    #                  a horizontal split has been applied, dividing the pane 
-    #                  into upper and lower regions. In that case, this value 
+    #                  a horizontal split has been applied, dividing the pane
+    #                  into upper and lower regions. In that case, this value
     #                  specifies the bottom pane.
     #  * bottom_right: Bottom right pane, when both vertical and horizontal
     #                  splits are applied.
     #  * top_left:     Top left pane, when both vertical and horizontal splits
-    #                  are applied. This value is also used when only a horizontal 
+    #                  are applied. This value is also used when only a horizontal
     #                  split has been applied, dividing the pane into upper and lower
     #                  regions. In that case, this value specifies the top pane.
     #                  This value is also used when only a vertical split has
@@ -41,22 +42,21 @@ module Axlsx
     #                  regions. In that case, this value specifies the left pane
     #  * top_right:    Top right pane, when both vertical and horizontal
     #                  splits are applied. This value is also used when only
-    #                  a vertical split has been applied, dividing the pane 
-    #                  into right and left regions. In that case, this value 
+    #                  a vertical split has been applied, dividing the pane
+    #                  into right and left regions. In that case, this value
     #                  specifies the right pane.
     # @see type
     # @return [Symbol]
     # default nil
     attr_reader :active_pane
 
-
     # Split State
-    # Indicates whether the pane has horizontal / vertical 
+    # Indicates whether the pane has horizontal / vertical
     # splits, and whether those splits are frozen.
-    # Options are 
+    # Options are
     #  * frozen:       Panes are frozen, but were not split being frozen. In
     #                  this state, when the panes are unfrozen again, a single
-    #                  pane results, with no split. In this state, the split 
+    #                  pane results, with no split. In this state, the split
     #                  bars are not adjustable.
     #  * frozen_split: Panes are frozen and were split before being frozen. In
     #                  this state, when the panes are unfrozen again, the split
@@ -69,7 +69,7 @@ module Axlsx
     attr_reader :state
 
     # Top Left Visible Cell
-    # Location of the top left visible cell in the bottom 
+    # Location of the top left visible cell in the bottom
     # right pane (when in Left-To-Right mode).
     # @see type
     # @return [String]
@@ -78,7 +78,7 @@ module Axlsx
 
     # Horizontal Split Position
     # Horizontal position of the split, in 1/20th of a point; 0 (zero)
-    # if none. If the pane is frozen, this value indicates the number 
+    # if none. If the pane is frozen, this value indicates the number
     # of columns visible in the top pane.
     # @see type
     # @return [Integer]
@@ -86,7 +86,7 @@ module Axlsx
     attr_reader :x_split
 
     # Vertical Split Position
-    # Vertical position of the split, in 1/20th of a point; 0 (zero) 
+    # Vertical position of the split, in 1/20th of a point; 0 (zero)
     # if none. If the pane is frozen, this value indicates the number
     # of rows visible in the left pane.
     # @see type
@@ -96,43 +96,44 @@ module Axlsx
 
     # @see active_pane
     def active_pane=(v)
-      Axlsx::validate_pane_type(v)
-      @active_pane = Axlsx::camel(v.to_s, false)
+      Axlsx.validate_pane_type(v)
+      @active_pane = Axlsx.camel(v.to_s, false)
     end
 
     # @see state
     def state=(v)
-      Axlsx::validate_split_state_type(v)
-      @state = Axlsx::camel(v.to_s, false)
+      Axlsx.validate_split_state_type(v)
+      @state = Axlsx.camel(v.to_s, false)
     end
 
     # @see top_left_cell
     def top_left_cell=(v)
-      cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)
+      cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v)
+      Axlsx.validate_string(cell)
       @top_left_cell = cell
     end
 
     # @see x_split
-    def x_split=(v); Axlsx::validate_unsigned_int(v); @x_split = v end
+    def x_split=(v); Axlsx.validate_unsigned_int(v); @x_split = v end
 
     # @see y_split
-    def y_split=(v); Axlsx::validate_unsigned_int(v); @y_split = v end
+    def y_split=(v); Axlsx.validate_unsigned_int(v); @y_split = v end
 
     # Serializes the data validation
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       finalize
       serialized_tag 'pane', str
     end
+
     private
 
     def finalize
       if @state == 'frozen' && @top_left_cell.nil?
         row = @y_split || 0
         column = @x_split || 0
-        @top_left_cell = "#{('A'..'ZZ').to_a[column]}#{row+1}"
+        @top_left_cell = "#{('A'..'ZZ').to_a[column]}#{row + 1}"
       end
     end
   end

data/lib/axlsx/workbook/worksheet/pivot_table.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # Table
   # @note Worksheet#add_pivot_table is the recommended way to create tables for your worksheets.
   # @see README for examples
   class PivotTable
-
     include Axlsx::OptionsParser
 
     # Creates a new PivotTable object
@@ -13,12 +13,12 @@ module Axlsx
     # @param [Worksheet] sheet The sheet containing the table data.
     # @option options [Cell, String] name
     # @option options [TableStyle] style
-    def initialize(ref, range, sheet, options={})
+    def initialize(ref, range, sheet, options = {})
       @ref = ref
       self.range = range
       @sheet = sheet
       @sheet.workbook.pivot_tables << self
-      @name = "PivotTable#{index+1}"
+      @name = "PivotTable#{index + 1}"
       @data_sheet = nil
       @rows = []
       @columns = []
@@ -92,7 +92,6 @@ module Axlsx
     # @return [Array]
     attr_reader :rows
 
-
     # (see #rows)
     def rows=(v)
       DataTypeValidator.validate "#{self.class}.rows", [Array], v
@@ -125,7 +124,7 @@ module Axlsx
       @data = []
       v.each do |data_field|
         if data_field.is_a? String
-          data_field = {:ref => data_field}
+          data_field = { ref: data_field }
         end
         data_field.each do |key, value|
           if key == :num_fmt
@@ -136,7 +135,6 @@ module Axlsx
         end
         @data << data_field
       end
-      @data
     end
 
     # The pages
@@ -161,13 +159,13 @@ module Axlsx
     # The part name for this table
     # @return [String]
     def pn
-      "#{PIVOT_TABLE_PN % (index+1)}"
+      format(PIVOT_TABLE_PN, index + 1)
     end
 
     # The relationship part name of this pivot table
     # @return [String]
     def rels_pn
-      "#{PIVOT_TABLE_RELS_PN % (index+1)}"
+      format(PIVOT_TABLE_RELS_PN, index + 1)
     end
 
     # The cache_definition for this pivot table
@@ -187,13 +185,13 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
 
-      str << ('<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">')
+      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
 
-      str << ('<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>')
-      str << ('<pivotFields count="' << header_cells_count.to_s << '">')
+      str << '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
+      str << '<pivotFields count="' << header_cells_count.to_s << '">'
 
       header_cell_values.each do |cell_value|
         subtotal = !no_subtotals_on_headers.include?(cell_value)
@@ -206,13 +204,13 @@ module Axlsx
         str << '<rowFields count="1"><field x="-2"/></rowFields>'
         str << '<rowItems count="2"><i><x/></i> <i i="1"><x v="1"/></i></rowItems>'
       else
-        str << ('<rowFields count="' << rows.size.to_s << '">')
+        str << '<rowFields count="' << rows.size.to_s << '">'
         rows.each do |row_value|
-          str << ('<field x="' << header_index_of(row_value).to_s << '"/>')
+          str << '<field x="' << header_index_of(row_value).to_s << '"/>'
         end
         str << '</rowFields>'
-        str << ('<rowItems count="' << rows.size.to_s << '">')
-        rows.size.times do |i|
+        str << '<rowItems count="' << rows.size.to_s << '">'
+        rows.size.times do
           str << '<i/>'
         end
         str << '</rowItems>'
@@ -222,7 +220,7 @@ module Axlsx
           str << '<colFields count="1"><field x="-2"/></colFields>'
           str << "<colItems count=\"#{data.size}\">"
           str << '<i><x/></i>'
-          data[1..-1].each_with_index do |datum_value,i|
+          (data.size - 1).times do |i|
             str << "<i i=\"#{i + 1}\"><x v=\"#{i + 1}\"/></i>"
           end
           str << '</colItems>'
@@ -230,16 +228,16 @@ module Axlsx
           str << '<colItems count="1"><i/></colItems>'
         end
       else
-        str << ('<colFields count="' << columns.size.to_s << '">')
+        str << '<colFields count="' << columns.size.to_s << '">'
         columns.each do |column_value|
-          str << ('<field x="' << header_index_of(column_value).to_s << '"/>')
+          str << '<field x="' << header_index_of(column_value).to_s << '"/>'
         end
         str << '</colFields>'
       end
       unless pages.empty?
-        str << ('<pageFields count="' << pages.size.to_s << '">')
+        str << '<pageFields count="' << pages.size.to_s << '">'
         pages.each do |page_value|
-          str << ('<pageField fld="' << header_index_of(page_value).to_s << '"/>')
+          str << '<pageField fld="' << header_index_of(page_value).to_s << '"/>'
         end
         str << '</pageFields>'
       end
@@ -247,7 +245,7 @@ module Axlsx
         str << "<dataFields count=\"#{data.size}\">"
         data.each do |datum_value|
           # The correct name prefix in ["Sum","Average", etc...]
-          str << "<dataField name='#{(datum_value[:subtotal]||'')} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          str << "<dataField name='#{datum_value[:subtotal] || ''} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
           str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"
@@ -257,7 +255,7 @@ module Axlsx
       # custom pivot table style
       unless style_info.empty?
         str << '<pivotTableStyleInfo'
-        style_info.each do |k,v|
+        style_info.each do |k, v|
           str << ' ' << k.to_s << '="' << v.to_s << '"'
         end
         str << ' />'
@@ -268,7 +266,7 @@ module Axlsx
     # References for header cells
     # @return [Array]
     def header_cell_refs
-      Axlsx::range_to_a(header_range).first
+      Axlsx.range_to_a(header_range).first
     end
 
     # The header cells for the pivot table