xsv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85395cd1f83157097328c94eb82db6ecbf4c3e18ae1241c56762b21d5de03927
-  data.tar.gz: 3141ce4b9bd703aed15cab002f6905636d3597a92492e7d7689077628b7618b9
+  metadata.gz: 6433d19ba65e00b98adecde398a3bfbfe9583ac811290d8f8ffa5ada16ea9b70
+  data.tar.gz: 903c61f9485f1380a064cc8ccfdfa378a46df1383259e6c82ca21501dcc485a5
 SHA512:
-  metadata.gz: 91870ea588f4fbe857c7c8a75c0282a8a22dd91c552bb166cda59d6ecffb32694383dd764136f8412dcaffa12d177df15cd73d408a84d7553ed9d83074c5af46
-  data.tar.gz: e9c81c6c5601b290d13d8eea15a57c018c7c6cee064bd478026b82d279b28d29e7f30d0fe9703e46d16c9653697f71454714592fc9f05ac105836598b7cd4176
+  metadata.gz: e79c5866cd7dd20f0c36ea46a341234bcbc8cdbed40492c8bab31543fe96fcd4bd242a6c63368841e7ad481e4f72187eca5682effdb445388256e83969e1a969
+  data.tar.gz: 474da420765253453a3a1e9a25e8a2582052600bfdaee3e0f246db9d6b415a2a2ae46bd9c2edbb5364efb99708061125f189fd608cab5122bfc2090dd183004d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Xsv Changelog
 
+## 1.0.2 2021-05-01
+
+- Ignore phonetic shared string data (thanks @sinoue-1003)
+- Throw ArgumentError when `Workbook.new` is called unintentionally
+
 ## 1.0.1 2021-03-18
 
 - Allow passing a block to Workbook.open

data/lib/xsv/helpers.rb

@@ -103,38 +103,20 @@ module Xsv
 
     # Apply date or time number formats, if applicable
     def parse_number_format(number, format)
-      number = parse_number(number) if number.is_a?(String)
+      number = parse_number(number) # number is always a string since it comes out of the Sax Parser
 
-      if datetime_format?(format)
+      is_date_format = format.scan(/[dmy]+/).length > 1
+      is_time_format = format.scan(/[hms]+/).length > 1
+
+      if !is_date_format && !is_time_format
+        number
+      elsif is_date_format && is_time_format
         parse_datetime(number)
-      elsif date_format?(format)
+      elsif is_date_format
         parse_date(number)
-      elsif time_format?(format)
+      elsif is_time_format
         parse_time(number)
-      else
-        number
       end
     end
-
-    # Tests if the given format string includes both date and time
-    def datetime_format?(format)
-      date_format?(format) && time_format?(format)
-    end
-
-    # Tests if the given format string is a date
-    def date_format?(format)
-      return false if format.nil?
-
-      # If it contains at least 2 sequences of d's, m's or y's it's a date!
-      format.scan(/[dmy]+/).length > 1
-    end
-
-    # Tests if the given format string is a time
-    def time_format?(format)
-      return false if format.nil?
-
-      # If it contains at least 2 sequences of h's, m's or s's it's a time!
-      format.scan(/[hms]+/).length > 1
-    end
   end
 end

data/lib/xsv/shared_strings_parser.rb

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

data/lib/xsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xsv
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/xsv/workbook.rb

@@ -42,6 +42,8 @@ module Xsv
     #    trim_empty_rows (false) Scan sheet for end of content and don't return trailing rows
     #
     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)
+
       @zip = zip
       @trim_empty_rows = trim_empty_rows
 

metadata

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