spreadsheet 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.7.2 / 14.06.2012
+
+* many changes by Mina Naguib <mina.git@naguib.ca>
+* see git log for full details
+
 === 0.7.1 / 08.05.2012
 
 * Author: Artem Ignatiev <zazubrik@gmail.com>

data/lib/spreadsheet.rb

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

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

@@ -30,7 +30,6 @@ class Format < DelegateClass Spreadsheet::Format
   color :diagonal_color,   :border
   color :pattern_fg_color, :pattern_bg
   color :pattern_bg_color, :pattern_bg
-  attr_accessor :xf_index
   attr_reader :format
   def initialize writer, workbook, format=workbook.default_format, opts={}
     @opts = { :type => :format }.merge opts

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

@@ -118,9 +118,11 @@ class Worksheet
     @io.size
   end
   def strings
-    @worksheet.inject [] do |memo, row|
-      strings = row.select do |cell| cell.is_a?(String) && !cell.empty? end
-      memo.concat strings
+    @worksheet.inject(Hash.new(0)) do |memo, row|
+      row.each do |cell|
+        memo[cell] += 1 if (cell.is_a?(String) && !cell.empty?)
+      end
+      memo
     end
   end
   ##

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

@@ -64,26 +64,33 @@ class Workbook < Spreadsheet::Writer
     workbook.formats.each do |fmt|
       formats.push Format.new(self, workbook, fmt)
     end
+    @formats[workbook] = {
+      :writers => [],
+      :xf_indexes => {}
+    }
     formats.each_with_index do |fmt, idx|
-      fmt.xf_index = idx
+      @formats[workbook][:writers] << fmt
+      @formats[workbook][:xf_indexes][fmt.format] ||= idx
     end
-    @formats[workbook] = formats
   end
   def complete_sst_update? workbook
     stored = workbook.sst.collect do |entry| entry.content end
-    current = worksheets(workbook).inject [] do |memo, worksheet|
-      memo.concat worksheet.strings
+    num_total = 0
+    current = worksheets(workbook).inject(Hash.new(0)) do |memo, worksheet|
+      worksheet.strings.each do |k,v|
+        memo[k] += v
+        num_total += v
+      end
+      memo
     end
-    total = current.size
-    current.uniq!
     current.delete ''
-    if (stored - current).empty? && !stored.empty?
+    if !stored.empty? && stored.all?{|x| current.include?(x) }
       ## if all previously stored strings are still needed, we don't have to
       #  rewrite all cells because the sst-index of such string does not change.
-      additions = current - stored
-      [:partial_update, total, stored + additions]
+      additions = current.keys - stored
+      [:partial_update, num_total, stored + additions]
     else
-      [:complete_update, total, current]
+      [:complete_update, num_total, current.keys]
     end
   end
   def font_index workbook, font_key
@@ -349,8 +356,8 @@ class Workbook < Spreadsheet::Writer
   end
   def write_fonts workbook, writer
     fonts = @fonts[workbook] = {}
-    @formats[workbook].each do |format|
-      if(font = format.font) && !fonts.include?(font.key)
+    @formats[workbook][:writers].map{|format| format.font }.compact.uniq.each do |font|
+      unless fonts.include?(font.key)
         fonts.store font.key, fonts.size
         write_font workbook, writer, font
       end
@@ -482,12 +489,15 @@ class Workbook < Spreadsheet::Writer
     #      0     4  Total number of strings in the workbook (see below)
     #      4     4  Number of following strings (nm)
     #      8  var.  List of nm Unicode strings, 16-bit string length (➜ 3.4)
-    strings = worksheets(workbook).inject [] do |memo, worksheet|
-      memo.concat worksheet.strings
+    num_total = 0
+    strings = worksheets(workbook).inject(Hash.new(0)) do |memo, worksheet|
+      worksheet.strings.each do |k,v|
+        memo[k] += v
+        num_total += v
+      end
+      memo
     end
-    total = strings.size
-    strings.uniq!
-    _write_sst workbook, writer, offset, total, strings
+    _write_sst workbook, writer, offset, num_total, strings.keys
   end
   def _write_sst workbook, writer, offset, total, strings
     sst = {}
@@ -635,17 +645,13 @@ class Workbook < Spreadsheet::Writer
     # the XF record with the fixed index 15 (0-based). By default, it uses the
     # worksheet/workbook default cell style, described by the very first XF
     # record (index 0).
-    @formats[workbook].each do |fmt| fmt.write_xf writer end
+    @formats[workbook][:writers].each do |fmt| fmt.write_xf writer end
   end
   def sst_index worksheet, str
     @sst[worksheet][str]
   end
   def xf_index workbook, format
-    if fmt = @formats[workbook].find do |fm| fm.format == format end
-      fmt.xf_index
-    else
-      0
-    end
+    @formats[workbook][:xf_indexes][format] || 0
   end
 end
     end

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

@@ -118,9 +118,11 @@ class Worksheet
     @io.size
   end
   def strings
-    @worksheet.inject [] do |memo, row|
-      strings = row.select do |cell| cell.is_a?(String) && !cell.empty? end
-      memo.concat strings
+    @worksheet.inject(Hash.new(0)) do |memo, row|
+      row.each do |cell|
+        memo[cell] += 1 if (cell.is_a?(String) && !cell.empty?)
+      end
+      memo
     end
   end
   ##

data/lib/spreadsheet/font.rb

@@ -74,10 +74,18 @@ module Spreadsheet
       self.weight = bool ? :bold : nil
     end
     def key # :nodoc:
-      key = @name.dup
+      fk = fast_key
+      return @key if @previous_fast_key == fk
+      @previous_fast_key = fk
+      @key = build_key
+    end
+    private
+    def build_key # :nodoc:
       underscore = client('_', 'UTF-8')
+      key = []
+      key << @name
       key << underscore << client(size.to_s, 'US-ASCII')
-      key << client('_', 'UTF-8') << client(weight.to_s, 'US-ASCII')
+      key << underscore << client(weight.to_s, 'US-ASCII')
       key << client('_italic', 'UTF-8')    if italic?
       key << client('_strikeout', 'UTF-8') if strikeout?
       key << client('_outline', 'UTF-8')   if outline?
@@ -87,6 +95,10 @@ module Spreadsheet
       key << underscore << client(color.to_s, 'US-ASCII')
       key << underscore << client(family.to_s, 'US-ASCII')
       key << underscore << client(encoding.to_s, 'US-ASCII')
+      key.join("")
+    end
+    def fast_key
+      [@name, @size, @weight, @italic, @strikeout, @outline, @shadow, @escapement, @underline, @color, @family, @encoding]
     end
   end
 end

data/lib/spreadsheet/format.rb

@@ -84,6 +84,12 @@ module Spreadsheet
       @diagonal_color   = :builtin_black
       @pattern_fg_color = :border
       @pattern_bg_color = :pattern_bg
+      @regexes = {
+        :date         => Regexp.new(client("[YMD]", 'UTF-8')),
+        :date_or_time => Regexp.new(client("[hmsYMD]", 'UTF-8')),
+        :datetime     => Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')),
+        :time         => Regexp.new(client("[hms]", 'UTF-8'))
+      }
       # Temp code to prevent merged formats in non-merged cells.
       @used_merge    = 0
       opts.each do |key, val|
@@ -156,22 +162,22 @@ module Spreadsheet
     ##
     # Is the cell formatted as a Date?
     def date?
-      !!Regexp.new(client("[YMD]", 'UTF-8')).match(@number_format.to_s)
+      !!@regexes[:date].match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a Date or Time?
     def date_or_time?
-      !!Regexp.new(client("[hmsYMD]", 'UTF-8')).match(@number_format.to_s)
+      !!@regexes[:date_or_time].match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a DateTime?
     def datetime?
-      !!Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')).match(@number_format.to_s)
+      !!@regexes[:datetime].match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a Time?
     def time?
-      !!Regexp.new(client("[hms]", 'UTF-8')).match(@number_format.to_s)
+      !!@regexes[:time].match(@number_format.to_s)
     end
   end
 end

data/lib/spreadsheet/workbook.rb

@@ -19,8 +19,9 @@ module Spreadsheet
       @io = io
       @fonts = []
       @formats = []
+      @formats_set = {}
       if @default_format = opts[:default_format]
-        @formats.push @default_format
+        add_format @default_format
       end
     end
     ##
@@ -34,7 +35,10 @@ module Spreadsheet
     # Add a Format to the Workbook. If you use Row#set_format, you should not
     # need to use this Method.
     def add_format format
-      @formats.push(format) if format && !@formats.include?(format)
+      if format && !@formats_set[format]
+        @formats_set[format] = true
+        @formats.push(format)
+      end
       format
     end
     ##

data/lib/spreadsheet/worksheet.rb

@@ -167,22 +167,30 @@ module Spreadsheet
     # - 'DD.MM.YYYY' for Date
     # - 'DD.MM.YYYY hh:mm:ss' for DateTime and Time
     def format_dates! format=nil
+      new_formats = {}
+      fmt_str_time = client('DD.MM.YYYY hh:mm:ss', 'UTF-8')
+      fmt_str_date = client('DD.MM.YYYY', 'UTF-8')
       each do |row|
         row.each_with_index do |value, idx|
           unless row.formats[idx] || row.format(idx).date_or_time?
             numfmt = case value
                      when DateTime, Time
-                       format || client('DD.MM.YYYY hh:mm:ss', 'UTF-8')
+                       format || fmt_str_time
                      when Date
-                       format || client('DD.MM.YYYY', 'UTF-8')
+                       format || fmt_str_date
                      end
             case numfmt
             when Format
               row.set_format idx, numfmt
             when String
-              fmt = row.format(idx).dup
-              fmt.number_format = numfmt
-              row.set_format idx, fmt
+              existing_format = row.format(idx)
+              new_formats[existing_format] ||= {}
+              new_format = new_formats[existing_format][numfmt]
+              if !new_format
+                new_format = new_formats[existing_format][numfmt] = existing_format.dup
+                new_format.number_format = numfmt
+              end
+              row.set_format idx, new_format
             end
           end
         end

data/test/excel/writer/workbook.rb

@@ -10,12 +10,84 @@ module Spreadsheet
   module Excel
     module Writer
       class TestWorkbook < Test::Unit::TestCase
+        def setup
+          @book = Spreadsheet::Excel::Workbook.new
+          assert_instance_of Excel::Workbook, @book
+          assert_equal @book.worksheets.size, 0
+          @workbook_writer = Excel::Writer::Workbook.new @book
+        end
         def test_sanitize_worksheets
-          book = Spreadsheet::Excel::Workbook.new
-          assert_instance_of Excel::Workbook, book
-          assert_equal book.worksheets.size, 0
-          workbook_writer = Excel::Writer::Workbook.new book
-          assert_nothing_raised { workbook_writer.sanitize_worksheets book.worksheets }
+          assert_nothing_raised { @workbook_writer.sanitize_worksheets @book.worksheets }
+        end
+        def test_collect_formats
+          assert_equal 17, @workbook_writer.collect_formats(@book).length # Expected for vanilla
+          sheet = @book.create_worksheet
+          rowi=-1
+
+          f1 = Spreadsheet::Format.new
+          sheet.row(rowi+=1).default_format = f1
+          assert_equal 18, @workbook_writer.collect_formats(@book).length
+
+          f2 = Spreadsheet::Format.new
+          sheet.row(rowi+=1).default_format = f2
+          assert_equal 19, @workbook_writer.collect_formats(@book).length
+
+          sheet.row(rowi+=1).default_format = f2
+          assert_equal 19, @workbook_writer.collect_formats(@book).length # Ignores duplicates
+        end
+        def test_xf_index
+          sheet = @book.create_worksheet
+          rowi=-1
+
+          f1 = Spreadsheet::Format.new
+          sheet.row(rowi+=1).default_format = f1
+          @workbook_writer.collect_formats(@book)
+          assert_equal 17, @workbook_writer.xf_index(@book, f1)
+
+          f2 = Spreadsheet::Format.new
+          sheet.row(rowi+=1).default_format = f2
+          @workbook_writer.collect_formats(@book)
+          assert_equal 18, @workbook_writer.xf_index(@book, f2)
+
+        end
+        def test_write_fonts
+          num_written = 0
+          sheet = @book.create_worksheet
+          rowi=-1
+          # Stub inner #write_font as a counter:
+          (class << @workbook_writer; self; end).send(:define_method, :write_font) do |*args|
+            num_written += 1
+          end
+          io = StringIO.new("")
+
+          num_written = 0
+          @workbook_writer.collect_formats(@book)
+          @workbook_writer.write_fonts(@book, io)
+          assert_equal 1, num_written # Default format's font
+
+          f1 = Spreadsheet::Format.new
+          sheet.row(rowi+=1).default_format = f1
+          num_written = 0
+          @workbook_writer.collect_formats(@book)
+          @workbook_writer.write_fonts(@book, io)
+          assert_equal 1, num_written # No new fonts
+
+          f2 = Spreadsheet::Format.new
+          f2.font = Spreadsheet::Font.new("Foo")
+          sheet.row(rowi+=1).default_format = f2
+          num_written = 0
+          @workbook_writer.collect_formats(@book)
+          @workbook_writer.write_fonts(@book, io)
+          assert_equal 2, num_written # 2 distinct fonts total
+
+          f3 = Spreadsheet::Format.new
+          f3.font = f2.font # Re-use previous font
+          sheet.row(rowi+=1).default_format = f3
+          num_written = 0
+          @workbook_writer.collect_formats(@book)
+          @workbook_writer.write_fonts(@book, io)
+          assert_equal 2, num_written # 2 distinct fonts total still
+
         end
       end
     end

data/test/excel/writer/worksheet.rb

@@ -49,6 +49,32 @@ module Spreadsheet
 
           assert_equal false, sheet.data.empty?
         end
+
+        def test_strings
+          book = Spreadsheet::Excel::Workbook.new
+          sheet = book.create_worksheet
+          writer = Worksheet.new book, sheet
+          rowi = -1
+
+          assert_equal(
+            {},
+            writer.strings
+          )
+
+          sheet.row(rowi+=1).concat(["Hello", "World"])
+          assert_equal(
+            {"Hello" => 1, "World" => 1},
+            writer.strings
+          )
+
+          sheet.row(rowi+=1).concat(["Goodbye", "Cruel", "World", 2012])
+          assert_equal(
+            {"Hello" => 1, "Goodbye" => 1, "Cruel" => 1, "World" => 2},
+            writer.strings
+          )
+
+        end
+
       end
     end
   end

data/test/integration.rb

@@ -106,33 +106,11 @@ module Spreadsheet
       assert_equal enc, book.encoding
       assert_equal 25, book.formats.size
       assert_equal 5, book.fonts.size
-      str1 = book.shared_string 0
-      other = @@iconv.iconv('Shared String')
-      assert_equal @@iconv.iconv('Shared String'), str1
-      str2 = book.shared_string 1
-      assert_equal @@iconv.iconv('Another Shared String'), str2
-      str3 = book.shared_string 2
-      long = @@iconv.iconv('1234567890 ' * 1000)
-      if str3 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str3[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str3[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str3
-      str4 = book.shared_string 3
-      long = @@iconv.iconv('9876543210 ' * 1000)
-      if str4 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str4[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str4[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str4
+      str1 = @@iconv.iconv('Shared String')
+      str2 = @@iconv.iconv('Another Shared String')
+      str3 = @@iconv.iconv('1234567890 ' * 1000)
+      str4 = @@iconv.iconv('9876543210 ' * 1000)
+      assert_valid_sst(book, :contains => [str1, str2, str3, str4])
       sheet = book.worksheet 0
       assert_equal 11, sheet.row_count
       assert_equal 12, sheet.column_count
@@ -211,32 +189,11 @@ module Spreadsheet
       assert_equal enc, book.encoding
       assert_equal 25, book.formats.size
       assert_equal 5, book.fonts.size
-      str1 = book.shared_string 0
-      assert_equal 'Shared String', str1
-      str2 = book.shared_string 1
-      assert_equal 'Another Shared String', str2
-      str3 = book.shared_string 2
-      long = '1234567890 ' * 1000
-      if str3 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str3[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str3[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str3
-      str4 = book.shared_string 3
-      long = '9876543210 ' * 1000
-      if str4 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str4[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str4[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str4
+      str1 = 'Shared String'
+      str2 = 'Another Shared String'
+      str3 = '1234567890 ' * 1000
+      str4 = '9876543210 ' * 1000
+      assert_valid_sst(book, :contains => [str1, str2, str3, str4])
       sheet = book.worksheet 0
       assert_equal 11, sheet.row_count
       assert_equal 12, sheet.column_count
@@ -601,32 +558,12 @@ module Spreadsheet
       assert_equal 8, book.biff_version
       assert_equal 'Microsoft Excel 97/2000/XP', book.version_string
       path = File.join @var, 'test_change_cell.xls'
-      str1 = book.shared_string 0
-      assert_equal 'Shared String', str1
-      str2 = book.shared_string 1
-      assert_equal 'Another Shared String', str2
-      str3 = book.shared_string 2
-      long = '1234567890 ' * 1000
-      if str3 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str3[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str3[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str3
-      str4 = book.shared_string 3
-      long = '9876543210 ' * 1000
-      if str4 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str4[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str4[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str4
+      str1 = 'Shared String'
+      str2 = 'Another Shared String'
+      str3 = '1234567890 ' * 1000
+      str4 = '9876543210 ' * 1000
+      str5 = "Link-Text"
+      assert_valid_sst(book, :is => [str1, str2, str3, str4, str5])
       sheet = book.worksheet 0
       sheet[0,0] = 4
       row = sheet.row 1
@@ -704,44 +641,21 @@ module Spreadsheet
       assert_equal 8, book.biff_version
       assert_equal 'Microsoft Excel 97/2000/XP', book.version_string
       path = File.join @var, 'test_change_cell.xls'
-      str1 = book.shared_string 0
-      assert_equal 'Shared String', str1
-      str2 = book.shared_string 1
-      assert_equal 'Another Shared String', str2
-      str3 = book.shared_string 2
-      long = '1234567890 ' * 1000
-      if str3 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str3[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str3[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str3
-      str4 = book.shared_string 3
-      long = '9876543210 ' * 1000
-      if str4 != long
-        long.size.times do |idx|
-          len = idx.next
-          if str4[0,len] != long[0,len]
-            assert_equal long[idx - 5, 10], str4[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal long, str4
+      str1 = 'Shared String'
+      str2 = 'Another Shared String'
+      str3 = '1234567890 ' * 1000
+      str4 = '9876543210 ' * 1000
+      str5 = 'Link-Text'
+      assert_valid_sst(book, :is => [str1, str2, str3, str4, str5])
       sheet = book.worksheet 0
       sheet[0,0] = 4
-      str5 = 'A completely different String'
-      sheet[0,1] = str5
+      str6 = 'A completely different String'
+      sheet[0,1] = str6
       row = sheet.row 1
       row[0] = 3
       book.write path
       assert_nothing_raised do book = Spreadsheet.open path end
-      assert_equal str5, book.shared_string(0)
-      assert_equal str2, book.shared_string(1)
-      assert_equal str3, book.shared_string(2)
-      assert_equal str4, book.shared_string(3)
+      assert_valid_sst(book, :is => [str2, str3, str4, str5, str6])
       sheet = book.worksheet 0
       assert_equal 11, sheet.row_count
       assert_equal 12, sheet.column_count
@@ -756,9 +670,9 @@ module Spreadsheet
       assert_equal 4, row[0]
       assert_equal 4, sheet[0,0]
       assert_equal 4, sheet.cell(0,0)
-      assert_equal str5, row[1]
-      assert_equal str5, sheet[0,1]
-      assert_equal str5, sheet.cell(0,1)
+      assert_equal str6, row[1]
+      assert_equal str6, sheet[0,1]
+      assert_equal str6, sheet.cell(0,1)
       row = sheet.row 1
       assert_equal 3, row[0]
       assert_equal 3, sheet[1,0]
@@ -905,31 +819,7 @@ module Spreadsheet
       else
         assert_equal 'UTF-16LE', book.encoding
       end
-      assert_equal str1, book.shared_string(0)
-      assert_equal str2, book.shared_string(1)
-      test = nil
-      assert_nothing_raised "I've probably split a two-byte-character" do
-        test = book.shared_string 2
-      end
-      if test != str3
-        str3.size.times do |idx|
-          len = idx.next
-          if test[0,len] != str3[0,len]
-            assert_equal str3[idx - 5, 10], test[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal str3, test
-      test = book.shared_string 3
-      if test != str4
-        str4.size.times do |idx|
-          len = idx.next
-          if test[0,len] != str4[0,len]
-            assert_equal str4[idx - 5, 10], test[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal str4, test
+      assert_valid_sst(book, :contains => [str1, str2, str3, str4])
       assert_equal 2, book.worksheets.size
       sheet = book.worksheets.first
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
@@ -1080,28 +970,7 @@ module Spreadsheet
       else
         assert_equal 'UTF-16LE', book.encoding
       end
-      assert_equal str1, book.shared_string(0)
-      assert_equal str2, book.shared_string(1)
-      test = book.shared_string 2
-      if test != str3
-        str3.size.times do |idx|
-          len = idx.next
-          if test[0,len] != str3[0,len]
-            assert_equal str3[idx - 5, 10], test[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal str3, test
-      test = book.shared_string 3
-      if test != str4
-        str4.size.times do |idx|
-          len = idx.next
-          if test[0,len] != str4[0,len]
-            assert_equal str4[idx - 5, 10], test[idx - 5, 10], "in position #{idx}"
-          end
-        end
-      end
-      assert_equal str4, test
+      assert_valid_sst(book, :is => [str1, str2, str3, str4, "formatted when empty"])
       assert_equal 2, book.worksheets.size
       sheet = book.worksheets.first
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
@@ -1364,5 +1233,35 @@ module Spreadsheet
       sheet[0,0] # trigger read_worksheet
       assert_equal [[2, 4, 1, 1], [3, 3, 2, 3]], sheet.merged_cells
     end
+
+    private
+
+    # Validates the workbook's SST
+    # Valid options:
+    #   :is       => [array]
+    #   :contains => [array]
+    #   :length   => num
+    def assert_valid_sst(workbook, opts = {})
+      assert workbook.is_a?(Spreadsheet::Excel::Workbook)
+      sst = workbook.sst
+      assert sst.is_a?(Array)
+      strings = sst.map do |entry|
+        assert entry.is_a?(Spreadsheet::Excel::SstEntry)
+        entry.content
+      end
+      sorted_strings = strings.sort
+      # Make sure there are no duplicates, the whole point of the SST:
+      assert_equal strings.uniq.sort, sorted_strings
+      if opts[:is]
+        assert_equal opts[:is].sort, sorted_strings
+      end
+      if opts[:contains]
+        assert_equal [], opts[:contains] - sorted_strings
+      end
+      if opts[:length]
+        assert_equal opts[:length], sorted_strings
+      end
+    end
+
   end
 end

data/test/workbook.rb

@@ -25,5 +25,20 @@ module Spreadsheet
         @book.add_worksheet @worksheet2
         assert_equal 2, @book.sheet_count
     end
+    def test_add_format
+
+      assert_equal 1, @book.formats.length # Received a default format
+
+      f1 = Format.new
+      @book.add_format f1
+      assert_equal 2, @book.formats.length
+
+      f2 = Format.new
+      @book.add_format f2
+      assert_equal 3, @book.formats.length
+
+      @book.add_format f2
+      assert_equal 3, @book.formats.length # Rejected duplicate insertion
+    end
   end
 end

data/test/worksheet.rb

@@ -76,5 +76,37 @@ module Spreadsheet
       assert_equal 30, @sheet.column(0).width
       assert_equal 20, @sheet.column(1).width
     end
+    def test_format_dates!
+      rowi = -1
+
+      @sheet.format_dates!
+      # No dates = no new formats
+      assert_equal 1, @book.formats.length # Default format
+
+      @sheet.row(rowi+=1).concat(["Hello", "World"])
+      @sheet.format_dates!
+      # No dates = no new formats
+      assert_equal 1, @book.formats.length
+
+      @sheet.row(rowi+=1).concat([Date.new(2010,1,1)])
+      @sheet.format_dates!
+      # 1 date = 1 new format
+      assert_equal 2, @book.formats.length
+
+      @sheet.row(rowi+=1).concat([Date.new(2011,1,1)])
+      @sheet.row(rowi+=1).concat([Date.new(2012,1,1)])
+      @sheet.row(rowi+=1).concat([Date.new(2013,1,1)])
+      @sheet.format_dates!
+      # 4 dates = only 1 new format across them:
+      assert_equal 3, @book.formats.length
+
+      @sheet.row(rowi+=1).concat([Date.new(2014,1,1)])
+      @sheet.row(rowi).default_format = Format.new
+      @sheet.row(rowi+=1).concat([Date.new(2015,1,1)])
+      @sheet.format_dates!
+      # 6 dates = 2 new formats across them:
+      assert_equal 6, @book.formats.length
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
-  requirement: &18163460 !ruby/object:Gem::Requirement
+  requirement: &8107060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18163460
+  version_requirements: *8107060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18162320 !ruby/object:Gem::Requirement
+  requirement: &8106340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *18162320
+  version_requirements: *8106340
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18161240 !ruby/object:Gem::Requirement
+  requirement: &8105620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *18161240
+  version_requirements: *8105620
 description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
   Documents.