xsv 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff63ab6263b0486a400d5d36eb53d0af7265532b67536c7024b414b2bcf3ad2
-  data.tar.gz: a885af30f1a874818bb80f984115d7bc47e178007bf9848407e279af3effcd3b
+  metadata.gz: 9f753b006d8a3c230447e56b70824c7df929c5b7bd074ec82cf82acdf971073c
+  data.tar.gz: bb457169f14d259526443ff2afa47477dceb13edf13d99f089e2f843f9fa258f
 SHA512:
-  metadata.gz: 37b9b49b66fcec0c393a56382b162d0fb3c77e2342798292d3a4c73c49939ce3d0827c783a7b9b5c139b52553e3a622f6e47f510e4839963609c571e7ab53067
-  data.tar.gz: ecd5e49c82d802e2a654c7d6321cdf81b5ea81482a83821ca6ddd19ae5036a6e2a516569356ded600b2181b0c4161c5c7e4e36a43570b4bef82f7c9d58038392
+  metadata.gz: e3686372d118d3d3ca17c403e34479ab00168f0ba5b2057b624cf0b90ed4ee28caf7f9237201c5f6649a7435adc2b77e29751eeec90a71ec577acfcbca2ff0b2
+  data.tar.gz: '094d7b47e71c7ad96b1a477e672c2615203f814cc475cc6194772e8e048713d36e58780c9dbe17a2239a4a63869eea3cde8cbcc20a7dd07816cde9519ff6a2e7'

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Xsv Changelog
 
+## 1.3.1 2023-05-06
+
+- Fix issue #56 with multiple nil headers 
+- Ignore colums with a `nil` header in hash mode
+
 ## 1.3.0 2023-12-16
 
 - Ruby 2.6 is no longer supported. Xsv is compatible with Ruby 2.7 through 3.3, latest JRuby, and latest TruffleRuby

data/lib/xsv/sheet.rb

@@ -56,7 +56,7 @@ module Xsv
     # Iterate over rows, returning either hashes or arrays based on the current mode.
     def each_row(&block)
       @io.rewind
-      SheetRowsHandler.new(@mode, empty_row, @workbook, @row_skip, @last_row, &block).parse(@io)
+      SheetRowsHandler.new(@mode, @headers, empty_row, @workbook, @row_skip, @last_row, &block).parse(@io)
       true
     end
 
@@ -114,7 +114,7 @@ module Xsv
       when :array
         [nil] * @column_count
       when :hash
-        @headers.zip([]).to_h
+        @headers.compact.zip([]).to_h
       end
     end
   end

data/lib/xsv/sheet_rows_handler.rb

@@ -6,8 +6,9 @@ module Xsv
   class SheetRowsHandler < SaxParser
     include Xsv::Helpers
 
-    def initialize(mode, empty_row, workbook, row_skip, last_row, &block)
+    def initialize(mode, headers, empty_row, workbook, row_skip, last_row, &block)
       @mode = mode
+      @headers = headers
       @empty_row = empty_row
       @workbook = workbook
       @row_skip = row_skip
@@ -22,8 +23,6 @@ module Xsv
       @current_row_number = 0
       @current_cell = {}
       @current_value = +""
-
-      @headers = @empty_row.keys if @mode == :hash
     end
 
     def start_element(name, attrs)
@@ -34,7 +33,7 @@ module Xsv
       when "v", "is", "t"
         @store_characters = true
       when "row"
-        @current_row = @mode == :array ? [] : @empty_row.dup
+        @current_row = (@mode == :array) ? [] : @empty_row.dup
         @current_row_number = attrs[:r].to_i
       end
     end
@@ -53,7 +52,7 @@ module Xsv
         if @mode == :array
           @current_row[col_index] = format_cell
         else
-          @current_row[@headers[col_index]] = format_cell
+          @current_row[@headers[col_index]] = format_cell unless @headers[col_index].nil?
         end
 
         @col_index += 1

data/lib/xsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xsv
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Martijn Storck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip