write_xlsx 0.71.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104355ee8489de1e6777be4649f8ac0c6003e094
-  data.tar.gz: 3f96a27434ef9282fcd9701a47fedfcfafe05318
+  metadata.gz: a44c776377d18f36e5e2410d5d56ee8238f65850
+  data.tar.gz: 859623a413b0f8046ce7256970a1ac926687d07d
 SHA512:
-  metadata.gz: 5f416e1dd40635ea678d10a8561bde047615ddb1ad2610bd63693b1f92362edefac594d055ff063568a97b1f1df592e94c007e9faae7af231bcb91b814ebc80c
-  data.tar.gz: 92e174651ff4dd4c54e3501f583b7b206e9ab2a2b20ca6366137dd8ba65ef6bc48b8f001f6fda89f476875a9161f18c3c202f5cae70b84adb35e30c5df017e67
+  metadata.gz: 9bc0e1d4c487213517e2ad9dbf0cd6a7ca6dee10ce5b62eee3694b5de3f6b5f91383c3595da26177d5064d7d2f1d94798d8659107585f5a094c400f2ff83fdfe
+  data.tar.gz: fb98eca9e50f55ea16ebc2fac03f126a8661e16f2966c92d1159c4cb5153529def1baea481d9c000327f562cfe94422d78b7c9d671325a45f9e054ce9f57c336

data/README.rdoc

@@ -77,6 +77,9 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-09-03 v0.72.0
+   Fix for charts and images that cross rows and columns that are hidden or formatted but which don't have size changes.
+
 2013-09-02 v0.71.0
    Fixed issue in image handling.
    Added fix to ensure formula calculation on load regardless of Excel version.

data/lib/write_xlsx/version.rb

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

data/lib/write_xlsx/workbook.rb

@@ -1694,9 +1694,8 @@ def get_image_properties(filename)
           # Test for PNGs.
           type, width, height = process_png(data)
           image_types[:png] = 1
-        elsif data.unpack('n')[0] == 0xFFD8 &&
-            (data.unpack('x6 A4')[0] == 'JFIF' || data.unpack('x6 A4')[0] == 'Exif')
-          # Test for JFIF and Exif JPEGs.
+        elsif data.unpack('n')[0] == 0xFFD8
+          # Test for JPEG files.
           type, width, height = process_jpg(data, filename)
           @image_types[:jpeg] = 1
         elsif data.unpack('A2')[0] == 'BM'

data/lib/write_xlsx/worksheet.rb

@@ -739,8 +739,7 @@ def set_column(*args)
 
       # Store the col sizes for use when calculating image vertices taking
       # hidden columns into account. Also store the column formats.
-      width  ||= 0                        # Ensure width isn't nil.
-      width = 0 if ptrue?(hidden)         # Set width to zero if col is hidden
+      width = 0 if ptrue?(hidden)         # Set width to zero if hidden
 
       (firstcol .. lastcol).each do |col|
         @col_sizes[col]   = width
@@ -1671,7 +1670,8 @@ def set_start_page(page_start)
     #
     def write(*args)
       # Check for a cell reference in A1 notation and substitute row and column
-      token = row_col_notation(args)[2] || ''
+      row_col_args = row_col_notation(args)
+      token = row_col_args[2] || ''
 
       # Match an array ref.
       if token.respond_to?(:to_ary)
@@ -1697,8 +1697,8 @@ def write(*args)
         write_formula(*args)
       # Match blank
       elsif token == ''
-        args.delete_at(2)     # remove the empty string from the parameter list
-        write_blank(*args)
+        row_col_args.delete_at(2)     # remove the empty string from the parameter list
+        write_blank(*row_col_args)
       else
         write_string(*args)
       end
@@ -3086,6 +3086,8 @@ def set_row(*args)
       # Store the row change to allow optimisations.
       @row_size_changed = true
 
+      height = 0 if ptrue?(hidden)
+
       # Store the row sizes for use when calculating image vertices.
       @row_sizes[row] = height
     end

data/test/regression/test_hyperlink20.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink20 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_hyperlink20
+    @xlsx = 'hyperlink20.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    workbook.instance_variable_set('@custom_colors', ['FF0000FF'])
+
+    worksheet = workbook.add_worksheet
+    format1   = workbook.add_format(:color => 'blue', :underline => 1)
+    format2   = workbook.add_format(:color => 'red',  :underline => 1)
+
+    worksheet.write_url('A1', 'http://www.python.org/1', format1)
+    worksheet.write_url('A2', 'http://www.python.org/2', format2)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image19.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage19 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image19
+    @xlsx = 'image19.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('C2',
+                           File.join(@test_dir, 'regression', 'images/train.jpg'))
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_set_column03.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column03
+    @xlsx = 'set_column03.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    bold   = workbook.add_format(:bold   => 1)
+    italic = workbook.add_format(:italic => 1)
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', italic)
+    worksheet.write('B1', 'Bar', bold)
+    worksheet.write('A2', data)
+
+    worksheet.set_column('F:F', nil, bold)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_set_column04.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column04
+    @xlsx = 'set_column04.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    bold        = workbook.add_format(:bold   => 1)
+    italic      = workbook.add_format(:italic => 1)
+    bold_italic = workbook.add_format(:bold   => 1, :italic => 1)
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', italic)
+    worksheet.write('B1', 'Bar', bold)
+    worksheet.write('A2', data)
+
+    worksheet.set_row(12, nil, italic)
+    worksheet.set_column('F:F', nil, bold)
+
+    worksheet.write('F13', nil, bold_italic)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_set_column05.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column05
+    @xlsx = 'set_column05.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+
+    bold        = workbook.add_format(:bold   => 1)
+    italic      = workbook.add_format(:italic => 1)
+    bold_italic = workbook.add_format(:bold   => 1, :italic => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [68311296, 69198208])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', italic)
+    worksheet.write('B1', 'Bar', bold)
+    worksheet.write('A2', data)
+
+    worksheet.set_row(12, nil, italic)
+    worksheet.set_column('F:F', nil, bold)
+
+    worksheet.write('F13', nil, bold_italic)
+
+    chart.add_series(:values => '=Sheet1!$A$2:$A$6')
+    chart.add_series(:values => '=Sheet1!$B$2:$B$6')
+    chart.add_series(:values => '=Sheet1!$C$2:$C$6')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_set_column06.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn06 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column06
+    @xlsx = 'set_column06.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+
+    bold        = workbook.add_format(:bold   => 1)
+    italic      = workbook.add_format(:italic => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [69197824, 69199360])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', bold)
+    worksheet.write('B1', 'Bar', italic)
+    worksheet.write('A2', data)
+
+    worksheet.set_row(12, nil, nil, 1)
+    worksheet.set_column('F:F', nil, nil, 1)
+
+    chart.add_series(:values => '=Sheet1!$A$2:$A$6')
+    chart.add_series(:values => '=Sheet1!$B$2:$B$6')
+    chart.add_series(:values => '=Sheet1!$C$2:$C$6')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_set_column07.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn07 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column07
+    @xlsx = 'set_column07.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    bold        = workbook.add_format(:bold   => 1)
+    italic      = workbook.add_format(:italic => 1)
+    bold_italic = workbook.add_format(:bold   => 1, :italic => 1)
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', italic)
+    worksheet.write('B1', 'Bar', bold)
+    worksheet.write('A2', data)
+
+    worksheet.set_row(12, nil, italic)
+    worksheet.set_column('F:F', nil, bold)
+
+    worksheet.write('F13', nil, bold_italic)
+
+    worksheet.insert_image('E12',
+                           File.join(@test_dir, 'regression', 'images/logo.png'))
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_set_column08.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn08 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column08
+    @xlsx = 'set_column08.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    bold        = workbook.add_format(:bold   => 1)
+    italic      = workbook.add_format(:italic => 1)
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', 'Foo', bold)
+    worksheet.write('B1', 'Bar', italic)
+    worksheet.write('A2', data)
+
+    worksheet.set_row(12, nil, nil, 1)
+    worksheet.set_column('F:F', nil, nil, 1)
+
+    worksheet.insert_image('E12',
+                           File.join(@test_dir, 'regression', 'images/logo.png'))
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -337,7 +337,6 @@ files:
 - test/regression/images/blue.png
 - test/regression/images/grey.jpg
 - test/regression/images/grey.png
-- test/regression/images/issue32.jpg
 - test/regression/images/issue32.png
 - test/regression/images/logo.png
 - test/regression/images/mylogo.png
@@ -345,6 +344,7 @@ files:
 - test/regression/images/red.jpg
 - test/regression/images/red.png
 - test/regression/images/red_64x20.png
+- test/regression/images/train.jpg
 - test/regression/images/yellow.jpg
 - test/regression/images/yellow.png
 - test/regression/test_array_formula01.rb
@@ -611,6 +611,7 @@ files:
 - test/regression/test_hyperlink16.rb
 - test/regression/test_hyperlink17.rb
 - test/regression/test_hyperlink18.rb
+- test/regression/test_hyperlink20.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -629,6 +630,7 @@ files:
 - test/regression/test_image16.rb
 - test/regression/test_image17.rb
 - test/regression/test_image18.rb
+- test/regression/test_image19.rb
 - test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
@@ -699,6 +701,12 @@ files:
 - test/regression/test_selection02.rb
 - test/regression/test_set_column01.rb
 - test/regression/test_set_column02.rb
+- test/regression/test_set_column03.rb
+- test/regression/test_set_column04.rb
+- test/regression/test_set_column05.rb
+- test/regression/test_set_column06.rb
+- test/regression/test_set_column07.rb
+- test/regression/test_set_column08.rb
 - test/regression/test_set_print_scale01.rb
 - test/regression/test_set_start_page01.rb
 - test/regression/test_shape01.rb
@@ -1014,6 +1022,7 @@ files:
 - test/regression/xlsx_files/hyperlink16.xlsx
 - test/regression/xlsx_files/hyperlink17.xlsx
 - test/regression/xlsx_files/hyperlink18.xlsx
+- test/regression/xlsx_files/hyperlink20.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -1032,6 +1041,7 @@ files:
 - test/regression/xlsx_files/image16.xlsx
 - test/regression/xlsx_files/image17.xlsx
 - test/regression/xlsx_files/image18.xlsx
+- test/regression/xlsx_files/image19.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
@@ -1101,6 +1111,12 @@ files:
 - test/regression/xlsx_files/selection01.xlsx
 - test/regression/xlsx_files/selection02.xlsx
 - test/regression/xlsx_files/set_column01.xlsx
+- test/regression/xlsx_files/set_column03.xlsx
+- test/regression/xlsx_files/set_column04.xlsx
+- test/regression/xlsx_files/set_column05.xlsx
+- test/regression/xlsx_files/set_column06.xlsx
+- test/regression/xlsx_files/set_column07.xlsx
+- test/regression/xlsx_files/set_column08.xlsx
 - test/regression/xlsx_files/set_print_scale01.xlsx
 - test/regression/xlsx_files/set_start_page01.xlsx
 - test/regression/xlsx_files/shape01.xlsx
@@ -1461,7 +1477,6 @@ test_files:
 - test/regression/images/blue.png
 - test/regression/images/grey.jpg
 - test/regression/images/grey.png
-- test/regression/images/issue32.jpg
 - test/regression/images/issue32.png
 - test/regression/images/logo.png
 - test/regression/images/mylogo.png
@@ -1469,6 +1484,7 @@ test_files:
 - test/regression/images/red.jpg
 - test/regression/images/red.png
 - test/regression/images/red_64x20.png
+- test/regression/images/train.jpg
 - test/regression/images/yellow.jpg
 - test/regression/images/yellow.png
 - test/regression/test_array_formula01.rb
@@ -1735,6 +1751,7 @@ test_files:
 - test/regression/test_hyperlink16.rb
 - test/regression/test_hyperlink17.rb
 - test/regression/test_hyperlink18.rb
+- test/regression/test_hyperlink20.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -1753,6 +1770,7 @@ test_files:
 - test/regression/test_image16.rb
 - test/regression/test_image17.rb
 - test/regression/test_image18.rb
+- test/regression/test_image19.rb
 - test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
@@ -1823,6 +1841,12 @@ test_files:
 - test/regression/test_selection02.rb
 - test/regression/test_set_column01.rb
 - test/regression/test_set_column02.rb
+- test/regression/test_set_column03.rb
+- test/regression/test_set_column04.rb
+- test/regression/test_set_column05.rb
+- test/regression/test_set_column06.rb
+- test/regression/test_set_column07.rb
+- test/regression/test_set_column08.rb
 - test/regression/test_set_print_scale01.rb
 - test/regression/test_set_start_page01.rb
 - test/regression/test_shape01.rb
@@ -2138,6 +2162,7 @@ test_files:
 - test/regression/xlsx_files/hyperlink16.xlsx
 - test/regression/xlsx_files/hyperlink17.xlsx
 - test/regression/xlsx_files/hyperlink18.xlsx
+- test/regression/xlsx_files/hyperlink20.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -2156,6 +2181,7 @@ test_files:
 - test/regression/xlsx_files/image16.xlsx
 - test/regression/xlsx_files/image17.xlsx
 - test/regression/xlsx_files/image18.xlsx
+- test/regression/xlsx_files/image19.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
@@ -2225,6 +2251,12 @@ test_files:
 - test/regression/xlsx_files/selection01.xlsx
 - test/regression/xlsx_files/selection02.xlsx
 - test/regression/xlsx_files/set_column01.xlsx
+- test/regression/xlsx_files/set_column03.xlsx
+- test/regression/xlsx_files/set_column04.xlsx
+- test/regression/xlsx_files/set_column05.xlsx
+- test/regression/xlsx_files/set_column06.xlsx
+- test/regression/xlsx_files/set_column07.xlsx
+- test/regression/xlsx_files/set_column08.xlsx
 - test/regression/xlsx_files/set_print_scale01.xlsx
 - test/regression/xlsx_files/set_start_page01.xlsx
 - test/regression/xlsx_files/shape01.xlsx