write_xlsx 0.69.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b64b508ff280aa34008fca70ef3554cfd2aae0f
-  data.tar.gz: e9ca4ef7d80c4bf39be76c842725fd08f71d22fa
+  metadata.gz: 3bc15768bd6ed7228ff33b5a332b90c0f996b8e0
+  data.tar.gz: 3e3a148d8c17d061b6fb8f11c82a0a09e87645a8
 SHA512:
-  metadata.gz: 2b857dd675e58f9f2bc4e064ad133d4237c87d27809852688bd2e2f58ea70fb520b239a1924b92a4856c866fbcdb73ece933808f1aa5380d6a31c3b91e3fd8ff
-  data.tar.gz: 6ea66fc1fe51560bde230f42a5d6b119b59285a321f86f7c7d9776fcd83b24f4b21afcedd8be954df17a173d113a0dd765b830e704309219a365454be34ad5b2
+  metadata.gz: bdaf8c7ef0d30401256fd972b5b27ebc85e6a07bc5e06279ace3a0e5befb65dfc3fe7e9c54e4a53e0c615a16123ff596081a2619bfd99b20872d7aa59d35ba20
+  data.tar.gz: 4c76548dbb4d508f6c5801eb772a717a9f1a18d803f650d310428f705b6d16d6343f5c1b31d6265b570eace0d603ceb9119c39a0c09b5590dcfd4d1f6753d36b

data/README.rdoc

@@ -75,6 +75,11 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-07-13 v0.70.0
+   Fix for rendering images that are the same size as cell boundaries.
+   Fix for inaccurate column width calculation.
+   Added Chart line smoothing option.
+
 2013-06-30 v0.69.0
    Added chart font rotation property. Mainly for use with data axes to make the display more compact.
    Fix for issue where shapes on one worksheet corrupted charts on a subsequent worksheet.

data/lib/write_xlsx/chart.rb

@@ -575,6 +575,7 @@ def initialize(subtype)   # :nodoc:
       @x_offset          = 0
       @y_offset          = 0
       @table             = nil
+      @smooth_allowed    = 0
 
       set_default_properties
     end
@@ -1118,6 +1119,9 @@ def add_series(params)
       # Set the trendline properties for the series.
       trendline = trendline_properties(params[:trendline])
 
+      # Set the line smooth property for the series.
+      smooth = params[:smooth]
+
       # Set the error bars properties for the series.
       y_error_bars = error_bars_properties(params[:y_error_bars])
       x_error_bars = error_bars_properties(params[:x_error_bars])
@@ -1158,6 +1162,7 @@ def add_series(params)
         :_fill          => fill,
         :_marker        => marker,
         :_trendline     => trendline,
+        :_smooth        => smooth,
         :_labels        => labels,
         :_invert_if_neg => invert_if_neg,
         :_x2_axis       => x2_axis,
@@ -1281,6 +1286,7 @@ def add_series(params)
     #     bold
     #     italic
     #     underline
+    #     rotation
     #     color
     #
     # The following explains the available font properties:
@@ -1310,6 +1316,13 @@ def add_series(params)
     #
     #     chart.set_x_axis( :num_font => { :underline => 1 } )
     #
+    # ===rotation
+    # See the font rotation in the range -90 to 90:
+    #
+    #     chart.set_x_axis(:num_font => { :rotation => 45 })
+    #
+    # This is useful for displaying large axis data such as dates in a more compact format.
+    #
     # ===color
     # Set the font color property. Can be a color index, a color name or HTML
     # style RGB colour:
@@ -2574,6 +2587,8 @@ def write_ser(series) # :nodoc:
         write_cat(series)
         # Write the c:val element.
         write_val(series)
+        # Write the c:smooth element.
+        write_c_smooth(series[:_smooth]) if ptrue?(@smooth_allowed)
       end
     end
 
@@ -4151,6 +4166,17 @@ def write_down_bars(format)
       write_bars_base('c:downBars', format)
     end
 
+    #
+    # Write the <c:smooth> element.
+    #
+    def write_c_smooth(smooth)
+      return unless ptrue?(smooth)
+
+      attributes = ['val', 1]
+
+      @writer.empty_tag('c:smooth', attributes)
+    end
+
     def write_bars_base(tag, format)
       if ptrue?(format[:_line][:_defined]) || ptrue?(format[:_fill][:_defined])
         @writer.tag_elements(tag) { write_sp_pr(format) }

data/lib/write_xlsx/chart/line.rb

@@ -22,6 +22,7 @@ class Line < self
       def initialize(subtype)
         super(subtype)
         @default_marker = {:type => 'none'}
+        @smooth_allowed = 1
       end
 
       #

data/lib/write_xlsx/chart/scatter.rb

@@ -41,6 +41,7 @@ def initialize(subtype)
         @cross_between     = 'midCat'
         @horiz_val_axis    = 0
         @val_axis_position = 'b'
+        @smooth_allowed    = 1
       end
 
       #
@@ -123,7 +124,11 @@ def write_ser(series)
           # Write the c:yVal element.
           write_y_val(series)
           # Write the c:smooth element.
-          write_c_smooth
+          if @subtype =~ /smooth/ && !series[:_smooth]
+            write_c_smooth(1)
+          else
+            write_c_smooth(series[:_smooth])
+          end
         end
       end
 
@@ -227,20 +232,6 @@ def write_scatter_style(val)
         @writer.empty_tag('c:scatterStyle', attributes)
       end
 
-      #
-      # Write the <c:smooth> element.
-      #
-      def write_c_smooth
-        subtype = @subtype
-        val     = 1
-
-        return unless subtype =~ /smooth/
-
-        attributes = ['val', val]
-
-        @writer.empty_tag('c:smooth', attributes)
-      end
-
       #
       # Add default formatting to the series data unless it has already been
       # specified by the user.

data/lib/write_xlsx/shape.rb

@@ -175,8 +175,7 @@ def calc_position_emus(worksheet)
                                @x_offset,
                                @y_offset,
                                @width  * @scale_x,
-                               @height * @scale_y,
-                               @drawing
+                               @height * @scale_y
                                )
 
       # Now that x2/y2 have been calculated with a potentially negative

data/lib/write_xlsx/version.rb

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

data/lib/write_xlsx/worksheet.rb

@@ -5507,7 +5507,7 @@ def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       width  = (0.5 + (width  * x_scale)).to_i
       height = (0.5 + (height * y_scale)).to_i
 
-      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height, false)
+      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height)
 
       # Set the chart name for the embedded object if it has been specified.
       name = chart.name
@@ -5605,7 +5605,7 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     #    y2           # Distance to bottom of object.
     #    width        # Width of object frame.
     #    height       # Height of object frame.
-    def position_object_pixels(col_start, row_start, x1, y1, width, height, is_drawing = false) #: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)}
@@ -5644,13 +5644,6 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height, is_drawi
       # Subtract the underlying cell heights to find the end cell of the object.
       height, row_end = adjust_row_offset(height, row_end)
 
-      # The following is only required for positioning drawing/chart objects
-      # and not comments. It is probably the result of a bug.
-      if ptrue?(is_drawing)
-        col_end -= 1 if width == 0
-        row_end -= 1 if height == 0
-      end
-
       # The end vertices are whatever is left from the width and height.
       x2 = width
       y2 = height
@@ -6045,9 +6038,9 @@ def adjust_row_offset(y, row)
     # The vertices are expressed as English Metric Units (EMUs). There are 12,700
     # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per pixel.
     #
-    def position_object_emus(col_start, row_start, x1, y1, width, height, is_drawing = true) #:nodoc:
+    def position_object_emus(col_start, row_start, x1, y1, width, height) #:nodoc:
       col_start, row_start, x1, y1, col_end, row_end, x2, y2, x_abs, y_abs =
-        position_object_pixels(col_start, row_start, x1, y1, width, height, is_drawing)
+        position_object_pixels(col_start, row_start, x1, y1, width, height)
 
       # Convert the pixel values to EMUs. See above.
       x1    = (0.5 + 9_525 * x1).to_i
@@ -6074,7 +6067,7 @@ def size_col(col) #:nodoc:
         if width == 0
           pixels = 0
         elsif width < 1
-          pixels = (width * 12 + 0.5).to_i
+          pixels = (width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i
         else
           pixels = (width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING
         end
@@ -6542,10 +6535,15 @@ def col_info_attributes(args)
        end
 
       # Convert column width from user units to character width.
-      if width && width > 0
-        width = ((width * MAX_DIGIT_WIDTH + PADDING) / MAX_DIGIT_WIDTH.to_f * 256).to_i/256.0
-        width = width.to_i if width.to_s =~ /\.0+$/
+      if width && width < 1
+        width =
+         ((width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i / MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
+      else
+        width =
+          (((width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING).to_i/ MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
       end
+      width = width.to_i if width - width.to_i == 0
+
       attributes = [
           'min',   min + 1,
           'max',   max + 1,

data/test/chart/test_add_series.rb

@@ -20,6 +20,7 @@ def test_add_series_only_values
       :_fill          => { :_defined => 0 },
       :_marker        => nil,
       :_trendline     => nil,
+      :_smooth        => nil,
       :_labels        => nil,
       :_invert_if_neg => nil,
       :_x2_axis       => nil,
@@ -51,6 +52,7 @@ def test_add_series_with_categories_and_values
                   :_fill         => { :_defined => 0 },
                   :_marker       => nil,
                   :_trendline    => nil,
+                  :_smooth        => nil,
                   :_labels        => nil,
                   :_invert_if_neg => nil,
                   :_x2_axis       => nil,
@@ -87,6 +89,7 @@ def test_add_series_only_values_checked_by_array
                   :_fill         => { :_defined => 0 },
                   :_marker       => nil,
                   :_trendline    => nil,
+                  :_smooth        => nil,
                   :_labels       => nil,
                   :_invert_if_neg => nil,
                   :_x2_axis       => nil,
@@ -118,6 +121,7 @@ def test_add_series_both_checked_by_array
       :_fill         => { :_defined => 0 },
       :_marker       => nil,
       :_trendline    => nil,
+      :_smooth       => nil,
       :_labels       => nil,
       :_invert_if_neg => nil,
       :_x2_axis       => nil,
@@ -152,6 +156,7 @@ def test_add_series_secondary_axis
       :_fill          => { :_defined => 0 },
       :_marker        => nil,
       :_trendline     => nil,
+      :_smooth        => nil,
       :_labels        => nil,
       :_invert_if_neg => nil,
       :_x2_axis       => 1,

data/test/helper.rb

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
+require 'simplecov' if RUBY_VERSION >= "1.9"
 require 'bundler'
+
+SimpleCov.start if RUBY_VERSION >= "1.9"
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/test/regression/test_chart_line03.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartLine03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_line03
+    @xlsx = 'chart_line03.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids,  [47673728, 47675264])
+
+    data = [
+            [ 5,  2, 3, 4,  3 ],
+            [ 10, 4, 6, 8,  6 ],
+            [ 15, 6, 9, 12, 9 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5', :smooth => 1)
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_line04.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartLine04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_line04
+    @xlsx = 'chart_line04.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids,  [47670016, 47671552])
+
+    data = [
+            [ 5,  2, 3, 4,  3 ],
+            [ 10, 4, 6, 8,  6 ],
+            [ 15, 6, 9, 12, 9 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5', :smooth => 1)
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5', :smooth => 1)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_scatter09.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartScatter09 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_scatter09
+    @xlsx = 'chart_scatter09.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(
+                                     :type     => 'scatter',
+                                     :embedded => 1,
+                                     :subtype  => 'smooth_with_markers'
+                                     )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids,  [45953024, 45954944])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                     :smooth     => 0
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+                                # @xlsx,
+                                # nil,
+                                # {
+                                #   'xl/charts/chart1.xml' => ['<c:pageMargins'],
+                                #   'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+                                # }
+                                # )
+
+  end
+end

data/test/regression/test_chart_scatter10.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartScatter10 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_scatter10
+    @xlsx = 'chart_scatter10.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(
+                                     :type     => 'scatter',
+                                     :embedded => 1,
+                                     :subtype  => 'smooth'
+                                     )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids,  [84754816, 84756352])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5',
+                     :smooth     => 0
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+                                # @xlsx,
+                                # nil,
+                                # {
+                                #   'xl/charts/chart1.xml' => ['<c:pageMargins'],
+                                #   'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+                                # }
+                                # )
+
+  end
+end

data/test/regression/test_chart_scatter11.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartScatter11 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_scatter11
+    @xlsx = 'chart_scatter11.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(
+                                     :type     => 'scatter',
+                                     :embedded => 1,
+                                     :subtype  => 'straight_with_markers'
+                                     )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids,  [47439232, 47670400])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                     :smooth     => 1
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+                                # @xlsx,
+                                # nil,
+                                # {
+                                #   'xl/charts/chart1.xml' => ['<c:pageMargins'],
+                                #   'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+                                # }
+                                # )
+
+  end
+end

data/test/regression/test_image09.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage09 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image09
+    @xlsx = 'image09.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('E9',
+                           'test/regression/images/red_64x20.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_set_column01.rb

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column01
+    @xlsx = 'set_column01.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    worksheet.set_column( "A:A",   0.08 )
+    worksheet.set_column( "B:B",   0.17 )
+    worksheet.set_column( "C:C",   0.25 )
+    worksheet.set_column( "D:D",   0.33 )
+    worksheet.set_column( "E:E",   0.42 )
+    worksheet.set_column( "F:F",   0.5 )
+    worksheet.set_column( "G:G",   0.58 )
+    worksheet.set_column( "H:H",   0.67 )
+    worksheet.set_column( "I:I",   0.75 )
+    worksheet.set_column( "J:J",   0.83 )
+    worksheet.set_column( "K:K",   0.92 )
+    worksheet.set_column( "L:L",   1 )
+    worksheet.set_column( "M:M",   1.14 )
+    worksheet.set_column( "N:N",   1.29 )
+    worksheet.set_column( "O:O",   1.43 )
+    worksheet.set_column( "P:P",   1.57 )
+    worksheet.set_column( "Q:Q",   1.71 )
+    worksheet.set_column( "R:R",   1.86 )
+    worksheet.set_column( "S:S",   2 )
+    worksheet.set_column( "T:T",   2.14 )
+    worksheet.set_column( "U:U",   2.29 )
+    worksheet.set_column( "V:V",   2.43 )
+    worksheet.set_column( "W:W",   2.57 )
+    worksheet.set_column( "X:X",   2.71 )
+    worksheet.set_column( "Y:Y",   2.86 )
+    worksheet.set_column( "Z:Z",   3 )
+    worksheet.set_column( "AB:AB", 8.57 )
+    worksheet.set_column( "AC:AC", 8.71 )
+    worksheet.set_column( "AD:AD", 8.86 )
+    worksheet.set_column( "AE:AE", 9 )
+    worksheet.set_column( "AF:AF", 9.14 )
+    worksheet.set_column( "AG:AG", 9.29 )
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    # @xlsx,
+    # nil,
+    # {
+    #   'xl/charts/chart1.xml' => ['<c:pageMargins'],
+    #   'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+    # }
+    # )
+
+  end
+end

data/test/regression/test_set_column02.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column02
+    @xlsx = 'set_column01.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    # Test widths with higher precision.
+    worksheet.set_column( "A:A",   0.083333333333333 )
+    worksheet.set_column( "B:B",   0.166666666666667 )
+    worksheet.set_column( "C:C",   0.250000000000000 )
+    worksheet.set_column( "D:D",   0.333333333333333 )
+    worksheet.set_column( "E:E",   0.416666666666667 )
+    worksheet.set_column( "F:F",   0.500000000000000 )
+    worksheet.set_column( "G:G",   0.583333333333333 )
+    worksheet.set_column( "H:H",   0.666666666666666 )
+    worksheet.set_column( "I:I",   0.750000000000000 )
+    worksheet.set_column( "J:J",   0.833333333333333 )
+    worksheet.set_column( "K:K",   0.916666666666666 )
+    worksheet.set_column( "L:L",   1.000000000000000 )
+    worksheet.set_column( "M:M",   1.142857142857140 )
+    worksheet.set_column( "N:N",   1.285714285714290 )
+    worksheet.set_column( "O:O",   1.428571428571430 )
+    worksheet.set_column( "P:P",   1.571428571428570 )
+    worksheet.set_column( "Q:Q",   1.714285714285710 )
+    worksheet.set_column( "R:R",   1.857142857142860 )
+    worksheet.set_column( "S:S",   2.000000000000000 )
+    worksheet.set_column( "T:T",   2.142857142857140 )
+    worksheet.set_column( "U:U",   2.285714285714290 )
+    worksheet.set_column( "V:V",   2.428571428571430 )
+    worksheet.set_column( "W:W",   2.571428571428570 )
+    worksheet.set_column( "X:X",   2.714285714285710 )
+    worksheet.set_column( "Y:Y",   2.857142857142860 )
+    worksheet.set_column( "Z:Z",   3.000000000000000 )
+    worksheet.set_column( "AB:AB", 8.571428571428570 )
+    worksheet.set_column( "AC:AC", 8.711428571428570 )
+    worksheet.set_column( "AD:AD", 8.857142857142860 )
+    worksheet.set_column( "AE:AE", 9.000000000000000 )
+    worksheet.set_column( "AF:AF", 9.142857142857140 )
+    worksheet.set_column( "AG:AG", 9.285714285714290 )
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    # @xlsx,
+    # nil,
+    # {
+    #   'xl/charts/chart1.xml' => ['<c:pageMargins'],
+    #   'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+    # }
+    # )
+
+  end
+end

data/test/worksheet/test_position_object.rb

@@ -18,7 +18,7 @@ def test_position_object_emus_01
   def test_position_object_emus_02
     @worksheet.set_column('L:L', 3.86)
     result = @worksheet.__send__("position_object_emus", 4, 8, 0, 0, 480, 288)
-    expected = [4, 8, 0, 0, 11, 22, 0, 76200, 2438400, 1524000]
+    expected = [4, 8, 0, 0, 12, 22, 0, 76200, 2438400, 1524000]
     assert_equal(expected, result)
   end
 
@@ -26,7 +26,7 @@ def test_position_object_emus_03
     @worksheet.set_column('L:L', 3.86)
     @worksheet.set_row(22, 6)
     result = @worksheet.__send__("position_object_emus", 4, 8, 0, 0, 480, 288)
-    expected = [4, 8, 0, 0, 11, 22, 0, 0, 2438400, 1524000]
+    expected = [4, 8, 0, 0, 12, 23, 0, 0, 2438400, 1524000]
     assert_equal(expected, result)
   end
 

data/write_xlsx.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |gem|
   ]
 
   gem.add_runtime_dependency(%q<rubyzip>, [">= 0"])
+  gem.add_development_dependency(%q<simplecov>) if RUBY_VERSION >= "1.9"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.69.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   write_xlsx s a gem to create a new file in the Excel 2007+ XLSX format, and you can use the same interface as writeexcel gem.
   The WriteXLSX supports the following features:
@@ -351,6 +365,7 @@ files:
 - test/regression/images/red.bmp
 - test/regression/images/red.jpg
 - test/regression/images/red.png
+- test/regression/images/red_64x20.png
 - test/regression/images/yellow.jpg
 - test/regression/images/yellow.png
 - test/regression/test_array_formula01.rb
@@ -497,6 +512,8 @@ files:
 - test/regression/test_chart_gridlines09.rb
 - test/regression/test_chart_line01.rb
 - test/regression/test_chart_line02.rb
+- test/regression/test_chart_line03.rb
+- test/regression/test_chart_line04.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
@@ -521,6 +538,9 @@ files:
 - test/regression/test_chart_scatter06.rb
 - test/regression/test_chart_scatter07.rb
 - test/regression/test_chart_scatter08.rb
+- test/regression/test_chart_scatter09.rb
+- test/regression/test_chart_scatter10.rb
+- test/regression/test_chart_scatter11.rb
 - test/regression/test_chart_size01.rb
 - test/regression/test_chart_size02.rb
 - test/regression/test_chart_size03.rb
@@ -619,6 +639,7 @@ files:
 - test/regression/test_image06.rb
 - test/regression/test_image07.rb
 - test/regression/test_image08.rb
+- test/regression/test_image09.rb
 - test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
@@ -687,6 +708,8 @@ files:
 - test/regression/test_row_col_format14.rb
 - test/regression/test_selection01.rb
 - test/regression/test_selection02.rb
+- test/regression/test_set_column01.rb
+- test/regression/test_set_column02.rb
 - test/regression/test_set_print_scale01.rb
 - test/regression/test_set_start_page01.rb
 - test/regression/test_shape01.rb
@@ -884,6 +907,8 @@ files:
 - test/regression/xlsx_files/chart_gridlines09.xlsx
 - test/regression/xlsx_files/chart_line01.xlsx
 - test/regression/xlsx_files/chart_line02.xlsx
+- test/regression/xlsx_files/chart_line03.xlsx
+- test/regression/xlsx_files/chart_line04.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
@@ -907,6 +932,9 @@ files:
 - test/regression/xlsx_files/chart_scatter06.xlsx
 - test/regression/xlsx_files/chart_scatter07.xlsx
 - test/regression/xlsx_files/chart_scatter08.xlsx
+- test/regression/xlsx_files/chart_scatter09.xlsx
+- test/regression/xlsx_files/chart_scatter10.xlsx
+- test/regression/xlsx_files/chart_scatter11.xlsx
 - test/regression/xlsx_files/chart_size01.xlsx
 - test/regression/xlsx_files/chart_sparse01.xlsx
 - test/regression/xlsx_files/chart_stock01.xlsx
@@ -1005,6 +1033,7 @@ files:
 - test/regression/xlsx_files/image06.xlsx
 - test/regression/xlsx_files/image07.xlsx
 - test/regression/xlsx_files/image08.xlsx
+- test/regression/xlsx_files/image09.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
@@ -1073,6 +1102,7 @@ files:
 - test/regression/xlsx_files/row_col_format14.xlsx
 - test/regression/xlsx_files/selection01.xlsx
 - test/regression/xlsx_files/selection02.xlsx
+- test/regression/xlsx_files/set_column01.xlsx
 - test/regression/xlsx_files/set_print_scale01.xlsx
 - test/regression/xlsx_files/set_start_page01.xlsx
 - test/regression/xlsx_files/shape01.xlsx
@@ -1435,6 +1465,7 @@ test_files:
 - test/regression/images/red.bmp
 - test/regression/images/red.jpg
 - test/regression/images/red.png
+- test/regression/images/red_64x20.png
 - test/regression/images/yellow.jpg
 - test/regression/images/yellow.png
 - test/regression/test_array_formula01.rb
@@ -1581,6 +1612,8 @@ test_files:
 - test/regression/test_chart_gridlines09.rb
 - test/regression/test_chart_line01.rb
 - test/regression/test_chart_line02.rb
+- test/regression/test_chart_line03.rb
+- test/regression/test_chart_line04.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
@@ -1605,6 +1638,9 @@ test_files:
 - test/regression/test_chart_scatter06.rb
 - test/regression/test_chart_scatter07.rb
 - test/regression/test_chart_scatter08.rb
+- test/regression/test_chart_scatter09.rb
+- test/regression/test_chart_scatter10.rb
+- test/regression/test_chart_scatter11.rb
 - test/regression/test_chart_size01.rb
 - test/regression/test_chart_size02.rb
 - test/regression/test_chart_size03.rb
@@ -1703,6 +1739,7 @@ test_files:
 - test/regression/test_image06.rb
 - test/regression/test_image07.rb
 - test/regression/test_image08.rb
+- test/regression/test_image09.rb
 - test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
@@ -1771,6 +1808,8 @@ test_files:
 - test/regression/test_row_col_format14.rb
 - test/regression/test_selection01.rb
 - test/regression/test_selection02.rb
+- test/regression/test_set_column01.rb
+- test/regression/test_set_column02.rb
 - test/regression/test_set_print_scale01.rb
 - test/regression/test_set_start_page01.rb
 - test/regression/test_shape01.rb
@@ -1968,6 +2007,8 @@ test_files:
 - test/regression/xlsx_files/chart_gridlines09.xlsx
 - test/regression/xlsx_files/chart_line01.xlsx
 - test/regression/xlsx_files/chart_line02.xlsx
+- test/regression/xlsx_files/chart_line03.xlsx
+- test/regression/xlsx_files/chart_line04.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
@@ -1991,6 +2032,9 @@ test_files:
 - test/regression/xlsx_files/chart_scatter06.xlsx
 - test/regression/xlsx_files/chart_scatter07.xlsx
 - test/regression/xlsx_files/chart_scatter08.xlsx
+- test/regression/xlsx_files/chart_scatter09.xlsx
+- test/regression/xlsx_files/chart_scatter10.xlsx
+- test/regression/xlsx_files/chart_scatter11.xlsx
 - test/regression/xlsx_files/chart_size01.xlsx
 - test/regression/xlsx_files/chart_sparse01.xlsx
 - test/regression/xlsx_files/chart_stock01.xlsx
@@ -2089,6 +2133,7 @@ test_files:
 - test/regression/xlsx_files/image06.xlsx
 - test/regression/xlsx_files/image07.xlsx
 - test/regression/xlsx_files/image08.xlsx
+- test/regression/xlsx_files/image09.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
@@ -2157,6 +2202,7 @@ test_files:
 - test/regression/xlsx_files/row_col_format14.xlsx
 - test/regression/xlsx_files/selection01.xlsx
 - test/regression/xlsx_files/selection02.xlsx
+- test/regression/xlsx_files/set_column01.xlsx
 - test/regression/xlsx_files/set_print_scale01.xlsx
 - test/regression/xlsx_files/set_start_page01.xlsx
 - test/regression/xlsx_files/shape01.xlsx