write_xlsx 0.85.2 → 0.85.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06209799005c4363ca55e009fe371d533fa7e7f
-  data.tar.gz: ec976a656ba2c3ad849a1f078cf00012e8f7aabf
+  metadata.gz: 451a49314f7a14e2c9d5bfc5c4df3ca7f54e2718
+  data.tar.gz: 040af462094068f22464c341ea38fa971b5e4403
 SHA512:
-  metadata.gz: 163fac6a14621889306c47aac360019470862a7eb25781702b33b80f00737c63bc7af9177f612c0db3b8b784663711570d21497d318b3e4ef65643e9e8bec602
-  data.tar.gz: b19f5e20a77aa834b5850f7d5a550cf777565c3d2fa444cb69ba7a5baa1bf32ef4b6aa4bf47a97f5c8a5d5948cc8c744e73f08d82ef1ce4c16e17c94b3a8bc94
+  metadata.gz: 47524ba5498e8529ccc789da00036e0cf7a901d116f6661c75d8ee7b74485181aeb5ee7f657844cdbf756a1dfaa6337faf25c307586960fb32465fcca4764249
+  data.tar.gz: b582ea2f76e0bf02a37484581d732c9a329161d606fae13a381cd6541824b0a4ee061f8196385277a4e8b92f0965db79b5d426bf77cc7107201f55f18b1e0b76

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2018-01-07 v0.85.3
+   Fix hide first sheet problem #37
+
 2017-11-05 v0.85.2
    Fix frozen string litterals problems #30
 

data/README.md

@@ -85,7 +85,7 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
 Original Perl module was written by John McNamara(jmcnamara@cpan.org).
 
 Converted to ruby by Hideo NAKAMURA(cxn03651@msj.biglobe.ne.jp)
-Copyright (c) 2012-2017 Hideo NAKAMURA.
+Copyright (c) 2012-2018 Hideo NAKAMURA.
 
 See LICENSE.txt for further details.
 

data/lib/write_xlsx/sheets.rb

@@ -205,6 +205,10 @@ def chartsheets
       self.select { |worksheet| worksheet.is_chartsheet? }
     end
 
+    def visible_first
+      self.reject { |worksheet| worksheet.hidden? }.first
+    end
+
     private
 
     def sheet_chart_count(type)

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.85.2"
+WriteXLSX_VERSION = "0.85.3"

data/lib/write_xlsx/workbook.rb

@@ -1019,6 +1019,14 @@ def non_chartsheets
       @worksheets.worksheets
     end
 
+    def firstsheet #:nodoc:
+      @firstsheet ||= 0
+    end
+
+    def activesheet #:nodoc:
+      @activesheet ||= 0
+    end
+
     private
 
     def filename
@@ -1270,14 +1278,6 @@ def write_io(str) #:nodoc:
       str
     end
 
-    def firstsheet #:nodoc:
-      @firstsheet ||= 0
-    end
-
-    def activesheet #:nodoc:
-      @activesheet ||= 0
-    end
-
     # for test
     def defined_names #:nodoc:
       @defined_names ||= []
@@ -1291,9 +1291,10 @@ def store_workbook #:nodoc:
       add_worksheet if @worksheets.empty?
 
       # Ensure that at least one worksheet has been selected.
-      @worksheets.first.select if @activesheet == 0
+      @worksheets.visible_first.select if @activesheet == 0
 
       # Set the active sheet.
+      @activesheet = @worksheets.visible_first.index if @activesheet == 0
       @worksheets[@activesheet].activate
 
       # Prepare the worksheet VML elements such as comments and buttons.
@@ -1917,7 +1918,7 @@ def process_png(data)
       type   = 'png'
       width  = 0
       height = 0
-      x_dip  = 96
+      x_dpi  = 96
       y_dpi  = 96
 
       offset = 8

data/lib/write_xlsx/worksheet.rb

@@ -509,8 +509,8 @@ def activate
     def hide
       @hidden = true
       @selected = false
-      @workbook.activesheet = 0
-      @workbook.firstsheet  = 0
+      @workbook.activesheet = 0 if @workbook.activesheet == @index
+      @workbook.firstsheet  = 0 if @workbook.firstsheet  == @index
     end
 
     def hidden? # :nodoc:
@@ -2225,6 +2225,7 @@ def write_number(*args)
     def write_string(*args)
       # Check for a cell reference in A1 notation and substitute row and column
       row, col, str, xf = row_col_notation(args)
+      str &&= str.to_s
       raise WriteXLSXInsufficientArgumentError if [row, col, str].include?(nil)
 
       # Check that row and col are valid and store max and min values

data/test/test_example_match.rb

@@ -2711,6 +2711,19 @@ def test_headers
     compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
   end
 
+  def test_hide_first_sheet
+    @xlsx = 'hide_first_sheet.xlsx'
+    workbook   = WriteXLSX.new(@xlsx)
+    worksheet1 = workbook.add_worksheet
+    worksheet2 = workbook.add_worksheet
+
+    worksheet2.activate
+    worksheet1.hide
+
+    workbook.close
+    compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
+  end
+
   def test_hide_sheet
     @xlsx = 'hide_sheet.xlsx'
     workbook   = WriteXLSX.new(@xlsx)

data/test/worksheet/test_write_methods.rb

@@ -59,6 +59,12 @@ def test_write_number_with_valid_arg_not_raise
     end
   end
 
+  def test_write_string_with_non_string_value
+    assert_nothing_raised do
+      @worksheet.write_string(0, 0, 1)
+    end
+  end
+
   def test_write_string_with_insufficient_args_raise_InsufficientArgumentError
     assert_raise(WriteXLSXInsufficientArgumentError) do
       @worksheet.write_string()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.85.2
+  version: 0.85.3
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -337,6 +337,7 @@ files:
 - test/perl_output/fit_to_pages.xlsx
 - test/perl_output/formats.xlsx
 - test/perl_output/headers.xlsx
+- test/perl_output/hide_first_sheet.xlsx
 - test/perl_output/hide_row_col.xlsx
 - test/perl_output/hide_sheet.xlsx
 - test/perl_output/hyperlink.xlsx
@@ -1707,7 +1708,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
@@ -1846,6 +1847,7 @@ test_files:
 - test/perl_output/fit_to_pages.xlsx
 - test/perl_output/formats.xlsx
 - test/perl_output/headers.xlsx
+- test/perl_output/hide_first_sheet.xlsx
 - test/perl_output/hide_row_col.xlsx
 - test/perl_output/hide_sheet.xlsx
 - test/perl_output/hyperlink.xlsx