write_xlsx 0.85.5 → 0.85.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41cd805a992ae404ee02bf633b0a1efe8ed112617953de8a442dc5404d9fc73
-  data.tar.gz: 311e2e1cdeef58369fa0f8e860c2af7323e92642ecbe5ba931baa129e30f5fc9
+  metadata.gz: 7d9381b5893f5bba74793716ade4ac8560af6c18953acebe9eb1b13afbc7efc5
+  data.tar.gz: aff6349570d4111a80b991504d0e1293c6e650c793028bef340fbdcb65fb355e
 SHA512:
-  metadata.gz: e0eaa1bbad03a112c043aa890aecf016c95ecf75f03c4c0379fa1a24eeaa0ca054e245eb0bc9f0be66dca571928708e20dd4a11003741c05cf7b1c9e02db6036
-  data.tar.gz: 599e512bd7b0ebe8b8baee86dd289b1367d8f0422b8c57f321e8c387c807e4b55b67a6b1b15b59d2c578cbb88049023638ffa82008b23794325fdebc0e7d8ee8
+  metadata.gz: a86c39e414f965061cec64e49aa8163a8d09a0e0707ba602647377b34a1d6bbd12a702a27a8c496b3d31ac93f0b4ea9e629d48eb8c5fbce4e527b6182aefb8d4
+  data.tar.gz: b8e18e11a09b91fc86ec2fe5d6eeeb5047e27cb1378e67b871df141084040f469deabd593076a77666d1d03564bdcdf104f7ba6476b011b8a87c54c1c74fb622

data/.gitignore

@@ -1,4 +1,7 @@
 TAGS
+GPATH
+GRTAGS
+GTAGS
 *.gem
 .bundle
 .config

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2019-02-10 v0.85.6
+   Fix work well in ms windows.
+
 2018-04-29 v0.85.5
    Added option to store hyperlink strings as string (strings_as_urls: false).
 

data/lib/write_xlsx/compatibility.rb

@@ -45,7 +45,7 @@ def ascii_only?
 
 unless File.respond_to?(:binread)
   def File.binread(file) #:nodoc:
-    File.open(file,"rb") { |f| f.read }
+    File.open(file,"rb:utf-8:utf-8") { |f| f.read }
   end
 end
 

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -92,7 +92,7 @@ def crlf
 
       def close
         if @filename
-          File.open(@filename, "wb") { |f| f << string }
+          File.open(@filename, "wb:utf-8:utf-8") { |f| f << string }
         end
         @io.close
       end

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.85.5"
+WriteXLSX_VERSION = "0.85.6"

data/lib/write_xlsx/worksheet.rb

@@ -5849,10 +5849,11 @@ def prepare_vml_objects(vml_data_id, vml_shape_id, vml_drawing_id, comment_id)
 
       # The VML o:idmap data id contains a comma separated range when there is
       # more than one 1024 block of comments, like this: data="1,2".
+      data = "#{vml_data_id}"
       (1 .. num_comments_block).each do |i|
-        vml_data_id = "#{vml_data_id},#{vml_data_id + i}"
+        data += ",#{vml_data_id + i}"
       end
-      @vml_data_id = vml_data_id
+      @vml_data_id = data
       @vml_shape_id = vml_shape_id
     end
 

data/test/helper.rb

@@ -13,6 +13,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'write_xlsx'
+require 'stringio'
+require 'tempfile'
+
 
 class Writexlsx::Workbook
   #
@@ -28,6 +31,11 @@ def setup_dir_var
     @test_dir = File.dirname(__FILE__)
     @perl_output  = File.join(@test_dir, 'perl_output')
     @regression_output  = File.join(@test_dir, 'regression', 'xlsx_files')
+    @io = StringIO.new
+  end
+
+  def expected_xlsx
+    File.join(@regression_output, @xlsx)
   end
 
   def expected_to_array(lines)
@@ -68,6 +76,18 @@ def entrys(xlsx)
     result
   end
 
+  def compare_for_regression(ignore_members = nil, ignore_elements = nil)
+    store_to_tempfile
+    compare_xlsx(expected_xlsx, @tempfile.path, ignore_members, ignore_elements, true)
+  end
+
+  def store_to_tempfile
+    @tempfile = Tempfile.open(@xlsx)
+    @tempfile.binmode
+    @tempfile.write(@io.string)
+    @tempfile.close
+  end
+
   def compare_xlsx_for_regression(exp_filename, got_filename, ignore_members = nil, ignore_elements = nil)
     compare_xlsx(exp_filename, got_filename, ignore_members, ignore_elements, true)
   end

data/test/regression/disabled_test_vml04.rb

@@ -12,7 +12,7 @@ def teardown
 
   def test_vml04
     @xlsx = 'vml04.xlsx'
-    workbook   = WriteXLSX.new(@xlsx)
+    workbook   = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
     worksheet2 = workbook.add_worksheet
     worksheet3 = workbook.add_worksheet
@@ -36,6 +36,6 @@ def test_vml04
     worksheet3.insert_button('E8', {})
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_array_formula01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_array_formula01
     @xlsx = 'array_formula01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = [0, 0, 0]
@@ -23,9 +23,9 @@ def test_array_formula01
     worksheet.write_array_formula('A1:A3', '{=SUM(B1:C1*B2:C2)}', nil, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
-                                [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
-                                {'xl/workbook.xml' => ['<workbookView']}
-                                )
+    compare_for_regression(
+      [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
   end
 end

data/test/regression/test_array_formula02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_array_formula02
     @xlsx = 'array_formula02.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
     format    = workbook.add_format(:bold => 1)
 
@@ -24,9 +24,9 @@ def test_array_formula02
     worksheet.write_array_formula('A1:A3', '{=SUM(B1:C1*B2:C2)}', format, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
-                                [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
-                                {'xl/workbook.xml' => ['<workbookView']}
-                                )
+    compare_for_regression(
+      [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
   end
 end

data/test/regression/test_autofilter00.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter00
     @xlsx = 'autofilter00.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -20,7 +20,7 @@ def test_autofilter00
     worksheet.write('A1', [data])
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter01
     @xlsx = 'autofilter01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -22,7 +22,7 @@ def test_autofilter01
     worksheet.write('A1', [data])
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter02
     @xlsx = 'autofilter02.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -37,7 +37,7 @@ def test_autofilter02
     end
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter03.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter03
     @xlsx = 'autofilter03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -37,7 +37,7 @@ def test_autofilter03
     end
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter04.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter04
     @xlsx = 'autofilter04.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -40,7 +40,7 @@ def test_autofilter04
     end
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter05.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter05
     @xlsx = 'autofilter05.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -41,7 +41,7 @@ def test_autofilter05
     end
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter06.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter06
     @xlsx = 'autofilter06.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     data = []
@@ -41,7 +41,7 @@ def test_autofilter06
     end
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_autofilter07.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_autofilter07
     @xlsx = 'autofilter07.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     # Extract the data embedded at the end of this file.
@@ -40,7 +40,7 @@ def test_autofilter07
     end
 
     workbook.close
-       compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+       compare_for_regression(
                  nil,
                  {'xl/workbook.xml' => ['<workbookView']}
                  )

data/test/regression/test_button01.rb

@@ -7,17 +7,17 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_button01
     @xlsx = 'button01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.insert_button('C2', {})
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_button02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_button02
     @xlsx = 'button02.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.insert_button('B4',
@@ -24,6 +24,6 @@ def test_button02
                             )
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_button03.rb

@@ -7,18 +7,18 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_button03
     @xlsx = 'button03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.insert_button('C2', {})
     worksheet.insert_button('E5', {})
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end