xsv 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ebfa4e4778af72a8b295d258d899a5b5d01fd029d1294d54af5e4f1e0de05a
-  data.tar.gz: aa74ffe0d57eebc12e312bdb42107bc39203cd3a0237f2e2481205c8b3b933c9
+  metadata.gz: b2cc530ad96a5351ea6ab8a8b9d0f2ee9df0e1827a98e4244f239b3658bc2145
+  data.tar.gz: e286d74163ea3524dfcbd92553c0c4254b667e4ea13adae7468c0d1dc4c8089b
 SHA512:
-  metadata.gz: 6ebbb32e48860043bdb0a5d17f6fef525252e8bb01ac63180cd0e749dfbd1b3bb08b8a82e43e9e13da2fa187c02f77e37f525e9c7453334bc3cb8fdf05400187
-  data.tar.gz: 4e1450daebcc3ddfbc0585de52f4d1f362ef2d79281e59cc641119a47924f8450b76c3643a6403a440e0a581ebfcc108431a311f902e2b48be61a1d2afd7b19e
+  metadata.gz: a89e58bc0447ecbd2eefdd81fe978a5e38438296bcce9dbf18b4dbc3fea5d5740016e35237d229fbab8201bb0e71b208ca66858c9d61e85f4d31d729e9048054
+  data.tar.gz: 45ddf90be0abe97dcd8aac6b08b9daeac2f68f7634062655efee6f59fbef50c6aad3eb69a461b4f7fcf9dd2751fa735de82e9a0821ec18d2f45cb4bada591698

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Xsv Changelog
 
+## 1.1.1 2022-04-01
+
+- Improve compatibility with files generated by the Open XML SDK (#40)
+
 ## 1.1.0 2022-02-13
 
 - New, shorter `Xsv.open` syntax as a drop-in replacement for `Xsv::Workbook.open`, which is still supported

data/README.md

@@ -1,9 +1,10 @@
 # Xsv .xlsx reader
 
-[![Travis CI](https://img.shields.io/travis/martijn/xsv/master)](https://travis-ci.org/martijn/xsv)
-[![Codecov](https://img.shields.io/codecov/c/github/martijn/xsv/main)](https://app.codecov.io/gh/martijn/xsv)
-[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/github/martijn/xsv)
-[![Gem Version](https://badge.fury.io/rb/xsv.svg)](https://badge.fury.io/rb/xsv)
+
+[![Test badge](https://img.shields.io/github/workflow/status/martijn/xsv/Ruby/main)](https://github.com/martijn/xsv/actions/workflows/ruby.yml)
+[![Codecov badge](https://img.shields.io/codecov/c/github/martijn/xsv/main)](https://app.codecov.io/gh/martijn/xsv)
+[![Yard Docs badge](http://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/github/martijn/xsv)
+[![Gem Version badge](https://badge.fury.io/rb/xsv.svg)](https://badge.fury.io/rb/xsv)
 
 Xsv is a fast, lightweight, pure Ruby parser for ISO/IEC 29500 Office Open XML spreadsheet files
 (commonly known as Excel or .xlsx files). It strives to be minimal in the

data/lib/xsv/sax_parser.rb

@@ -2,7 +2,7 @@
 
 module Xsv
   class SaxParser
-    ATTR_REGEX = /((\S+)="(.*?)")/m
+    ATTR_REGEX = /((\p{Alnum}+)="(.*?)")/mn
 
     def parse(io)
       responds_to_end_element = respond_to?(:end_element)
@@ -67,13 +67,15 @@ module Xsv
               args = nil
             end
 
+            stripped_tag_name = strip_namespace(tag_name)
+
             if tag_name.start_with?("/")
-              end_element(tag_name[1..]) if responds_to_end_element
+              end_element(strip_namespace(tag_name[1..])) if responds_to_end_element
             elsif args.nil?
-              start_element(tag_name, nil)
+              start_element(stripped_tag_name, nil)
             else
-              start_element(tag_name, args.scan(ATTR_REGEX).each_with_object({}) { |m, h| h[m[1].to_sym] = m[2] })
-              end_element(tag_name) if responds_to_end_element && args.end_with?("/")
+              start_element(stripped_tag_name, args.scan(ATTR_REGEX).each_with_object({}) { |(_, k, v), h| h[k.to_sym] = v })
+              end_element(stripped_tag_name) if responds_to_end_element && args.end_with?("/")
             end
 
             state = :look_start
@@ -85,5 +87,16 @@ module Xsv
         end
       end
     end
+
+    private
+
+    # I am not proud of this, but there's simply no need to deal with xmlns for this application ¯\_(ツ)_/¯
+    def strip_namespace(tag)
+      if (offset = tag.index(":"))
+        tag[offset + 1..]
+      else
+        tag
+      end
+    end
   end
 end

data/lib/xsv/sheets_ids_handler.rb

@@ -17,7 +17,7 @@ module Xsv
     end
 
     def start_element(name, attrs)
-      @block.call(attrs.slice(:name, :sheetId, :state, :'r:id')) if name == "sheet"
+      @block.call(attrs.slice(:name, :sheetId, :state, :id)) if name == "sheet"
     end
   end
 end

data/lib/xsv/version.rb

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

data/lib/xsv/workbook.rb

@@ -93,8 +93,11 @@ module Xsv
       @zip.glob("xl/worksheets/sheet*.xml").sort do |a, b|
         a.name[/\d+/].to_i <=> b.name[/\d+/].to_i
       end.map do |entry|
-        rel = @relationships.detect { |r| entry.name.end_with?(r[:Target]) && r[:Type].end_with?("worksheet") }
-        sheet_ids = @sheet_ids.detect { |i| i[:"r:id"] == rel[:Id] }
+        rel = @relationships.detect do |r|
+          entry.name.end_with?(r[:Target].sub(/^\//, "")) && # ignore leading / in some files
+            r[:Type].end_with?("worksheet")
+        end
+        sheet_ids = @sheet_ids.detect { |i| i[:id] == rel[:Id] }
         Xsv::Sheet.new(self, entry.get_input_stream, entry.size, sheet_ids).tap do |sheet|
           sheet.parse_headers! if mode == :hash
         end

data/xsv.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = "https://github.com/martijn/xsv"
-    spec.metadata["changelog_uri"] = "https://github.com/martijn/xsv/CHANGELOG.md"
+    spec.metadata["changelog_uri"] = "https://raw.githubusercontent.com/martijn/xsv/main/CHANGELOG.md"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
           "public gem pushes."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Martijn Storck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -141,7 +141,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/martijn/xsv
   source_code_uri: https://github.com/martijn/xsv
-  changelog_uri: https://github.com/martijn/xsv/CHANGELOG.md
+  changelog_uri: https://raw.githubusercontent.com/martijn/xsv/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: