rubyXL 1.0.10 → 1.0.11

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/lib/cell.rb

@@ -2,9 +2,9 @@ module RubyXL
   class Cell < PrivateClass
 
     attr_accessor :row, :column, :datatype, :style_index, :value, :formula, :worksheet
-    attr_reader :workbook
+    attr_reader :workbook,:formula_attributes
 
-    def initialize(worksheet,row,column,value=nil,formula=nil,datatype='s',style_index=0)
+    def initialize(worksheet,row,column,value=nil,formula=nil,datatype='s',style_index=0, fmla_attr={})
       @worksheet = worksheet
 
       @workbook = worksheet.workbook
@@ -14,6 +14,7 @@ module RubyXL
       @value = value
       @formula=formula
       @style_index = style_index
+      @formula_attributes = fmla_attr
     end
 
     # changes fill color of cell

data/lib/parser.rb

@@ -244,8 +244,13 @@ module RubyXL
               end
             end
             cell_formula = nil
-            if(value.css('f').to_s != "")
-              cell_formula = value.css('f').children.to_s
+            fmla_css = value.css('f')
+            if(fmla_css.to_s != "")
+              cell_formula = fmla_css.children.to_s
+              cell_formula_attr = {}
+              cell_formula_attr['t'] = fmla_css.attribute('t').to_s if fmla_css.attribute('t')
+              cell_formula_attr['ref'] = fmla_css.attribute('ref').to_s if fmla_css.attribute('ref')
+              cell_formula_attr['si'] = fmla_css.attribute('si').to_s if fmla_css.attribute('si')
             end
 
             unless @data_only
@@ -256,7 +261,7 @@ module RubyXL
 
             wb.worksheets[i].sheet_data[cell_index[0]][cell_index[1]] =
               Cell.new(wb.worksheets[i],cell_index[0],cell_index[1],cell_data,cell_formula,
-                data_type,style_index)
+                data_type,style_index,cell_formula_attr)
             cell = wb.worksheets[i].sheet_data[cell_index[0]][cell_index[1]]
           end
         end

data/lib/writer/worksheet_writer.rb

@@ -121,9 +121,13 @@ module Writer
                       #TODO do xml.c for all cases, inside specific.
                       # if dat.formula.nil?
                       xml.c('r'=>Cell.convert_to_cell(i,j),
-                        's'=>@workbook.style_corrector[dat.style_index.to_s].to_s, 't'=>dat.datatype) {
+                        's'=>@workbook.style_corrector[dat.style_index.to_s].to_s, 't'=>dat.datatype) {                          
                         unless dat.formula.nil?
-                          xml.f dat.formula.to_s
+                          if dat.formula_attributes.empty?
+                            xml.f dat.formula.to_s
+                          else
+                            xml.f('t'=>dat.formula_attributes['t'].to_s, 'ref'=>dat.formula_attributes['ref'], 'si'=>dat.formula_attributes['si']).nokogiri dat.formula
+                          end
                         end
                         if(dat.datatype == 's')
                           unless dat.value.nil? #empty cell, but has a style

data/rubyXL.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Vivek Bhagwat