write_xlsx 0.99.0 → 1.00.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8880984e96fe4a8788fe6642220163ff36932dea018a335d00165a7b2d2ae04
-  data.tar.gz: 99153b43aba51974cca58ed8c38d6308814820846b4617444fcd302752843bc5
+  metadata.gz: bde6d7de8885eab3b8b2ccd4c1ec5b682b55b9893a730c3475d5c0e0b6aca459
+  data.tar.gz: c6f347da459b3a80bb699632d5aee762fb80de9ebde962463406618a2ed62c1f
 SHA512:
-  metadata.gz: 1b5c868f6e42846e925282b0eed02064b4541e852e72012e083009dbaa44e6bc419f1ad5b630cfe3ca149b12832732b972f340e6038502e1c8acbce9358702d2
-  data.tar.gz: 8bc6c84b0bb6c5901516441c7a5b1e45044ba5c26d30c92ac773f0de521e8e78785cd8aa4759a0d0db96d629aedd4aaf2a7453cb1f075b36dd1e61fc34cb217d
+  metadata.gz: 9c562aa8183d3d5bfa800aa961883620ae645107e5de36f7559efdbd2624384cc810d6b1c5098f36bd8508f72c7f6177803fd4f54713c068c59cc4d983da2091
+  data.tar.gz: 6af5a9bb53da31ad5e1eca9de975fe5ee68233be6712cecc939d3fc77496d38a23639f43be66bc8a520895e43de6dadb5f3278893711e23397151967912d07b5

data/Changes

@@ -1,5 +1,11 @@
 Change history of write_xlsx rubygem.
 
+2021-01-23 v1.00.0
+
+   Fixed issue where images that started in hidden rows/columns weren't placed
+   correctly in the worksheet.
+
+
 2021-01-08 v0.99.0
 
    Added font and font_size parameters to write_comment().

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.99.0"
+WriteXLSX_VERSION = "1.00.0"

data/lib/write_xlsx/worksheet.rb

@@ -5871,17 +5871,21 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       y_abs += y1
 
       # Adjust start column for offsets that are greater than the col width.
-      x1, col_start = adjust_column_offset(x1, col_start)
+      if size_col(col_start) > 0
+        x1, col_start = adjust_column_offset(x1, col_start)
+      end
 
       # Adjust start row for offsets that are greater than the row height.
-      y1, row_start = adjust_row_offset(y1, row_start)
+      if size_row(row_start) > 0
+        y1, row_start = adjust_row_offset(y1, row_start)
+      end
 
       # Initialise end cell to the same as the start cell.
       col_end = col_start
       row_end = row_start
 
-      width  += x1
-      height += y1
+      width  += x1 if size_col(col_start) > 0
+      height += y1 if size_row(row_start) > 0
 
       # Subtract the underlying cell widths to find the end cell of the object.
       width, col_end = adjust_column_offset(width, col_end)

data/test/regression/test_image44.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage44 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image44
+    @xlsx = 'image44.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png')
+    )
+
+    worksheet.set_row(8, 30)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image45.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage45 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image45
+    @xlsx = 'image45.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png')
+    )
+
+    worksheet.set_row(8, 30, nil, 1)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image46.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage46 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image46
+    @xlsx = 'image46.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png'),
+      0, 4
+    )
+
+    worksheet.set_row(8, 30, nil, 1)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image47.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage47 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image47
+    @xlsx = 'image47.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png')
+    )
+
+    worksheet.set_row(9, nil, nil, 1)
+
+    workbook.close
+    compare_for_regression
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 1.00.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -924,6 +924,10 @@ files:
 - test/regression/test_image33.rb
 - test/regression/test_image35.rb
 - test/regression/test_image36.rb
+- test/regression/test_image44.rb
+- test/regression/test_image45.rb
+- test/regression/test_image46.rb
+- test/regression/test_image47.rb
 - test/regression/test_landscape01.rb
 - test/regression/test_macro01.rb
 - test/regression/test_merge_cells01.rb
@@ -1589,6 +1593,10 @@ files:
 - test/regression/xlsx_files/image33.xlsx
 - test/regression/xlsx_files/image35.xlsx
 - test/regression/xlsx_files/image36.xlsx
+- test/regression/xlsx_files/image44.xlsx
+- test/regression/xlsx_files/image45.xlsx
+- test/regression/xlsx_files/image46.xlsx
+- test/regression/xlsx_files/image47.xlsx
 - test/regression/xlsx_files/landscape01.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/merge_cells01.xlsx
@@ -1882,7 +1890,7 @@ homepage: https://github.com/cxn03651/write_xlsx#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1897,8 +1905,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 test_files:
@@ -2620,6 +2628,10 @@ test_files:
 - test/regression/test_image33.rb
 - test/regression/test_image35.rb
 - test/regression/test_image36.rb
+- test/regression/test_image44.rb
+- test/regression/test_image45.rb
+- test/regression/test_image46.rb
+- test/regression/test_image47.rb
 - test/regression/test_landscape01.rb
 - test/regression/test_macro01.rb
 - test/regression/test_merge_cells01.rb
@@ -3285,6 +3297,10 @@ test_files:
 - test/regression/xlsx_files/image33.xlsx
 - test/regression/xlsx_files/image35.xlsx
 - test/regression/xlsx_files/image36.xlsx
+- test/regression/xlsx_files/image44.xlsx
+- test/regression/xlsx_files/image45.xlsx
+- test/regression/xlsx_files/image46.xlsx
+- test/regression/xlsx_files/image47.xlsx
 - test/regression/xlsx_files/landscape01.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/merge_cells01.xlsx