xsv 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff63ab6263b0486a400d5d36eb53d0af7265532b67536c7024b414b2bcf3ad2
-  data.tar.gz: a885af30f1a874818bb80f984115d7bc47e178007bf9848407e279af3effcd3b
+  metadata.gz: e03874b3017fd111c7b63d68bb2273f406cab5e129b4edb174c2710aed0cbab9
+  data.tar.gz: 39ebe2ffdc657efd737f62026d9cc18a531262f4722189f3d2a3012a1e0885d9
 SHA512:
-  metadata.gz: 37b9b49b66fcec0c393a56382b162d0fb3c77e2342798292d3a4c73c49939ce3d0827c783a7b9b5c139b52553e3a622f6e47f510e4839963609c571e7ab53067
-  data.tar.gz: ecd5e49c82d802e2a654c7d6321cdf81b5ea81482a83821ca6ddd19ae5036a6e2a516569356ded600b2181b0c4161c5c7e4e36a43570b4bef82f7c9d58038392
+  metadata.gz: 95e8ea84b5a39cb1158f7f1a8eb531f00f76d94eacfa370d74080b943f213dbf6d5aa9df237b54896769f4ff9e3a0a1a1393863d832e6b9cf2ceb21e2069d711
+  data.tar.gz: 9b0392cebd9f720d0c716a99f8a179a4def088e90ed79721c40fdecba518365e1e23f8fb82bbf41dbb474329d44414b1742d375a44388a2fc56cd074c870b2f3

data/.github/workflows/ruby.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', 'jruby', 'truffleruby']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'jruby', 'truffleruby']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Xsv Changelog
 
+## 1.3.2 2024-12-25
+
+- Xsv is now compatbile with Ruby 2.7 through 3.4, latest JRuby, and latest TruffleRuby
+- Sheet#each_row returns Enumerator when no block is given (thanks @myabc)
+
+## 1.3.1 2024-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/helpers.rb

@@ -74,7 +74,7 @@ module Xsv
       # Compensate for rounding errors
       if minutes >= 60
         hours += (minutes / 60)
-        minutes = minutes % 60
+        minutes %= 60
       end
 
       format("%02d:%02d", hours, minutes)

data/lib/xsv/sheet.rb

@@ -55,8 +55,10 @@ module Xsv
 
     # Iterate over rows, returning either hashes or arrays based on the current mode.
     def each_row(&block)
+      return to_enum(__method__) unless 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 +116,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.2"
 end

data/xsv.gemspec

@@ -41,7 +41,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rubyzip", ">= 1.3", "< 3"
 
   spec.add_development_dependency "bundler", "< 3"
-  spec.add_development_dependency "rake", "~> 13.1.0"
-  spec.add_development_dependency "minitest", "~> 5.20.0"
-  spec.add_development_dependency "standard", "~> 1.32.1"
+  spec.add_development_dependency "rake", "~> 13.2"
+  spec.add_development_dependency "minitest", "~> 5.24"
+  # Maintain Ruby 2.7 compatibility
+  spec.add_development_dependency "standard", "1.37.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Martijn Storck
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -50,42 +49,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.20.0
+        version: '5.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.20.0
+        version: '5.24'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.37.0
 description: |2
                               Xsv is a fast, lightweight parser for Office Open XML spreadsheet files
                               (commonly known as Excel or .xlsx files). It strives to be minimal in the
@@ -128,7 +127,6 @@ metadata:
   homepage_uri: https://github.com/martijn/xsv
   source_code_uri: https://github.com/martijn/xsv
   changelog_uri: https://raw.githubusercontent.com/martijn/xsv/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A fast and lightweight xlsx parser that provides nothing a CSV parser wouldn't
 test_files: []