xsv 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3abfccfccc78bc42a10cd71a1c1579b4498acee6b3f6e96b19da0aa13f27c6
-  data.tar.gz: fc317c12354721f08d6ad757f147c9ba6fcf2b8cc73cc0500ae5d17e1f5675a4
+  metadata.gz: ade681d66101849ddf0ecd1cb0211d309153f604cbe0fc8ed3254c7930265e0a
+  data.tar.gz: e9c0d24538cfe42affb2690f2f00a5535277013898c781aa668eecbd3329df6b
 SHA512:
-  metadata.gz: 92e917efe5443041dc3ac24e38518541dfedc834eaa17b866800b85a356a2072f6bf0f52c4bc977b9c4ba115a2a4f5401d782408d4528bbe44781f0c92a44161
-  data.tar.gz: edca02d81bafea0cdf80665448d69d39325de475144dcfac10f4e4cde77a413cd3a4aed0b269b0eae88bde9b0c4723c4e1ce3608969f36af41630a4a480bc5a8
+  metadata.gz: fb21f559a6a3d8fd20192fab8c0543fbf430f49fc563e5c98e584258bb72cd0faa8b0cf8ce9792035d5db46f40a8db082eb2407c6a132e085d74cc69200c3e2a
+  data.tar.gz: 87c1ffca0e26ffdaf9a91bae58d188bffedae87508c3a91d33fb06c1fbb6c121f40dfce12af3dd5080254613ae47a5481cab996f9a6284517967fd71893ede94

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.5.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Xsv Changelog
 
+## 1.0.5 2022-01-05
+
+- Raise exception if given an empty buffer when opening workbook (thanks @kevin-j-m)
+
 ## 1.0.4 2021-07-05
 
 - Support for custom date/time columns

data/Rakefile

@@ -13,4 +13,4 @@ Rake::TestTask.new(:bench) do |t|
   t.test_files = FileList["test/**/*_benchmark.rb"]
 end
 
-task :default => [:test, :bench]
+task default: [:test, :bench]

data/lib/xsv/helpers.rb

@@ -5,42 +5,42 @@ module Xsv
     # The default OOXML Spreadheet number formats according to the ECMA standard
     # User formats are appended from index 174 onward
     BUILT_IN_NUMBER_FORMATS = {
-      1 => '0',
-      2 => '0.00',
-      3 => '#, ##0',
-      4 => '#, ##0.00',
-      5 => '$#, ##0_);($#, ##0)',
-      6 => '$#, ##0_);[Red]($#, ##0)',
-      7 => '$#, ##0.00_);($#, ##0.00)',
-      8 => '$#, ##0.00_);[Red]($#, ##0.00)',
-      9 => '0%',
-      10 => '0.00%',
-      11 => '0.00E+00',
-      12 => '# ?/?',
-      13 => '# ??/??',
-      14 => 'm/d/yyyy',
-      15 => 'd-mmm-yy',
-      16 => 'd-mmm',
-      17 => 'mmm-yy',
-      18 => 'h:mm AM/PM',
-      19 => 'h:mm:ss AM/PM',
-      20 => 'h:mm',
-      21 => 'h:mm:ss',
-      22 => 'm/d/yyyy h:mm',
-      37 => '#, ##0_);(#, ##0)',
-      38 => '#, ##0_);[Red](#, ##0)',
-      39 => '#, ##0.00_);(#, ##0.00)',
-      40 => '#, ##0.00_);[Red](#, ##0.00)',
-      45 => 'mm:ss',
-      46 => '[h]:mm:ss',
-      47 => 'mm:ss.0',
-      48 => '##0.0E+0',
-      49 => '@'
+      1 => "0",
+      2 => "0.00",
+      3 => "#, ##0",
+      4 => "#, ##0.00",
+      5 => "$#, ##0_);($#, ##0)",
+      6 => "$#, ##0_);[Red]($#, ##0)",
+      7 => "$#, ##0.00_);($#, ##0.00)",
+      8 => "$#, ##0.00_);[Red]($#, ##0.00)",
+      9 => "0%",
+      10 => "0.00%",
+      11 => "0.00E+00",
+      12 => "# ?/?",
+      13 => "# ??/??",
+      14 => "m/d/yyyy",
+      15 => "d-mmm-yy",
+      16 => "d-mmm",
+      17 => "mmm-yy",
+      18 => "h:mm AM/PM",
+      19 => "h:mm:ss AM/PM",
+      20 => "h:mm",
+      21 => "h:mm:ss",
+      22 => "m/d/yyyy h:mm",
+      37 => "#, ##0_);(#, ##0)",
+      38 => "#, ##0_);[Red](#, ##0)",
+      39 => "#, ##0.00_);(#, ##0.00)",
+      40 => "#, ##0.00_);[Red](#, ##0.00)",
+      45 => "mm:ss",
+      46 => "[h]:mm:ss",
+      47 => "mm:ss.0",
+      48 => "##0.0E+0",
+      49 => "@"
     }.freeze
 
     MINUTE = 60
     HOUR = 3600
-    A_CODEPOINT = 'A'.ord.freeze
+    A_CODEPOINT = "A".ord.freeze
     # The epoch for all dates in OOXML Spreadsheet documents
     EPOCH = Date.new(1899, 12, 30).freeze
 
@@ -74,7 +74,7 @@ module Xsv
         minutes = minutes % 60
       end
 
-      format('%02d:%02d', hours, minutes)
+      format("%02d:%02d", hours, minutes)
     end
 
     # Returns a time including a date as a {Time} object
@@ -92,9 +92,9 @@ module Xsv
 
     # Returns a number as either Integer or Float
     def parse_number(string)
-      if string.include? '.'
+      if string.include? "."
         string.to_f
-      elsif string.include? 'E'
+      elsif string.include? "E"
         Complex(string).to_f
       else
         string.to_i

data/lib/xsv/relationships_handler.rb

@@ -17,7 +17,7 @@ module Xsv
     end
 
     def start_element(name, attrs)
-      @block.call(attrs.slice(:Id, :Type, :Target)) if name == 'Relationship'
+      @block.call(attrs.slice(:Id, :Type, :Target)) if name == "Relationship"
     end
   end
 end

data/lib/xsv/sax_parser.rb

@@ -29,16 +29,16 @@ module Xsv
         end
 
         if state == :look_start
-          if (o = pbuf.index('<'))
-            chars = pbuf.slice!(0, o + 1).chop!.force_encoding('utf-8')
+          if (o = pbuf.index("<"))
+            chars = pbuf.slice!(0, o + 1).chop!.force_encoding("utf-8")
 
             if respond_to?(:characters) && !chars.empty?
-              if chars.index('&')
-                chars.gsub!('&amp;', '&')
-                chars.gsub!('&apos;', "'")
-                chars.gsub!('&gt;', '>')
-                chars.gsub!('&lt;', '<')
-                chars.gsub!('&quot;', '"')
+              if chars.index("&")
+                chars.gsub!("&amp;", "&")
+                chars.gsub!("&apos;", "'")
+                chars.gsub!("&gt;", ">")
+                chars.gsub!("&lt;", "<")
+                chars.gsub!("&quot;", '"')
               end
               characters(chars)
             end
@@ -55,8 +55,8 @@ module Xsv
         end
 
         if state == :look_end
-          if (o = pbuf.index('>'))
-            if (s = pbuf.index(' ')) && s < o
+          if (o = pbuf.index(">"))
+            if (s = pbuf.index(" ")) && s < o
               tag_name = pbuf.slice!(0, s + 1).chop!
               args = pbuf.slice!(0, o - s)
             else
@@ -64,18 +64,18 @@ module Xsv
               args = nil
             end
 
-            if tag_name.start_with?('/')
+            if tag_name.start_with?("/")
               end_element(tag_name[1..-1]) if respond_to?(:end_element)
             elsif args.nil?
               start_element(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 args.end_with?('/') && respond_to?(:end_element)
+              end_element(tag_name) if args.end_with?("/") && respond_to?(:end_element)
             end
 
             state = :look_start
           elsif eof_reached
-            raise 'Malformed XML document, looking for end of tag beyond EOF'
+            raise "Malformed XML document, looking for end of tag beyond EOF"
           else
             must_read = true
           end

data/lib/xsv/shared_strings_parser.rb

@@ -18,29 +18,29 @@ module Xsv
 
     def start_element(name, _attrs)
       case name
-      when 'si'
-        @current_string = ''
+      when "si"
+        @current_string = ""
         @skip = false
-      when 'rPh'
+      when "rPh"
         @skip = true
-      when 't'
+      when "t"
         @state = name
       end
     end
 
     def characters(value)
-      if @state == 't' && !@skip
+      if @state == "t" && !@skip
         @current_string += value
       end
     end
 
     def end_element(name)
       case name
-      when 'si'
+      when "si"
         @block.call(@current_string)
-      when 'rPh'
+      when "rPh"
         @skip = false
-      when 't'
+      when "t"
         @state = nil
       end
     end

data/lib/xsv/sheet.rb

@@ -40,7 +40,7 @@ module Xsv
       @headers = []
       @mode = :array
       @row_skip = 0
-      @hidden = ids[:state] == 'hidden'
+      @hidden = ids[:state] == "hidden"
 
       @last_row, @column_count = SheetBoundsHandler.get_bounds(@io, @workbook)
     end
@@ -66,7 +66,7 @@ module Xsv
       true
     end
 
-    alias each each_row
+    alias_method :each, :each_row
 
     # Get row by number, starting at 0. Returns either a hash or an array based on the current row.
     # If the specified index is out of bounds an empty row is returned.

data/lib/xsv/sheet_bounds_handler.rb

@@ -37,20 +37,20 @@ module Xsv
 
     def start_element(name, attrs)
       case name
-      when 'c'
+      when "c"
         @state = name
         @cell = attrs[:r]
-      when 'v'
+      when "v"
         col = column_index(@cell)
         @maxColumn = col if col > @maxColumn
         @maxRow = @row if @row > @maxRow
-      when 'row'
+      when "row"
         @state = name
         @row = attrs[:r].to_i
-      when 'dimension'
+      when "dimension"
         @state = name
 
-        _firstCell, lastCell = attrs[:ref].split(':')
+        _firstCell, lastCell = attrs[:ref].split(":")
 
         if lastCell
           @maxColumn = column_index(lastCell)
@@ -63,7 +63,7 @@ module Xsv
     end
 
     def end_element(name)
-      @block.call(@maxRow, @maxColumn) if name == 'sheetData'
+      @block.call(@maxRow, @maxColumn) if name == "sheetData"
     end
   end
 end

data/lib/xsv/sheet_rows_handler.rb

@@ -20,39 +20,39 @@ module Xsv
       @current_row = {}
       @current_row_attrs = {}
       @current_cell = {}
-      @current_value = String.new
+      @current_value = +""
 
       @headers = @empty_row.keys if @mode == :hash
     end
 
     def start_element(name, attrs)
       case name
-      when 'c'
+      when "c"
         @state = name
         @current_cell = attrs
         @current_value.clear
-      when 'v', 'is'
+      when "v", "is"
         @state = name
-      when 'row'
+      when "row"
         @state = name
         @current_row = @empty_row.dup
         @current_row_attrs = attrs
-      when 't'
-        @state = nil unless @state == 'is'
+      when "t"
+        @state = nil unless @state == "is"
       else
         @state = nil
       end
     end
 
     def characters(value)
-      @current_value << value if @state == 'v' || @state == 'is'
+      @current_value << value if @state == "v" || @state == "is"
     end
 
     def end_element(name)
       case name
-      when 'v'
+      when "v"
         @state = nil
-      when 'c'
+      when "c"
         col_index = column_index(@current_cell[:r])
 
         case @mode
@@ -61,7 +61,7 @@ module Xsv
         when :hash
           @current_row[@headers[col_index]] = format_cell
         end
-      when 'row'
+      when "row"
         real_row_number = @current_row_attrs[:r].to_i
         adjusted_row_number = real_row_number - @row_skip
 
@@ -90,13 +90,13 @@ module Xsv
       return nil if @current_value.empty?
 
       case @current_cell[:t]
-      when 's'
+      when "s"
         @workbook.shared_strings[@current_value.to_i]
-      when 'str', 'inlineStr'
+      when "str", "inlineStr"
         @current_value.strip
-      when 'e' # N/A
+      when "e" # N/A
         nil
-      when nil, 'n'
+      when nil, "n"
         if @current_cell[:s]
           style = @workbook.xfs[@current_cell[:s].to_i]
           numFmt = @workbook.numFmts[style[:numFmtId].to_i]
@@ -105,9 +105,9 @@ module Xsv
         else
           parse_number(@current_value)
         end
-      when 'b'
-        @current_value == '1'
-      when 'd'
+      when "b"
+        @current_value == "1"
+      when "d"
         DateTime.parse(@current_value)
       else
         raise Xsv::Error, "Encountered unknown column type #{@current_cell[:t]}"

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, :'r:id')) if name == "sheet"
     end
   end
 end

data/lib/xsv/styles_handler.rb

@@ -24,20 +24,20 @@ module Xsv
 
     def start_element(name, attrs)
       case name
-      when 'cellXfs'
-        @state = 'cellXfs'
-      when 'xf'
-        @xfs << attrs if @state == 'cellXfs'
-      when 'numFmt'
+      when "cellXfs"
+        @state = "cellXfs"
+      when "xf"
+        @xfs << attrs if @state == "cellXfs"
+      when "numFmt"
         @numFmts[attrs[:numFmtId].to_i] = attrs[:formatCode]
       end
     end
 
     def end_element(name)
       case name
-      when 'styleSheet'
+      when "styleSheet"
         @block.call(@xfs, @numFmts)
-      when 'cellXfs'
+      when "cellXfs"
         @state = nil
       end
     end

data/lib/xsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xsv
-  VERSION = '1.0.4'
+  VERSION = "1.0.5"
 end

data/lib/xsv/workbook.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'zip'
+require "zip"
 
 module Xsv
   # An OOXML Spreadsheet document is called a Workbook. A Workbook consists of
@@ -16,12 +16,12 @@ module Xsv
     # options see {.initialize}
     def self.open(data, **kws)
       @workbook = if data.is_a?(IO) || data.respond_to?(:read) # is it a buffer?
-                    new(Zip::File.open_buffer(data), **kws)
-                  elsif data.start_with?("PK\x03\x04") # is it a string containing a file?
-                    new(Zip::File.open_buffer(data), **kws)
-                  else # must be a filename
-                    new(Zip::File.open(data), **kws)
-                  end
+        new(Zip::File.open_buffer(data), **kws)
+      elsif data.start_with?("PK\x03\x04") # is it a string containing a file?
+        new(Zip::File.open_buffer(data), **kws)
+      else # must be a filename
+        new(Zip::File.open(data), **kws)
+      end
 
       if block_given?
         begin
@@ -43,6 +43,7 @@ module Xsv
     #
     def initialize(zip, trim_empty_rows: false)
       raise ArgumentError, "Passed argument is not an instance of Zip::File. Did you mean to use Workbook.open?" unless zip.is_a?(Zip::File)
+      raise Xsv::Error, "Zip::File is empty" if zip.size.zero?
 
       @zip = zip
       @trim_empty_rows = trim_empty_rows
@@ -85,7 +86,7 @@ module Xsv
     private
 
     def fetch_shared_strings
-      handle = @zip.glob('xl/sharedStrings.xml').first
+      handle = @zip.glob("xl/sharedStrings.xml").first
       return if handle.nil?
 
       stream = handle.get_input_stream
@@ -95,7 +96,7 @@ module Xsv
     end
 
     def fetch_styles
-      stream = @zip.glob('xl/styles.xml').first.get_input_stream
+      stream = @zip.glob("xl/styles.xml").first.get_input_stream
 
       StylesHandler.get_styles(stream)
     ensure
@@ -103,24 +104,24 @@ module Xsv
     end
 
     def fetch_sheets
-      @zip.glob('xl/worksheets/sheet*.xml').sort do |a, b|
+      @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') }
+        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] }
         Xsv::Sheet.new(self, entry.get_input_stream, entry.size, sheet_ids)
       end
     end
 
     def fetch_sheet_ids
-      stream = @zip.glob('xl/workbook.xml').first.get_input_stream
+      stream = @zip.glob("xl/workbook.xml").first.get_input_stream
       SheetsIdsHandler.get_sheets_ids(stream)
     ensure
       stream.close
     end
 
     def fetch_relationships
-      stream = @zip.glob('xl/_rels/workbook.xml.rels').first.get_input_stream
+      stream = @zip.glob("xl/_rels/workbook.xml.rels").first.get_input_stream
       RelationshipsHandler.get_relations(stream)
     ensure
       stream.close

data/lib/xsv.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'date'
+require "date"
 
-require 'xsv/helpers'
-require 'xsv/sax_parser'
-require 'xsv/relationships_handler'
-require 'xsv/shared_strings_parser'
-require 'xsv/sheet'
-require 'xsv/sheet_bounds_handler'
-require 'xsv/sheet_rows_handler'
-require 'xsv/sheets_ids_handler'
-require 'xsv/styles_handler'
-require 'xsv/version'
-require 'xsv/workbook'
+require "xsv/helpers"
+require "xsv/sax_parser"
+require "xsv/relationships_handler"
+require "xsv/shared_strings_parser"
+require "xsv/sheet"
+require "xsv/sheet_bounds_handler"
+require "xsv/sheet_rows_handler"
+require "xsv/sheets_ids_handler"
+require "xsv/styles_handler"
+require "xsv/version"
+require "xsv/workbook"
 
 # 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

data/xsv.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
                             (commonly known as Excel or .xlsx files). It strives to be minimal in the
                             sense that it provides nothing a CSV reader wouldn't, meaning it only
                             deals with minimal formatting and cannot create or modify documents.
-                          EOF
+  EOF
   spec.homepage = "https://github.com/martijn/xsv"
   spec.license = "MIT"
 
@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "< 3"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.14.2"
+  spec.add_development_dependency "standardrb", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Martijn Storck
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.14.2
+- !ruby/object:Gem::Dependency
+  name: standardrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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
@@ -85,6 +99,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".standard.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -112,7 +127,7 @@ 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
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.3.3
+signing_key: 
 specification_version: 4
 summary: A fast and lightweight xlsx parser that provides nothing a CSV parser wouldn't
 test_files: []