ooxl 0.0.1.5.0 → 0.0.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3da0847d61333cf06c4a9e3212604a6b6f1e1e0
-  data.tar.gz: 2b5d30b7c28f88c14adfe0fcbe4e1c0085ccfb61
+  metadata.gz: b4f14b323fab2a3362235d62a449584a6b980482
+  data.tar.gz: 696182e5392827ccc8754300c8e9e9df49fc020b
 SHA512:
-  metadata.gz: cb1e938d50dbfa698605986ae790670f0b2c557438aeb73925baf261326fe8f79b05948d409d06a5fbf620aaa88adba26642206b3beed11ca05e05372487a0ac
-  data.tar.gz: e30534d829e6b0ba29388a950cf5743977ee0b73c942c798df26eca177f9e17a70d365515c76bf37d20d6bb42c027ddad937223a75b582143a1cf1cac7c00d82
+  metadata.gz: 7c4a10ad5b476b807649a94541ce6c7a516a8efbebbd527eceab608a01eb1c0e80edbf1fd535511b521a92725c969b6196cf79b8437391a115fcf04529e853ad
+  data.tar.gz: c1b0926146a8b4cdf68bb55ea1b0307dd4cae502dd11a4fd7fba4b137b16fcc56931b806e651bf2a12e2d2df43c953f0b7c16232b5d5b1e7b59e56b64bade18f

data/lib/ooxl/util.rb

@@ -1,12 +1,13 @@
-class OOXL
+class OOXL
   module Util
-    COLUMN_LETTERS = ('A'..'ZZZZ').to_a
-    def letter_equivalent(index)
-      COLUMN_LETTERS.fetch(index)
+    COLUMN_LETTERS = [nil] + ('A'..'ZZZZ').to_a
+
+    def letter_index(col_letter)
+      column_letter_to_number(col_letter) - 1
     end
 
-    def letter_index(letter)
-      COLUMN_LETTERS.index { |c_letter| c_letter == letter}
+    def letter_equivalent(col_index)
+      column_number_to_letter(col_index + 1)
     end
 
     def to_column_letter(reference)
@@ -14,13 +15,17 @@ class OOXL
     end
 
     def uniform_reference(ref)
-      ref.to_s[/[A-Z]/] ? letter_index(ref) + 1 : ref
+      ref.to_s[/[A-Z]/] ? column_letter_to_number(ref) : ref
     end
 
     def node_value_extractor(node)
       node.try(:value)
     end
 
+    def column_number_to_letter(index)
+      COLUMN_LETTERS.fetch(index)
+    end
+
     def column_letter_to_number(column_letter)
       pow = column_letter.length - 1
       result = 0

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.5.0"
+  VERSION = "0.0.1.5.1"
 end

data/lib/ooxl/xl_objects/row.rb

@@ -45,12 +45,16 @@ class OOXL
     end
 
     def self.load_from_node(row_node, shared_strings, styles, options)
-      new(id: row_node.attributes["r"].try(:value),
+      new(id: extract_id(row_node),
           spans: row_node.attributes["spans"].try(:value),
           height: row_node.attributes["ht"].try(:value),
           cells: row_node.xpath('c').map {  |cell_node| OOXL::Cell.load_from_node(cell_node, shared_strings, styles)},
           options: options )
     end
+
+    def self.extract_id(row_node)
+      row_node.attributes["r"].try(:value)
+    end
   end
 end
 

data/lib/ooxl/xl_objects/row_cache.rb

@@ -10,6 +10,8 @@ class OOXL
     # built on-demand -- use fetch_row_by_id instead
     attr_reader :row_id_map
 
+    delegate :size, to: :row_nodes
+
     def initialize(sheet_xml, shared_strings, options = {})
       @shared_strings = shared_strings
       @sheet_xml = sheet_xml
@@ -47,11 +49,33 @@ class OOXL
       row_cache
     end
 
+    def row_range(start_index, end_index)
+      return enum_for(:row_range, start_index, end_index) unless block_given?
+
+      rows do |row|
+        row_id = row.id.to_i
+        next if row_id < start_index
+        break if row_id > end_index
+
+        yield row
+      end
+    end
+
+    def max_row_index
+      return 0 if row_nodes.empty?
+
+      if all_rows_loaded?
+        row_cache.last.id.to_i
+      else
+        Row.extract_id(row_nodes.last).to_i
+      end
+    end
+
     private
 
     def parse_more_rows
       row_nodes.drop(row_cache.count).each do |row_node|
-        row = Row.load_from_node(row_node, @shared_strings, @styles, @options)
+        row = parse_row(row_node)
         row_cache << row
         row_id_map[row.id] = row
         yield row if block_given?
@@ -62,10 +86,6 @@ class OOXL
       row_cache.count == row_nodes.count
     end
 
-    def row_nodes
-      @row_nodes ||= @sheet_xml.xpath('//sheetData/row')
-    end
-
     def fetch_row_by_id(row_id)
       row_id = row_id.to_s
       return row_id_map[row_id] if all_rows_loaded? || row_id_map.key?(row_id)
@@ -95,6 +115,14 @@ class OOXL
       end
       yielded_rows
     end
+
+    def row_nodes
+      @row_nodes ||= @sheet_xml.xpath('//sheetData/row')
+    end
+
+    def parse_row(row_node)
+      Row.load_from_node(row_node, @shared_strings, @styles, @options)
+    end
   end
 end
 

data/lib/ooxl/xl_objects/sheet.rb

@@ -128,7 +128,7 @@ class OOXL
       # cell_range values separated by comma
       if cell_range.include?(":")
         cell_letters = cell_range.gsub(/[\d]/, '').split(':')
-        start_index, end_index = cell_range[/[A-Z]{1,}\d+/] ? cell_range.gsub(/[^\d:]/, '').split(':').map(&:to_i) : [1, rows.size]
+        start_index, end_index = cell_range[/[A-Z]{1,}\d+/] ? cell_range.gsub(/[^\d:]/, '').split(':').map(&:to_i) : [1, @row_cache.max_row_index]
         if cell_letters.uniq.size > 1
           list_values_from_rectangle(cell_letters, start_index, end_index)
         else
@@ -148,22 +148,19 @@ class OOXL
     # 3 => end_index
     # Expected output would be: [['value', 'value', 'value'], ['value', 'value', 'value'], ['value', 'value', 'value']]
     def list_values_from_rectangle(cell_letters, start_index, end_index)
-      start_index.upto(end_index).map do |row_index|
-        (letter_index(cell_letters.first)..letter_index(cell_letters.last)).map do |cell_index|
-          row = row(row_index)
-          next if row.blank?
-
-          cell_letter = letter_equivalent(cell_index)
-          row["#{cell_letter}#{row_index}"].value
+      start_col = column_letter_to_number(cell_letters.first)
+      end_col = column_letter_to_number(cell_letters.last)
+      @row_cache.row_range(start_index, end_index).map do |row|
+        (start_col..end_col).map do |col_index|
+          col_letter = column_number_to_letter(col_index)
+          row["#{col_letter}#{row.id}"].value
         end
       end
     end
 
     def list_values_from_column(column_letter, start_index, end_index)
-      (start_index..end_index).to_a.map do |row_index|
-        row = row(row_index)
-        next if row.blank?
-        row["#{column_letter}#{row_index}"].value
+      @row_cache.row_range(start_index, end_index).map do |row|
+        row["#{column_letter}#{row.id}"].value
       end
     end
 
@@ -174,19 +171,19 @@ class OOXL
       [row[cell_ref].value]
     end
 
-    def self.load_from_stream(xml_stream, shared_strings)
-      self.new(Nokogiri.XML(xml_stream).remove_namespaces!, shared_strings)
-    end
-
     def in_merged_cells?(cell_id)
       column_letter, column_index = cell_id.partition(/\d+/)
-      range = merged_cells_range.find { |column_range, index_range| column_range.cover?(column_letter) && index_range.cover?(column_index) }
+      range = merged_cells.find { |column_range, index_range| column_range.cover?(column_letter) && index_range.cover?(column_index) }
       range.present?
     end
 
+    def self.load_from_stream(xml_stream, shared_strings)
+      self.new(xml_stream, shared_strings)
+    end
+
     private
 
-    def merged_cells_range
+    def merged_cells
       @merged_cells ||= @xml.xpath('//mergeCells/mergeCell').map do |merged_cell|
         # <mergeCell ref="Q381:R381"/>
         start_reference, end_reference = merged_cell.attributes["ref"].try(:value).split(':')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.5.0
+  version: 0.0.1.5.1
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport