write_xlsx 0.70.0 → 0.71.0

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.70.0"
+  VERSION = "0.71.0"
 end

data/lib/write_xlsx/workbook.rb

@@ -1137,7 +1137,7 @@ def write_workbook_view #:nodoc:
     end
 
     def write_calc_pr #:nodoc:
-      attributes = ['calcId', 124519]
+      attributes = ['calcId', 124519, 'fullCalcOnLoad', 1]
       @writer.empty_tag('calcPr', attributes)
     end
 

data/lib/write_xlsx/worksheet.rb

@@ -5608,7 +5608,7 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       # Calculate the absolute x offset of the top-left vertex.
       if @col_size_changed
-        x_abs = (1 .. col_start).inject(0) {|sum, col| sum += size_col(col)}
+        x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col)}
       else
         # Optimisation for when the column widths haven't changed.
         x_abs = 64 * col_start
@@ -5618,7 +5618,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       # Calculate the absolute y offset of the top-left vertex.
       # Store the column change to allow optimisations.
       if @row_size_changed
-        y_abs = (1 .. row_start).inject(0) {|sum, row| sum += size_row(row)}
+        y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row)}
       else
         # Optimisation for when the row heights haven't changed.
         y_abs = 20 * row_start

data/test/chart/test_add_series.rb

@@ -8,29 +8,30 @@ def setup
   end
 
   def test_add_series_only_values
-    expected = {
-      :_categories    => nil,
-      :_values        => '=Sheet1!$A$1:$A$5',
-      :_name          => nil,
-      :_name_formula  => nil,
-      :_name_id       => nil,
-      :_cat_data_id   => nil,
-      :_val_data_id   => 0,
-      :_line          => { :_defined => 0 },
-      :_fill          => { :_defined => 0 },
-      :_marker        => nil,
-      :_trendline     => nil,
-      :_smooth        => nil,
-      :_labels        => nil,
-      :_invert_if_neg => nil,
-      :_x2_axis       => nil,
-      :_y2_axis       => nil,
-      :_error_bars    => {
+    series = Series.new(@chart)
+    series.instance_variable_set(:@categories, nil)
+    series.instance_variable_set(:@values, '=Sheet1!$A$1:$A$5')
+    series.instance_variable_set(:@name, nil)
+    series.instance_variable_set(:@name_formula, nil)
+    series.instance_variable_set(:@name_id, nil)
+    series.instance_variable_set(:@cat_data_id, nil)
+    series.instance_variable_set(:@val_data_id, 0)
+    series.instance_variable_set(:@line, { :_defined => 0 })
+    series.instance_variable_set(:@fill, { :_defined => 0 })
+    series.instance_variable_set(:@marker, nil)
+    series.instance_variable_set(:@trendline, nil)
+    series.instance_variable_set(:@smooth, nil)
+    series.instance_variable_set(:@labels, nil)
+    series.instance_variable_set(:@invert_if_neg, nil)
+    series.instance_variable_set(:@x2_axis, nil)
+    series.instance_variable_set(:@y2_axis, nil)
+    series.instance_variable_set(:@error_bars, {
         :_x_error_bars => nil,
         :_y_error_bars => nil
-      },
-      :_points        => nil
-    }
+    })
+    series.instance_variable_set(:@points, nil)
+
+    expected = series
 
     @chart.add_series(:values => '=Sheet1!$A$1:$A$5')
 
@@ -39,31 +40,29 @@ def test_add_series_only_values
   end
 
   def test_add_series_with_categories_and_values
-    expected = [
-                {
-                  :_categories   => '=Sheet1!$A$1:$A$5',
-                  :_values       => '=Sheet1!$B$1:$B$5',
-                  :_name         => 'Text',
-                  :_name_formula => nil,
-                  :_name_id      => nil,
-                  :_cat_data_id  => 0,
-                  :_val_data_id  => 1,
-                  :_line         => { :_defined => 0 },
-                  :_fill         => { :_defined => 0 },
-                  :_marker       => nil,
-                  :_trendline    => nil,
-                  :_smooth        => nil,
-                  :_labels        => nil,
-                  :_invert_if_neg => nil,
-                  :_x2_axis       => nil,
-                  :_y2_axis       => nil,
-                  :_error_bars    => {
-                    :_x_error_bars => nil,
-                    :_y_error_bars => nil
-                  },
-                  :_points        => nil
-                }
-               ]
+    series = Series.new(@chart)
+    series.instance_variable_set(:@categories, '=Sheet1!$A$1:$A$5')
+    series.instance_variable_set(:@values, '=Sheet1!$B$1:$B$5')
+    series.instance_variable_set(:@name, 'Text')
+    series.instance_variable_set(:@name_formula, nil)
+    series.instance_variable_set(:@name_id       , nil)
+    series.instance_variable_set(:@cat_data_id   , 0)
+    series.instance_variable_set(:@val_data_id, 1)
+    series.instance_variable_set(:@line          , { :_defined => 0 })
+    series.instance_variable_set(:@fill          , { :_defined => 0 })
+    series.instance_variable_set(:@marker, nil)
+    series.instance_variable_set(:@trendline, nil)
+    series.instance_variable_set(:@smooth, nil)
+    series.instance_variable_set(:@labels, nil)
+    series.instance_variable_set(:@invert_if_neg, nil)
+    series.instance_variable_set(:@x2_axis, nil)
+    series.instance_variable_set(:@y2_axis, nil)
+    series.instance_variable_set(:@error_bars, {
+        :_x_error_bars => nil,
+        :_y_error_bars => nil
+    })
+    series.instance_variable_set(:@points, nil)
+    expected = [ series ]
 
     @chart.add_series(
                       :categories => '=Sheet1!$A$1:$A$5',
@@ -76,31 +75,29 @@ def test_add_series_with_categories_and_values
   end
 
   def test_add_series_only_values_checked_by_array
-    expected = [
-                {
-                  :_categories   => nil,
-                  :_values       => '=Sheet1!$A$1:$A$5',
-                  :_name         => nil,
-                  :_name_formula => nil,
-                  :_name_id      => nil,
-                  :_cat_data_id  => nil,
-                  :_val_data_id  => 0,
-                  :_line         => { :_defined => 0 },
-                  :_fill         => { :_defined => 0 },
-                  :_marker       => nil,
-                  :_trendline    => nil,
-                  :_smooth        => nil,
-                  :_labels       => nil,
-                  :_invert_if_neg => nil,
-                  :_x2_axis       => nil,
-                  :_y2_axis       => nil,
-                  :_error_bars    => {
-                    :_x_error_bars => nil,
-                    :_y_error_bars => nil
-                  },
-                  :_points        => nil
-                }
-               ]
+    series = Series.new(@chart)
+    series.instance_variable_set(:@categories, nil)
+    series.instance_variable_set(:@values, '=Sheet1!$A$1:$A$5')
+    series.instance_variable_set(:@name, nil)
+    series.instance_variable_set(:@name_formula, nil)
+    series.instance_variable_set(:@name_id       , nil)
+    series.instance_variable_set(:@cat_data_id   , nil)
+    series.instance_variable_set(:@val_data_id, 0)
+    series.instance_variable_set(:@line          , { :_defined => 0 })
+    series.instance_variable_set(:@fill          , { :_defined => 0 })
+    series.instance_variable_set(:@marker, nil)
+    series.instance_variable_set(:@trendline, nil)
+    series.instance_variable_set(:@smooth, nil)
+    series.instance_variable_set(:@labels, nil)
+    series.instance_variable_set(:@invert_if_neg, nil)
+    series.instance_variable_set(:@x2_axis, nil)
+    series.instance_variable_set(:@y2_axis, nil)
+    series.instance_variable_set(:@error_bars, {
+        :_x_error_bars => nil,
+        :_y_error_bars => nil
+    })
+    series.instance_variable_set(:@points, nil)
+    expected = [ series ]
 
     @chart.add_series(:values => ['Sheet1', 0, 4, 0, 0])
 
@@ -109,29 +106,29 @@ def test_add_series_only_values_checked_by_array
   end
 
   def test_add_series_both_checked_by_array
-    expected = {
-      :_categories   => '=Sheet1!$A$1:$A$5',
-      :_values       => '=Sheet1!$B$1:$B$5',
-      :_name         => 'Text',
-      :_name_formula => nil,
-      :_name_id      => nil,
-      :_cat_data_id  => 0,
-      :_val_data_id  => 1,
-      :_line         => { :_defined => 0 },
-      :_fill         => { :_defined => 0 },
-      :_marker       => nil,
-      :_trendline    => nil,
-      :_smooth       => nil,
-      :_labels       => nil,
-      :_invert_if_neg => nil,
-      :_x2_axis       => nil,
-      :_y2_axis       => nil,
-      :_error_bars    => {
+    series = Series.new(@chart)
+    series.instance_variable_set(:@categories, '=Sheet1!$A$1:$A$5')
+    series.instance_variable_set(:@values, '=Sheet1!$B$1:$B$5')
+    series.instance_variable_set(:@name, 'Text')
+    series.instance_variable_set(:@name_formula, nil)
+    series.instance_variable_set(:@name_id       , nil)
+    series.instance_variable_set(:@cat_data_id  , 0)
+    series.instance_variable_set(:@val_data_id, 1)
+    series.instance_variable_set(:@line          , { :_defined => 0 })
+    series.instance_variable_set(:@fill          , { :_defined => 0 })
+    series.instance_variable_set(:@marker, nil)
+    series.instance_variable_set(:@trendline, nil)
+    series.instance_variable_set(:@smooth, nil)
+    series.instance_variable_set(:@labels, nil)
+    series.instance_variable_set(:@invert_if_neg, nil)
+    series.instance_variable_set(:@x2_axis, nil)
+    series.instance_variable_set(:@y2_axis, nil)
+    series.instance_variable_set(:@error_bars, {
         :_x_error_bars => nil,
         :_y_error_bars => nil
-      },
-      :_points        => nil
-   }
+    })
+    series.instance_variable_set(:@points, nil)
+    expected = series
 
     @chart.add_series(
                       :categories => [ 'Sheet1', 0, 4, 0, 0 ],
@@ -144,29 +141,30 @@ def test_add_series_both_checked_by_array
   end
 
   def test_add_series_secondary_axis
-    expected = {
-      :_categories    => '=Sheet1!$A$1:$A$5',
-      :_values        => '=Sheet1!$B$1:$B$5',
-      :_name          => 'Text',
-      :_name_formula  => nil,
-      :_name_id       => nil,
-      :_cat_data_id   => 0,
-      :_val_data_id   => 1,
-      :_line          => { :_defined => 0 },
-      :_fill          => { :_defined => 0 },
-      :_marker        => nil,
-      :_trendline     => nil,
-      :_smooth        => nil,
-      :_labels        => nil,
-      :_invert_if_neg => nil,
-      :_x2_axis       => 1,
-      :_y2_axis       => 1,
-      :_error_bars    => {
-        :_x_error_bars => nil,
-        :_y_error_bars => nil
-      },
-      :_points        => nil
-    }
+    series = Series.new(@chart)
+    series.instance_variable_set(:@categories,  '=Sheet1!$A$1:$A$5')
+    series.instance_variable_set(:@values, '=Sheet1!$B$1:$B$5')
+    series.instance_variable_set(:@name, 'Text')
+    series.instance_variable_set(:@name_formula, nil)
+    series.instance_variable_set(:@name_id, nil)
+    series.instance_variable_set(:@cat_data_id, 0)
+    series.instance_variable_set(:@val_data_id, 1)
+    series.instance_variable_set(:@line          , { :_defined => 0 })
+    series.instance_variable_set(:@fill          , { :_defined => 0 })
+    series.instance_variable_set(:@marker, nil)
+    series.instance_variable_set(:@trendline, nil)
+    series.instance_variable_set(:@smooth, nil)
+    series.instance_variable_set(:@labels, nil)
+    series.instance_variable_set(:@invert_if_neg, nil)
+    series.instance_variable_set(:@x2_axis, 1)
+    series.instance_variable_set(:@y2_axis, 1)
+    series.instance_variable_set(:@error_bars,
+                                 {
+                                   :_x_error_bars => nil,
+                                   :_y_error_bars => nil
+                                 })
+    series.instance_variable_set(:@points, nil)
+    expected = series
 
     @chart.add_series(
                       :categories => [ 'Sheet1', 0, 4, 0, 0 ],

data/test/chart/test_write_d_lbls.rb

@@ -5,12 +5,13 @@
 class TestWriteDLbls < Test::Unit::TestCase
   def setup
     @chart = Writexlsx::Chart.new('Pie')
+    @series = Series.new(@chart)
   end
 
   def test_write_d_lbls_value_only
     expected = '<c:dLbls><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties, :value => 1)
+    labels = @series.__send__(:labels_properties, :value => 1)
     @chart.__send__(:write_d_lbls, labels)
 
     result = chart_writer_string
@@ -20,7 +21,7 @@ def test_write_d_lbls_value_only
   def test_write_d_lbls_series_name_only
     expected = '<c:dLbls><c:showSerName val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties, :series_name => 1)
+    labels = @series.__send__(:labels_properties, :series_name => 1)
     @chart.__send__(:write_d_lbls, labels)
 
     result = chart_writer_string
@@ -30,7 +31,7 @@ def test_write_d_lbls_series_name_only
   def test_write_d_lbls_category_only
     expected = '<c:dLbls><c:showCatName val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties, :category => 1)
+    labels = @series.__send__(:labels_properties, :category => 1)
     @chart.__send__(:write_d_lbls, labels)
 
     result = chart_writer_string
@@ -40,7 +41,7 @@ def test_write_d_lbls_category_only
   def test_write_d_lbls_value_category_and_series
     expected = '<c:dLbls><c:showVal val="1"/><c:showCatName val="1"/><c:showSerName val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value       => 1,
                                :category    => 1,
@@ -56,7 +57,7 @@ def test_write_d_lbls_value_category_and_series
   def test_write_d_lbls_position_center
     expected = '<c:dLbls><c:dLblPos val="ctr"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'center'
@@ -71,7 +72,7 @@ def test_write_d_lbls_position_center
   def test_write_d_lbls_position_left
     expected = '<c:dLbls><c:dLblPos val="l"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'left'
@@ -86,7 +87,7 @@ def test_write_d_lbls_position_left
   def test_write_d_lbls_position_right
     expected = '<c:dLbls><c:dLblPos val="r"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'right'
@@ -101,7 +102,7 @@ def test_write_d_lbls_position_right
   def test_write_d_lbls_position_top
     expected = '<c:dLbls><c:dLblPos val="t"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'top'
@@ -116,7 +117,7 @@ def test_write_d_lbls_position_top
   def test_write_d_lbls_position_above
     expected = '<c:dLbls><c:dLblPos val="t"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'above'
@@ -131,7 +132,7 @@ def test_write_d_lbls_position_above
   def test_write_d_lbls_position_bottom
     expected = '<c:dLbls><c:dLblPos val="b"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'bottom'
@@ -146,7 +147,7 @@ def test_write_d_lbls_position_bottom
   def test_write_d_lbls_position_below
     expected = '<c:dLbls><c:dLblPos val="b"/><c:showVal val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value    => 1,
                                :position => 'below'
@@ -161,7 +162,7 @@ def test_write_d_lbls_position_below
   def test_write_d_lbls_pie
     expected = '<c:dLbls><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1
@@ -176,7 +177,7 @@ def test_write_d_lbls_pie
   def test_write_d_lbls_pie_position_empty
     expected = '<c:dLbls><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1,
@@ -192,7 +193,7 @@ def test_write_d_lbls_pie_position_empty
   def test_write_d_lbls_pie_position_center
     expected = '<c:dLbls><c:dLblPos val="ctr"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1,
@@ -208,7 +209,7 @@ def test_write_d_lbls_pie_position_center
   def test_write_d_lbls_pie_position_inside_end
     expected = '<c:dLbls><c:dLblPos val="inEnd"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1,
@@ -224,7 +225,7 @@ def test_write_d_lbls_pie_position_inside_end
   def test_write_d_lbls_pie_position_outside_end
     expected = '<c:dLbls><c:dLblPos val="outEnd"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1,
@@ -240,7 +241,7 @@ def test_write_d_lbls_pie_position_outside_end
   def test_write_d_lbls_pie_position_best_fit
     expected = '<c:dLbls><c:dLblPos val="bestFit"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :value        => 1,
                                :leader_lines => 1,
@@ -256,7 +257,7 @@ def test_write_d_lbls_pie_position_best_fit
   def test_write_d_lbls_pie_percentage
     expected = '<c:dLbls><c:showPercent val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
-    labels = @chart.__send__(:labels_properties,
+    labels = @series.__send__(:labels_properties,
                              {
                                :leader_lines => 1,
                                :percentage   => 1