rubyXL 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b72075ba552948163cd05f66ce5ba9c7df31ac
-  data.tar.gz: 3baf324bb4179983d316d71fb117535ae664336b
+  metadata.gz: e5d4de6685adea206ea016f0836086e35756a016
+  data.tar.gz: 808c2f74761873580278873b28644650244aa003
 SHA512:
-  metadata.gz: a42cc82b1a82fdffb5e687c003a8e61c99c5e5d2bb8d9d128697e71bc5a6b71eed82a4898c7253c664a4c6b915f54115b9f6d90a833e6f0fd78f727ef0d2aa46
-  data.tar.gz: 115d6753e60167ec4f38f4b7db5beec1cc88965ff7847c3346c3a6b3556e68e0a50e7e18ac87d9d9757c7fb9878d019de85f8808f07614ad6053f8c34874ff8a
+  metadata.gz: c48ceac803b8088420747e52fff0700aab2ebfce5355bd128c0334f6da73327a509b2c7300560297463ad0663405df237941b69cfc4a78e874155e8a3a141540
+  data.tar.gz: e6cd7b075274dc1cd319ca32e56b4602acdbda72ae39a67a2d46bc2baae3c6881df57966decc8febaef3606fc010bc7e2ee23c0c827be8f778deabcc0f256577

data/VERSION

@@ -1 +1 @@
-2.5.5
+2.5.6

data/lib/rubyXL/parser.rb

@@ -10,11 +10,13 @@ module RubyXL
       self.new(opts).parse(file_path)
     end
 
-    # +:data_only+ allows only the sheet data to be parsed, so as to speed up parsing
-    # However, using this option will result in date-formatted cells being interpreted as numbers
+    # +keep_tempfiles_on_error+ prevents temp files to be erased if exception was thrown during parsing.
+    # +:data_only+ allows only the sheet data to be parsed, so as to speed up parsing.
+    # However, using this option will result in date-formatted cells being interpreted as numbers.
     def initialize(opts = {})
       @data_only = opts.is_a?(TrueClass) || opts[:data_only]
       @skip_filename_check = opts[:skip_filename_check]
+      @delete_tempfiles_on_error = !opts[:keep_tempfiles_on_error]
     end
 
     def data_only
@@ -22,90 +24,95 @@ module RubyXL
       self
     end
 
-    def parse(xl_file_path, opts = {})
+    def parse(xl_file_path)
       raise 'Not .xlsx or .xlsm excel file' unless @skip_filename_check ||
                                               %w{.xlsx .xlsm}.include?(File.extname(xl_file_path))
 
       dir_path = File.join(File.dirname(xl_file_path), Dir::Tmpname.make_tmpname(['rubyXL', '.tmp'], nil))
+      parse_success = false
+
+      begin
+        ::Zip::File.open(xl_file_path) { |zip_file|
+          zip_file.each { |f|
+            fpath = File.join(dir_path, f.name)
+            FileUtils.mkdir_p(File.dirname(fpath))
+            zip_file.extract(f, fpath) unless File.exist?(fpath)
+          }
+        }
 
-      ::Zip::File.open(xl_file_path) { |zip_file|
-        zip_file.each { |f|
-          fpath = File.join(dir_path, f.name)
-          FileUtils.mkdir_p(File.dirname(fpath))
-          zip_file.extract(f, fpath) unless File.exist?(fpath)
+        wb = RubyXL::Workbook.parse_file(dir_path)
+        wb.filepath = xl_file_path
+
+        wb.content_types = RubyXL::ContentTypes.parse_file(dir_path)
+        wb.relationship_container = RubyXL::WorkbookRelationships.parse_file(dir_path)
+        wb.root_relationship_container = RubyXL::RootRelationships.parse_file(dir_path)
+        wb.shared_strings_container = RubyXL::SharedStringsTable.parse_file(dir_path)
+
+        # We must always load the stylesheet because it tells us which values are actually dates/times.
+        wb.stylesheet = RubyXL::Stylesheet.parse_file(dir_path)
+
+        unless @data_only
+          wb.media.load_dir(dir_path)
+          wb.external_links.load_dir(dir_path)
+          wb.external_links_rels.load_dir(dir_path)
+          wb.drawings.load_dir(dir_path)
+          wb.drawings_rels.load_dir(dir_path)
+          wb.charts.load_dir(dir_path)
+          wb.chart_rels.load_dir(dir_path)
+          wb.printer_settings.load_dir(dir_path)
+          wb.worksheet_rels.load_dir(dir_path)
+          wb.chartsheet_rels.load_dir(dir_path)
+          wb.macros.load_file(dir_path, 'vbaProject.bin')
+          wb.thumbnail.load_file(dir_path, 'thumbnail.jpeg')
+
+          wb.theme = RubyXL::Theme.parse_file(dir_path)
+          wb.core_properties = RubyXL::CoreProperties.parse_file(dir_path)
+          wb.document_properties = RubyXL::DocumentProperties.parse_file(dir_path)
+          wb.calculation_chain = RubyXL::CalculationChain.parse_file(dir_path)
+        end
+
+        #fills out count information for each font, fill, and border
+        wb.cell_xfs.each { |style|
+          id = style.font_id
+          wb.fonts[id].count += 1 #unless id.nil?
+
+          id = style.fill_id
+          wb.fills[id].count += 1 #unless id.nil?
+
+          id = style.border_id
+          wb.borders[id].count += 1 #unless id.nil?
         }
-      }
-
-      wb = RubyXL::Workbook.parse_file(dir_path)
-      wb.filepath = xl_file_path
-
-      wb.content_types = RubyXL::ContentTypes.parse_file(dir_path)
-      wb.relationship_container = RubyXL::WorkbookRelationships.parse_file(dir_path)
-      wb.root_relationship_container = RubyXL::RootRelationships.parse_file(dir_path)
-      wb.shared_strings_container = RubyXL::SharedStringsTable.parse_file(dir_path)
-
-      # We must always load the stylesheet because it tells us which values are actually dates/times.
-      wb.stylesheet = RubyXL::Stylesheet.parse_file(dir_path)
-
-      unless @data_only
-        wb.media.load_dir(dir_path)
-        wb.external_links.load_dir(dir_path)
-        wb.external_links_rels.load_dir(dir_path)
-        wb.drawings.load_dir(dir_path)
-        wb.drawings_rels.load_dir(dir_path)
-        wb.charts.load_dir(dir_path)
-        wb.chart_rels.load_dir(dir_path)
-        wb.printer_settings.load_dir(dir_path)
-        wb.worksheet_rels.load_dir(dir_path)
-        wb.chartsheet_rels.load_dir(dir_path)
-        wb.macros.load_file(dir_path, 'vbaProject.bin')
-        wb.thumbnail.load_file(dir_path, 'thumbnail.jpeg')
-
-        wb.theme = RubyXL::Theme.parse_file(dir_path)
-        wb.core_properties = RubyXL::CoreProperties.parse_file(dir_path)
-        wb.document_properties = RubyXL::DocumentProperties.parse_file(dir_path)
-        wb.calculation_chain = RubyXL::CalculationChain.parse_file(dir_path)
-      end
 
-      #fills out count information for each font, fill, and border
-      wb.cell_xfs.each { |style|
-        id = style.font_id
-        wb.fonts[id].count += 1 #unless id.nil?
-
-        id = style.fill_id
-        wb.fills[id].count += 1 #unless id.nil?
-
-        id = style.border_id
-        wb.borders[id].count += 1 #unless id.nil?
-      }
-
-      wb.sheets.each_with_index { |sheet, i|
-        sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
-
-        # Making sure that the file will be automatically closed immediately after it has been read
-        File.open(File.join(dir_path, 'xl', sheet_rel.target)) { |sheet_file|
-          case File::basename(sheet_rel.type)
-          when 'worksheet' then
-            sheet_obj = RubyXL::Worksheet.parse(sheet_file)
-            sheet_obj.sheet_data.rows.each { |r|
-              next if r.nil?
-              r.worksheet = sheet
-              r.cells.each { |c| c.worksheet = sheet_obj unless c.nil? }
-            }
-          when 'chartsheet' then
-            sheet_obj = RubyXL::Chartsheet.parse(sheet_file)
-          end
-
-          sheet_obj.workbook = wb
-          sheet_obj.sheet_name = sheet.name
-          sheet_obj.sheet_id = sheet.sheet_id
-          sheet_obj.state = sheet.state
-
-          wb.worksheets[i] = sheet_obj
+        wb.sheets.each_with_index { |sheet, i|
+          sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
+
+          # Making sure that the file will be automatically closed immediately after it has been read
+          File.open(File.join(dir_path, 'xl', sheet_rel.target)) { |sheet_file|
+            case File::basename(sheet_rel.type)
+            when 'worksheet' then
+              sheet_obj = RubyXL::Worksheet.parse(sheet_file)
+              sheet_obj.sheet_data.rows.each { |r|
+                next if r.nil?
+                r.worksheet = sheet
+                r.cells.each { |c| c.worksheet = sheet_obj unless c.nil? }
+              }
+            when 'chartsheet' then
+              sheet_obj = RubyXL::Chartsheet.parse(sheet_file)
+            end
+
+            sheet_obj.workbook = wb
+            sheet_obj.sheet_name = sheet.name
+            sheet_obj.sheet_id = sheet.sheet_id
+            sheet_obj.state = sheet.state
+
+            wb.worksheets[i] = sheet_obj
+          }
         }
-      }
 
-      FileUtils.remove_entry_secure(dir_path)
+        parse_success = true
+      ensure
+        FileUtils.remove_entry_secure(dir_path) if parse_success || @delete_tempfiles_on_error
+      end
 
       return wb
     end

data/lib/rubyXL/worksheet.rb

@@ -23,7 +23,7 @@ module LegacyWorksheet
   #returns 2d array of just the cell values (without style or formula information)
   def extract_data(args = {})
     sheet_data.rows.map { |row| 
-      row && row.cells.map { |c| c && c.value(args) }
+      row.cells.map { |c| c && c.value(args) } unless row.nil?
     }
   end
 
@@ -369,28 +369,33 @@ module LegacyWorksheet
   end
 
   # Inserts row at row_index, pushes down, copies style from the row above (that's what Excel 2013 does!)
-  #USE OF THIS METHOD will break formulas which reference cells which are being "pushed down"
+  # NOTE: use of this method will break formulas which reference cells which are being "pushed down"
   def insert_row(row_index = 0)
     validate_workbook
     ensure_cell_exists(row_index)
 
-    if row_index == 0 then
-      old_row = nil
-      new_cells = Array.new(sheet_data.rows[0].cells.size)
-    else
-      old_row = sheet_data.rows[row_index - 1] 
-      new_cells = old_row.cells.collect { |c| 
-                                          if c.nil? then nil
-                                          else RubyXL::Cell.new(:style_index => c.style_index)
-                                          end }
+    old_row = new_cells = nil
+
+    if row_index > 0 then
+      old_row = sheet_data.rows[row_index - 1]
+      if old_row then
+        new_cells = old_row.cells.collect { |c| 
+                                            if c.nil? then nil
+                                            else RubyXL::Cell.new(:style_index => c.style_index)
+                                            end }
+      end
     end
 
+    row0 = sheet_data.rows[0]
+    new_cells ||= Array.new((row0 && row0.cells.size) || 0)
+
     sheet_data.rows.insert(row_index, nil)
     new_row = add_row(row_index, :cells => new_cells, :style_index => old_row && old_row.style_index)
 
-    #update row value for all rows below
+    # Update row values for all rows below
     row_index.upto(sheet_data.rows.size - 1) { |i|
       row = sheet_data.rows[i]
+      next if row.nil?
       row.cells.each { |c| c.row = i unless c.nil? }
     }
 
@@ -403,21 +408,20 @@ module LegacyWorksheet
 
     return nil unless column_exists(column_index)
 
-    #delete column
     sheet_data.rows.each { |row| row.cells.delete_at(column_index) }
 
-    #change column numbers for cells to right of deleted column
+    # Change column numbers for cells to the right of the deleted column
     sheet_data.rows.each_with_index { |row, row_index|
       row.cells.each_with_index { |c, column_index|
-        c.column -= 1 if c.is_a?(Cell)
+        c.column = column_index if c.is_a?(Cell)
       }
     }
 
     cols.column_ranges.each { |range| range.delete_column(column_index) }
   end
 
-  # inserts column at +column_index+, pushes everything right, takes styles from column to left
-  # USE OF THIS METHOD will break formulas which reference cells which are being "pushed down"
+  # Inserts column at +column_index+, pushes everything right, takes styles from column to left
+  # NOTE: use of this method will break formulas which reference cells which are being "pushed right"
   def insert_column(column_index = 0)
     validate_workbook
     ensure_cell_exists(0, column_index)
@@ -816,7 +820,7 @@ module LegacyWorksheet
     # with lower indices, filling them with +nil+s. But, we can't just write +nil+
     # to +column_index+ because it may be less than +size+! So we read from that index
     # (if it didn't exist, we will get nil) and write right back.
-    sheet_data.rows.each { |r| r.cells[column_index] = r.cells[column_index] }
+    sheet_data.rows.each { |r| r.cells[column_index] = r.cells[column_index] unless r.nil? }
 
     first_row = sheet_data.rows.first
     col_size = [ first_row && first_row.cells.size || 0, column_index ].max

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.5.5</title>
+<title>README - rubyXL 2.5.6</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.5.5</title>
+<title>module RubyXL - rubyXL 2.5.6</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.5.5</title>
+<title>class RubyXL::AExtension - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.5</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 2.5.5</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 2.5.5</title>
+<title>class RubyXL::Alignment - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 2.5.5</title>
+<title>class RubyXL::AlternateContent - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 2.5.5</title>
+<title>class RubyXL::AutoFilter - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.5</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BodyProperties.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BodyProperties - rubyXL 2.5.5</title>
+<title>class RubyXL::BodyProperties - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BooleanNode.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanNode - rubyXL 2.5.5</title>
+<title>class RubyXL::BooleanNode - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BooleanValue.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanValue - rubyXL 2.5.5</title>
+<title>class RubyXL::BooleanValue - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Border.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Border - rubyXL 2.5.5</title>
+<title>class RubyXL::Border - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BorderEdge.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BorderEdge - rubyXL 2.5.5</title>
+<title>class RubyXL::BorderEdge - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Borders.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Borders - rubyXL 2.5.5</title>
+<title>class RubyXL::Borders - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Break.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Break - rubyXL 2.5.5</title>
+<title>class RubyXL::Break - rubyXL 2.5.6</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">