rubyXL 1.2.8 → 1.2.9

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.2.9

data/lib/rubyXL/cell.rb

@@ -30,9 +30,9 @@ module RubyXL
 
     def is_date?
       if !@value.is_a?(String)
-        if @workbook.num_fmts
+        if @workbook.num_fmts_by_id
           num_fmt_id = xf_id()[:numFmtId]
-          tmp_num_fmt = @workbook.num_fmts[:numFmt].select { |f| f[:attributes][:numFmtId] == num_fmt_id }[0]
+          tmp_num_fmt = @workbook.num_fmts_by_id[num_fmt_id]
           num_fmt = (tmp_num_fmt &&tmp_num_fmt[:attributes] && tmp_num_fmt[:attributes][:formatCode]) ? tmp_num_fmt[:attributes][:formatCode] : nil
           if num_fmt && workbook.date_num_fmt?(num_fmt)
             return true

data/lib/rubyXL/parser.rb

@@ -10,9 +10,7 @@ module RubyXL
     @@parsed_column_hash ={}
     # converts cell string (such as "AA1") to matrix indices
     def Parser.convert_to_index(cell_string)
-      index = Array.new(2)
-      index[0]=-1
-      index[1]=-1
+      index = [-1,-1]
       if(cell_string =~ /^([A-Z]+)(\d+)$/)
 
         one = $1
@@ -243,12 +241,19 @@ module RubyXL
           ##end row styles##
         end
 
-        c_row = row.search('./xmlns:c')
+        unless @data_only
+          c_row = row.search('./xmlns:c')
+        else
+          c_row = row.search('./xmlns:c[xmlns:v[text()]]')
+        end
         c_row.each do |value|
+          #attributes is from the excel cell(c) and is basically location information and style and type
           value_attributes= value.attributes
+          # r attribute contains the location like A1
           cell_index = Parser.convert_to_index(value_attributes['r'].content)
-          style_index = nil
+          style_index = 0
 
+          # t is optional and contains the type of the cell
           data_type = value_attributes['t'].content if value_attributes['t']
           element_hash ={}
           value.children.each do |node|
@@ -277,6 +282,7 @@ module RubyXL
               cell_data = Integer(v_element_content)
             end
           end
+          # f is the formula element
           cell_formula = nil
           fmla_css = element_hash["f_element"]
           if fmla_css && fmla_css.content
@@ -293,8 +299,6 @@ module RubyXL
 
           unless @data_only
             style_index = value['s'].to_i #nil goes to 0 (default)
-          else
-            style_index = 0
           end
 
           wb.worksheets[i].sheet_data[cell_index[0]][cell_index[1]] =

data/lib/rubyXL/workbook.rb

@@ -15,7 +15,7 @@ module RubyXL
   class Workbook
     include Enumerable
     attr_accessor :worksheets, :filepath, :creator, :modifier, :created_at,
-      :modified_at, :company, :application, :appversion, :num_fmts, :fonts, :fills,
+      :modified_at, :company, :application, :appversion, :num_fmts, :num_fmts_hash, :fonts, :fills,
       :borders, :cell_xfs, :cell_style_xfs, :cell_styles, :shared_strings, :calc_chain,
       :num_strings, :size, :date1904, :external_links, :style_corrector, :drawings,
       :worksheet_rels, :printer_settings, :macros, :colors, :shared_strings_XML, :defined_names, :column_lookup_hash
@@ -39,6 +39,7 @@ module RubyXL
       @application        = application
       @appversion         = appversion
       @num_fmts           = nil
+      @num_fmts_hash      = nil
       @fonts              = nil
       @fills              = nil
       @borders            = nil
@@ -82,6 +83,20 @@ module RubyXL
       worksheets.each{|i| yield i}
     end
 
+    def num_fmts_by_id
+      
+      return @num_fmts_hash unless @num_fmts_hash.nil?
+      if num_fmts
+        @num_fmts_hash={}
+        num_fmts[:numFmt].each do |num_fmt|
+          @num_fmts_hash[num_fmt[:attributes][:numFmtId]]=num_fmt
+        end
+        @num_fmts_hash
+      else
+        {}
+      end
+    end
+
     #filepath of xlsx file (including file itself)
     def write(filepath=@filepath)
       validate_before_write

data/lib/rubyXL/writer/worksheet_writer.rb

@@ -171,6 +171,8 @@ module Writer
           xml.sheetCalcPr('fullCalcOnLoad'=>'1')
 
           unless @worksheet.merged_cells.nil? || @worksheet.merged_cells.size==0
+            #There is some kind of bug here that when merged_cells is sometimes a hash and not an array
+            #initial attempt at a fix fails in corrupted excel documents leaving as is for now.
             xml.mergeCells {
               @worksheet.merged_cells.each do |merged_cell|
                 xml.mergeCell('ref'=>merged_cell[:attributes][:ref].to_s)

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2012-07-11}
+  s.date = %q{2012-07-26}
   s.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
   s.email = %q{bhagwat.vivek@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 2
-  - 8
+  - 9
   segments_generated: true
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 -04:00
+date: 2012-07-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency