xsv 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b097ec44b4cee4a7f6331a3a94f15e24f33c88258d375923f965dafe88ee13e
-  data.tar.gz: c2da68b26d04cb6bd28496d810f7721e327a655c1c96b695d9b091e569767d21
+  metadata.gz: 9493c51a049db036f7fcfacbdf911d69255008cb15fd4853eafd12a6d9eeaaf1
+  data.tar.gz: '008dfbfa456e9a07e7e301290388a23bb18e3e61f79ce480e5cff5f8b050253f'
 SHA512:
-  metadata.gz: b0a7b30c258e16d391990881f4574577eeee6ec3424524cdc360901ffa62033102c518b005d3b181d0b6e7887f52afa7dfc9415cb2cd762f3f0779d9801aaf5a
-  data.tar.gz: 32ab543df470d94eb4a81e2b271a18ba9295c0d7d9fd63cf918a18baa02b6c01e6bcfb35e6d6e42021d36f773affce5ace52fb07dd7d2ea4110b4a0cbe22fc9c
+  metadata.gz: 154e166f904d5c964d44ad7886d8b5dbc350073d8c01b22f6490c1bf65ec376e06474b249f781314deb3541ee14bbb103e3acd096938bd1b7d8bb118b94b1ab1
+  data.tar.gz: ac24357f40b3aba550668a4d2ba4be75625751868f180a07b981dc931fcf28c2a714eac72443d123dd0a22ac28e1e6c67e56ca3423eb89a716b4e78b7ce8de59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsv (0.2.1)
+    xsv (0.2.2)
       nokogiri (~> 1.10)
       rubyzip (~> 2.2)
 

data/README.md

@@ -68,6 +68,11 @@ sheet[1] # => {"header1" => "value1", "header2" => "value2"}
 Be aware that hash mode will lead to unpredictable results if you have multiple
 columns with the same name!
 
+`Xsv::Workbook.open` accepts a filename, or a IO or String containing a workbook.
+
+`Xsv::Sheet` implements `Enumerable` so you can call methods like `#first`,
+`#filter` and `#map` on it.
+
 ### Assumptions
 
 Since Xsv treats worksheets like csv files it makes certain assumptions about your

data/lib/xsv/helpers.rb

@@ -96,6 +96,20 @@ module Xsv
       end
     end
 
+    def parse_number_format(number, format)
+      number = parse_number(number) if number.is_a?(String)
+
+      if is_datetime_format?(format)
+        parse_datetime(number)
+      elsif is_date_format?(format)
+        parse_date(number)
+      elsif is_time_format?(format)
+        parse_time(number)
+      else
+        number
+      end
+    end
+
     # Tests if the given format string includes both date and time
     def is_datetime_format?(format)
       is_date_format?(format) && is_time_format?(format)

data/lib/xsv/sheet.rb

@@ -1,5 +1,6 @@
 module Xsv
   class Sheet
+    include Enumerable
     include Xsv::Helpers
 
     attr_reader :xml, :mode
@@ -57,6 +58,8 @@ module Xsv
       true
     end
 
+    alias each each_row
+
     # Get row by number, starting at 0
     def [](number)
       row_xml = xml.at_css("sheetData row[r=#{number + @row_skip + 1}]")
@@ -118,22 +121,10 @@ module Xsv
             if v.nil?
               nil
             elsif c_xml["s"]
-              value = parse_number(v.inner_text)
-
               style = @workbook.xfs[c_xml["s"].to_i]
-              numFmtId = style[:numFmtId].to_i
-              numFmt = @workbook.numFmts[numFmtId]
-              if numFmtId == 0
-                value
-              elsif is_datetime_format?(numFmt)
-                parse_datetime(value)
-              elsif is_date_format?(numFmt)
-                parse_date(value)
-              elsif is_time_format?(numFmt)
-                parse_time(value)
-              else
-                value
-              end
+              numFmt = @workbook.numFmts[style[:numFmtId].to_i]
+
+              parse_number_format(v.inner_text, numFmt)
             else
               parse_number(v.inner_text)
             end

data/lib/xsv/version.rb

@@ -1,3 +1,3 @@
 module Xsv
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/xsv/workbook.rb

@@ -6,9 +6,15 @@ module Xsv
 
     attr_reader :sheets, :shared_strings, :xfs, :numFmts
 
-    # Open the workbook of the given filename
-    def self.open(file)
-      @workbook = self.new(Zip::File.open(file))
+    # Open the workbook of the given filename, string or buffer
+    def self.open(data)
+      if data.is_a?(IO)
+        @workbook = self.new(Zip::File.open_buffer(data))
+      elsif data.start_with?("PK\x03\x04")
+        @workbook = self.new(Zip::File.open_buffer(data))
+      else
+        @workbook = self.new(Zip::File.open(data))
+      end
     end
 
     # Open a workbook from an instance of Zip::File

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Martijn Storck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip