xsv 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee84dde820110bc0a0589f2d9bea811ec537c60eec89a6393ba8daaa956dd9fe
-  data.tar.gz: fea2b0b705cd4a231a0dd6a7f721607c8f3411413fcfc101cd8ea21d794e57e0
+  metadata.gz: c2aa2ded79ad696b69629b1c3056b565cd348b9583cb52aa5f8e32610a44d011
+  data.tar.gz: f66b3222504d6bd96c1c93c136cba30ba83bdb0c29bc52ce807d570f07788ba1
 SHA512:
-  metadata.gz: 75d44ca538496f4d14a92eb2b51a01e0ab9e5da7995e9e7ff5a7e910d960442cd3291da9ee143393fe16cd4786cad0cff9fdc9a3175c57df6e7938f76c784df1
-  data.tar.gz: da29709a4f7e0a5748eb99fc9c3514634573d3e3cfa63baaf3729976c07ff3cd49c6f2e50a58e8707e34429f5f15a3854a6973ad1934708a2a746b811ab8fb52
+  metadata.gz: c8a0c855084362664bc1ce05ba0a5f8cb5e2f43523fb87b5fdef1af388177be96fc8e0be8328b60d84a84cf09b6911ea28ec68023fe6c48c9b56b07a19540921
+  data.tar.gz: d632a005b2cf1c1a800d67142736029f318e78f5cc69aef74a3eb6e79ce95cce5af1d188923e134f836bb7a7604cad2ec21b185fce1a0c741412c9868e6bdd75

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Xsv Changelog
 
+## 0.3.9 - 2020-03-16
+
+- Fix an edge case issue with row_skip  and empty rows
+
 ## 0.3.8 - 2020-03-11
 
 - Improve compatibility with files exported from LibreOffice

data/lib/xsv/sheet_rows_handler.rb

@@ -12,7 +12,7 @@ module Xsv
       when "s"
         @workbook.shared_strings[@current_value.to_i]
       when "str", "inlineStr"
-        @current_value
+        @current_value.dup
       when "e" # N/A
         nil
       when nil, "n"
@@ -46,7 +46,7 @@ module Xsv
       @empty_row = empty_row
       @workbook = workbook
       @row_skip = row_skip
-      @row_index = 0 - @row_skip
+      @row_index = 0
       @current_row = {}
       @current_row_attrs = {}
       @current_cell = {}
@@ -102,20 +102,23 @@ module Xsv
           @current_row[@headers[col_index]] = format_cell
         end
       when :row
-        if @row_index < 0
-          @row_index += 1
+        @real_row_number = @current_row_attrs[:r].to_i
+        @adjusted_row_number = @real_row_number - @row_skip
+
+        if @real_row_number <= @row_skip
           return
         end
 
         @row_index += 1
 
         # Skip first row if we're in hash mode
-        return if @row_index == 1 && @mode == :hash
+        return if @adjusted_row_number == 1 && @mode == :hash
 
         # Pad empty rows
-        while @row_index < @current_row_attrs[:r].to_i - @row_skip
+        while @row_index < @adjusted_row_number
           @block.call(@empty_row)
           @row_index += 1
+          next
         end
 
         # Do not return empty trailing rows

data/lib/xsv/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Xsv
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Martijn Storck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip