rubyXL 1.1.10 → 1.1.11

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/rubyXL/cell.rb

@@ -1,7 +1,7 @@
 module RubyXL
   class Cell < PrivateClass
 
-    attr_accessor :row, :column, :datatype, :style_index, :value, :formula, :worksheet
+    attr_accessor :row, :column, :datatype, :style_index, :formula, :worksheet
     attr_reader :workbook,:formula_attributes
 
     def initialize(worksheet,row,column,value=nil,formula=nil,datatype='s',style_index=0, fmla_attr={})
@@ -17,6 +17,83 @@ module RubyXL
       @formula_attributes = fmla_attr
     end
 
+    def value
+      if is_date?
+        return @workbook.num_to_date(@value)
+      else
+        return @value
+      end
+    end
+
+    def is_date?
+      if !@value.is_a?(String)
+        if @workbook.num_fmts
+          num_fmt_id = xf_id()[:numFmtId]
+          num_fmt = @workbook.num_fmts[:numFmt].select { |f| f[:attributes][:numFmtId] == num_fmt_id }[0].andand[:attributes].andand[:formatCode]
+          if num_fmt && is_date_format?(num_fmt)
+            return true
+          end
+        end
+      end
+      return false
+    end
+
+    def is_date_format?(num_fmt)
+      skip_chars = ['$', '-', '+', '/', '(', ')', ':', ' ']
+      num_chars = ['0', '#', '?']
+      non_date_formats = ['0.00E+00', '##0.0E+0', 'General', 'GENERAL', 'general', '@']
+      date_chars = ['y','m','d','h','s']
+
+      state = 0
+      s = ''
+      num_fmt.split(//).each do |c|
+        if state == 0
+          if c == '"'
+            state = 1
+          elsif ['\\', '_', '*'].include?(c)
+            state = 2
+          elsif skip_chars.include?(c)
+            next
+          else
+            s << c
+          end
+        elsif state == 1
+          if c == '"'
+            state = 0
+          end
+        elsif state == 2
+          state = 0
+        end
+      end
+      s.gsub!(/\[[^\]]*\]/, '')
+      if non_date_formats.include?(s)
+        return false
+      end
+      separator = ';'
+      got_sep = 0
+      date_count = 0
+      num_count = 0
+      s.split(//).each do |c|
+        if date_chars.include?(c)
+          date_count += 1
+        elsif num_chars.include?(c)
+          num_count += 1
+        elsif c == separator
+          got_sep = 1
+        end
+      end
+      if date_count > 0 && num_count == 0
+        return true
+      elsif num_count > 0 && date_count == 0
+        return false
+      elsif date_count
+        # ambiguous result
+      elsif got_sep == 0
+        # constant result
+      end
+      return date_count > num_count
+    end
+
     # changes fill color of cell
     def change_fill(rgb='ffffff')
       validate_worksheet
@@ -145,6 +222,9 @@ module RubyXL
     def change_contents(data, formula=nil)
       validate_worksheet
       @datatype='str'
+      if data.is_a?(Date) || data.is_a?(DateTime)
+        data = @workbook.date_to_num(data)
+      end
       if (data.is_a?Integer) || (data.is_a?Float)
         @datatype = ''
       end
@@ -305,7 +385,7 @@ module RubyXL
     end
 
     def inspect
-      str = "(#{@row},#{@column}): #{@value}" 
+      str = "(#{@row},#{@column}): #{@value}"
       str += " =#{@formula}" if @formula
       str += ", datatype = #{@datatype}, style_index = #{@style_index}"
       return str

data/lib/rubyXL/parser.rb

@@ -33,6 +33,7 @@ module RubyXL
 
 
     # data_only allows only the sheet data to be parsed, so as to speed up parsing
+    # However, using this option will result in date-formatted cells being interpreted as numbers
     def Parser.parse(file_path, data_only=false)
       @data_only = data_only
       files = Parser.decompress(file_path)
@@ -386,7 +387,7 @@ module RubyXL
 
       wb.shared_strings_XML = files['sharedString'].to_s
       wb.defined_names = files['workbook'].css('definedNames').to_s
-
+      wb.date1904 = files['workbook'].css('workbookPr').attribute('date1904').to_s == '1'
 
       wb.worksheets = Array.new(@num_sheets) #array of Worksheet objs
       wb

data/lib/rubyXL/workbook.rb

@@ -9,6 +9,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'writer','styles_write
 require File.expand_path(File.join(File.dirname(__FILE__),'writer','shared_strings_writer'))
 require File.expand_path(File.join(File.dirname(__FILE__),'writer','worksheet_writer'))
 require 'rubyXL/zip'
+require 'date'
 
 module RubyXL
   class Workbook
@@ -46,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
       @external_links     = nil
       @style_corrector    = nil
       @drawings           = nil
@@ -188,6 +189,28 @@ module RubyXL
       return filepath
     end
 
+    def date_to_num(date)
+      return nil if date.nil?
+      if @date1904
+        compare_date = DateTime.parse('December 31, 1903')
+      else
+        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)
+    end
+
+    def num_to_date(num)
+      return nil if num.nil?
+      if @date1904
+        compare_date = DateTime.parse('December 31, 1903')
+      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
+    end
+
     #gets style object from style array given index
     def get_style(style_index)
       if !@cell_xfs[:xf].is_a?Array

data/lib/rubyXL/worksheet.rb

@@ -1370,7 +1370,8 @@ class Worksheet < PrivateClass
     index = nil
 
     @sheet_data.each_with_index do |row, index|
-      original_cells_content = row.map { |cell| cell.nil? ? '' : cell.value.to_s }
+      cells_content = cells_content.map { |header| header.to_s.downcase.strip }
+      original_cells_content = row.map { |cell| cell.nil? ? '' : cell.value.to_s.downcase.strip }
       if (cells_content & original_cells_content).size == cells_content.size
         return index
       end

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.10"
+  s.version = "1.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-10-14}
+  s.date = %q{2011-11-23}
   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,10 +55,11 @@ 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.4.2}
+  s.rubygems_version = %q{1.3.7}
   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

data/spec/lib/cell_spec.rb

@@ -192,6 +192,15 @@ describe RubyXL::Cell do
     end
   end
 
+  describe '.value' 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.value.should == date
+    end
+  end
+
   describe '.change_contents' do
     it 'should cause cell value to match string or number that is passed in' do
       @cell.change_contents('TEST')
@@ -199,6 +208,14 @@ describe RubyXL::Cell do
       @cell.formula.should == nil
     end
 
+    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.value.should == date
+      @cell.formula.should == nil
+    end
+
     it 'should cause cell value and formula to match what is passed in' do
       @cell.change_contents(nil, 'SUM(A2:A4)')
       @cell.value.should == nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 5
+  prerelease: false
   segments: 
   - 1
   - 1
-  - 10
-  version: 1.1.10
+  - 11
+  version: 1.1.11
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -04:00
+date: 2011-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
   name: shoulda
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +45,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-  prerelease: false
   name: bundler
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +61,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id003
-  prerelease: false
   name: jeweler
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +75,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
   name: rcov
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,11 +91,11 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  requirement: *id005
-  prerelease: false
   name: nokogiri
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,11 +107,11 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id006
-  prerelease: false
   name: rubyzip
-- !ruby/object:Gem::Dependency 
+  requirement: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,9 +123,9 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  requirement: *id007
-  prerelease: false
   name: rspec
+  requirement: *id007
+  type: :development
 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.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents