oxcelix 0.3.2 → 0.3.3

data/.yardopts

@@ -1,2 +1,2 @@
---protected
+--protected
 --private

data/CHANGES

@@ -1,3 +1,8 @@
+0.3.3
+* Will not terminate it a directory called 'tmp' already exists in the current directory.
+  Thanks to bhavinkamani for pointing this out.
+* Corrected type in xlsheet parser: empty cells near to non-empty ones will now be correctly handled
+
 0.3.2
 * The numeric method in numformats will now try to gsub the correct format value and not the format index.
 * Required rubyzip version number is now >=1.1.0. 0.9.9 which was apparently 

data/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 gbiczo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2013 gbiczo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,70 +1,70 @@
-Oxcelix
-=======
-<a href="http://badge.fury.io/rb/oxcelix"><img src="https://badge.fury.io/rb/oxcelix@2x.png" alt="Gem Version" height="18"></a>
-
-Oxcelix - A fast and simple .xlsx file parser
-
-Description
------------
-
-Oxcelix is an xlsx (Excel 2007/2010) parser. The result of the parsing is a
-Workbook which is an array of Sheet objects, which in turn store the data in
-Matrix objects. Matrices consist of Cell objects to maintain comments and
-formatting/style data
-
-Oxcelix uses the great Ox gem (http://rubygems.org/gems/ox) for fast SAX-parsing.
-
-Synopsis
---------
-
-  To process an xlsx file:
-
-    `require 'oxcelix'`
-    `w = Oxcelix::Workbook.new('whatever.xlsx')`
-
-  To omit certain sheets:
-
-    `w = Oxcelix::Workbook.new('whatever.xlsx', :exclude => ['sheet1', 'sheet2'])`
-
-  Include only some of the sheets:
-
-    `w = Oxcelix::Workbook.new('whatever.xlsx', :include => ['sheet1', 'sheet2', 'sheet3'])`
-
-  To have the values of the merged cells copied over the mergegroup:
-
-    `w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)`
-  
-  Convert a Sheet object into a collection of ruby values or formatted ruby strings:
-  
-    `require 'oxcelix'`
-    `w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)`
-    `w.sheets[0].to_ru # returns a Matrix of DateTime, Integer, etc objects`
-    `w.sheets[0].to_fmt # returns a Matrix of formatted Strings based on the above.`
-
-Installation
-------------
-
-  `gem install oxcelix`
-
-
-Advantages over other Excel parsers
------------------------------------
-
-Excel file processing involves XML document parsing. Usually, this is achieved by DOM-parsing the data with a suitable XML library.
-
-The main drawbacks of this approach are memory usage and speed. The resulting object tree will be roughly as big as the original file, and during the parsing, they will both be stored in the memory, which can cause quite some complications when processing huge files. Also, interpreting every bit of an excel spreadsheet will slow down unnecessarily the process, if we only need the data stored in that file.
-
-The solution for the memory-consumption problem is SAX stream parsing. This ensures that only the relevant XML elements get processed, 
-without having to load the whole XML file in memory.
-
-Oxcelix uses the SAX parser offered by Peter Ohler's Ox gem. I found Ox SAX parser quite fast, so to further speed up the parsing.
-
-For a comparison of XML parsers, please consult the Ox homepage[http://www.ohler.com/dev/xml_with_ruby/xml_with_ruby.html].
-
-TODO
-----
-  * Implement RawWorkbook, ValueWorkbook, FormattedWorkbook
-  * include/exclude mechanism should extend to cell areas inside Sheet objects
-  * Possible speedups
-  * Further improvement to the formatting algorithms. Theoretically, to_fmt should be able to
-    split conditional-formatting strings and to display e.g. thousands separated number strings
+Oxcelix
+=======
+<a href="http://badge.fury.io/rb/oxcelix"><img src="https://badge.fury.io/rb/oxcelix@2x.png" alt="Gem Version" height="18"></a>
+
+Oxcelix - A fast and simple .xlsx file parser
+
+Description
+-----------
+
+Oxcelix is an xlsx (Excel 2007/2010) parser. The result of the parsing is a
+Workbook which is an array of Sheet objects, which in turn store the data in
+Matrix objects. Matrices consist of Cell objects to maintain comments and
+formatting/style data
+
+Oxcelix uses the great Ox gem (http://rubygems.org/gems/ox) for fast SAX-parsing.
+
+Synopsis
+--------
+
+  To process an xlsx file:
+
+    `require 'oxcelix'`
+    `w = Oxcelix::Workbook.new('whatever.xlsx')`
+
+  To omit certain sheets:
+
+    `w = Oxcelix::Workbook.new('whatever.xlsx', :exclude => ['sheet1', 'sheet2'])`
+
+  Include only some of the sheets:
+
+    `w = Oxcelix::Workbook.new('whatever.xlsx', :include => ['sheet1', 'sheet2', 'sheet3'])`
+
+  To have the values of the merged cells copied over the mergegroup:
+
+    `w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)`
+  
+  Convert a Sheet object into a collection of ruby values or formatted ruby strings:
+  
+    `require 'oxcelix'`
+    `w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)`
+    `w.sheets[0].to_ru # returns a Matrix of DateTime, Integer, etc objects`
+    `w.sheets[0].to_fmt # returns a Matrix of formatted Strings based on the above.`
+
+Installation
+------------
+
+  `gem install oxcelix`
+
+
+Advantages over other Excel parsers
+-----------------------------------
+
+Excel file processing involves XML document parsing. Usually, this is achieved by DOM-parsing the data with a suitable XML library.
+
+The main drawbacks of this approach are memory usage and speed. The resulting object tree will be roughly as big as the original file, and during the parsing, they will both be stored in the memory, which can cause quite some complications when processing huge files. Also, interpreting every bit of an excel spreadsheet will slow down unnecessarily the process, if we only need the data stored in that file.
+
+The solution for the memory-consumption problem is SAX stream parsing. This ensures that only the relevant XML elements get processed, 
+without having to load the whole XML file in memory.
+
+Oxcelix uses the SAX parser offered by Peter Ohler's Ox gem. I found Ox SAX parser quite fast, so to further speed up the parsing.
+
+For a comparison of XML parsers, please consult the Ox homepage[http://www.ohler.com/dev/xml_with_ruby/xml_with_ruby.html].
+
+TODO
+----
+  * Implement RawWorkbook, ValueWorkbook, FormattedWorkbook
+  * include/exclude mechanism should extend to cell areas inside Sheet objects
+  * Possible speedups
+  * Further improvement to the formatting algorithms. Theoretically, to_fmt should be able to
+    split conditional-formatting strings and to display e.g. thousands separated number strings

data/README.rdoc

@@ -1,62 +1,62 @@
-= \Oxcelix - A fast .xlsx file parser
-
-{<img src="https://badge.fury.io/rb/oxcelix.png" alt="Gem Version" />}[http://badge.fury.io/rb/oxcelix]
-
-== Description
-
-Oxcelix is an xlsx (Excel 2007/2010) parser. The result of the parsing is a
-Workbook which is an array of Sheet objects, which in turn store the data in
-Matrix objects. Matrices consist of Cell objects to maintain comments and
-formatting/style data.
-
-Oxcelix uses the great Ox gem (http://rubygems.org/gems/ox) for fast SAX-parsing.
-
-== Synopsis
-
-To process an xlsx file:
-
-  require 'oxcelix'
-  
-  w = Oxcelix::Workbook.new('whatever.xlsx')
-
-To omit certain sheets to be processed:
-
-  w = Oxcelix::Workbook.new('whatever.xlsx', :exclude => ['sheet1', 'sheet2'])
-
-Include only some of the sheets:
-
-  w = Oxcelix::Workbook.new('whatever.xlsx', :include => ['sheet1', 'sheet2', 'sheet3'])
-
-To have the values of the merged cells copied over the mergegroup:
-
-  w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)
-
-Convert a Sheet object into a collection of ruby values or formatted ruby strings:
-  require 'oxcelix'
-  w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)
-  w.sheets[0].to_ru # returns a Matrix of DateTime, Integer, etc objects
-  w.sheets[0].to_fmt # returns a Matrix of formatted Strings based on the above.
-
-== Installation
-
-  gem install oxcelix
-
-== Advantages over other Excel parsers
-
-Excel file processing involves XML document parsing. Usually, this is achieved by DOM-parsing the data with a suitable XML library.
-
-The main drawbacks of this approach are memory usage and speed. The resulting object tree will be roughly as big as the original file, and during the parsing, they will both be stored in the memory, which can cause quite some complications when processing huge files. Also, interpreting every bit of an excel spreadsheet will slow down unnecessarily the process, if we only need the data stored in that file.
-
-The solution for the memory-consumption problem is SAX stream parsing. This ensures that only the relevant XML elements get processed, 
-without having to load the whole XML file in memory.
-
-Oxcelix uses the SAX parser offered by Peter Ohler's Ox gem. I found Ox SAX parser quite fast, so to further speed up the parsing.
-
-For a comparison of XML parsers, please consult the Ox homepage[http://www.ohler.com/dev/xml_with_ruby/xml_with_ruby.html].
-
-== TODO
-  * Implement RawWorkbook, ValueWorkbook, FormattedWorkbook
-  * include/exclude mechanism should extend to cell areas inside Sheet objects
-  * Possible speedups
-  * Further improvement to the formatting algorithms. Theoretically, to_fmt should be able to
+= \Oxcelix - A fast .xlsx file parser
+
+{<img src="https://badge.fury.io/rb/oxcelix.png" alt="Gem Version" />}[http://badge.fury.io/rb/oxcelix]
+
+== Description
+
+Oxcelix is an xlsx (Excel 2007/2010) parser. The result of the parsing is a
+Workbook which is an array of Sheet objects, which in turn store the data in
+Matrix objects. Matrices consist of Cell objects to maintain comments and
+formatting/style data.
+
+Oxcelix uses the great Ox gem (http://rubygems.org/gems/ox) for fast SAX-parsing.
+
+== Synopsis
+
+To process an xlsx file:
+
+  require 'oxcelix'
+  
+  w = Oxcelix::Workbook.new('whatever.xlsx')
+
+To omit certain sheets to be processed:
+
+  w = Oxcelix::Workbook.new('whatever.xlsx', :exclude => ['sheet1', 'sheet2'])
+
+Include only some of the sheets:
+
+  w = Oxcelix::Workbook.new('whatever.xlsx', :include => ['sheet1', 'sheet2', 'sheet3'])
+
+To have the values of the merged cells copied over the mergegroup:
+
+  w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)
+
+Convert a Sheet object into a collection of ruby values or formatted ruby strings:
+  require 'oxcelix'
+  w = Oxcelix::Workbook.new('whatever.xlsx', :copymerge => true)
+  w.sheets[0].to_ru # returns a Matrix of DateTime, Integer, etc objects
+  w.sheets[0].to_fmt # returns a Matrix of formatted Strings based on the above.
+
+== Installation
+
+  gem install oxcelix
+
+== Advantages over other Excel parsers
+
+Excel file processing involves XML document parsing. Usually, this is achieved by DOM-parsing the data with a suitable XML library.
+
+The main drawbacks of this approach are memory usage and speed. The resulting object tree will be roughly as big as the original file, and during the parsing, they will both be stored in the memory, which can cause quite some complications when processing huge files. Also, interpreting every bit of an excel spreadsheet will slow down unnecessarily the process, if we only need the data stored in that file.
+
+The solution for the memory-consumption problem is SAX stream parsing. This ensures that only the relevant XML elements get processed, 
+without having to load the whole XML file in memory.
+
+Oxcelix uses the SAX parser offered by Peter Ohler's Ox gem. I found Ox SAX parser quite fast, so to further speed up the parsing.
+
+For a comparison of XML parsers, please consult the Ox homepage[http://www.ohler.com/dev/xml_with_ruby/xml_with_ruby.html].
+
+== TODO
+  * Implement RawWorkbook, ValueWorkbook, FormattedWorkbook
+  * include/exclude mechanism should extend to cell areas inside Sheet objects
+  * Possible speedups
+  * Further improvement to the formatting algorithms. Theoretically, to_fmt should be able to
     split conditional-formatting strings and to display e.g. thousands separated number strings

data/lib/oxcelix.rb

@@ -1,47 +1,47 @@
-require 'ox'
-require 'find'
-require 'matrix'
-require 'fileutils'
-require 'zip'
-require 'oxcelix/cellhelper'
-require 'oxcelix/numformats'
-require 'oxcelix/nf'
-require 'oxcelix/cell'
-require 'oxcelix/sheet'
-require 'oxcelix/workbook'
-require 'oxcelix/sax/sharedstrings'
-require 'oxcelix/sax/comments'
-require 'oxcelix/sax/xlsheet'
-require 'oxcelix/sax/styles'
-
-class String
-  # Returns true if the given String represents a numeric value 
-  # @return [Bool] true if the string represents a numeric value, false if it doesn't.
-  def numeric?
-    Float(self) != nil rescue false
-  end
-end
-
-class Matrix
-  # Set the cell value i,j to x, where i=row, and j=column.
-  # @param i [Integer] Row
-  # @param j [Integer] Column
-  # @param x [Object] New cell value
-  def []=(i, j, x)
-    @rows[i][j]=x
-  end
-end
-
-class Fixnum
-  # Returns the column name corresponding to the given number. e.g: 1.col_name => 'B'
-  # @return [String]
-  def col_name
-    val=self/26
-    (val > 0 ? (val - 1).col_name : "") + (self % 26 + 65).chr
-  end
-end
-
-# The namespace for all classes and modules included in Oxcelix.
-module Oxcelix
-
-end
+require 'ox'
+require 'find'
+require 'matrix'
+require 'fileutils'
+require 'zip'
+require 'oxcelix/cellhelper'
+require 'oxcelix/numformats'
+require 'oxcelix/nf'
+require 'oxcelix/cell'
+require 'oxcelix/sheet'
+require 'oxcelix/workbook'
+require 'oxcelix/sax/sharedstrings'
+require 'oxcelix/sax/comments'
+require 'oxcelix/sax/xlsheet'
+require 'oxcelix/sax/styles'
+
+class String
+  # Returns true if the given String represents a numeric value 
+  # @return [Bool] true if the string represents a numeric value, false if it doesn't.
+  def numeric?
+    Float(self) != nil rescue false
+  end
+end
+
+class Matrix
+  # Set the cell value i,j to x, where i=row, and j=column.
+  # @param i [Integer] Row
+  # @param j [Integer] Column
+  # @param x [Object] New cell value
+  def []=(i, j, x)
+    @rows[i][j]=x
+  end
+end
+
+class Fixnum
+  # Returns the column name corresponding to the given number. e.g: 1.col_name => 'B'
+  # @return [String]
+  def col_name
+    val=self/26
+    (val > 0 ? (val - 1).col_name : "") + (self % 26 + 65).chr
+  end
+end
+
+# The namespace for all classes and modules included in Oxcelix.
+module Oxcelix
+
+end

data/lib/oxcelix/cell.rb

@@ -1,22 +1,22 @@
-module Oxcelix
-  # Simple class representing an excel cell.
-  # @!attribute [rw] xlcoords
-  #   @return [String] The Excel-style coordinates of the cell object
-  # @!attribute [rw] type
-  #   @return [String] Cell content type
-  # @!attribute [rw] value
-  #   @return [String] the type of the cell
-  # @!attribute [rw] comment
-  #   @return [String] Comment text
-  # @!attribute [rw] style
-  #   @return [String] Excel style attribute
-  # @!attribute [rw] numformat
-  #   @return [String] Excel style number formatting
-
-  class Cell
-    attr_accessor :xlcoords, :type, :value, :comment, :style, :numformat
-    include Cellhelper
-    include Cellvalues
-    include Numberhelper
-  end
-end
+module Oxcelix
+  # Simple class representing an excel cell.
+  # @!attribute [rw] xlcoords
+  #   @return [String] The Excel-style coordinates of the cell object
+  # @!attribute [rw] type
+  #   @return [String] Cell content type
+  # @!attribute [rw] value
+  #   @return [String] the type of the cell
+  # @!attribute [rw] comment
+  #   @return [String] Comment text
+  # @!attribute [rw] style
+  #   @return [String] Excel style attribute
+  # @!attribute [rw] numformat
+  #   @return [String] Excel style number formatting
+
+  class Cell
+    attr_accessor :xlcoords, :type, :value, :comment, :style, :numformat
+    include Cellhelper
+    include Cellvalues
+    include Numberhelper
+  end
+end