Fix an off-by-one error when reading dates

This fixes a bug reported by Hugh McGowan in: http://rubyforge.org/tracker/index.php?func=detail&aid=26422&group_id=678&atid=2677
alvin2ye · Jul 3, 2009 · e13c616 · e13c616
1 parent cf398b1
commit e13c616
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/spreadsheet/excel/row.rb b/lib/spreadsheet/excel/row.rb
@@ -50,8 +50,9 @@ def _date data # :nodoc:
   end
   def _datetime data # :nodoc:
     return data if data.is_a?(DateTime)
-    date = @worksheet.date_base + data.to_f
-    if date > LEAP_ERROR
+    base = @worksheet.date_base
+    date = base + data.to_f
+    if LEAP_ERROR > base
       date -= 1
     end
     date

diff --git a/lib/spreadsheet/excel/writer/worksheet.rb b/lib/spreadsheet/excel/writer/worksheet.rb
@@ -48,8 +48,9 @@ def encode_date date
       date = DateTime.new date.year, date.month, date.day,
                           date.hour, date.min, date.sec
     end
-    value = date - @workbook.date_base
-    if date > LEAP_ERROR
+    base = @workbook.date_base
+    value = date - base
+    if LEAP_ERROR > base
       value += 1
     end
     value