xsv 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21f0a8d16ae47d4f467f2a329a3fb50122d5386aa7459f7a04cf83594814752
-  data.tar.gz: ee74ecd24d93c200df5626748e17b300c6147a9c7d7442ed5913ee80e7bcb500
+  metadata.gz: 9fde081e219b3d4ae14aaa9d29de699e67df263ff0d8bfa1ffc10362099dc8eb
+  data.tar.gz: f2cd6e1ae40a06bcac62368a26f9cf09157d5394bbb7f9ab34473a90be729d37
 SHA512:
-  metadata.gz: 9b95af14330be23be0003753112486e71980bc06073baa22054a725775fd17a246d1cb448816666bde6fffc9793c7cec242b143c28cac2b5d4dbeacfd78c89da
-  data.tar.gz: b659683e0a6bc6c7bb661642bdc1dd94acf6af2fdfc3833e2cfd54f465981821117d133c551feb7c69673d88a1fe0be5881c79c02ab1443b4f714720737eb3db
+  metadata.gz: 24a1070748166f3d18fffced8b310825efa72c121b4226ce588686c18eb07f80a8c328848b7f1c0915b4c002ea656916db263441dd2a442a60dd828e4ba8ccde
+  data.tar.gz: 01530b8f31bc60aafbeb36a563faff5958bf98577ae3a85e527e217c0c988a5b5d4ef7e614811cdd590402312835b7f60c50c0a94c4a77bc0543729e41c6e826

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsv (0.3.0)
+    xsv (0.3.2)
       ox (~> 2.13)
       rubyzip (~> 2.2)
 

data/lib/xsv/helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   module Helpers
     BUILT_IN_NUMBER_FORMATS = {
@@ -36,23 +37,19 @@ module Xsv
 
     MINUTE = 60.freeze
     HOUR = 3600.freeze
+    A_CODEPOINT = 'A'.ord.freeze
+    EPOCH = Date.new(1899, 12, 30).freeze
 
     # Return the index number for the given Excel column name
     def column_index(col)
       col = col[/^[A-Z]+/]
 
-      val = 0
-      while col.length > 0
-        val *= 26
-        val += (col[0].ord - "A".ord + 1)
-        col = col[1..-1]
-      end
-      return val - 1
+      col.each_codepoint.reduce(0) { |sum, n| sum * 26 + (n - A_CODEPOINT + 1) } - 1
     end
 
     # Return a Date for the given Excel date value
     def parse_date(number)
-      Date.new(1899, 12, 30) + number
+       EPOCH + number
     end
 
     # Return a time as a string for the given Excel time value

data/lib/xsv/shared_strings_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   class SharedStringsParser < Ox::Sax
     def self.parse(io)

data/lib/xsv/sheet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   class Sheet
     include Enumerable
@@ -69,7 +70,7 @@ module Xsv
       if @mode == :array
         first
       elsif @mode == :hash
-        @mode == :array
+        @mode = :array
         headers.tap { @mode = :hash }
       end
     end

data/lib/xsv/sheet_bounds_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   # SheetBoundsHandler scans a sheet looking for the outer bounds of the content within
   class SheetBoundsHandler < Ox::Sax

data/lib/xsv/sheet_rows_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   class SheetRowsHandler < Ox::Sax
     include Xsv::Helpers
@@ -58,7 +59,7 @@ module Xsv
       when :c
         @state = name
         @current_cell = {}
-        @current_value = ""
+        @current_value = String.new
       when :v
         @state = name
       when :row
@@ -72,7 +73,7 @@ module Xsv
 
     def text(value)
       if @state == :v
-        @current_value += value
+        @current_value << value
       end
     end
 

data/lib/xsv/styles_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
   # StylesHandler interprets the relevant parts of styles.xml
   class StylesHandler < Ox::Sax

data/lib/xsv/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Xsv
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/xsv/workbook.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'zip'
 
 module Xsv
@@ -8,11 +9,11 @@ module Xsv
     # Open the workbook of the given filename, string or buffer
     def self.open(data, **kws)
       if data.is_a?(IO)
-        @workbook = self.new(Zip::File.open_buffer(data), kws)
+        @workbook = self.new(Zip::File.open_buffer(data), **kws)
       elsif data.start_with?("PK\x03\x04")
-        @workbook = self.new(Zip::File.open_buffer(data), kws)
+        @workbook = self.new(Zip::File.open_buffer(data), **kws)
       else
-        @workbook = self.new(Zip::File.open(data), kws)
+        @workbook = self.new(Zip::File.open(data), **kws)
       end
     end
 

data/lib/xsv.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "date"
 require "ox"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Martijn Storck
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Minimal xlsx parser that provides nothing a CSV parser wouldn't