writeexcel 0.3.5 → 0.4.0

data/test/test_workbook.rb

@@ -1,18 +1,16 @@
+# -*- coding: utf-8 -*-
 require 'helper'
 require "stringio"
 
 class TC_Workbook < Test::Unit::TestCase
 
   def setup
-    t = Time.now.strftime("%Y%m%d")
-    path = "temp#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-    @test_file  = File.join(Dir.tmpdir, path)
+    @test_file  = StringIO.new
     @workbook   = Workbook.new(@test_file)
   end
 
   def teardown
     @workbook.close
-    File.unlink(@test_file) if FileTest.exist?(@test_file)
   end
 
   def test_new
@@ -84,25 +82,6 @@ def test_raise_set_compatibility_after_sheet_creation
     assert_raise(RuntimeError) { @workbook.compatibility_mode }
   end
 
-  def test_write_to_io
-    # write to @test_file
-    @workbook.add_worksheet
-    @workbook.close
-    file = ''
-    File.open(@test_file, "rb") do |f|
-      file = f.read
-    end
-
-    # write to io
-    io = StringIO.new
-    wb = Workbook.new(io)
-    wb.add_worksheet
-    wb.close
-
-    # compare @test_file and io
-    assert_equal(file, io.string)
-  end
-
   def valid_sheetname
     [
       # Tests for valid names

data/test/test_worksheet.rb

@@ -1,16 +1,16 @@
+# -*- 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
-    t = Time.now.strftime("%Y%m%d")
-    path = "temp#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-    @test_file           = File.join(Dir.tmpdir, path)
+    @test_file = StringIO.new
     @workbook = WriteExcel.new(@test_file)
     @sheetname = 'test'
-    @ws      = @workbook.add_worksheet(@sheetname,0)
+    @ws      = @workbook.add_worksheet(@sheetname, 0)
     @perldir = "#{PERL_OUTDIR}/"
     @format  = Format.new(:color=>"green")
   end
@@ -19,7 +19,6 @@ def teardown
     @ws     = nil
     @format = nil
     @workbook.close
-    File.unlink(@test_file) if FileTest.exist?(@test_file)
   end
 
   def test_methods_exist

data/utils/add_magic_comment.rb

@@ -0,0 +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

data/writeexcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{writeexcel}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hideo NAKAMURA"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-04-11}
   s.description = %q{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 = %q{cxn03651@msj.biglobe.ne.jp}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+     ".gitattributes",
      ".gitignore",
      "README.rdoc",
      "Rakefile",
@@ -91,10 +92,12 @@ Gem::Specification.new do |s|
      "lib/writeexcel/charts/pie.rb",
      "lib/writeexcel/charts/scatter.rb",
      "lib/writeexcel/charts/stock.rb",
+     "lib/writeexcel/compatibility.rb",
      "lib/writeexcel/excelformula.y",
      "lib/writeexcel/excelformulaparser.rb",
      "lib/writeexcel/format.rb",
      "lib/writeexcel/formula.rb",
+     "lib/writeexcel/helper.rb",
      "lib/writeexcel/olewriter.rb",
      "lib/writeexcel/properties.rb",
      "lib/writeexcel/storage_lite.rb",
@@ -206,6 +209,7 @@ Gem::Specification.new do |s|
      "test/test_62_chart_formats.rb",
      "test/test_63_chart_area_formats.rb",
      "test/test_biff.rb",
+     "test/test_compatibility.rb",
      "test/test_example_match.rb",
      "test/test_format.rb",
      "test/test_formula.rb",
@@ -213,6 +217,7 @@ Gem::Specification.new do |s|
      "test/test_storage_lite.rb",
      "test/test_workbook.rb",
      "test/test_worksheet.rb",
+     "utils/add_magic_comment.rb",
      "writeexcel.gemspec",
      "writeexcel.rdoc"
   ]
@@ -256,6 +261,7 @@ Gem::Specification.new do |s|
      "test/test_62_chart_formats.rb",
      "test/test_63_chart_area_formats.rb",
      "test/test_biff.rb",
+     "test/test_compatibility.rb",
      "test/test_example_match.rb",
      "test/test_format.rb",
      "test/test_formula.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Hideo NAKAMURA
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +09:00
+date: 2010-04-11 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitattributes
 - .gitignore
 - README.rdoc
 - Rakefile
@@ -102,10 +103,12 @@ files:
 - lib/writeexcel/charts/pie.rb
 - lib/writeexcel/charts/scatter.rb
 - lib/writeexcel/charts/stock.rb
+- lib/writeexcel/compatibility.rb
 - lib/writeexcel/excelformula.y
 - lib/writeexcel/excelformulaparser.rb
 - lib/writeexcel/format.rb
 - lib/writeexcel/formula.rb
+- lib/writeexcel/helper.rb
 - lib/writeexcel/olewriter.rb
 - lib/writeexcel/properties.rb
 - lib/writeexcel/storage_lite.rb
@@ -217,6 +220,7 @@ files:
 - test/test_62_chart_formats.rb
 - test/test_63_chart_area_formats.rb
 - test/test_biff.rb
+- test/test_compatibility.rb
 - test/test_example_match.rb
 - test/test_format.rb
 - test/test_formula.rb
@@ -224,6 +228,7 @@ files:
 - test/test_storage_lite.rb
 - test/test_workbook.rb
 - test/test_worksheet.rb
+- utils/add_magic_comment.rb
 - writeexcel.gemspec
 - writeexcel.rdoc
 has_rdoc: true
@@ -291,6 +296,7 @@ test_files:
 - test/test_62_chart_formats.rb
 - test/test_63_chart_area_formats.rb
 - test/test_biff.rb
+- test/test_compatibility.rb
 - test/test_example_match.rb
 - test/test_format.rb
 - test/test_formula.rb