writeexcel 0.6.14 → 0.6.15

data/README.rdoc

@@ -76,6 +76,9 @@ You must save source file in UTF8 and run ruby with -Ku option or set $KCODE='u'
 when use urf8 string data.
 
 == Recent Changes
+v0.6.15
+* add Worksheet#merge_range_with_date_time : write datetime string to merged cells
+
 v0.6.14
 * Buf fix Issues 20. If more than 10 sheets, sheet reference mix up
 

data/VERSION

@@ -1 +1 @@
-0.6.14
+0.6.15

data/lib/writeexcel/worksheet.rb

@@ -959,43 +959,39 @@ class Worksheet < BIFFWriter
     format   = args[5]
     encoding = args[6] ? 1 : 0
 
-    # Temp code to prevent merged formats in non-merged cells.
-    error = "Error: refer to merge_range() in the documentation. " +
-    "Can't use previously non-merged format in merged cells"
-
-    raise error if format.used_merge == -1
-    format.used_merge = 0   # Until the end of this function.
-
-    # Set the merge_range property of the format object. For BIFF8+.
-    format.set_merge_range
+    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |rwFirst, colFirst, string, format, encoding|
+      if encoding != 0
+        write_utf16be_string(rwFirst, colFirst, string, format)
+      else
+        write(rwFirst, colFirst, string, format)
+      end
+    end
+  end
 
-    # Excel doesn't allow a single cell to be merged
-    raise "Can't merge single cell" if rwFirst  == rwLast and
-    colFirst == colLast
+  # 
+  # :call-seq:
+  #   merge_range_with_date_time(first_row, first_col, last_row, last_col, token, format)
+  #
+  # Write to meged cells, a datetime string in ISO8601 "yyyy-mm-ddThh:mm:ss.ss" format as a
+  # number representing an Excel date. format is optional.
+  # 
+  def merge_range_with_date_time(*args)
+    # Check for a cell reference in A1 notation and substitute row and column
+    args = row_col_notation(args)
 
-    # Swap last row/col with first row/col as necessary
-    rwFirst,  rwLast  = rwLast,  rwFirst  if rwFirst  > rwLast
-    colFirst, colLast = colLast, colFirst if colFirst > colLast
+    raise "Incorrect number of arguments" if args.size != 6 and args.size != 7
+    raise "Format argument is not a format object" unless args[5].respond_to?(:xf_index)
 
-    # Write the first cell
-    if encoding != 0
-      write_utf16be_string(rwFirst, colFirst, string, format)
-    else
-      write(rwFirst, colFirst, string, format)
-    end
+    rwFirst  = args[0]
+    colFirst = args[1]
+    rwLast   = args[2]
+    colLast  = args[3]
+    string   = args[4]
+    format   = args[5]
 
-    # Pad out the rest of the area with formatted blank cells.
-    (rwFirst .. rwLast).each do |row|
-      (colFirst .. colLast).each do |col|
-        next if row == rwFirst and col == colFirst
-        write_blank(row, col, format)
-      end
+    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |rwFirst, colFirst, string, format, nil|
+      write_date_time(rwFirst, colFirst, string, format)
     end
-
-    merge_cells(rwFirst, colFirst, rwLast, colLast)
-
-    # Temp code to prevent merged formats in non-merged cells.
-    format.used_merge = 1
   end
 
   #
@@ -4702,6 +4698,42 @@ class Worksheet < BIFFWriter
     end
   end
 
+  def merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding)
+    # Temp code to prevent merged formats in non-merged cells.
+    error = "Error: refer to merge_range() in the documentation. " +
+    "Can't use previously non-merged format in merged cells"
+
+    raise error if format.used_merge == -1
+    format.used_merge = 0   # Until the end of this function.
+
+    # Set the merge_range property of the format object. For BIFF8+.
+    format.set_merge_range
+
+    # Excel doesn't allow a single cell to be merged
+    raise "Can't merge single cell" if rwFirst  == rwLast and
+    colFirst == colLast
+
+    # Swap last row/col with first row/col as necessary
+    rwFirst,  rwLast  = rwLast,  rwFirst  if rwFirst  > rwLast
+    colFirst, colLast = colLast, colFirst if colFirst > colLast
+
+    # Write the first cell
+    yield(rwFirst, colFirst, string, format, encoding)
+
+    # Pad out the rest of the area with formatted blank cells.
+    (rwFirst .. rwLast).each do |row|
+      (colFirst .. colLast).each do |col|
+        next if row == rwFirst and col == colFirst
+        write_blank(row, col, format)
+      end
+    end
+
+    merge_cells(rwFirst, colFirst, rwLast, colLast)
+
+    # Temp code to prevent merged formats in non-merged cells.
+    format.used_merge = 1
+  end
+
   #
   # Extract the tokens from the filter expression. The tokens are mainly non-
   # whitespace groups. The only tricky part is to extract string tokens that

data/writeexcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "writeexcel"
-  s.version = "0.6.14"
+  s.version = "0.6.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hideo NAKAMURA"]
-  s.date = "2012-07-12"
+  s.date = "2012-07-26"
   s.description = "Multiple worksheets can be added to a workbook and formatting can be applied to cells. Text, numbers, formulas, hyperlinks and images can be written to the cells."
   s.email = "cxn03651@msj.biglobe.ne.jp"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: writeexcel
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies: []
 description: Multiple worksheets can be added to a workbook and formatting can be
   applied to cells. Text, numbers, formulas, hyperlinks and images can be written