write_xlsx 0.72.2 → 0.72.3.beta1

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -14,17 +14,19 @@ class CellData   # :nodoc:
       #
       def cell_attributes #:nodoc:
         xf_index = xf ? xf.get_xf_index : 0
-        attributes = ['r', xl_rowcol_to_cell(row, col)]
+        attributes = [
+                      ['r', xl_rowcol_to_cell(row, col)]
+                     ]
 
         # Add the cell format index.
         if xf_index != 0
-          attributes << 's' << xf_index
+          attributes << ['s', xf_index]
         elsif @worksheet.set_rows[row] && @worksheet.set_rows[row][1]
           row_xf = @worksheet.set_rows[row][1]
-          attributes << 's' << row_xf.get_xf_index
+          attributes << ['s', row_xf.get_xf_index]
         elsif @worksheet.col_formats[col]
           col_xf = @worksheet.col_formats[col]
-          attributes << 's' << col_xf.get_xf_index
+          attributes << ['s', col_xf.get_xf_index]
         end
         attributes
       end
@@ -63,7 +65,7 @@ def data
 
       def write_cell
         attributes = cell_attributes
-        attributes << 't' << 's'
+        attributes << ['t', 's']
         @worksheet.writer.tag_elements('c', attributes) do
           @worksheet.write_cell_value(token)
         end
@@ -87,7 +89,7 @@ def data
       def write_cell
         attributes = cell_attributes
         if @result &&  !(@result.to_s =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/)
-          attributes << 't' << 'str'
+          attributes << ['t', 'str']
         end
         @worksheet.writer.tag_elements('c', attributes) do
           @worksheet.write_cell_formula(token)

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -128,23 +128,23 @@ def attributes
           end
         end
 
-        attributes << 'type' << @validate
-        attributes << 'operator' << @criteria if @criteria != 'between'
+        attributes << ['type', @validate]
+        attributes << ['operator', @criteria] if @criteria != 'between'
 
         if @error_type
-          attributes << 'errorStyle' << 'warning' if @error_type == 1
-          attributes << 'errorStyle' << 'information' if @error_type == 2
+          attributes << ['errorStyle', 'warning'] if @error_type == 1
+          attributes << ['errorStyle', 'information'] if @error_type == 2
         end
-        attributes << 'allowBlank'       << 1 if @ignore_blank != 0
-        attributes << 'showDropDown'     << 1 if @dropdown     == 0
-        attributes << 'showInputMessage' << 1 if @show_input   != 0
-        attributes << 'showErrorMessage' << 1 if @show_error   != 0
-
-        attributes << 'errorTitle'  << @error_title   if @error_title
-        attributes << 'error'       << @error_message if @error_message
-        attributes << 'promptTitle' << @input_title   if @input_title
-        attributes << 'prompt'      << @input_message if @input_message
-        attributes << 'sqref'       << sqref
+        attributes << ['allowBlank',       1] if @ignore_blank != 0
+        attributes << ['showDropDown',     1] if @dropdown     == 0
+        attributes << ['showInputMessage', 1] if @show_input   != 0
+        attributes << ['showErrorMessage', 1] if @show_error   != 0
+
+        attributes << ['errorTitle',  @error_title]   if @error_title
+        attributes << ['error',       @error_message] if @error_message
+        attributes << ['promptTitle', @input_title]   if @input_title
+        attributes << ['prompt',      @input_message] if @input_message
+        attributes << ['sqref',       sqref]
       end
 
       def has_key?(key)

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -8,104 +8,136 @@ class Hyperlink   # :nodoc:
       attr_reader :url, :link_type, :str, :url_str
       attr_accessor :tip, :display
 
-      def initialize(url, str = nil)
-        link_type = 1
-
-        # Remove the URI scheme from internal links.
+      def self.factory(url, str = nil)
         if url =~ /^internal:/
-          url = url.sub(/^internal:/, '')
-          link_type = 2
-          # Remove the URI scheme from external links.
+          InternalHyperlink.new(url, str)
         elsif url =~ /^external:/
-          url = url.sub(/^external:/, '')
-          link_type = 3
+          ExternalHyperlink.new(url, str)
+        else
+          new(url, str)
         end
+      end
+
+      def initialize(url, str = nil)
+        @link_type = 1
 
         # The displayed string defaults to the url string.
         str ||= url.dup
 
-        # For external links change the directory separator from Unix to Dos.
-        if link_type == 3
-          url = url.gsub(%r|/|, '\\')
-          str.gsub!(%r|/|, '\\')
-        end
-
         # Strip the mailto header.
         str.sub!(/^mailto:/, '')
 
-        # Copy string for use in hyperlink elements.
-        url_str = str.dup
-
-        # External links to URLs and to other Excel workbooks have slightly
-        # different characteristics that we have to account for.
-        if link_type == 1
-          # Escape URL unless it looks already escaped.
-          unless url =~ /%[0-9a-fA-F]{2}/
-            # Escape the URL escape symbol.
-            url = url.gsub(/%/, "%25")
-
-            # Escape whitespae in URL.
-            url = url.gsub(/[\s\x00]/, '%20')
-
-            # Escape other special characters in URL.
-            re = /(["<>\[\]`^{}])/
-            while re =~ url
-              match = $~[1]
-              url = url.sub(re, sprintf("%%%x", match.ord))
-            end
-          end
+        # Escape URL unless it looks already escaped.
+        unless url =~ /%[0-9a-fA-F]{2}/
+          # Escape the URL escape symbol.
+          url = url.gsub(/%/, "%25")
 
-          # Ordinary URL style external links don't have a "location" string.
-          url_str = nil
-        elsif link_type == 3
-          # External Workbook links need to be modified into the right format.
-          # The URL will look something like 'c:\temp\file.xlsx#Sheet!A1'.
-          # We need the part to the left of the # as the URL and the part to
-          # the right as the "location" string (if it exists).
-          url, url_str = url.split(/#/)
-
-          # Add the file:/// URI to the url if non-local.
-          if url =~ %r![:]! ||        # Windows style "C:/" link.
-              url =~ %r!^\\\\!        # Network share.
-            url = "file:///#{url}"
-          end
-
-          # Convert a ./dir/file.xlsx link to dir/file.xlsx.
-          url = url.sub(%r!^.\\!, '')
+          # Escape whitespae in URL.
+          url = url.gsub(/[\s\x00]/, '%20')
 
-          # Treat as a default external link now that the data has been modified.
-          link_type = 1
+          # Escape other special characters in URL.
+          re = /(["<>\[\]`^{}])/
+          while re =~ url
+            match = $~[1]
+            url = url.sub(re, sprintf("%%%x", match.ord))
+          end
         end
 
         # Excel limits escaped URL to 255 characters.
         if url.bytesize > 255
           raise "URL '#{url}' > 255 characters, it exceeds Excel's limit for URLS."
         end
+
         @url       = url
-        @link_type = link_type
         @str       = str
-        @url_str   = url_str
+        @url_str   = nil
       end
 
       def write_external_attributes(row, col, id)
         ref = xl_rowcol_to_cell(row, col)
 
-        attributes = ['ref', ref]
-        attributes += r_id_attributes(id)
+        attributes = [ ['ref', ref] ]
+        attributes << r_id_attributes(id)
 
-        attributes << 'location' << url_str if url_str
-        attributes << 'display'  << display if display
-        attributes << 'tooltip'  << tip     if tip
+        attributes << ['location', url_str] if url_str
+        attributes << ['display',  display] if display
+        attributes << ['tooltip',  tip]     if tip
         attributes
       end
 
       def write_internal_attributes(row, col)
         ref = xl_rowcol_to_cell(row, col)
 
-        attributes = ['ref', ref, 'location', url]
+        attributes = [
+                      ['ref', ref],
+                      ['location', url]
+                     ]
+
+        attributes << ['tooltip', tip] if tip
+        attributes << ['display', str]
+      end
+    end
+
+    class InternalHyperlink < Hyperlink
+      def initialize(url, str)
+        @link_type = 2
+        @url = url.sub(/^internal:/, '')
+
+        # The displayed string defaults to the url string.
+        str ||= @url.dup
+
+        # Strip the mailto header.
+        @str = str.sub(/^mailto:/, '')
+
+        # Copy string for use in hyperlink elements.
+        @url_str = @str.dup
+
+        # Excel limits escaped URL to 255 characters.
+        if @url.bytesize > 255
+          raise "URL '#{@url}' > 255 characters, it exceeds Excel's limit for URLS."
+        end
+      end
+    end
+
+    class ExternalHyperlink < Hyperlink
+      def initialize(url, str = nil)
+        @link_type = 1
+
+        # Remove the URI scheme from internal links.
+        url = url.sub(/^external:/, '')
+
+        # The displayed string defaults to the url string.
+        str ||= url.dup
 
-        attributes << 'tooltip' << tip if tip
-        attributes << 'display' << str
+        # For external links change the directory separator from Unix to Dos.
+        url = url.gsub(%r|/|, '\\')
+        str.gsub!(%r|/|, '\\')
+
+        # Strip the mailto header.
+        str.sub!(/^mailto:/, '')
+
+        # External Workbook links need to be modified into the right format.
+        # The URL will look something like 'c:\temp\file.xlsx#Sheet!A1'.
+        # We need the part to the left of the # as the URL and the part to
+        # the right as the "location" string (if it exists).
+        url, url_str = url.split(/#/)
+
+        # Add the file:/// URI to the url if non-local.
+        if url =~ %r![:]! ||        # Windows style "C:/" link.
+            url =~ %r!^\\\\!        # Network share.
+          url = "file:///#{url}"
+        end
+
+        # Convert a ./dir/file.xlsx link to dir/file.xlsx.
+        url = url.sub(%r!^.\\!, '')
+
+        # Excel limits escaped URL to 255 characters.
+        if url.bytesize > 255
+          raise "URL '#{url}' > 255 characters, it exceeds Excel's limit for URLS."
+        end
+        @url       = url
+        @str       = str
+        @url_str   = url_str
       end
     end
   end

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -95,18 +95,19 @@ def write_page_setup(writer) #:nodoc:
         return unless @page_setup_changed
 
         attributes = []
-        attributes << 'paperSize'   << @paper_size    if @paper_size
-        attributes << 'scale'       << @scale         if @scale != 100
-        attributes << 'fitToWidth'  << @fit_width     if @fit_page && @fit_width != 1
-        attributes << 'fitToHeight' << @fit_height    if @fit_page && @fit_height != 1
-        attributes << 'pageOrder'   << "overThenDown" if @across
-        attributes << 'orientation'
-        if @orientation
-          attributes << 'portrait'
-        else
-          attributes << 'landscape'
-        end
-        attributes << 'useFirstPageNumber' << @page_start if ptrue?(@page_start)
+        attributes << ['paperSize',   @paper_size]    if @paper_size
+        attributes << ['scale',       @scale]         if @scale != 100
+        attributes << ['fitToWidth',  @fit_width]     if @fit_page && @fit_width != 1
+        attributes << ['fitToHeight', @fit_height]    if @fit_page && @fit_height != 1
+        attributes << ['pageOrder',   "overThenDown"] if @across
+        attributes << ['orientation',
+                       if @orientation
+                         'portrait'
+                       else
+                         'landscape'
+                       end
+                      ]
+        attributes << ['useFirstPageNumber', @page_start] if ptrue?(@page_start)
 
         writer.empty_tag('pageSetup', attributes)
       end
@@ -125,10 +126,10 @@ def write_print_options(writer) #:nodoc:
         return unless @print_options_changed
 
         attributes = []
-        attributes << 'horizontalCentered' << 1 if @hcenter
-        attributes << 'verticalCentered'   << 1 if @vcenter
-        attributes << 'headings'           << 1 if @print_headers
-        attributes << 'gridLines'          << 1 if @print_gridlines
+        attributes << ['horizontalCentered', 1] if @hcenter
+        attributes << ['verticalCentered',   1] if @vcenter
+        attributes << ['headings',           1] if @print_headers
+        attributes << ['gridLines',          1] if @print_gridlines
         writer.empty_tag('printOptions', attributes)
       end
 
@@ -162,12 +163,12 @@ def write_odd_footer(writer) #:nodoc:
 
       def margin_attributes    # :nodoc:
         [
-         'left',   @margin_left,
-         'right',  @margin_right,
-         'top',    @margin_top,
-         'bottom', @margin_bottom,
-         'header', @margin_header,
-         'footer', @margin_footer
+         ['left',   @margin_left],
+         ['right',  @margin_right],
+         ['top',    @margin_top],
+         ['bottom', @margin_bottom],
+         ['header', @margin_header],
+         ['footer', @margin_footer]
         ]
       end
     end

data/test/chart/test_write_a_latin.rb

@@ -12,9 +12,9 @@ def test_write_a_latin
 
     result = @chart.__send__('write_a_latin',
                              [
-                              'typeface', 'Arial',
-                              'pitchFamily', 34,
-                              'charset', 0
+                              ['typeface', 'Arial'],
+                              ['pitchFamily', 34],
+                              ['charset', 0]
                              ]
                          )
     assert_equal(expected, result)

data/test/regression/test_chart_font01.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area01
+  def test_chart_font01
     @xlsx = 'chart_font01.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_chart_font02.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area02
+  def test_chart_font02
     @xlsx = 'chart_font02.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_chart_font03.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area03
+  def test_chart_font03
     @xlsx = 'chart_font03.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_chart_font04.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area04
+  def test_chart_font04
     @xlsx = 'chart_font04.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_chart_font05.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area05
+  def test_chart_font05
     @xlsx = 'chart_font05.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_chart_font06.rb

@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_area06
+  def test_chart_font06
     @xlsx = 'chart_font06.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/test_xml_writer_simple.rb

@@ -32,7 +32,7 @@ def test_start_end_tag
 
   def test_attribute
     assert_equal(
-      "<foo x=\"1&gt;2\"/>", @obj.empty_tag("foo", ['x', '1>2'])
+      "<foo x=\"1&gt;2\"/>", @obj.empty_tag("foo", [ ['x', '1>2'] ])
     )
   end
 
@@ -52,8 +52,8 @@ def test_data_element_with_empty_attr
 
   def test_data_element
     attributes = [
-      'name', '_xlnm.Print_Titles',
-      'localSheetId', 0
+      ['name', '_xlnm.Print_Titles'],
+      ['localSheetId', 0]
     ]
     expected =
       "<definedName name=\"_xlnm.Print_Titles\" localSheetId=\"0\">Sheet1!$1:$1</definedName>"

data/test/worksheet/test_write_hyperlink.rb

@@ -10,7 +10,7 @@ def setup
   end
 
   def test_write_hyperlink_external
-    hyperlink = Writexlsx::Worksheet::Hyperlink.new('')
+    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('')
     @worksheet.__send__('write_hyperlink_external', hyperlink, 0, 0, 1)
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<hyperlink ref="A1" r:id="rId1"/>'
@@ -18,7 +18,7 @@ def test_write_hyperlink_external
   end
 
   def test_write_hyperlink_internal_sheet2
-    hyperlink = Writexlsx::Worksheet::Hyperlink.new('internal:Sheet2!A1', 'Sheet2!A1')
+    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1')
     @worksheet.__send__('write_hyperlink_internal', hyperlink, 0, 0)
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<hyperlink ref="A1" location="Sheet2!A1" display="Sheet2!A1"/>'
@@ -26,7 +26,7 @@ def test_write_hyperlink_internal_sheet2
   end
 
   def test_write_hyperlink_internal_quoted_sheet
-    hyperlink = Writexlsx::Worksheet::Hyperlink.new("internal:'Data Sheet'!D5", "'Data Sheet'!D5")
+    hyperlink = Writexlsx::Worksheet::Hyperlink.factory("internal:'Data Sheet'!D5", "'Data Sheet'!D5")
     @worksheet.__send__('write_hyperlink_internal', hyperlink, 4, 0)
     result = @worksheet.instance_variable_get(:@writer).string
     expected = %q{<hyperlink ref="A5" location="'Data Sheet'!D5" display="'Data Sheet'!D5"/>}
@@ -34,7 +34,7 @@ def test_write_hyperlink_internal_quoted_sheet
   end
 
   def test_write_hyperlink_internal_tooltip
-    hyperlink = Writexlsx::Worksheet::Hyperlink.new('internal:Sheet2!A1', 'Sheet2!A1')
+    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1')
     hyperlink.tip = 'Screen Tip 1'
     @worksheet.__send__('write_hyperlink_internal', hyperlink, 17, 0)
     result = @worksheet.instance_variable_get(:@writer).string