xsv 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd294b7a34e4551d8d86fce762b4c632a2b6b0906665b321b4e0bf586880f0a9
-  data.tar.gz: 204862fa72e99e0cb67c3bc54c21e0e652e6028070d81dd993d5df012e264ca5
+  metadata.gz: 2eed2bd4654d89a75f817365a919f2ca4c8f4f9bee17e63f5fc938b574826696
+  data.tar.gz: ddfa4e09f2d9378a79943cef340b1af20ae49764b64bcb28478b672d676e4565
 SHA512:
-  metadata.gz: 6f4063b90b0d9c30586fa4ac9cecda89fbd2f6bf6ef2ab8ba379039c32cff0d0d2072946b598accc64f05cb3949c6039bae0848a1119180902e0561448153d4b
-  data.tar.gz: '01932836f664fb61d285edd4d6b88ca84a5141ac2c20c09b177d30e15a039e406311505fc0c111f9fdcd0be18da8a0e0baf020d3a4c0a748e8384485ad25c91c'
+  metadata.gz: 6b79348311d076d9397b7cd0629ac4502dc8a3410835b68682e4410af64dea2603d6ea2a68157e0a0bd933f9cdc3b3780034e645d7df9036d7696bda927b858d
+  data.tar.gz: e40fa7237b12c4d83639f797ba38c9928e6d412bb658b0fa6855dc2bbca6004d89f36a306c74b207e453d2a5e3597b7e45fd76b464c1c5b3a45a716d09d876f0

data/Gemfile.lock

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

data/lib/xsv/helpers.rb

@@ -0,0 +1,14 @@
+module Xsv
+  module Helpers
+    # Return the index number for the given Excel column name
+    def column_index(col)
+      val = 0
+      while col.length > 0
+        val *= 26
+        val += (col[0].ord - "A".ord + 1)
+        col = col[1..-1]
+      end
+      return val - 1
+    end
+  end
+end

data/lib/xsv/sheet.rb

@@ -1,5 +1,7 @@
 module Xsv
   class Sheet
+    include Xsv::Helpers
+
     attr_reader :xml
 
     def initialize(workbook, xml)
@@ -17,7 +19,9 @@ module Xsv
     def each_row(read_headers: false)
       @parse_headers if read_headers
 
-      @xml.css("sheetData row").each do |row_xml|
+      @xml.css("sheetData row").each_with_index do |row_xml, i|
+        next if i == 0 && @headers.any?
+
         yield(parse_row(row_xml))
       end
 
@@ -50,14 +54,14 @@ module Xsv
         row = []
       end
 
-      xml.css("c").each_with_index do |c_xml, i|
-        next if @headers.any? && i == 0
+      next_index = 0
 
+      xml.css("c").each do |c_xml|
         value = case c_xml["t"]
           when "s"
             @workbook.shared_strings[c_xml.css("v").inner_text.to_i]
           when "str"
-            c_xml.css("v").inner_text
+            c_xml.css("v").inner_text.to_s
           when "e" # N/A
             nil
           when nil
@@ -66,11 +70,25 @@ module Xsv
             raise Xsv::Error, "Encountered unknown column type #{c_xml["t"]}"
           end
 
+        # Determine column position and pad row with nil values
+        col_index = column_index(c_xml["r"].scan(/^[A-Z]+/).first)
+
+        (col_index - next_index).times do
+          if @headers.any?
+            row[@headers[next_index]] = nil
+          else
+            row << nil
+          end
+          next_index += 1
+        end
+
         if @headers.any?
-          row[@headers[i]] = value
+          row[@headers[next_index]] = value
         else
           row << value
         end
+
+        next_index += 1
       end
 
       row

data/lib/xsv/version.rb

@@ -1,3 +1,3 @@
 module Xsv
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/xsv.rb

@@ -1,4 +1,5 @@
 require "xsv/file"
+require "xsv/helpers"
 require "xsv/sheet"
 require "xsv/version"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xsv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martijn Storck
@@ -98,6 +98,7 @@ files:
 - bin/setup
 - lib/xsv.rb
 - lib/xsv/file.rb
+- lib/xsv/helpers.rb
 - lib/xsv/sheet.rb
 - lib/xsv/version.rb
 - xsv.gemspec