write_xlsx 0.0.2 → 0.0.3

data/test/helper.rb

@@ -61,9 +61,16 @@ class Test::Unit::TestCase
   end
 
   def compare_file(expected, result, file)
-    assert_equal(got_to_array(IO.read(File.join(expected, file))),
-                 got_to_array(IO.read(File.join(result, file))),
-                 "#{file} differs.")
+    ruby_19 do
+      assert_equal(got_to_array(IO.read(File.join(expected, file), :encoding => 'UTF-8')),
+                   got_to_array(IO.read(File.join(result, file),   :encoding => 'UTF-8')),
+                   "#{file} differs.")
+    end
+    ruby_18 do 
+      assert_equal(got_to_array(IO.read(File.join(expected, file))),
+                   got_to_array(IO.read(File.join(result, file))),
+                   "#{file} differs.")
+    end
   end
 
   def prepare_compare(expected, result, xlsx)

data/test/package/comments/test_write_text_t.rb

@@ -4,7 +4,7 @@ require 'write_xlsx/package/comments'
 
 class TestWriteTextT < Test::Unit::TestCase
   def setup
-    @comment = Writexlsx::Package::Comments.new
+    @comment = Writexlsx::Package::Comments.new(nil)
   end
 
   def test_write_text_t_with_center_space

data/test/package/shared_strings/test_shared_strings01.rb

@@ -5,9 +5,9 @@ require 'write_xlsx/package/shared_strings'
 class TestSharedStrings01 < Test::Unit::TestCase
   def test_shared_strings01
     @obj = Writexlsx::Package::SharedStrings.new
-    @obj.string_count = 7
-    @obj.unique_count = 3
-    @obj.add_strings(['neptune', 'mars', 'venus'])
+    @obj.index('neptune')
+    @obj.index('mars')
+    5.times { @obj.index('venus') }
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/shared_strings/test_shared_strings02.rb

@@ -5,9 +5,9 @@ require 'write_xlsx/package/shared_strings'
 class TestSharedStrings02 < Test::Unit::TestCase
   def test_shared_strings02
     @obj = Writexlsx::Package::SharedStrings.new
-    @obj.string_count = 3
-    @obj.unique_count = 3
-    @obj.add_strings(['abcdefg', '   abcdefg', 'abcdefg   '])
+    @obj.index('abcdefg')
+    @obj.index('   abcdefg')
+    @obj.index('abcdefg   ')
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/shared_strings/test_write_sst.rb

@@ -5,8 +5,9 @@ require 'write_xlsx/package/shared_strings'
 class TestWriteSst < Test::Unit::TestCase
   def test_write_sst
     @obj = Writexlsx::Package::SharedStrings.new
-    @obj.string_count = 7
-    @obj.unique_count = 3
+    @obj.index('1')
+    @obj.index('2')
+    5.times { @obj.index('3') }
     @obj.__send__('write_sst')
     result = @obj.instance_variable_get(:@writer).string
     expected = '<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="7" uniqueCount="3">'

data/test/package/vml/test_write_anchor.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteAnchor < Test::Unit::TestCase
   def test_write_anchor
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_anchor', [ 2, 0, 15, 10, 4, 4, 15, 4 ])
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:Anchor>2, 15, 0, 10, 4, 15, 4, 4</x:Anchor>'

data/test/package/vml/test_write_auto_fill.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteAutoFill < Test::Unit::TestCase
   def test_write_auto_fill
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_auto_fill')
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:AutoFill>False</x:AutoFill>'

data/test/package/vml/test_write_column.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteColumn < Test::Unit::TestCase
   def test_write_auto_column
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_column', 2)
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:Column>2</x:Column>'

data/test/package/vml/test_write_div.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteDiv < Test::Unit::TestCase
   def test_write_div
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_div')
     result = vml.instance_variable_get(:@writer).string
     expected = '<div style="text-align:left"></div>'

data/test/package/vml/test_write_fill.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteFill < Test::Unit::TestCase
   def test_write_fill
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_fill')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:fill color2="#ffffe1" />'

data/test/package/vml/test_write_idmap.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteIdmap < Test::Unit::TestCase
   def test_write_idmap
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_idmap', 1)
     result = vml.instance_variable_get(:@writer).string
     expected = '<o:idmap v:ext="edit" data="1" />'

data/test/package/vml/test_write_move_with_cells.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteMoveWithCells < Test::Unit::TestCase
   def test_write_move_with_cells
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_move_with_cells')
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:MoveWithCells />'

data/test/package/vml/test_write_path.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWritePath < Test::Unit::TestCase
   def test_write_path
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_path', 't', 'rect')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:path gradientshapeok="t" o:connecttype="rect" />'
@@ -13,7 +13,7 @@ class TestWritePath < Test::Unit::TestCase
   end
 
   def test_write_path_without_gradientshapeok
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_path', nil, 'none')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:path o:connecttype="none" />'

data/test/package/vml/test_write_row.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteRow < Test::Unit::TestCase
   def test_write_row
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_row', 2)
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:Row>2</x:Row>'

data/test/package/vml/test_write_shadow.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteShadow < Test::Unit::TestCase
   def test_write_shadow
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shadow')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:shadow on="t" color="black" obscured="t" />'

data/test/package/vml/test_write_shapelayout.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteShapelayout < Test::Unit::TestCase
   def test_write_shapelayout
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shapelayout', 1)
     result = vml.instance_variable_get(:@writer).string
     expected = '<o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1" /></o:shapelayout>'

data/test/package/vml/test_write_shapetype.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteShapetype < Test::Unit::TestCase
   def test_write_shapetype
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shapetype')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter" /><v:path gradientshapeok="t" o:connecttype="rect" /></v:shapetype>'

data/test/package/vml/test_write_size_with_cells.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteSizeWithCells < Test::Unit::TestCase
   def test_write_size_with_cells
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_size_with_cells')
     result = vml.instance_variable_get(:@writer).string
     expected = '<x:SizeWithCells />'

data/test/package/vml/test_write_stroke.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteStroke < Test::Unit::TestCase
   def test_write_stroke
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_stroke')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:stroke joinstyle="miter" />'

data/test/package/vml/test_write_textbox.rb

@@ -5,7 +5,7 @@ require 'write_xlsx/package/vml'
 
 class TestWriteTextbox < Test::Unit::TestCase
   def test_write_textbox
-    vml = Writexlsx::Package::VML.new
+    vml = Writexlsx::Package::Vml.new
     vml.__send__('write_textbox')
     result = vml.instance_variable_get(:@writer).string
     expected = '<v:textbox style="mso-direction-alt:auto"><div style="text-align:left"></div></v:textbox>'