rubyXL 1.1.5 → 1.1.6

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/rubyXL/worksheet.rb

@@ -33,11 +33,11 @@ class Worksheet < PrivateClass
 
   def get_table(headers=[])
     validate_workbook
-    
+
     if !headers.is_a?(Array)
       headers = [headers]
     end
-    
+
     row_num = find_first_row_with_content(headers)
 
   	if row_num.nil?
@@ -47,20 +47,21 @@ class Worksheet < PrivateClass
   	table_hash = {}
   	table_hash[:table] = []
 
-  	headers.each do |header|
-  	  row_strings = @sheet_data[row_num].map { |cell| cell.nil? ? '' : cell.value.to_s }
-  	  header_column = row_strings.index(header)
-  	  table_hash[header.to_sym] = []
+    header_row = @sheet_data[row_num]
+  	header_row.each_with_index do |header_cell, index|
+      next if header_cell.nil? || header_cell.value.nil?
+      header = header_cell.value.to_s
+  	  table_hash[header] = []
 
   	  original_row = row_num + 1
   	  current_row = original_row
 
-  	  cell = @sheet_data[current_row][header_column]	  
+  	  cell = @sheet_data[current_row][index]
 
       # makes array of hashes in table_hash[:table]
-  	  # as well as hash of arrays in table_hash[header.to_sym]
+  	  # as well as hash of arrays in table_hash[header]
   	  while !cell.nil? && !cell.value.nil?
-  		  table_hash[header.to_sym] << cell.value
+  		  table_hash[header] << cell.value
 
     		table_index = current_row - original_row
 
@@ -68,17 +69,17 @@ class Worksheet < PrivateClass
     		  table_hash[:table][table_index] = {}
     		end
 
-    		table_hash[:table][table_index][header.to_sym] = cell.value	
+    		table_hash[:table][table_index][header] = cell.value
 
     		current_row += 1
     		if @sheet_data[current_row].nil?
     		  cell = nil
   		  else
-      		cell = @sheet_data[current_row][header_column]
+      		cell = @sheet_data[current_row][index]
     		end
   	  end
 	  end
-	  
+
 	  return table_hash
   end
 
@@ -374,11 +375,11 @@ class Worksheet < PrivateClass
 
   def add_cell_obj(cell, overwrite=true)
     validate_workbook
-    
+
     if cell.nil?
       return cell
     end
-    
+
     row = cell.row
     column = cell.column
 
@@ -401,27 +402,27 @@ class Worksheet < PrivateClass
   def delete_row(row_index=0)
     validate_workbook
     validate_nonnegative(row_index)
-    
+
     if row_index >= @sheet_data.size
       return nil
     end
-    
+
     deleted = @sheet_data.delete_at(row_index)
     row_num = row_index+1
-    
+
     row_num.upto(@sheet_data.size) do |index|
       @row_styles[(index-1).to_s] = deep_copy(@row_styles[index.to_s])
     end
     @row_styles.delete(@sheet_data.size.to_s)
-    
+
     #change row styles
     # raise row_styles.inspect
-    
+
     #change cell row numbers
     (row_index...(@sheet_data.size-1)).each do |index|
       @sheet_data[index].map {|c| c.row -= 1 if c}
     end
-    
+
     return deleted
   end
 
@@ -485,11 +486,11 @@ class Worksheet < PrivateClass
   def delete_column(col_index=0)
     validate_workbook
     validate_nonnegative(col_index)
-    
+
     if col_index >= @sheet_data[0].size
       return nil
     end
-    
+
     #delete column
     @sheet_data.map {|r| r.delete_at(col_index)}
 
@@ -501,7 +502,7 @@ class Worksheet < PrivateClass
         end
       end
     end
-    
+
     #shift column styles
     #shift col styles 'left'
     @cols.each do |col|
@@ -578,19 +579,19 @@ class Worksheet < PrivateClass
       end
     end
   end
-  
+
   def insert_cell(row=0,col=0,data=nil,formula=nil,shift=nil)
     validate_workbook
     validate_nonnegative(row)
     validate_nonnegative(col)
-    
+
     increase_rows(row)
     increase_columns(col)
-    
+
     if shift && shift != :right && shift != :down
       raise 'invalid shift option'
     end
-    
+
     if shift == :right
       @sheet_data[row].insert(col,nil)
       (row...(@sheet_data[row].size)).each do |index|
@@ -604,10 +605,10 @@ class Worksheet < PrivateClass
         @sheet_data[index][col] = @sheet_data[index-1][col]
       end
     end
-    
+
     return add_cell(row,col,data,formula)
   end
-  
+
   # by default, only sets cell to nil
   # if :left is specified, method will shift row contents to the right of the deleted cell to the left
   # if :up is specified, method will shift column contents below the deleted cell upward
@@ -618,14 +619,14 @@ class Worksheet < PrivateClass
     if @sheet_data.size <= row || @sheet_data[row].size <= col
       return nil
     end
-    
+
     cell = @sheet_data[row][col]
     @sheet_data[row][col]=nil
-    
+
     if shift && shift != :left && shift != :up
       raise 'invalid shift option'
     end
-    
+
     if shift == :left
       @sheet_data[row].delete_at(col)
       @sheet_data[row] << nil
@@ -645,7 +646,7 @@ class Worksheet < PrivateClass
         @sheet_data.last[col].row -= 1
       end
     end
-    
+
     return cell
   end
 
@@ -1362,7 +1363,7 @@ class Worksheet < PrivateClass
     @workbook.fills[xf[:fillId].to_s][:count] += 1
     @workbook.borders[xf[:borderId].to_s][:count] += 1
   end
-  
+
   # finds first row which contains at least all strings in cells_content
   def find_first_row_with_content(cells_content)
     validate_workbook
@@ -1376,6 +1377,6 @@ class Worksheet < PrivateClass
     end
     return nil
   end
-  
+
 end #end class
 end

data/lib/rubyXL/writer/workbook_writer.rb

@@ -23,7 +23,11 @@ module Writer
           #attributes out of order here
           xml.fileVersion('appName'=>'xl', 'lastEdited'=>'4','lowestEdited'=>'4','rupBuild'=>'4505')
           #TODO following line - date 1904? check if mac only
-          xml.workbookPr('date1904'=>@workbook.date1904.to_s, 'showInkAnnotation'=>'0', 'autoCompressPictures'=>'0')
+          if @workbook.date1904.nil? || @workbook.date1904.to_s == ''
+            xml.workbookPr('showInkAnnotation'=>'0', 'autoCompressPictures'=>'0')
+          else
+            xml.workbookPr('date1904'=>@workbook.date1904.to_s, 'showInkAnnotation'=>'0', 'autoCompressPictures'=>'0')
+          end
           xml.bookViews {
             #attributes out of order here
             xml.workbookView('xWindow'=>'-20', 'yWindow'=>'-20',
@@ -44,8 +48,8 @@ module Writer
               end
             }
           end
-          
-          # nokogiri builder creates CDATA tag around content, 
+
+          # nokogiri builder creates CDATA tag around content,
           # using .text creates "html safe" &lt; and &gt; in place of < and >
           # xml to hash method does not seem to function well for this particular piece of xml
           xml.cdata @workbook.defined_names.to_s
@@ -68,7 +72,7 @@ module Writer
       contents = contents.gsub(/<!\[CDATA\[(.*)\]\]>/,'\1')
       contents = contents.sub(/<\?xml version=\"1.0\"\?>/,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+"\n")
       puts '
-      
+
       '
       puts contents
 

data/lib/rubyXL/writer/worksheet_writer.rb

@@ -123,8 +123,11 @@ module Writer
                       #TODO do xml.c for all cases, inside specific.
                       # if dat.formula.nil?
                       dat.style_index = @workbook.style_corrector[dat.style_index.to_s]
-                      xml.c('r'=>Cell.convert_to_cell(i,j),
-                        's'=>dat.style_index.to_s, 't'=>dat.datatype) {
+                      c_opts = {'r'=>Cell.convert_to_cell(i,j), 's'=>dat.style_index.to_s}
+                      unless dat.datatype.nil? || dat.datatype == ''
+                        c_opts['t'] = dat.datatype
+                      end
+                      xml.c(c_opts) {
                         unless dat.formula.nil?
                           if dat.formula_attributes.nil? || dat.formula_attributes.empty?
                             xml.f dat.formula.to_s
@@ -191,7 +194,7 @@ module Writer
 
           unless @worksheet.legacy_drawing.nil?
             xml.legacyDrawing('r:id'=>@worksheet.legacy_drawing[:attributes][:id])
-          end            
+          end
 
           unless @worksheet.extLst.nil?
             xml.extLst {

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-09-08}
+  s.date = %q{2011-09-13}
   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 = [
@@ -55,11 +55,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/gilt/rubyXL}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -04:00
+date: 2011-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +30,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
+  prerelease: false
+  name: shoulda
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +46,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
+  prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +62,10 @@ dependencies:
         - 0
         version: 1.6.0
   requirement: *id003
+  prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +76,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
+  prerelease: false
+  name: rcov
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: nokogiri
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,10 +92,10 @@ dependencies:
         - 4
         version: 1.4.4
   requirement: *id005
+  prerelease: false
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: rubyzip
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,10 +108,10 @@ dependencies:
         - 4
         version: 0.9.4
   requirement: *id006
+  prerelease: false
+  name: rubyzip
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: rspec
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,6 +124,8 @@ dependencies:
         - 4
         version: 1.3.4
   requirement: *id007
+  prerelease: false
+  name: rspec
 description: rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents
 email: bhagwat.vivek@gmail.com
 executables: []
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents