spreadsheetx 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/spreadsheetx.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 # 
 require 'spreadsheetx/workbook'
 require 'spreadsheetx/worksheet'
+require 'spreadsheetx/cell_format'
 
 module SpreadsheetX
   

data/lib/spreadsheetx/cell_format.rb

@@ -0,0 +1,19 @@
+module SpreadsheetX
+
+  # this object represents an existing cell format in the workbook
+  class CellFormat
+
+    attr_reader :id
+    attr_reader :format
+    
+    def initialize(id, format)
+      @id = id
+      @format = format
+    end
+    
+    def to_s
+      id.to_s
+    end
+    
+  end
+end

data/lib/spreadsheetx/workbook.rb

@@ -5,6 +5,7 @@ module SpreadsheetX
 
     attr_reader :path
     attr_reader :worksheets
+    attr_reader :formats
 
     # return a Workbook object which relates to an existing xlsx file on disk
     def initialize(path)
@@ -33,6 +34,26 @@ module SpreadsheetX
           
         end
 
+        # open the styles, to get the cell formats
+        archive.fopen('xl/styles.xml') do |f| 
+
+          # read contents of this file
+          file_contents = f.read 
+
+          #parse the XML and build the worksheets
+          @formats = []
+          # parse the XML and hold the doc
+          xml_doc = XML::Document.string(file_contents)
+          # set the default namespace
+          xml_doc.root.namespaces.default_prefix = 'spreadsheetml'
+          
+          format_id = 0
+          xml_doc.find('spreadsheetml:numFmts/spreadsheetml:numFmt').each do |node|
+            @formats.push SpreadsheetX::CellFormat.new((format_id+=1), node['formatCode'])
+          end
+          
+        end
+        
       end
     end
     
@@ -54,6 +75,7 @@ module SpreadsheetX
 
     end
 
+
   end
   
 end

data/lib/spreadsheetx/worksheet.rb

@@ -28,19 +28,37 @@ module SpreadsheetX
     end
 
     # update the value of a particular cell, if the row or cell doesnt exist in the XML, then it will be created
-    def update_cell(col_number, row_number, val)
+    def update_cell(col_number, row_number, val, format=nil)
       
       cell_id = SpreadsheetX::Worksheet.cell_id(col_number, row_number)
+
+      val_is_a_date = (val.kind_of?(Date) || val.kind_of?(Time) || val.kind_of?(DateTime))
+      
+      # if the val is nil or an empty string, then just delete the cell
+      if val.nil? || val == ''
+        if cell = @xml_doc.find_first("spreadsheetml:sheetData/spreadsheetml:row[@r=#{row_number}]/spreadsheetml:c[@r='#{cell_id}']")
+          cell.remove!
+        end
+        return
+      end
       
       row = @xml_doc.find_first("spreadsheetml:sheetData/spreadsheetml:row[@r=#{row_number}]")
       
       # was this row found
       unless row
+        
         # build a new row
         row = XML::Node.new('row')
         row['r'] = row_number.to_s
-        # add it to the other rows
-        @xml_doc.find_first('spreadsheetml:sheetData') << row
+        
+        # if there are no rows higher than this one, then add this row to the end of the sheetData
+        next_largest = @xml_doc.find_first("spreadsheetml:sheetData/spreadsheetml:row[@r>#{row_number}]")
+        if next_largest
+          next_largest.prev = row
+        else  # there are no rows higher than this one
+          # add this row to the end of the sheetData
+          @xml_doc.find_first('spreadsheetml:sheetData') << row
+        end
       end
       
       cell = row.find_first("spreadsheetml:c[@r='#{cell_id}']")
@@ -49,30 +67,42 @@ module SpreadsheetX
         # build a new cell
         cell = XML::Node.new('c')
         cell['r'] = cell_id
-        # add it to the other rows
+        # add it to the other cells in this row
         row << cell
       end
       
+      # are we setting a format
+      cell['s'] = format.to_s
+      
+      # reset this attribute
+      cell['t'] = ''
+      
       # create the node which represents the value in the cell
-      if val.kind_of? String
+      
+      # numeric types
+      if val.kind_of?(Integer) || val.kind_of?(Float) || val.kind_of?(Fixnum)
+        
+        cell_value = XML::Node.new('v')
+        cell_value.content = val.to_s
+
+      # if we are using a format, then dates are stored as floats, otherwise they get caught by string use a string
+      elsif format && val_is_a_date
         
+        cell_value = XML::Node.new('v')
+        # dates are stored as flaots, otherwise use a string
+        cell_value.content = (val.to_time.to_f / (60*60*24)).to_s
+        
+      else # assume its a string
+
         # put the strings inline to make life easier
         cell['t'] = 'inlineStr'
         
-        # the string node looke like <is><t>string</t></is>
+        # the string node looks like <is><t>string</t></is>
         is = XML::Node.new('is')
         t = XML::Node.new('t')
-        t.content = val
+        t.content = val_is_a_date ? val.to_time.strftime('%Y-%m-%d %H:%M:%S') : val.to_s
         
         cell_value = ( is << t )
-        
-      else
-        
-        # incase this was an inline string, clear out this attribute
-        cell['t'] = ''
-        
-        cell_value = XML::Node.new('v')
-        cell_value.content = val.to_s
 
       end
       
@@ -94,7 +124,7 @@ module SpreadsheetX
 
     # returns the xml representation of this worksheet
     def to_s
-      @xml_doc.to_s
+      @xml_doc.to_s(:indent => false).gsub(/\n/,"\r\n")
     end
     
     # turns a cell address into its excel name, 1,1 = A1  2,3 = C2 etc.

data/spec/spreadsheetx_spec.rb

@@ -27,7 +27,7 @@ describe "Spreadsheetx" do
     empty_xlsx_file = "#{File.dirname(__FILE__)}/../templates/spec.xlsx"
     workbook = SpreadsheetX.open(empty_xlsx_file)
 
-    workbook.worksheets.last.row_count.should == 4
+    workbook.worksheets.last.row_count.should == 8
     
   end
   
@@ -107,6 +107,7 @@ describe "Spreadsheetx" do
     workbook = SpreadsheetX.open(empty_xlsx_file)
   
     workbook.worksheets.last.update_cell(9, 9, Time.now)
+    workbook.worksheets.last.update_cell(1, 4, 'A string')
     workbook.worksheets.last.update_cell(9, 10, 'A string')
     workbook.worksheets.last.update_cell(9, 11, 10.3)
     workbook.worksheets.last.update_cell(9, 12, 53)
@@ -116,7 +117,35 @@ describe "Spreadsheetx" do
     workbook.save(new_xlsx_file)
   
   end
+
+  it "can read and return a list of number formats currently in the document" do
+  
+    # a valid xlsx file used for testing
+    empty_xlsx_file = "#{File.dirname(__FILE__)}/../templates/spec.xlsx"
+    workbook = SpreadsheetX.open(empty_xlsx_file)
+  
+    workbook.formats.count.should == 3
+    workbook.formats.first.id.to_i.should > 0
+    puts workbook.formats.first.format.should == '[$-F400]h:mm:ss\ AM/PM'
+
+    new_xlsx_file = "#{File.dirname(__FILE__)}/../templates/spec_various_content.xlsx"
+    workbook.save(new_xlsx_file)
+  
+  end
+  
+
+  it "can set formats on cells" do
+  
+    # a valid xlsx file used for testing
+    empty_xlsx_file = "#{File.dirname(__FILE__)}/../templates/spec.xlsx"
+    workbook = SpreadsheetX.open(empty_xlsx_file)
   
+    date_format = workbook.formats.first
+    workbook.worksheets.last.update_cell(1, 8, Time.now, date_format)
+
+    new_xlsx_file = "#{File.dirname(__FILE__)}/../templates/spec_cell_format.xlsx"
+    workbook.save(new_xlsx_file)
   
+  end
   
 end

data/spreadsheetx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spreadsheetx}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Ulliott"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/spreadsheetx.rb",
+    "lib/spreadsheetx/cell_format.rb",
     "lib/spreadsheetx/workbook.rb",
     "lib/spreadsheetx/worksheet.rb",
     "spec/spec_helper.rb",

metadata

@@ -2,7 +2,7 @@
 name: spreadsheetx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Craig Ulliott
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - VERSION
 - lib/spreadsheetx.rb
+- lib/spreadsheetx/cell_format.rb
 - lib/spreadsheetx/workbook.rb
 - lib/spreadsheetx/worksheet.rb
 - spec/spec_helper.rb
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -772800674702882304
+      hash: 3923025067229430193
       segments: 
       - 0
       version: "0"