rubyXL 1.1.12 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.12
+1.2.0

data/lib/rubyXL/parser.rb

@@ -155,116 +155,136 @@ module RubyXL
       wb.worksheets[i] = Parser.create_matrix(wb, i, files)
       j = i+1
 
+      namespaces = files[j].root.namespaces()
       unless @data_only
-        hash = Hash.xml_node_to_hash(files[j].root)
-
-        wb.worksheets[i].sheet_view = hash[:sheetViews][:sheetView]
+        sheet_views_node= files[j].xpath('/xmlns:worksheet/xmlns:sheetViews[xmlns:sheetView]',namespaces).first
+        wb.worksheets[i].sheet_view = Hash.xml_node_to_hash(sheet_views_node)[:sheetView]
 
         ##col styles##
-        col_data = hash[:cols]
-        unless col_data.nil?
-          wb.worksheets[i].cols=col_data[:col]
+        cols_node_set = files[j].xpath('/xmlns:worksheet/xmlns:cols/xmlns:col',namespaces)
+        unless cols_node_set.empty?
+          wb.worksheets[i].cols= cols_node_set.map(&:attributes)
         end
         ##end col styles##
 
         ##merge_cells##
-        merge_data = hash[:mergeCells]
-        unless merge_data.nil?
-          wb.worksheets[i].merged_cells = merge_data[:mergeCell]
+        merge_cells_node = files[j].xpath('/xmlns:worksheet/xmlns:mergeCells[xmlns:mergeCell]',namespaces)
+        unless merge_cells_node.empty?
+          wb.worksheets[i].merged_cells = Hash.xml_node_to_hash(merge_cells_node.first)[:mergeCell]
         end
         ##end merge_cells##
 
         ##sheet_view pane##
-        pane_data = hash[:sheetViews][:sheetView][:pane]
+        pane_data = wb.worksheets[i].sheet_view[:pane]
         wb.worksheets[i].pane = pane_data
         ##end sheet_view pane##
 
         ##data_validation##
-        data_validation = hash[:dataValidations]
-        unless data_validation.nil?
-          data_validation = data_validation[:dataValidation]
+        data_validations_node = files[j].xpath('/xmlns:worksheet/xmlns:dataValidations[xmlns:dataValidation]',namespaces)
+        unless data_validations_node.empty?
+          wb.worksheets[i].validations = Hash.xml_node_to_hash(data_validations_node.first)[:dataValidation]
+        else
+          wb.worksheets[i].validations=nil
         end
-        wb.worksheets[i].validations = data_validation
         ##end data_validation##
 
         #extLst
-        wb.worksheets[i].extLst = hash[:extLst]
+        ext_list_node=files[j].xpath('/xmlns:worksheet/xmlns:extLst',namespaces)
+        unless ext_list_node.empty?
+          wb.worksheets[i].extLst = Hash.xml_node_to_hash(ext_list_node.first)
+        else
+          wb.worksheets[i].extLst=nil
+        end
         #extLst
 
         ##legacy drawing##
-        drawing = hash[:legacyDrawing]
-        wb.worksheets[i].legacy_drawing = drawing
+        legacy_drawing_node = files[j].xpath('/xmlns:worksheet/xmlns:legacyDrawing',namespaces)
+        unless legacy_drawing_node.empty?
+          wb.worksheets[i].legacy_drawing = Hash.xml_node_to_hash(legacy_drawing_node.first)
+        else
+          wb.worksheets[i].legacy_drawing = nil
+        end
         ##end legacy drawing
       end
 
-      row_data = files[j].css('sheetData row')
+      
+      row_data = files[j].xpath('/xmlns:worksheet/xmlns:sheetData/xmlns:row[xmlns:c[xmlns:v]]',namespaces)
+      row_data.each do |row|
+        unless @data_only
+          ##row styles##
+          row_style = '0'
+          row_attributes = row.attributes
+          unless row_attributes['s'].nil?
+            row_style = row_attributes['s'].value
+          end
 
-      if(row_data.to_s != "")
-        row_data.each do |row|
+          wb.worksheets[i].row_styles[row_attributes['r'].content] = { :style => row_style  }
 
-          unless @data_only
-            ##row styles##
-            unless row.css('c').nil?
-              row_style = '0'
-              unless row.attribute('s').nil?
-                row_style = row.attribute('s').value.to_s
-              end
-
-              wb.worksheets[i].row_styles[row.attribute('r').to_s] = { :style => row_style.to_s  }
-
-              unless row.attribute('ht').to_s == ""
-                wb.worksheets[i].change_row_height(Integer(row.attribute('r').to_s)-1,
-                  Float(row.attribute('ht').to_s))
-              end
-            end
-            ##end row styles##
+          unless row_attributes['ht'].content == ""
+            wb.worksheets[i].change_row_height(Integer(row_attributes['r'].content)-1,
+              Float(row_attributes['ht'].content))
           end
+          ##end row styles##
+        end
 
-          row = row.css('c')
-          row.each do |value|
-            cell_index = Parser.convert_to_index(value.attribute('r').to_s)
-            style_index = nil
-
-            data_type = value.attribute('t').to_s
-
-            if (value.css('v').to_s == "") || (value.css('v').children.to_s == "") #no data
-              cell_data = nil
-            elsif data_type == 's' #shared string
-              str_index = Integer(value.css('v').children.to_s)
-              cell_data = shared_strings[str_index].to_s
-            elsif data_type=='str' #raw string
-              cell_data = value.css('v').children.to_s
-            elsif data_type=='e' #error
-              cell_data = value.css('v').children.to_s
-            else# (value.css('v').to_s != "") && (value.css('v').children.to_s != "") #is number
-              data_type = ''
-              if(value.css('v').children.to_s =~ /\./) #is float
-                cell_data = Float(value.css('v').children.to_s)
-              else
-                cell_data = Integer(value.css('v').children.to_s)
-              end
-            end
-            cell_formula = nil
-            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
+        c_row = row.search('./xmlns:c[xmlns:v]')
+        c_row.each do |value|
+          value_attributes= value.attributes
+          cell_index = Parser.convert_to_index(value_attributes['r'].content)
+          style_index = nil
 
-            unless @data_only
-              style_index = value['s'].to_i #nil goes to 0 (default)
+          data_type = value_attributes['t'].content if value_attributes['t']
+          element_hash ={}
+          value.children.each do |node|
+            element_hash["#{node.name()}_element"]=node
+          end
+          # v is the value element that is part of the cell
+          if element_hash["v_element"]
+            v_element_content = element_hash["v_element"].content
+          else
+            v_element_content=""
+          end
+          if v_element_content =="" #no data
+            cell_data = nil
+          elsif data_type == 's' #shared string
+            str_index = Integer(v_element_content)
+            cell_data = shared_strings[str_index].to_s
+          elsif data_type=='str' #raw string
+            cell_data = v_element_content
+          elsif data_type=='e' #error
+            cell_data = v_element_content
+          else# (value.css('v').to_s != "") && (value.css('v').children.to_s != "") #is number
+            data_type = ''
+            if(v_element_content =~ /\./) #is float
+              cell_data = Float(v_element_content)
             else
-              style_index = 0
+              cell_data = Integer(v_element_content)
             end
+          end
+          cell_formula = nil
+          fmla_css = element_hash["f_element"]
+          if fmla_css && fmla_css.content
+            fmla_css_content= fmla_css.content
+            if(fmla_css_content != "")
+              cell_formula = fmla_css_content
+              cell_formula_attr = {}
+              fmla_css_attributes = fmla_css.attributes
+              cell_formula_attr['t'] = fmla_css_attributes['t'].content if fmla_css_attributes['t']
+              cell_formula_attr['ref'] = fmla_css_attributes['ref'].content if fmla_css_attributes['ref']
+              cell_formula_attr['si'] = fmla_css_attributes['si'].content if fmla_css_attributes['si']
+            end
+          end
 
-            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,cell_formula_attr)
-            cell = wb.worksheets[i].sheet_data[cell_index[0]][cell_index[1]]
+          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]] =
+            Cell.new(wb.worksheets[i],cell_index[0],cell_index[1],cell_data,cell_formula,
+              data_type,style_index,cell_formula_attr)
+          cell = wb.worksheets[i].sheet_data[cell_index[0]][cell_index[1]]
         end
       end
     end
@@ -288,13 +308,13 @@ module RubyXL
 
       files = Hash.new
 
-      files['app'] = Nokogiri::XML.parse(File.read(File.join(dir_path,'docProps','app.xml')))
-      files['core'] = Nokogiri::XML.parse(File.read(File.join(dir_path,'docProps','core.xml')))
+      files['app'] = Nokogiri::XML.parse(File.open(File.join(dir_path,'docProps','app.xml'),'r'))
+      files['core'] = Nokogiri::XML.parse(File.open(File.join(dir_path,'docProps','core.xml'),'r'))
 
-      files['workbook'] = Nokogiri::XML.parse(File.read(File.join(dir_path,'xl','workbook.xml')))
+      files['workbook'] = Nokogiri::XML.parse(File.open(File.join(dir_path,'xl','workbook.xml'),'r'))
 
       if(File.exist?(File.join(dir_path,'xl','sharedStrings.xml')))
-        files['sharedString'] = Nokogiri::XML.parse(File.read(File.join(dir_path,'xl','sharedStrings.xml')))
+        files['sharedString'] = Nokogiri::XML.parse(File.open(File.join(dir_path,'xl','sharedStrings.xml'),'r'))
       end
 
       unless @data_only
@@ -352,7 +372,7 @@ module RubyXL
           files['vbaProject'] = File.open(File.join(dir_path,"xl","vbaProject.bin"),'rb').read
         end
 
-        files['styles'] = Nokogiri::XML.parse(File.read(File.join(dir_path,'xl','styles.xml')))
+        files['styles'] = Nokogiri::XML.parse(File.open(File.join(dir_path,'xl','styles.xml'),'r'))
       end
 
       @num_sheets = files['workbook'].css('sheets').children.size
@@ -362,7 +382,7 @@ module RubyXL
       i=1
       1.upto(@num_sheets) do
         filename = 'sheet'+i.to_s
-        files[i] = Nokogiri::XML.parse(File.read(File.join(dir_path,'xl','worksheets',filename+'.xml')))
+        files[i] = Nokogiri::XML.parse(File.open(File.join(dir_path,'xl','worksheets',filename+'.xml'),'r'))
         i=i+1
       end
 

data/lib/rubyXL/workbook.rb

@@ -47,7 +47,7 @@ module RubyXL
       @calc_chain         = nil #unnecessary?
       @num_strings        = 0 #num strings total
       @size               = 0 #num strings in shared_strings array
-      @date1904           = date1904
+      @date1904           = date1904 > 0
       @external_links     = nil
       @style_corrector    = nil
       @drawings           = nil
@@ -78,6 +78,9 @@ module RubyXL
     #filepath of xlsx file (including file itself)
     def write(filepath=@filepath)
       validate_before_write
+      if !(filepath =~ /(.+)\.xls(x|m)/)
+        raise "Only xlsx and xlsm files are supported. Unsupported type for file: #{filepath}"
+      end
       dirpath = ''
       extension = 'xls'
       if(filepath =~ /((.|\s)*)\.xls(x|m)$/)
@@ -197,7 +200,7 @@ module RubyXL
         compare_date = DateTime.parse('December 31, 1899')
       end
       # add one day to compare date for erroneous 1900 leap year compatibility
-      date.ajd - (compare_date.ajd + 1)
+      date.ajd + 1 - compare_date.ajd
     end
 
     def num_to_date(num)
@@ -207,8 +210,8 @@ module RubyXL
       else
         compare_date = DateTime.parse('December 31, 1899')
       end
-      # add one day to compare date for erroneous 1900 leap year compatibility
-      compare_date + 1 + num
+      # subtract one day to compare date for erroneous 1900 leap year compatibility
+      compare_date - 1 + num
     end
 
     #gets style object from style array given index

data/lib/rubyXL/worksheet.rb

@@ -60,8 +60,11 @@ class Worksheet < PrivateClass
 
       # makes array of hashes in table_hash[:table]
   	  # as well as hash of arrays in table_hash[header]
-  	  while !cell.nil? && !cell.value.nil?
-  		  table_hash[header] << cell.value
+      table_index = current_row - original_row
+  	  cell_test= (!cell.nil? && !cell.value.nil?)
+      while cell_test || !table_hash[:table][table_index].empty?
+
+  		  table_hash[header] << (cell_test ? cell.value : nil)
 
     		table_index = current_row - original_row
 
@@ -69,7 +72,7 @@ class Worksheet < PrivateClass
     		  table_hash[:table][table_index] = {}
     		end
 
-    		table_hash[:table][table_index][header] = cell.value
+    		table_hash[:table][table_index][header] = cell.value if cell_test
 
     		current_row += 1
     		if @sheet_data[current_row].nil?
@@ -77,6 +80,7 @@ class Worksheet < PrivateClass
   		  else
       		cell = @sheet_data[current_row][index]
     		end
+        cell_test= (!cell.nil? && !cell.value.nil?)
   	  end
 	  end
 

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.12"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-11-29}
+  s.date = %q{2012-01-06}
   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 = [

data/spec/lib/cell_spec.rb

@@ -196,9 +196,18 @@ describe RubyXL::Cell do
     it 'should return the value of a date' do
       date = Date.parse('January 1, 2011')
       @cell.change_contents(date)
-      @cell.should_receive(:is_date?).once.and_return(true)
+      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
       @cell.value.should == date
     end
+
+    it 'should convert date numbers correctly' do
+      date = 41019
+      @cell.change_contents(date)
+      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
+      puts @cell.value
+      puts Date.parse('April 20, 2012')
+      @cell.value.should == Date.parse('April 20, 2012')
+    end
   end
 
   describe '.change_contents' do
@@ -211,7 +220,7 @@ describe RubyXL::Cell do
     it 'should cause cell value to match a date that is passed in' do
       date = Date.parse('January 1, 2011')
       @cell.change_contents(date)
-      @cell.should_receive(:is_date?).once.and_return(true)
+      @cell.should_receive(:is_date?).any_number_of_times.and_return(true)
       @cell.value.should == date
       @cell.formula.should == nil
     end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 12
-  version: 1.1.12
+  - 2
+  - 0
+  segments_generated: true
+  version: 1.2.0
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 -05:00
+date: 2012-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,6 +29,7 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   name: shoulda
   requirement: *id001
@@ -44,6 +46,7 @@ dependencies:
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
   name: bundler
   requirement: *id002
@@ -60,6 +63,7 @@ dependencies:
         - 1
         - 6
         - 0
+        segments_generated: true
         version: 1.6.0
   name: jeweler
   requirement: *id003
@@ -74,6 +78,7 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   name: rcov
   requirement: *id004
@@ -90,6 +95,7 @@ dependencies:
         - 1
         - 4
         - 4
+        segments_generated: true
         version: 1.4.4
   name: nokogiri
   requirement: *id005
@@ -106,6 +112,7 @@ dependencies:
         - 0
         - 9
         - 4
+        segments_generated: true
         version: 0.9.4
   name: rubyzip
   requirement: *id006
@@ -122,6 +129,7 @@ dependencies:
         - 1
         - 3
         - 4
+        segments_generated: true
         version: 1.3.4
   name: rspec
   requirement: *id007
@@ -187,6 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -196,6 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []