xsv 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e5d405e39f42d0e5287d47dd65c65b39a0ab5a2fc7fde3fd85c7211469e6e1
-  data.tar.gz: 7100a73ce192536f81a34ffbb1b431a793edf9cb71c1612a547a64a686a8330f
+  metadata.gz: 5ba17dfa73b0bb77884f1f95bac715291316aa415c512b5a60b230250395f87d
+  data.tar.gz: d5c9ce6ac4b64dc854f6dd133fb139fae13b343b9e08465712d6b0e0189a6628
 SHA512:
-  metadata.gz: 3b8fcbab2e2aa1f02dc0b51051a9b60dd2518b18b72007c2f3e77fa99248e864069d54b0bb43d783f8bb6ef79b6c2504c8cd05c244a2e9c85cddb882de224556
-  data.tar.gz: 3ec5120d8b6e365996985c75f4c291e3f4805e9876fd93ae2dfe071c5bd69ad751677cf71121ac23f6e9bed75ab80296b12346d79696cb6105974345d289bb7e
+  metadata.gz: ec2f2bfd10455002aa2ebe8fe661a2b347e5831fde513d57a08fa43a58ea24a8105a2b308d504d5e65f30a5ac5a5c029daf0a6c2ac9c81ca722d6ff456d512ac
+  data.tar.gz: 232238fb39c14a4a9fb7d080b0817bd83620f9caeecd812f3058cc473d97506d8b8fbfd5ef74fc25afaf2c46674d230f2292e9b2e1b8e89b2734bb8b1540c679

data/.github/workflows/ruby.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', 'jruby', 'truffleruby']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', 'jruby', 'truffleruby']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Xsv Changelog
 
+## 1.2.1 2023-05-09
+
+- Handle columns without `r` attribute (issue #48)
+- Access sheets by UTF-8 name (thanks @sebikeller)
+
 ## 1.2.0 2023-01-01
 
 **This release contains the following minor breaking changes**

data/lib/xsv/sheet_rows_handler.rb

@@ -17,6 +17,7 @@ module Xsv
       @store_characters = false
 
       @row_index = 0
+      @col_index = 0
       @current_row = {}
       @current_row_number = 0
       @current_cell = {}
@@ -33,7 +34,7 @@ module Xsv
       when "v", "is", "t"
         @store_characters = true
       when "row"
-        @current_row = @empty_row.dup
+        @current_row = @mode == :array ? []  : @empty_row.dup
         @current_row_number = attrs[:r].to_i
       end
     end
@@ -47,19 +48,22 @@ module Xsv
       when "v", "is", "t"
         @store_characters = false
       when "c"
-        col_index = column_index(@current_cell[:r])
+        col_index = @current_cell[:r] ? column_index(@current_cell[:r]) : @col_index
 
         if @mode == :array
           @current_row[col_index] = format_cell
         else
           @current_row[@headers[col_index]] = format_cell
         end
+
+        @col_index += 1
       when "row"
         return if @current_row_number <= @row_skip
 
         adjusted_row_number = @current_row_number - @row_skip
 
         @row_index += 1
+        @col_index = 0
 
         # Skip first row if we're in hash mode
         return if adjusted_row_number == 1 && @mode == :hash
@@ -72,7 +76,14 @@ module Xsv
         end
 
         # Do not return empty trailing rows
-        @block.call(@current_row) unless @row_index > @last_row
+        return if @row_index > @last_row
+
+        # Add trailing empty columns
+        if @mode == :array && @current_row.length < @empty_row.length
+          @block.call(@current_row + @empty_row[@current_row.length..])
+        else
+          @block.call(@current_row)
+        end
       end
     end
 

data/lib/xsv/sheets_ids_handler.rb

@@ -9,7 +9,9 @@ module Xsv
 
       new { |sheet_ids| sheets_ids << sheet_ids }.parse(io)
 
-      sheets_ids
+      sheets_ids.each do |sheet|
+        sheet[:name].force_encoding(Encoding::UTF_8)
+      end
     end
 
     def initialize(&block)

data/lib/xsv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Martijn Storck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip