writeexcel 0.3.5 → 0.4.0

data/test/test_example_match.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'helper'
 require 'stringio'
 
@@ -8,13 +9,6 @@ class TC_example_match < Test::Unit::TestCase
 
   def setup
     @file  = StringIO.new
-=begin
-    t = Time.now.strftime("%Y%m%d")
-    path = "temp#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-    @test_file  = File.join(Dir.tmpdir, path)
-    @filename  = @test_file
-    @filename2 = @test_file + "2"
-=end
   end
 
   def test_a_simple
@@ -2297,7 +2291,7 @@ def test_comments2
     worksheet1.write('C6', cell_text, text_wrap)
     worksheet1.write_comment('C6', comment, :encoding => 1)
 
-    # UTF-8 string in perl 5.8.
+    # UTF-8 string.
     worksheet1.set_row(8, 50)
     cell_text = 'This is a UTF-8 string.'
     comment   = '☺'  # chr 0x263a in perl.
@@ -2544,7 +2538,7 @@ def test_comments2
     worksheet7.write_comment(cell, comment, :author  => author,
                                             :author_encoding => 1)
 
-    # UTF-8 string in perl 5.8.
+    # UTF-8 string.
     author    = '☺'    # smiley
     cell      = 'C12'
     cell_text = "Move the mouse over this cell and you will see 'Cell commented " +
@@ -3133,13 +3127,4 @@ def test_right_to_left
     # do assertion
     compare_file("#{PERL_OUTDIR}/right_to_left.xls", @file)
   end
-
-  def compare_file(expected, target)
-    # target is StringIO object.
-    assert_equal(
-      open(expected, 'rb') { |f| f.read },
-      target.string,
-      "#{File.basename(expected)} doesn't match."
-    )
-  end
 end

data/test/test_format.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 require 'helper'
+require 'stringio'
 
 class TC_Format < Test::Unit::TestCase
 
@@ -6,15 +8,11 @@ class TC_Format < Test::Unit::TestCase
   PERL_OUTDIR = File.join(TEST_DIR, 'perl_output')
 
   def setup
-    t = Time.now.strftime("%Y%m%d")
-    path = "temp#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-    @ruby_file  = File.join(Dir.tmpdir, path)
+    @ruby_file = StringIO.new
     @format = Format.new
   end
 
   def teardown
-    File.delete(@ruby_file) if File.exist?(@ruby_file)
-    @format = nil
   end
 
   def test_set_format_properties
@@ -980,12 +978,9 @@ def test_set_border_color
   def test_xf_biff_size
     perl_file = "#{PERL_OUTDIR}/file_xf_biff"
     size = File.size(perl_file)
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_xf)
-    @fh.close
-    rsize = File.size(@ruby_file)
-    assert_equal(size,rsize,"File sizes not the same")
-
+    @ruby_file.print(@format.get_xf)
+    rsize = @ruby_file.size
+    assert_equal(size, rsize, "File sizes not the same")
   end
 
   # Because of the modifications to bg_color and fg_color, I know this
@@ -1002,47 +997,48 @@ def test_xf_biff_size
 
   def test_font_biff_size
     perl_file = "#{PERL_OUTDIR}/file_font_biff"
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font)
-    @fh.close
+    @ruby_file.print(@format.get_font)
     contents = IO.readlines(perl_file)
-    rcontents = IO.readlines(@ruby_file)
-    assert_equal(contents,rcontents,"Contents not the same")
+    @ruby_file.rewind
+    rcontents = @ruby_file.readlines
+    assert_equal(contents, rcontents, "Contents not the same")
   end
 
   def test_font_biff_contents
     perl_file = "#{PERL_OUTDIR}/file_font_biff"
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font)
-    @fh.close
-    contents = IO.readlines(perl_file)
-    rcontents = IO.readlines(@ruby_file)
-    assert_equal(contents,rcontents,"Contents not the same")
+    @ruby_file.print(@format.get_font)
+    contents  = IO.readlines(perl_file)
+    @ruby_file.rewind
+    rcontents = @ruby_file.readlines
+    assert_equal(contents, rcontents, "Contents not the same")
   end
 
   def test_get_font_key_size
     perl_file = "#{PERL_OUTDIR}/file_font_key"
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font_key)
-    @fh.close
-    assert_equal(File.size(perl_file),File.size(@ruby_file),"Bad file size")
+    @ruby_file.print(@format.get_font_key)
+    assert_equal(File.size(perl_file), @ruby_file.size, "Bad file size")
   end
 
   def test_get_font_key_contents
     perl_file = "#{PERL_OUTDIR}/file_font_key"
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font_key)
-    @fh.close
-    contents = IO.readlines(perl_file)
-    rcontents = IO.readlines(@ruby_file)
-    assert_equal(contents,rcontents,"Contents not the same")
+    @ruby_file.print(@format.get_font_key)
+    contents  = IO.readlines(perl_file)
+    @ruby_file.rewind
+    rcontents = @ruby_file.readlines
+    assert_equal(contents, rcontents, "Contents not the same")
   end
 
   def test_initialize
     assert_nothing_raised {
-      Format.new(:bold => true, :size => 10, :color => 'black',
-      :fg_color => 43, :align => 'top', :text_wrap => true,
-      :border => 1)
+      Format.new(
+        :bold => true,
+        :size => 10,
+        :color => 'black',
+        :fg_color => 43,
+        :align => 'top',
+        :text_wrap => true,
+        :border => 1
+      )
     }
   end
 
@@ -1051,85 +1047,31 @@ def test_initialize
   def test_get_xf
     perl_file = "#{PERL_OUTDIR}/file_xf_biff"
     size = File.size(perl_file)
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_xf)
-    @fh.close
-    rsize = File.size(@ruby_file)
-    assert_equal(size,rsize,"File sizes not the same")
-
-    fh_p = File.open(perl_file, "r")
-    fh_r = File.open(@ruby_file, "r")
-    while true do
-      p1 = fh_p.read(1)
-      r1 = fh_r.read(1)
-      if p1.nil?
-        assert( r1.nil?, 'p1 is EOF but r1 is NOT EOF.')
-        break
-      elsif r1.nil?
-        assert( p1.nil?, 'r1 is EOF but p1 is NOT EOF.')
-        break
-      end
-      assert_equal(p1, r1, sprintf(" p1 = %s but r1 = %s", p1, r1))
-      break
-    end
-    fh_p.close
-    fh_r.close
+    @ruby_file.print(@format.get_xf)
+    rsize = @ruby_file.size
+    assert_equal(size, rsize, "File sizes not the same")
+
+    compare_file(perl_file, @ruby_file)
   end
 
   def test_get_font
     perl_file = "#{PERL_OUTDIR}/file_font_biff"
     size = File.size(perl_file)
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font)
-    @fh.close
-    rsize = File.size(@ruby_file)
-    assert_equal(size,rsize,"File sizes not the same")
-
-    fh_p = File.open(perl_file, "r")
-    fh_r = File.open(@ruby_file, "r")
-    while true do
-      p1 = fh_p.read(1)
-      r1 = fh_r.read(1)
-      if p1.nil?
-        assert( r1.nil?, 'p1 is EOF but r1 is NOT EOF.')
-        break
-      elsif r1.nil?
-        assert( p1.nil?, 'r1 is EOF but p1 is NOT EOF.')
-        break
-      end
-      assert_equal(p1, r1, sprintf(" p1 = %s but r1 = %s", p1, r1))
-      break
-    end
-    fh_p.close
-    fh_r.close
+    @ruby_file.print(@format.get_font)
+    rsize = @ruby_file.size
+    assert_equal(size, rsize, "File sizes not the same")
+
+    compare_file(perl_file, @ruby_file)
   end
 
   def test_get_font_key
     perl_file = "#{PERL_OUTDIR}/file_font_key"
     size = File.size(perl_file)
-    @fh = File.new(@ruby_file,"w+")
-    @fh.print(@format.get_font_key)
-    @fh.close
-    rsize = File.size(@ruby_file)
-    assert_equal(size,rsize,"File sizes not the same")
-
-    fh_p = File.open(perl_file, "r")
-    fh_r = File.open(@ruby_file, "r")
-    while true do
-      p1 = fh_p.read(1)
-      r1 = fh_r.read(1)
-      if p1.nil?
-        assert( r1.nil?, 'p1 is EOF but r1 is NOT EOF.')
-        break
-      elsif r1.nil?
-        assert( p1.nil?, 'r1 is EOF but p1 is NOT EOF.')
-        break
-      end
-      assert_equal(p1, r1, sprintf(" p1 = %s but r1 = %s", p1, r1))
-      break
-    end
-    fh_p.close
-    fh_r.close
+    @ruby_file.print(@format.get_font_key)
+    rsize = @ruby_file.size
+    assert_equal(size, rsize, "File sizes not the same")
+
+    compare_file(perl_file, @ruby_file)
   end
 
   def test_copy
@@ -1247,5 +1189,4 @@ def get_format_property(format)
       :right_color         => format.right_color
     }
   end
-
 end

data/test/test_formula.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'helper'
 
 class TC_Formula < Test::Unit::TestCase

data/test/test_ole.rb

@@ -1,11 +1,11 @@
+# -*- coding: utf-8 -*-
 require 'helper'
+require 'stringio'
 
 class TC_OLE < Test::Unit::TestCase
 
   def setup
-    t = Time.now.strftime("%Y%m%d")
-    path = "temp#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-    @file  = File.join(Dir.tmpdir, path)
+    @file  = StringIO.new
     @ole  = OLEWriter.new(@file)
   end
 
@@ -102,6 +102,5 @@ def test_write_property_storage_size
 
   def teardown
     @ole.close rescue nil
-    File.unlink(@file) if File.exists?(@file)
   end
 end

data/test/test_storage_lite.rb

@@ -1,146 +1,125 @@
-require 'helper'
-require 'stringio'
-
-=begin
-  def compare_file(expected, target)
-    fh_e = File.open(expected, "r")
-    fh_t = File.open(target, "r")
-    while true do
-      e1 = fh_e.read(1)
-      t1 = fh_t.read(1)
-      if e1.nil?
-        assert( t1.nil?, "#{expexted} is EOF but #{target} is NOT EOF.")
-        break
-      elsif t1.nil?
-        assert( e1.nil?, '#{target} is EOF but #{expected} is NOT EOF.')
-        break
-      end
-      assert_equal(e1, t1, sprintf(" #{expected} = '%s' but #{target} = '%s'", e1, t1))
-      break
-    end
-    fh_e.close
-    fh_t.close
-  end
-=end
-
-class TC_OLEStorageLite < Test::Unit::TestCase
-  TEST_DIR    = File.expand_path(File.dirname(__FILE__))
-  PERL_OUTDIR = File.join(TEST_DIR, 'perl_output')
-  EXCEL_OUTDIR = File.join(TEST_DIR, 'excelfile')
-
-  def setup
-    @ole = OLEStorageLite.new
-  end
-
-  def teardown
-  end
-
-  def test_olestoragelite_new
-    ole = OLEStorageLite.new
-    assert_nil(ole.file)
-
-    io = StringIO.new
-    ole = OLEStorageLite.new(io)
-    assert_equal(io, ole.file)
-
-    file = 'test.ole'
-    ole = OLEStorageLite.new(file)
-    assert_equal(file, ole.file)
-
-  end
-
-  def test_asc2ucs
-    result = @ole.asc2ucs('Root Entry')
-    target = %w(
-        52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00
-      ).join(" ")
-    assert_equal(target, unpack_record(result))
-  end
-
-  def test_ucs2asc
-    strings = [
-        'Root Entry',
-        ''
-      ]
-    strings.each do |str|
-      result = @ole.ucs2asc(@ole.asc2ucs(str))
-      assert_equal(str, result)
-    end
-  end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
-end
-
-class TC_OLEStorageLitePPSFile < Test::Unit::TestCase
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_constructor
-    data = [
-        { :name => 'name', :data => 'data' },
-        { :name => '',     :data => 'data' },
-        { :name => 'name', :data => ''     },
-        { :name => '',     :data => ''     },
-      ]
-    data.each do |d|
-      olefile = OLEStorageLitePPSFile.new(d[:name])
-      assert_equal(d[:name], olefile.name)
-    end
-    data.each do |d|
-      olefile = OLEStorageLitePPSFile.new(d[:name], d[:data])
-      assert_equal(d[:name], olefile.name)
-      assert_equal(d[:data], olefile.data)
-    end
-  end
-
-  def test_append_no_file
-    olefile = OLEStorageLitePPSFile.new('name')
-    assert_equal('', olefile.data)
-
-    data = [ "data", "\r\n", "\r", "\n" ]
-    data.each do |d|
-      olefile = OLEStorageLitePPSFile.new('name')
-      olefile.append(d)
-      assert_equal(d, olefile.data)
-    end
-  end
-
-  def test_append_tempfile
-    data = [ "data", "\r\n", "\r", "\n" ]
-    data.each do |d|
-      olefile = OLEStorageLitePPSFile.new('name')
-      olefile.set_file
-      pps_file = olefile.pps_file
-
-      olefile.append(d)
-      pps_file.open
-      pps_file.binmode
-      assert_equal(d, pps_file.read)
-    end
-  end
-
-  def test_append_stringio
-    data = [ "data", "\r\n", "\r", "\n" ]
-    data.each do |d|
-      sio = StringIO.new
-      olefile = OLEStorageLitePPSFile.new('name')
-      olefile.set_file(sio)
-      pps_file = olefile.pps_file
-
-      olefile.append(d)
-      pps_file.rewind
-      assert_equal(d, pps_file.read)
-    end
-  end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
-end
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'stringio'
+
+class TC_OLEStorageLite < Test::Unit::TestCase
+  TEST_DIR    = File.expand_path(File.dirname(__FILE__))
+  PERL_OUTDIR = File.join(TEST_DIR, 'perl_output')
+  EXCEL_OUTDIR = File.join(TEST_DIR, 'excelfile')
+
+  def setup
+    @ole = OLEStorageLite.new
+  end
+
+  def teardown
+  end
+
+  def test_olestoragelite_new
+    ole = OLEStorageLite.new
+    assert_nil(ole.file)
+
+    io = StringIO.new
+    ole = OLEStorageLite.new(io)
+    assert_equal(io, ole.file)
+
+    file = 'test.ole'
+    ole = OLEStorageLite.new(file)
+    assert_equal(file, ole.file)
+
+  end
+
+  def test_asc2ucs
+    result = @ole.asc2ucs('Root Entry')
+    target = %w(
+        52 00 6F 00 6F 00 74 00 20 00 45 00 6E 00 74 00 72 00 79 00
+      ).join(" ")
+    assert_equal(target, unpack_record(result))
+  end
+
+  def test_ucs2asc
+    strings = [
+        'Root Entry',
+        ''
+      ]
+    strings.each do |str|
+      result = @ole.ucs2asc(@ole.asc2ucs(str))
+      assert_equal(str, result)
+    end
+  end
+
+  def unpack_record(data)
+    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
+  end
+
+end
+
+class TC_OLEStorageLitePPSFile < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_constructor
+    data = [
+        { :name => 'name', :data => 'data' },
+        { :name => '',     :data => 'data' },
+        { :name => 'name', :data => ''     },
+        { :name => '',     :data => ''     },
+      ]
+    data.each do |d|
+      olefile = OLEStorageLitePPSFile.new(d[:name])
+      assert_equal(d[:name], olefile.name)
+    end
+    data.each do |d|
+      olefile = OLEStorageLitePPSFile.new(d[:name], d[:data])
+      assert_equal(d[:name], olefile.name)
+      assert_equal(d[:data], olefile.data)
+    end
+  end
+
+  def test_append_no_file
+    olefile = OLEStorageLitePPSFile.new('name')
+    assert_equal('', olefile.data)
+
+    data = [ "data", "\r\n", "\r", "\n" ]
+    data.each do |d|
+      olefile = OLEStorageLitePPSFile.new('name')
+      olefile.append(d)
+      assert_equal(d, olefile.data)
+    end
+  end
+
+  def test_append_tempfile
+    data = [ "data", "\r\n", "\r", "\n" ]
+    data.each do |d|
+      olefile = OLEStorageLitePPSFile.new('name')
+      olefile.set_file
+      pps_file = olefile.pps_file
+
+      olefile.append(d)
+      pps_file.open
+      pps_file.binmode
+      assert_equal(d, pps_file.read)
+    end
+  end
+
+  def test_append_stringio
+    data = [ "data", "\r\n", "\r", "\n" ]
+    data.each do |d|
+      sio = StringIO.new
+      olefile = OLEStorageLitePPSFile.new('name')
+      olefile.set_file(sio)
+      pps_file = olefile.pps_file
+
+      olefile.append(d)
+      pps_file.rewind
+      assert_equal(d, pps_file.read)
+    end
+  end
+
+  def unpack_record(data)
+    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
+  end
+
+end