spreadsheet 0.6.1.8 → 0.6.1.9

data/History.txt

@@ -1,3 +1,17 @@
+=== 0.6.1.9 / 2008-11-07
+
+* 1 Bugfix
+
+  * Fixes a precision-issue in Excel::Row#datetime: Excel records Time-Values
+    with more significant bits (but not necessarily more precise) than
+    DateTime can handle.
+    (Thanks to Bjørn Hjelle for the Bugreport)
+
+* 1 minor enhancement
+
+  * Added support for appending Worksheets to a Workbook
+    (Thanks to Mohammed Rabbani for the report)
+
 === 0.6.1.8 / 2008-10-31
 
 * 1 Bugfix

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.1.8'
+  VERSION = '0.6.1.9'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/excel/reader.rb

@@ -112,6 +112,7 @@ class Reader
     extend_internals biff
     read_workbook
     @workbook.default_format = @workbook.format 0
+    @workbook.changes.clear
     @workbook
   end
   def read_blank worksheet, addr, work

data/lib/spreadsheet/excel/row.rb

@@ -20,6 +20,11 @@ class Row < Spreadsheet::Row
   def datetime idx
     _datetime at(idx)
   end
+  def each &block
+    size.times do |idx|
+      block.call self[idx]
+    end
+  end
   ##
   # Access data in this Row like you would in an Array. If a cell is formatted
   # as a Date or DateTime, the decoded Date or DateTime value is returned.
@@ -49,7 +54,11 @@ class Row < Spreadsheet::Row
   def _datetime data # :nodoc:
     return data if data.is_a?(DateTime)
     date = _date data
-    DateTime.new(date.year, date.month, date.day) + (data.to_f % 1)
+    hour = (data % 1) * 24
+    min  = (hour % 1) * 60
+    sec  = (min  % 1) * 60
+    DateTime.new(date.year, date.month, date.day,
+                 hour.to_i, min.to_i, sec.round)
   end
   def enriched_data idx, data # :nodoc:
     res = nil

data/lib/spreadsheet/excel/workbook.rb

@@ -44,6 +44,10 @@ class Workbook < Spreadsheet::Workbook
   def add_shared_string str
     @sst.push str
   end
+  def add_worksheet worksheet
+    @changes.store :boundsheets, true
+    super
+  end
   def biff_version
     case @bof
     when 0x009

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -154,11 +154,17 @@ class Workbook < Spreadsheet::Writer
     sst_strings.each_with_index do |str, idx| sst.store str, idx end
     sheets = worksheets(workbook)
     positions = []
+    newsheets = []
     sheets.each do |sheet|
       @sst[sheet] = sst
       pos, len = workbook.offsets[sheet.worksheet]
-      positions.push pos
-      sheet.write_changes reader, pos + len, sst_status
+      if pos
+        positions.push pos
+        sheet.write_changes reader, pos + len, sst_status
+      else
+        newsheets.push sheet
+        sheet.write_from_scratch
+      end
       sheet_data[sheet.worksheet] = sheet.data
     end
     Ole::Storage.open io do |ole|
@@ -202,6 +208,9 @@ class Workbook < Spreadsheet::Writer
           reader.seek lastpos
         end
         writer.write reader.read
+        newsheets.each do |sheet|
+          writer.write sheet.data
+        end
       end
     end
   end

data/lib/spreadsheet/format.rb

@@ -160,7 +160,7 @@ module Spreadsheet
     ##
     # Is the cell formatted as a DateTime?
     def datetime?
-      !!/([YMD].*[hms])|([hms].*[YMD])/.match(@number_format.to_s)
+      !!/([YMD].*[HS])|([HS].*[YMD])/.match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a Time?

data/test/integration.rb

@@ -502,6 +502,20 @@ module Spreadsheet
       assert_instance_of Excel::Worksheet, sheet
       assert_equal sheet, book.worksheet("S\000h\000e\000e\000t\0001\000")
     end
+    def test_datetime
+      path = File.join @data, 'test_datetime.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet 0
+      time = sheet[0,0]
+      assert_equal 22, time.hour
+      assert_equal 00, time.min
+      assert_equal 00, time.sec
+      time = sheet[1,0]
+      assert_equal 22, time.hour
+      assert_equal 30, time.min
+      assert_equal 45, time.sec
+    end
     def test_change_encoding
       path = File.join @data, 'test_version_excel95.xls'
       book = Spreadsheet.open path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.8
+  version: 0.6.1.9
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 +01:00
+date: 2008-11-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency