write_xlsx 1.07.0 → 1.09.0

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -16,8 +16,8 @@ module Writexlsx
       def cell_attributes #:nodoc:
         xf_index = xf ? xf.get_xf_index : 0
         attributes = [
-                      ['r', xl_rowcol_to_cell(row, col)]
-                     ]
+          ['r', xl_rowcol_to_cell(row, col)]
+        ]
 
         # Add the cell format index.
         if xf_index != 0
@@ -100,7 +100,7 @@ module Writexlsx
           elsif error_code.include?(@result)
             attributes << ['t', 'e']
           else
-             attributes << ['t', 'str']
+            attributes << ['t', 'str']
           end
         end
         @worksheet.writer.tag_elements('c', attributes) do
@@ -128,6 +128,28 @@ module Writexlsx
       end
     end
 
+    class DynamicFormulaArrayCellData < CellData # :nodoc:
+      def initialize(worksheet, row, col, formula, xf, range, result)
+        @worksheet = worksheet
+        @row, @col, @token, @xf, @range, @result = row, col, formula, xf, range, result
+      end
+
+      def data
+        @result || 0
+      end
+
+      def write_cell
+        # Add metadata linkage for dynamic array formulas.
+        attributes = cell_attributes
+        attributes << ['cm', '1']
+
+        @worksheet.writer.tag_elements('c', attributes) do
+          @worksheet.write_cell_array_formula(token, range)
+          @worksheet.write_cell_value(result)
+        end
+      end
+    end
+
     class BooleanCellData < CellData # :nodoc:
       def initialize(worksheet, row, col, val, xf)
         @worksheet = worksheet

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -138,12 +138,7 @@ module Writexlsx
           row_first, row_last = row_last, row_first if row_first > row_last
           col_first, col_last = col_last, col_first if col_first > col_last
 
-          # If the first and last cell are the same write a single cell.
-          if row_first == row_last && col_first == col_last
-            sqref += xl_rowcol_to_cell(row_first, col_first)
-          else
-            sqref += xl_range(row_first, row_last, col_first, col_last)
-          end
+          sqref += xl_range(row_first, row_last, col_first, col_last)
         end
 
         if @validate != 'none'
@@ -186,11 +181,11 @@ module Writexlsx
         end
         unless valid_validation_type.has_key?(@validate.downcase)
           raise WriteXLSXOptionParameterError,
-          "Unknown validation type '#{@validate}' for parameter :validate in data_validation()"
+                "Unknown validation type '#{@validate}' for parameter :validate in data_validation()"
         end
         if @error_type && !error_type_hash.has_key?(@error_type.downcase)
           raise WriteXLSXOptionParameterError,
-          "Unknown criteria type '#param[:error_type}' for parameter :error_type in data_validation()"
+                "Unknown criteria type '#param[:error_type}' for parameter :error_type in data_validation()"
         end
       end
 
@@ -204,7 +199,7 @@ module Writexlsx
         if @criteria == 'between' || @criteria == 'notBetween'
           unless has_key?(:maximum)
             raise WriteXLSXOptionParameterError,
-            "Parameter :maximum is required in data_validation() when using :between or :not between criteria"
+                  "Parameter :maximum is required in data_validation() when using :between or :not between criteria"
           end
         else
           @maximum = nil
@@ -214,7 +209,7 @@ module Writexlsx
       def check_valid_citeria_types
         unless valid_criteria_type.has_key?(@criteria.downcase)
           raise WriteXLSXOptionParameterError,
-          "Unknown criteria type '#{@criteria}' for parameter :criteria in data_validation()"
+                "Unknown criteria type '#{@criteria}' for parameter :criteria in data_validation()"
         end
       end
 
@@ -258,22 +253,22 @@ module Writexlsx
       # List of valid input parameters.
       def valid_validation_parameter
         [
-         :validate,
-         :criteria,
-         :value,
-         :source,
-         :minimum,
-         :maximum,
-         :ignore_blank,
-         :dropdown,
-         :show_input,
-         :input_title,
-         :input_message,
-         :show_error,
-         :error_title,
-         :error_message,
-         :error_type,
-         :other_cells
+          :validate,
+          :criteria,
+          :value,
+          :source,
+          :minimum,
+          :maximum,
+          :ignore_blank,
+          :dropdown,
+          :show_input,
+          :input_title,
+          :input_message,
+          :show_error,
+          :error_title,
+          :error_message,
+          :error_type,
+          :other_cells
         ]
       end
 

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -87,9 +87,9 @@ module Writexlsx
 
       def attributes(row, col, dummy = nil)
         attr = [
-                ['ref', xl_rowcol_to_cell(row, col)],
-                ['location', @url]
-               ]
+          ['ref', xl_rowcol_to_cell(row, col)],
+          ['location', @url]
+        ]
 
         attr << ['tooltip', @tip] if @tip
         attr << ['display', @str]
@@ -116,7 +116,7 @@ module Writexlsx
 
         # Add the file:/// URI to the url if non-local.
         if url =~ %r![:]! ||        # Windows style "C:/" link.
-            url =~ %r!^\\\\!        # Network share.
+           url =~ %r!^\\\\!        # Network share.
           url = "file:///#{url}"
         end
 

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -105,12 +105,12 @@ module Writexlsx
         attributes << ['pageOrder',       "overThenDown"] if @across
         attributes << ['firstPageNumber', @page_start]    if @page_start && @page_start > 1
         attributes << ['orientation',
-          if @orientation
-            'portrait'
-          else
-            'landscape'
-          end
-        ]
+                       if @orientation
+                         'portrait'
+                       else
+                         'landscape'
+                       end
+                      ]
         attributes << ['blackAndWhite', 1]      if @black_white
         attributes << ['useFirstPageNumber', 1] if ptrue?(@page_start)
 
@@ -180,12 +180,12 @@ module Writexlsx
 
       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