workbook 0.1.6.1 → 0.1.6.2

data/lib/workbook/readers/xlsx_reader.rb

@@ -62,20 +62,54 @@ module RubyXL
   end
 end
 # end monkey patch submitted
-
-# other monkey patch
 module RubyXL
-  class Cell
-    def number_format
-      if !@value.is_a?(String)
-        if @workbook.num_fmts_by_id
-          num_fmt_id = xf_id()[:numFmtId]
-          tmp_num_fmt = @workbook.num_fmts_by_id[num_fmt_id]
-          return (tmp_num_fmt &&tmp_num_fmt[:attributes] && tmp_num_fmt[:attributes][:formatCode]) ? tmp_num_fmt[:attributes][:formatCode] : nil
+  class Workbook
+    def num_fmts_by_id
+      return @num_fmts_hash unless @num_fmts_hash.nil?
+      @num_fmts_hash={1=>{:attributes=>{:formatCode=>'0'}},
+2=>{:attributes=>{:formatCode=>'0.00'}},
+3=>{:attributes=>{:formatCode=>'#, ##0'}},
+4=>{:attributes=>{:formatCode=>'#, ##0.00'}},
+5=>{:attributes=>{:formatCode=>'$#, ##0_);($#, ##0)'}},
+6=>{:attributes=>{:formatCode=>'$#, ##0_);[Red]($#, ##0)'}},
+7=>{:attributes=>{:formatCode=>'$#, ##0.00_);($#, ##0.00)'}},
+8=>{:attributes=>{:formatCode=>'$#, ##0.00_);[Red]($#, ##0.00)'}},
+9=>{:attributes=>{:formatCode=>'0%'}},
+10=>{:attributes=>{:formatCode=>'0.00%'}},
+11=>{:attributes=>{:formatCode=>'0.00E+00'}},
+12=>{:attributes=>{:formatCode=>'# ?/?'}},
+13=>{:attributes=>{:formatCode=>'# ??/??'}},
+14=>{:attributes=>{:formatCode=>'m/d/yyyy'}},
+15=>{:attributes=>{:formatCode=>'d-mmm-yy'}},
+16=>{:attributes=>{:formatCode=>'d-mmm'}},
+17=>{:attributes=>{:formatCode=>'mmm-yy'}},
+18=>{:attributes=>{:formatCode=>'h:mm AM/PM'}},
+19=>{:attributes=>{:formatCode=>'h:mm:ss AM/PM'}},
+20=>{:attributes=>{:formatCode=>'h:mm'}},
+21=>{:attributes=>{:formatCode=>'h:mm:ss'}},
+22=>{:attributes=>{:formatCode=>'m/d/yyyy h:mm'}},
+37=>{:attributes=>{:formatCode=>'#, ##0_);(#, ##0)'}},
+38=>{:attributes=>{:formatCode=>'#, ##0_);[Red](#, ##0)'}},
+39=>{:attributes=>{:formatCode=>'#, ##0.00_);(#, ##0.00)'}},
+40=>{:attributes=>{:formatCode=>'#, ##0.00_);[Red](#, ##0.00)'}},
+45=>{:attributes=>{:formatCode=>'mm:ss'}},
+46=>{:attributes=>{:formatCode=>'[h]:mm:ss'}},
+47=>{:attributes=>{:formatCode=>'mm:ss.0'}},
+48=>{:attributes=>{:formatCode=>'##0.0E+0'}},
+49=>{:attributes=>{:formatCode=>'@'}}}
+      if num_fmts and num_fmts[:numFmt]
+        num_fmts[:numFmt].each do |num_fmt|
+          @num_fmts_hash[num_fmt[:attributes][:numFmtId]]=num_fmt
         end
       end
+      return @num_fmts_hash
     end
-    def fill_color
+  end
+end
+# other monkey patch
+module RubyXL
+  class Cell
+    def number_format
       if !@value.is_a?(String)
         if @workbook.num_fmts_by_id
           num_fmt_id = xf_id()[:numFmtId]
@@ -84,7 +118,6 @@ module RubyXL
         end
       end
     end
-    
   end
 end
 # end of monkey patch 
@@ -112,10 +145,8 @@ module Workbook
               if cell.nil?
                 r[ci] = Workbook::Cell.new nil
               else
-                r[ci] = Workbook::Cell.new cell.value 
-                
+                r[ci] = Workbook::Cell.new cell.value        
                 r[ci].parse!    
-                
                 xls_format = cell.style_index
                 col_width = nil
               

data/test/test_readers_xlsx_reader.rb

@@ -20,8 +20,8 @@ module Readers
       
       assert_equal("Callnr.",w.sheet.table[0][:callnr].value)
       assert_equal("2475617.00",w.sheet.table[3][:callnr].value)
-      assert_equal("2012-12-03T09:48:59+00:00",w.sheet.table[6][:datum_gemeld].value.to_s)
       assert_equal("2012-12-03T12:30:00+00:00",w.sheet.table[7][:datum_gemeld].value.to_s)
+      assert_equal("2012-12-03T09:48:59+00:00",w.sheet.table[6][:datum_gemeld].value.to_s)
     end
 
   end

data/workbook.gemspec

@@ -5,7 +5,7 @@ require "workbook"
 Gem::Specification.new do |s|
   s.name        = 'workbook'
   s.rubyforge_project = 'workbook'
-  s.version     = '0.1.6.1'
+  s.version     = '0.1.6.2'
   s.date        = '2012-12-11'
   s.summary     = "Workbook is a datastructure to contain books of tables (an anlogy used in e.g. Excel)"
   s.description = "Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excels and csv's and tab separated, and offers basic diffing and sorting capabilities."

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 6
-  - 1
-  version: 0.1.6.1
+  - 2
+  version: 0.1.6.2
 platform: ruby
 authors: 
 - Maarten Brouwers