write_xlsx 0.88.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994776679641b1907ecab841ff3f708bdf82e7db2347b12a7b3e06c3cf3de218
-  data.tar.gz: 47fefd5324ac9fc71d40b4fcdcd59c2679098c04ff793d4a96c0e9988e7170cb
+  metadata.gz: 980d940d4b7386abe4429d994fdb89621a410b7dee208f931e0571034c40b7df
+  data.tar.gz: 376c1bd91e9d4139af09b69a35509125566a3a44a072f91e27cfd38524f579ae
 SHA512:
-  metadata.gz: 845c34594fea0e22e12663a4bc2912e48eef99de5685573d53c9ba74a89709d5a2ab25efd6eb76f799e1fd4b9913f1fe766d2010352058725389ef119e823c4e
-  data.tar.gz: e98541a0595e76f391a4dcd38f36b6f754cec385d6310fc169e088bd2f08b38cd4d0d10eebe1f44fd7bed2458bafc2f56fa7994d5bbe8982dc740f0b2ed7be0d
+  metadata.gz: 2be6712f3085f77b124f8ce6a400acf9a9c3edea9e27bcefcdef0926af29b29f2cb31eb3b82f5291bf1a6294afd4c504a1e2f32602f7fbbd1aeacc54d79fb9a2
+  data.tar.gz: 15cf003eb84c5312b01f4890e8be4299faf88f92710706f3c01a98c28ad35fb9ec1fbbcab253724804e1b4bfdcfa7c4cf0378d8304685f49c60bfa30651737b0

data/.travis.yml

@@ -1,7 +1,50 @@
 language: ruby
 rvm:
+- 3.0.0
+- 2.7.2
+- 2.7.1
+- 2.7.0
+- 2.6.6
+- 2.6.5
+- 2.6.4
+- 2.6.3
+- 2.6.2
+- 2.6.1
+- 2.6.0
+- 2.5.8
+- 2.5.7
+- 2.5.6
+- 2.5.5
+- 2.5.4
+- 2.5.3
+- 2.5.2
+- 2.5.1
+- 2.5.0
+- 2.4.10
+- 2.4.9
+- 2.4.8
+- 2.4.7
+- 2.4.6
+- 2.4.5
+- 2.4.4
+- 2.4.3
+- 2.4.2
+- 2.4.1
+- 2.4.0
+- 2.3.8
+- 2.3.7
+- 2.3.6
+- 2.3.5
+- 2.3.4
+- 2.3.3
+- 2.3.2
 - 2.3.1
 - 2.3.0
+- 2.2.10
+- 2.2.9
+- 2.2.8
+- 2.2.7
+- 2.2.6
 - 2.2.5
 - 2.2.4
 - 2.2.3

data/Changes

@@ -1,5 +1,10 @@
 Change history of write_xlsx rubygem.
 
+2020-12-27 v0.89.0
+
+   Added write_boolean() worksheet method to write Excel boolean values.
+
+
 2020-12-26 v0.88.0
 
    Added transparency option to solid fills in chart areas.

data/README.md

@@ -5,7 +5,7 @@
 
 gem to create a new file in the Excel 2007+ XLSX format, and you can use the
 same interface as writeexcel gem. write_xlsx is converted from Perl's module
-[Excel::Writer::XLSX-0.88](https://github.com/jmcnamara/excel-writer-xlsx) .
+[Excel::Writer::XLSX-0.89](https://github.com/jmcnamara/excel-writer-xlsx) .
 
 ## Description
 

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.88.0"
+WriteXLSX_VERSION = "0.89.0"

data/lib/write_xlsx/worksheet.rb

@@ -2529,6 +2529,26 @@ def write_array_formula(*args)
       end
     end
 
+    #
+    # write_boolean(row, col, val, format)
+    #
+    # Write a boolean value to the specified row and column (zero indexed).
+    #
+    def write_boolean(*args)
+      row, col, val, xf = row_col_notation(args)
+      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil?
+
+      val = val ? 1 : 0  # Boolean value.
+      # xf : cell format.
+      type = 'l'                 # The data type
+
+      # Check that row and col are valid and store max and min values
+      check_dimensions(row, col)
+      store_row_col_max_min_values(row, col)
+
+      store_data_to_table(BooleanCellData.new(self, row, col, val, xf))
+    end
+
     #
     # :call-seq:
     #   update_format_with_params(row, col, format_params)
@@ -2537,12 +2557,12 @@ def write_array_formula(*args)
     #
     #     worksheet.update_format_with_params(0, 0, color: 'red')
     #
-    # This method is used to update formatting of the cell keeping cell contents 
+    # This method is used to update formatting of the cell keeping cell contents
     # and formatting.
     #
-    # If the cell doesn't have CellData object, this method create a CellData 
+    # If the cell doesn't have CellData object, this method create a CellData
     # using write_blank method.
-    # If the cell has CellData, this method fetch contents and format of cell from 
+    # If the cell has CellData, this method fetch contents and format of cell from
     # the CellData object and recreate CellData using write method.
     #
     def update_format_with_params(*args)
@@ -2590,7 +2610,7 @@ def update_format_with_params(*args)
     #
     #     worksheet.update_range_format_with_params(0, 0, 3, 3, color: 'red')
     #
-    # This method is used to update formatting of multiple cells keeping cells' contents 
+    # This method is used to update formatting of multiple cells keeping cells' contents
     # and formatting.
     #
     #
@@ -5813,11 +5833,11 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
         y1 += size_row(row_start - 1)
         row_start -= 1
       end
-      
+
       # Ensure that the image isn't shifted off the page at top left.
       x1 = 0 if x1 < 0
       y1 = 0 if y1 < 0
-      
+
       # Calculate the absolute x offset of the top-left vertex.
       if @col_size_changed
         x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col)}

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -128,6 +128,27 @@ def write_cell
       end
     end
 
+    class BooleanCellData < CellData # :nodoc:
+      def initialize(worksheet, row, col, val, xf)
+        @worksheet = worksheet
+        @row, @col, @token, @xf = row, col, val, xf
+      end
+
+      def data
+        @token
+      end
+
+      def write_cell
+        attributes = cell_attributes
+
+        attributes << ['t', 'b']
+        @worksheet.writer.tag_elements('c', attributes) do
+          @worksheet.write_cell_value(token)
+        end
+      end
+    end
+
+
     class BlankCellData < CellData # :nodoc:
       def initialize(worksheet, row, col, xf)
         @worksheet = worksheet

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -27,8 +27,13 @@ def initialize(url, str, tip)
         normalized_str = str.sub(/^mailto:/, '')
 
         # Split url into the link and optional anchor/location.
-        url, @url_str = url.split(/#/)
+        url, *anchors = url.split(/#/)
         url  ||= ''
+        if anchors.empty?
+          @url_str = nil
+        else
+          @url_str = anchors.join('#')
+        end
 
         # Escape URL unless it looks already escaped.
         url = escape_url(url)

data/test/regression/test_format14.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionFormat14 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_format14
+    @xlsx = 'format14.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    center    = workbook.add_format
+
+    center.set_center_across
+
+    worksheet.write('A1', 'foo', center)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink25.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink25 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink25
+    @xlsx = 'hyperlink25.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'http://www.google.com/#foo#bar')
+
+    workbook.close
+
+    compare_for_regression(
+      nil,
+      { 'xl/workbook.xml' => ['<workbookView'] }
+    )
+  end
+end

data/test/regression/test_hyperlink26.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink26 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink26
+    @xlsx = 'hyperlink26.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'http://www.google.com/foo#bar#baz')
+
+    workbook.close
+
+    compare_for_regression(
+      nil,
+      { 'xl/workbook.xml' => ['<workbookView'] }
+    )
+  end
+end

data/test/regression/test_types02.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionTypes02 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_types02
+    @xlsx = 'types02.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_boolean('A1', 1)
+    worksheet.write_boolean('A2', false)
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_types08.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionTypes08 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_types08
+    @xlsx = 'types08.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    bold   = workbook.add_format(:bold   => 1)
+    italic = workbook.add_format(:italic => 1)
+
+    worksheet.write_boolean('A1', 'True', bold)
+    worksheet.write_boolean('A2', nil, italic)
+
+    workbook.close
+
+    compare_for_regression(
+      ['xl/styles.xml'],
+      {}
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.89.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -805,6 +805,7 @@ files:
 - test/regression/test_format11.rb
 - test/regression/test_format12.rb
 - test/regression/test_format13.rb
+- test/regression/test_format14.rb
 - test/regression/test_formula_results01.rb
 - test/regression/test_gridlines01.rb
 - test/regression/test_header01.rb
@@ -848,6 +849,8 @@ files:
 - test/regression/test_hyperlink22.rb
 - test/regression/test_hyperlink23.rb
 - test/regression/test_hyperlink24.rb
+- test/regression/test_hyperlink25.rb
+- test/regression/test_hyperlink26.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -1011,6 +1014,8 @@ files:
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
+- test/regression/test_types02.rb
+- test/regression/test_types08.rb
 - test/regression/test_update_range_format_with_params.rb
 - test/regression/test_urls_as_strings.rb
 - test/regression/test_utf8_01.rb
@@ -1421,6 +1426,7 @@ files:
 - test/regression/xlsx_files/format11.xlsx
 - test/regression/xlsx_files/format12.xlsx
 - test/regression/xlsx_files/format13.xlsx
+- test/regression/xlsx_files/format14.xlsx
 - test/regression/xlsx_files/formula_results01.xlsx
 - test/regression/xlsx_files/gridlines01.xlsx
 - test/regression/xlsx_files/header01.xlsx
@@ -1464,6 +1470,8 @@ files:
 - test/regression/xlsx_files/hyperlink22.xlsx
 - test/regression/xlsx_files/hyperlink23.xlsx
 - test/regression/xlsx_files/hyperlink24.xlsx
+- test/regression/xlsx_files/hyperlink25.xlsx
+- test/regression/xlsx_files/hyperlink26.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -1628,6 +1636,8 @@ files:
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx
+- test/regression/xlsx_files/types02.xlsx
+- test/regression/xlsx_files/types08.xlsx
 - test/regression/xlsx_files/update_range_format_with_params.xlsx
 - test/regression/xlsx_files/urls_as_strings.xlsx
 - test/regression/xlsx_files/utf8_01.xlsx
@@ -1777,7 +1787,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
@@ -2383,6 +2393,7 @@ test_files:
 - test/regression/test_format11.rb
 - test/regression/test_format12.rb
 - test/regression/test_format13.rb
+- test/regression/test_format14.rb
 - test/regression/test_formula_results01.rb
 - test/regression/test_gridlines01.rb
 - test/regression/test_header01.rb
@@ -2426,6 +2437,8 @@ test_files:
 - test/regression/test_hyperlink22.rb
 - test/regression/test_hyperlink23.rb
 - test/regression/test_hyperlink24.rb
+- test/regression/test_hyperlink25.rb
+- test/regression/test_hyperlink26.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -2589,6 +2602,8 @@ test_files:
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
+- test/regression/test_types02.rb
+- test/regression/test_types08.rb
 - test/regression/test_update_range_format_with_params.rb
 - test/regression/test_urls_as_strings.rb
 - test/regression/test_utf8_01.rb
@@ -2999,6 +3014,7 @@ test_files:
 - test/regression/xlsx_files/format11.xlsx
 - test/regression/xlsx_files/format12.xlsx
 - test/regression/xlsx_files/format13.xlsx
+- test/regression/xlsx_files/format14.xlsx
 - test/regression/xlsx_files/formula_results01.xlsx
 - test/regression/xlsx_files/gridlines01.xlsx
 - test/regression/xlsx_files/header01.xlsx
@@ -3042,6 +3058,8 @@ test_files:
 - test/regression/xlsx_files/hyperlink22.xlsx
 - test/regression/xlsx_files/hyperlink23.xlsx
 - test/regression/xlsx_files/hyperlink24.xlsx
+- test/regression/xlsx_files/hyperlink25.xlsx
+- test/regression/xlsx_files/hyperlink26.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -3206,6 +3224,8 @@ test_files:
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx
+- test/regression/xlsx_files/types02.xlsx
+- test/regression/xlsx_files/types08.xlsx
 - test/regression/xlsx_files/update_range_format_with_params.xlsx
 - test/regression/xlsx_files/urls_as_strings.xlsx
 - test/regression/xlsx_files/utf8_01.xlsx