ooxl 0.0.1.4.8.4 → 0.0.1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2390c1057acdb0574b122afbb727df765e44cdc
-  data.tar.gz: 9ce841e16ce3f15fc3c4090b960a9d6b7a2ae87f
+  metadata.gz: 48275946ae01a29a5f56c0c1bc561e66650977bb
+  data.tar.gz: 6d2a8a0cbbb736813eef27b018195b851098afad
 SHA512:
-  metadata.gz: 6af6199d80cf4e363be9104449a6e40a746e9a2374246521115cdf61adfd0f2e1804484a6fe0101de600c85a2e095e5fde39ed3b445b4e7381740fe4b9adfa89
-  data.tar.gz: 48455f48245053a6aefb95a6561288b3584ea8106801ed9ee47b846fd4a06b55864be6f6d9af6721c1efc21f79db5f2b6f0e2724aefd9d4210f7ac80f08cd003
+  metadata.gz: 7e4682b4a534e2334eaf1bd697e05c3adcc521fed4866219269a919bb501dace8621915ab904474a5ab6134457f6271565f6a48edf7e373cc540ef99d435e31b
+  data.tar.gz: 64131b1a33db9784767a7f9721dbf97ffa5b44b55fff7ab612191c090480d52fdd3337e051bb89151ca889d11d151a2d0711952371b3edb843d265a9ac4a5ac1

data/lib/ooxl/ooxl.rb

@@ -76,7 +76,7 @@ class OOXL
         case entry.name
         when /xl\/worksheets\/sheet(\d+)?\.xml/
           sheet_id = entry.name.scan(/xl\/worksheets\/sheet(\d+)?\.xml/).flatten.first
-          @sheets[sheet_id] = OOXL::Sheet.new(entry.get_input_stream.read, shared_strings)
+          @sheets[sheet_id] = OOXL::Sheet.new(entry.get_input_stream.read, shared_strings, @options)
         when /xl\/styles\.xml/
           @styles = OOXL::Styles.load_from_stream(entry.get_input_stream.read)
         when /xl\/comments(\d+)?\.xml/

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.4.8.4"
+  VERSION = "0.0.1.4.9"
 end

data/lib/ooxl/xl_objects/cell.rb

@@ -25,6 +25,14 @@ class OOXL
       attrs.each { |property, value| send("#{property}=", value)}
     end
 
+    def column
+      @column ||= id.gsub(/\d+/, '')
+    end
+
+    def row
+      @row ||= id.gsub(/[^\d+]/, '')
+    end
+
     def next_id(offset: 1, location: "bottom")
       _, column_letter, column_index = id.partition(/[A-Z]+/)
 

data/lib/ooxl/xl_objects/row.rb

@@ -4,7 +4,8 @@ class OOXL
     attr_accessor :id, :spans, :cells
 
     def initialize(**attrs)
-      attrs.each { |property, value| send("#{property}=", value)}
+      attrs.each { |property, value| property == :options ? instance_variable_set("@#{property}", value) : send("#{property}=", value)}
+      @options ||= {}
     end
 
     def [](id)
@@ -16,6 +17,19 @@ class OOXL
       (cell.present?) ? cell : BlankCell.new(id)
     end
 
+    def cells
+      if @options[:padded_cells]
+        unless @cells.blank?
+          'A'.upto(@cells.last.column).map do |column_letter|
+            cell = @cells.find { |cell| cell.column == column_letter}
+            (cell.blank?) ? BlankCell.new("#{column_letter}#{id}") : cell
+          end
+        end
+      else
+        @cells
+      end
+    end
+
     def cell(cell_id)
       cell_final_id = cell_id[/[A-Z]{1,}\d+/] ? cell_id : "#{cell_id}#{id}"
       cells.find { |cell| cell.id == cell_final_id}
@@ -25,10 +39,11 @@ class OOXL
       cells.each { |cell| yield cell }
     end
 
-    def self.load_from_node(row_node, shared_strings, styles)
+    def self.load_from_node(row_node, shared_strings, styles, options)
       new(id: row_node.attributes["r"].try(:value),
           spans: row_node.attributes["spans"].try(:value),
-          cells: row_node.xpath('c').map {  |cell_node| OOXL::Cell.load_from_node(cell_node, shared_strings, styles) } )
+          cells: row_node.xpath('c').map {  |cell_node| OOXL::Cell.load_from_node(cell_node, shared_strings, styles)},
+          options: options )
     end
   end
 end

data/lib/ooxl/xl_objects/sheet.rb

@@ -6,13 +6,14 @@ class OOXL
     attr_reader :columns, :data_validations, :shared_strings
     attr_accessor :comments, :styles, :defined_names, :name
 
-    def initialize(xml, shared_strings)
+    def initialize(xml, shared_strings, options={})
       @xml = Nokogiri.XML(xml).remove_namespaces!
       @shared_strings = shared_strings
       @comments = {}
       @defined_names = {}
       @styles = []
       @loaded_cache = {}
+      @options = options
     end
 
     def code_name
@@ -80,7 +81,7 @@ class OOXL
     def rows
       @rows ||= begin
         all_rows = @xml.xpath('//sheetData/row').map do |row_node|
-          row = Row.load_from_node(row_node, @shared_strings, styles)
+          row = Row.load_from_node(row_node, @shared_strings, @styles, @options)
           yield row if block_given?
           row
         end
@@ -90,7 +91,14 @@ class OOXL
     end
 
     def each
-      rows  { |row| yield row }
+      if @options[:padded_rows]
+        (1.upto(rows.size)).each do |row_index|
+          row = row(row_index)
+          yield (row.blank?) ? Row.new(id: "#{row_index}", cells: []) : row
+        end
+      else
+        rows  { |row| yield row }
+      end
     end
 
     def font(cell_reference)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.8.4
+  version: 0.0.1.4.9
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport