writeexcel 0.5.0 → 0.6.0

data/test/test_workbook.rb

@@ -1,139 +1,139 @@
-# -*- coding: utf-8 -*-
-require 'helper'
-require "stringio"
-
-class TC_Workbook < Test::Unit::TestCase
-
-  def setup
-    @test_file  = StringIO.new
-    @workbook   = Workbook.new(@test_file)
-  end
-
-  def teardown
-    @workbook.close
-  end
-
-  def test_new
-    assert_kind_of(Workbook, @workbook)
-  end
-
-  def test_add_worksheet
-    sheetnames = ['sheet1', 'sheet2']
-    (0 .. sheetnames.size-1).each do |i|
-      sheets = @workbook.sheets
-      assert_equal(i, sheets.size)
-      @workbook.add_worksheet(sheetnames[i])
-      sheets = @workbook.sheets
-      assert_equal(i+1, sheets.size)
-    end
-  end
-
-  def test_set_tempdir_after_sheet_added
-    # after shees added, call set_tempdir raise RuntimeError
-    @workbook.add_worksheet('name')
-    assert_raise(RuntimeError, "already sheet exists, but set_tempdir() doesn't raise"){
-      @workbook.set_tempdir
-    }
-  end
-
-  def test_set_tempdir_with_invalid_dir
-    # invalid dir raise RuntimeError
-    while true do
-      dir = Time.now.to_s
-      break unless FileTest.directory?(dir)
-      sleep 0.1
-    end
-    assert_raise(RuntimeError, "set_tempdir() doesn't raise invalid dir:#{dir}."){
-      @workbook.set_tempdir(dir)
-    }
-  end
-
-=begin
-#
-# Comment out because Workbook#check_sheetname was set to private method.
-#
-  def test_check_sheetname
-    valids   = valid_sheetname
-    invalids = invalid_sheetname
-    worksheet1 = @workbook.add_worksheet              # implicit name 'Sheet1'
-    worksheet2 = @workbook.add_worksheet              # implicit name 'Sheet2'
-    worksheet3 = @workbook.add_worksheet 'Sheet3'     # implicit name 'Sheet3'
-    worksheet1 = @workbook.add_worksheet 'Sheetz'     # implicit name 'Sheetz'
-
-    valids.each do |test|
-      target    = test[0]
-      sheetname = test[1]
-      caption   = test[2]
-      assert_nothing_raised { @workbook.check_sheetname(sheetname) }
-    end
-    invalids.each do |test|
-      target    = test[0]
-      sheetname = test[1]
-      caption   = test[2]
-      assert_raise(RuntimeError, "sheetname: #{sheetname}") {
-          @workbook.check_sheetname(sheetname)
-        }
-    end
-  end
-=end
-
-  def test_raise_set_compatibility_after_sheet_creation
-    @workbook.add_worksheet
-    assert_raise(RuntimeError) { @workbook.compatibility_mode }
-  end
-
-  def valid_sheetname
-    [
-      # Tests for valid names
-      [ 'PASS', nil,        'No worksheet name'           ],
-      [ 'PASS', '',         'Blank worksheet name'        ],
-      [ 'PASS', 'Sheet10',  'Valid worksheet name'        ],
-      [ 'PASS', 'a' * 31,   'Valid 31 char name'          ]
-    ]
-  end
-
-  def invalid_sheetname
-    [
-      # Tests for invalid names
-      [ 'FAIL', 'Sheet1',   'Caught duplicate name'       ],
-      [ 'FAIL', 'Sheet2',   'Caught duplicate name'       ],
-      [ 'FAIL', 'Sheet3',   'Caught duplicate name'       ],
-      [ 'FAIL', 'sheet1',   'Caught case-insensitive name'],
-      [ 'FAIL', 'SHEET1',   'Caught case-insensitive name'],
-      [ 'FAIL', 'sheetz',   'Caught case-insensitive name'],
-      [ 'FAIL', 'SHEETZ',   'Caught case-insensitive name'],
-      [ 'FAIL', 'a' * 32,   'Caught long name'            ],
-      [ 'FAIL', '[',        'Caught invalid char'         ],
-      [ 'FAIL', ']',        'Caught invalid char'         ],
-      [ 'FAIL', ':',        'Caught invalid char'         ],
-      [ 'FAIL', '*',        'Caught invalid char'         ],
-      [ 'FAIL', '?',        'Caught invalid char'         ],
-      [ 'FAIL', '/',        'Caught invalid char'         ],
-      [ 'FAIL', '\\',       'Caught invalid char'         ]
-    ]
-  end
-
-  def test_add_format_must_accept_one_or_more_hash_params
-    font    = {
-      :font   => 'ＭＳ 明朝',
-      :size   => 12,
-      :color  => 'blue',
-      :bold   => 1
-    }
-    shading = {
-      :bg_color => 'green',
-      :pattern  => 1
-    }
-    properties = font.merge(shading)
-
-    format1 = @workbook.add_format(properties)
-    format2 = @workbook.add_format(font, shading)
-    assert(format_equal?(format1, format2))
-  end
-
-  def format_equal?(f1, f2)
-    require 'yaml'
-    re = /xf_index: \d+\n/
-    YAML.dump(f1).sub(re, '') == YAML.dump(f2).sub(re, '')
-  end
-end
+# -*- coding: utf-8 -*-
+require 'helper'
+require "stringio"
+
+class TC_Workbook < Test::Unit::TestCase
+
+  def setup
+    @test_file  = StringIO.new
+    @workbook   = Workbook.new(@test_file)
+  end
+
+  def teardown
+    @workbook.close
+  end
+
+  def test_new
+    assert_kind_of(Workbook, @workbook)
+  end
+
+  def test_add_worksheet
+    sheetnames = ['sheet1', 'sheet2']
+    (0 .. sheetnames.size-1).each do |i|
+      sheets = @workbook.sheets
+      assert_equal(i, sheets.size)
+      @workbook.add_worksheet(sheetnames[i])
+      sheets = @workbook.sheets
+      assert_equal(i+1, sheets.size)
+    end
+  end
+
+  def test_set_tempdir_after_sheet_added
+    # after shees added, call set_tempdir raise RuntimeError
+    @workbook.add_worksheet('name')
+    assert_raise(RuntimeError, "already sheet exists, but set_tempdir() doesn't raise"){
+      @workbook.set_tempdir
+    }
+  end
+
+  def test_set_tempdir_with_invalid_dir
+    # invalid dir raise RuntimeError
+    while true do
+      dir = Time.now.to_s
+      break unless FileTest.directory?(dir)
+      sleep 0.1
+    end
+    assert_raise(RuntimeError, "set_tempdir() doesn't raise invalid dir:#{dir}."){
+      @workbook.set_tempdir(dir)
+    }
+  end
+
+=begin
+#
+# Comment out because Workbook#check_sheetname was set to private method.
+#
+  def test_check_sheetname
+    valids   = valid_sheetname
+    invalids = invalid_sheetname
+    worksheet1 = @workbook.add_worksheet              # implicit name 'Sheet1'
+    worksheet2 = @workbook.add_worksheet              # implicit name 'Sheet2'
+    worksheet3 = @workbook.add_worksheet 'Sheet3'     # implicit name 'Sheet3'
+    worksheet1 = @workbook.add_worksheet 'Sheetz'     # implicit name 'Sheetz'
+
+    valids.each do |test|
+      target    = test[0]
+      sheetname = test[1]
+      caption   = test[2]
+      assert_nothing_raised { @workbook.check_sheetname(sheetname) }
+    end
+    invalids.each do |test|
+      target    = test[0]
+      sheetname = test[1]
+      caption   = test[2]
+      assert_raise(RuntimeError, "sheetname: #{sheetname}") {
+          @workbook.check_sheetname(sheetname)
+        }
+    end
+  end
+=end
+
+  def test_raise_set_compatibility_after_sheet_creation
+    @workbook.add_worksheet
+    assert_raise(RuntimeError) { @workbook.compatibility_mode }
+  end
+
+  def valid_sheetname
+    [
+      # Tests for valid names
+      [ 'PASS', nil,        'No worksheet name'           ],
+      [ 'PASS', '',         'Blank worksheet name'        ],
+      [ 'PASS', 'Sheet10',  'Valid worksheet name'        ],
+      [ 'PASS', 'a' * 31,   'Valid 31 char name'          ]
+    ]
+  end
+
+  def invalid_sheetname
+    [
+      # Tests for invalid names
+      [ 'FAIL', 'Sheet1',   'Caught duplicate name'       ],
+      [ 'FAIL', 'Sheet2',   'Caught duplicate name'       ],
+      [ 'FAIL', 'Sheet3',   'Caught duplicate name'       ],
+      [ 'FAIL', 'sheet1',   'Caught case-insensitive name'],
+      [ 'FAIL', 'SHEET1',   'Caught case-insensitive name'],
+      [ 'FAIL', 'sheetz',   'Caught case-insensitive name'],
+      [ 'FAIL', 'SHEETZ',   'Caught case-insensitive name'],
+      [ 'FAIL', 'a' * 32,   'Caught long name'            ],
+      [ 'FAIL', '[',        'Caught invalid char'         ],
+      [ 'FAIL', ']',        'Caught invalid char'         ],
+      [ 'FAIL', ':',        'Caught invalid char'         ],
+      [ 'FAIL', '*',        'Caught invalid char'         ],
+      [ 'FAIL', '?',        'Caught invalid char'         ],
+      [ 'FAIL', '/',        'Caught invalid char'         ],
+      [ 'FAIL', '\\',       'Caught invalid char'         ]
+    ]
+  end
+
+  def test_add_format_must_accept_one_or_more_hash_params
+    font    = {
+      :font   => 'ＭＳ 明朝',
+      :size   => 12,
+      :color  => 'blue',
+      :bold   => 1
+    }
+    shading = {
+      :bg_color => 'green',
+      :pattern  => 1
+    }
+    properties = font.merge(shading)
+
+    format1 = @workbook.add_format(properties)
+    format2 = @workbook.add_format(font, shading)
+    assert(format_equal?(format1, format2))
+  end
+
+  def format_equal?(f1, f2)
+    require 'yaml'
+    re = /xf_index: \d+\n/
+    YAML.dump(f1).sub(re, '') == YAML.dump(f2).sub(re, '')
+  end
+end

data/test/test_worksheet.rb

@@ -1,110 +1,110 @@
-# -*- coding: utf-8 -*-
-require 'helper'
-require 'stringio'
-
-class TC_Worksheet < Test::Unit::TestCase
-  TEST_DIR    = File.expand_path(File.dirname(__FILE__))
-  PERL_OUTDIR = File.join(TEST_DIR, 'perl_output')
-
-  def setup
-    @test_file = StringIO.new
-    @workbook = WriteExcel.new(@test_file)
-    @sheetname = 'test'
-    @ws      = @workbook.add_worksheet(@sheetname, 0)
-    @perldir = "#{PERL_OUTDIR}/"
-    @format  = Writeexcel::Format.new(:color=>"green")
-  end
-
-  def teardown
-    @ws     = nil
-    @format = nil
-    @workbook.close
-  end
-
-  def test_methods_exist
-    assert_respond_to(@ws, :write)
-    assert_respond_to(@ws, :write_blank)
-    assert_respond_to(@ws, :write_row)
-    assert_respond_to(@ws, :write_col)
-  end
-
-  def test_methods_no_error
-    assert_nothing_raised{ @ws.write(0,0,nil) }
-    assert_nothing_raised{ @ws.write(0,0,"Hello") }
-    assert_nothing_raised{ @ws.write(0,0,888) }
-    assert_nothing_raised{ @ws.write_row(0,0,["one","two","three"]) }
-    assert_nothing_raised{ @ws.write_row(0,0,[1,2,3]) }
-    assert_nothing_raised{ @ws.write_col(0,0,["one","two","three"]) }
-    assert_nothing_raised{ @ws.write_col(0,0,[1,2,3]) }
-    assert_nothing_raised{ @ws.write_blank(0,0,nil) }
-    assert_nothing_raised{ @ws.write_url(0,0,"http://www.ruby-lang.org") }
-  end
-
-  def test_write_syntax
-    assert_nothing_raised{@ws.write(0,0,"Hello")}
-    assert_nothing_raised{@ws.write(0,0,666)}
-  end
-
-  def test_store_dimensions
-    file = "delete_this"
-    File.open(file,"w+"){ |f| f.print @ws.store_dimensions }
-    pf = @perldir + "ws_store_dimensions"
-    p_od = IO.readlines(pf).to_s.dump
-    r_od = IO.readlines(file).to_s.dump
-    assert_equal_filesize(pf ,file, "Invalid size for store_selection")
-    assert_equal(p_od, r_od,"Octal dumps are not identical")
-    File.delete(file)
-  end
-
-  def test_store_colinfo
-    file = "delete_this"
-    File.open(file,"w+"){ |f| f.print @ws.store_colinfo }
-    pf = @perldir + "ws_store_colinfo"
-    p_od = IO.readlines(pf).to_s.dump
-    r_od = IO.readlines(file).to_s.dump
-    assert_equal_filesize(pf, file, "Invalid size for store_colinfo")
-    assert_equal(p_od,r_od,"Perl and Ruby octal dumps don't match")
-    File.delete(file)
-  end
-
-  def test_store_selection
-    file = "delete_this"
-    File.open(file,"w+"){ |f| f.print @ws.store_selection(1,1,2,2) }
-    pf = @perldir + "ws_store_selection"
-    p_od = IO.readlines(pf).to_s.dump
-    r_od = IO.readlines(file).to_s.dump
-    assert_equal_filesize(pf, file, "Invalid size for store_selection")
-    assert_equal(p_od, r_od,"Octal dumps are not identical")
-    File.delete(file)
-  end
-
-  def test_store_filtermode
-    file = "delete_this"
-    File.open(file,"w+"){ |f| f.print @ws.store_filtermode }
-    pf = @perldir + "ws_store_filtermode_off"
-    p_od = IO.readlines(pf).to_s.dump
-    r_od = IO.readlines(file).to_s.dump
-    assert_equal_filesize(pf, file, "Invalid size for store_filtermode_off")
-    assert_equal(p_od, r_od,"Octal dumps are not identical")
-    File.delete(file)
-
-    @ws.autofilter(1,1,2,2)
-    @ws.filter_column(1, 'x < 2000')
-    File.open(file,"w+"){ |f| f.print @ws.store_filtermode }
-    pf = @perldir + "ws_store_filtermode_on"
-    p_od = IO.readlines(pf).to_s.dump
-    r_od = IO.readlines(file).to_s.dump
-    assert_equal_filesize(pf, file, "Invalid size for store_filtermode_off")
-    assert_equal(p_od, r_od,"Octal dumps are not identical")
-    File.delete(file)
-  end
-
-  def test_new
-    assert_equal(@sheetname, @ws.name)
-  end
-
-
-  def assert_equal_filesize(target, test, msg = "Bad file size")
-    assert_equal(File.size(target),File.size(test),msg)
-  end
-end
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'stringio'
+
+class TC_Worksheet < Test::Unit::TestCase
+  TEST_DIR    = File.expand_path(File.dirname(__FILE__))
+  PERL_OUTDIR = File.join(TEST_DIR, 'perl_output')
+
+  def setup
+    @test_file = StringIO.new
+    @workbook = WriteExcel.new(@test_file)
+    @sheetname = 'test'
+    @ws      = @workbook.add_worksheet(@sheetname, 0)
+    @perldir = "#{PERL_OUTDIR}/"
+    @format  = Writeexcel::Format.new(:color=>"green")
+  end
+
+  def teardown
+    @ws     = nil
+    @format = nil
+    @workbook.close
+  end
+
+  def test_methods_exist
+    assert_respond_to(@ws, :write)
+    assert_respond_to(@ws, :write_blank)
+    assert_respond_to(@ws, :write_row)
+    assert_respond_to(@ws, :write_col)
+  end
+
+  def test_methods_no_error
+    assert_nothing_raised{ @ws.write(0,0,nil) }
+    assert_nothing_raised{ @ws.write(0,0,"Hello") }
+    assert_nothing_raised{ @ws.write(0,0,888) }
+    assert_nothing_raised{ @ws.write_row(0,0,["one","two","three"]) }
+    assert_nothing_raised{ @ws.write_row(0,0,[1,2,3]) }
+    assert_nothing_raised{ @ws.write_col(0,0,["one","two","three"]) }
+    assert_nothing_raised{ @ws.write_col(0,0,[1,2,3]) }
+    assert_nothing_raised{ @ws.write_blank(0,0,nil) }
+    assert_nothing_raised{ @ws.write_url(0,0,"http://www.ruby-lang.org") }
+  end
+
+  def test_write_syntax
+    assert_nothing_raised{@ws.write(0,0,"Hello")}
+    assert_nothing_raised{@ws.write(0,0,666)}
+  end
+
+  def test_store_dimensions
+    file = "delete_this"
+    File.open(file,"w+"){ |f| f.print @ws.store_dimensions }
+    pf = @perldir + "ws_store_dimensions"
+    p_od = IO.readlines(pf).to_s.dump
+    r_od = IO.readlines(file).to_s.dump
+    assert_equal_filesize(pf ,file, "Invalid size for store_selection")
+    assert_equal(p_od, r_od,"Octal dumps are not identical")
+    File.delete(file)
+  end
+
+  def test_store_colinfo
+    file = "delete_this"
+    File.open(file,"w+"){ |f| f.print @ws.store_colinfo }
+    pf = @perldir + "ws_store_colinfo"
+    p_od = IO.readlines(pf).to_s.dump
+    r_od = IO.readlines(file).to_s.dump
+    assert_equal_filesize(pf, file, "Invalid size for store_colinfo")
+    assert_equal(p_od,r_od,"Perl and Ruby octal dumps don't match")
+    File.delete(file)
+  end
+
+  def test_store_selection
+    file = "delete_this"
+    File.open(file,"w+"){ |f| f.print @ws.store_selection(1,1,2,2) }
+    pf = @perldir + "ws_store_selection"
+    p_od = IO.readlines(pf).to_s.dump
+    r_od = IO.readlines(file).to_s.dump
+    assert_equal_filesize(pf, file, "Invalid size for store_selection")
+    assert_equal(p_od, r_od,"Octal dumps are not identical")
+    File.delete(file)
+  end
+
+  def test_store_filtermode
+    file = "delete_this"
+    File.open(file,"w+"){ |f| f.print @ws.store_filtermode }
+    pf = @perldir + "ws_store_filtermode_off"
+    p_od = IO.readlines(pf).to_s.dump
+    r_od = IO.readlines(file).to_s.dump
+    assert_equal_filesize(pf, file, "Invalid size for store_filtermode_off")
+    assert_equal(p_od, r_od,"Octal dumps are not identical")
+    File.delete(file)
+
+    @ws.autofilter(1,1,2,2)
+    @ws.filter_column(1, 'x < 2000')
+    File.open(file,"w+"){ |f| f.print @ws.store_filtermode }
+    pf = @perldir + "ws_store_filtermode_on"
+    p_od = IO.readlines(pf).to_s.dump
+    r_od = IO.readlines(file).to_s.dump
+    assert_equal_filesize(pf, file, "Invalid size for store_filtermode_off")
+    assert_equal(p_od, r_od,"Octal dumps are not identical")
+    File.delete(file)
+  end
+
+  def test_new
+    assert_equal(@sheetname, @ws.name)
+  end
+
+
+  def assert_equal_filesize(target, test, msg = "Bad file size")
+    assert_equal(File.size(target),File.size(test),msg)
+  end
+end

data/utils/add_magic_comment.rb

@@ -1,80 +1,80 @@
-#!/usr/bin/ruby -w
-# -*- coding: utf-8 -*-
-require 'stringio'
-#
-# magic commentを付与する
-#
-
-# カレントディレクトリ以下の.rbファイルパスの配列を返す
-def rb_files
-  Dir.glob("./**/*\.rb")
-end
-
-# カレントディレクトリ以下の.orgファイルパスの配列を返す
-def org_files
-  Dir.glob("./**/*\.org")
-end
-
-# ファイル名を*.orgに変更し、変更後のファイル名を返す
-def rename_to_org(file)
-  orgfile = change_ext_name(file, 'org')
-  File.rename(file, orgfile)
-  orgfile
-end
-
-# ファイル名の拡張子を変更した際のフルパスを返す（実際の変更はしない）
-def change_ext_name(file, new_ext)
-  File.join(File.dirname(file), File.basename(file, ".*")) + ".#{new_ext}"
-end
-
-# shebang か
-def shebang?(line)
-  line =~ /^#!.*ruby/ ? true : false
-end
-
-# magic_comment か
-def magic_comment?(line)
-  line =~ /coding[:=]\s*[\w.-]+/ ? true : false
-end
-
-def add_magic_comment(input = nil, output = nil)
-  input  ||= STDIN
-  output ||= STDOUT
-
-  magic_comment = "# -*- coding: utf-8 -*-\n"
-  if shebang?(line = input.gets)
-    output.write(line)
-    if magic_comment?(line = input.gets)
-      output.write(line)
-    else
-      output.write(magic_comment)
-      output.write(line)
-    end
-  elsif magic_comment?(line)
-    output.write(line)
-  else
-    output.write(magic_comment)
-    output.write(line)
-  end
-  while(line = input.gets)
-    output.write(line)
-  end
-end
-
-if $0 == __FILE__
-
-rb_files.each do |file|
-  orgfile = rename_to_org(file)
-  print("#{file}: renamed to #{orgfile}.\n")
-  io = StringIO.new
-  File.open(orgfile) do |fin|
-    File.open(file, 'w') { |fout| add_magic_comment(fin, fout) }
-  end
-  print("#{file}: contains magic comment.\n")
-end
-#
-# orgファイルをすべて消すには、以下を有効に。
-#
-org_files.each { |f| File.unlink(f) }
-
-end
+#!/usr/bin/ruby -w
+# -*- coding: utf-8 -*-
+require 'stringio'
+#
+# magic commentを付与する
+#
+
+# カレントディレクトリ以下の.rbファイルパスの配列を返す
+def rb_files
+  Dir.glob("./**/*\.rb")
+end
+
+# カレントディレクトリ以下の.orgファイルパスの配列を返す
+def org_files
+  Dir.glob("./**/*\.org")
+end
+
+# ファイル名を*.orgに変更し、変更後のファイル名を返す
+def rename_to_org(file)
+  orgfile = change_ext_name(file, 'org')
+  File.rename(file, orgfile)
+  orgfile
+end
+
+# ファイル名の拡張子を変更した際のフルパスを返す（実際の変更はしない）
+def change_ext_name(file, new_ext)
+  File.join(File.dirname(file), File.basename(file, ".*")) + ".#{new_ext}"
+end
+
+# shebang か
+def shebang?(line)
+  line =~ /^#!.*ruby/ ? true : false
+end
+
+# magic_comment か
+def magic_comment?(line)
+  line =~ /coding[:=]\s*[\w.-]+/ ? true : false
+end
+
+def add_magic_comment(input = nil, output = nil)
+  input  ||= STDIN
+  output ||= STDOUT
+
+  magic_comment = "# -*- coding: utf-8 -*-\n"
+  if shebang?(line = input.gets)
+    output.write(line)
+    if magic_comment?(line = input.gets)
+      output.write(line)
+    else
+      output.write(magic_comment)
+      output.write(line)
+    end
+  elsif magic_comment?(line)
+    output.write(line)
+  else
+    output.write(magic_comment)
+    output.write(line)
+  end
+  while(line = input.gets)
+    output.write(line)
+  end
+end
+
+if $0 == __FILE__
+
+rb_files.each do |file|
+  orgfile = rename_to_org(file)
+  print("#{file}: renamed to #{orgfile}.\n")
+  io = StringIO.new
+  File.open(orgfile) do |fin|
+    File.open(file, 'w') { |fout| add_magic_comment(fin, fout) }
+  end
+  print("#{file}: contains magic comment.\n")
+end
+#
+# orgファイルをすべて消すには、以下を有効に。
+#
+org_files.each { |f| File.unlink(f) }
+
+end