write_xlsx 0.75.0 → 0.76.0

data/test/regression/test_chart_column08.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartColumn08 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_column08
+    @xlsx = 'chart_column08.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [68809856, 68811392])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => '=(Sheet1!$A$1:$A$2,Sheet1!$A$4:$A$5)',
+                     :values          => '=(Sheet1!$B$1:$B$2,Sheet1!$B$4:$B$5)',
+                     :categories_data => [1, 2, 4, 5],
+                     :values_data     => [2, 4, 8, 10]
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_date01.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDate01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_date01
+    @xlsx = 'chart_date01.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+    date_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [73655040, 73907584])
+
+    worksheet.set_column('A:A', 12)
+
+    dates = [
+             '2013-01-01T', '2013-01-02T', '2013-01-03T', '2013-01-04T',
+             '2013-01-05T', '2013-01-06T', '2013-01-07T', '2013-01-08T',
+             '2013-01-09T', '2013-01-10T'
+            ]
+
+    data = [10, 30, 20, 40, 20, 60, 50, 40, 30, 30]
+
+    dates.each_with_index do |date_time, row|
+      worksheet.write_date_time(row, 0, date_time, date_format)
+      worksheet.write(row, 1, data[row])
+    end
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$10',
+                     :values     => '=Sheet1!$B$1:$B$10'
+                     )
+
+    chart.set_x_axis(
+                     :num_format        => 'dd/mm/yyyy',
+                     :num_format_linked => 1,
+                     :date_axis         => 1
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:formatCode']}
+                                )
+  end
+end

data/test/regression/test_chart_date02.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDate02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_date02
+    @xlsx = 'chart_date02.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+    date_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [55112064, 55115136])
+
+    worksheet.set_column('A:A', 12)
+
+    dates = [
+             '2013-01-01T', '2013-01-02T', '2013-01-03T', '2013-01-04T',
+             '2013-01-05T', '2013-01-06T', '2013-01-07T', '2013-01-08T',
+             '2013-01-09T', '2013-01-10T'
+            ]
+
+    data = [10, 30, 20, 40, 20, 60, 50, 40, 30, 30]
+
+    dates.each_with_index do |date_time, row|
+      worksheet.write_date_time(row, 0, date_time, date_format)
+      worksheet.write(row, 1, data[row])
+    end
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$10',
+                     :values     => '=Sheet1!$B$1:$B$10'
+                     )
+
+    chart.set_x_axis(
+                     :date_axis         => 1,
+                     :min               => worksheet.convert_date_time('2013-01-02T'),
+                     :max               => worksheet.convert_date_time('2013-01-09T'),
+                     :num_format        => 'dd/mm/yyyy',
+                     :num_format_linked => 1,
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:formatCode']}
+                                )
+  end
+end

data/test/regression/test_chart_date03.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDate03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_date03
+    @xlsx = 'chart_date03.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+    date_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [51761152, 51762688])
+
+    worksheet.set_column('A:A', 12)
+
+    dates = [
+             '2013-01-01T', '2013-01-02T', '2013-01-03T', '2013-01-04T',
+             '2013-01-05T', '2013-01-06T', '2013-01-07T', '2013-01-08T',
+             '2013-01-09T', '2013-01-10T'
+            ]
+
+    data = [10, 30, 20, 40, 20, 60, 50, 40, 30, 30]
+
+    dates.each_with_index do |date_time, row|
+      worksheet.write_date_time(row, 0, date_time, date_format)
+      worksheet.write(row, 1, data[row])
+    end
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$10',
+                     :values     => '=Sheet1!$B$1:$B$10'
+                     )
+
+    chart.set_x_axis(
+                     :date_axis         => 1,
+                     :minor_unit        => 1,
+                     :major_unit        => 1,
+                     :num_format        => 'dd/mm/yyyy',
+                     :num_format_linked => 1,
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:formatCode']}
+                                )
+  end
+end

data/test/regression/test_chart_date04.rb

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDate04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_date04
+    @xlsx = 'chart_date04.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'line', :embedded => 1)
+    date_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [51761152, 51762688])
+
+    worksheet.set_column('A:A', 12)
+
+    dates = [
+             '2013-01-01T', '2013-01-02T', '2013-01-03T', '2013-01-04T',
+             '2013-01-05T', '2013-01-06T', '2013-01-07T', '2013-01-08T',
+             '2013-01-09T', '2013-01-10T'
+            ]
+
+    data = [10, 30, 20, 40, 20, 60, 50, 40, 30, 30]
+
+    dates.each_with_index do |date_time, row|
+      worksheet.write_date_time(row, 0, date_time, date_format)
+      worksheet.write(row, 1, data[row])
+    end
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$10',
+                     :values     => '=Sheet1!$B$1:$B$10'
+                     )
+
+    chart.set_x_axis(
+                     :date_axis         => 1,
+                     :minor_unit        => 1,
+                     :minor_unit_type   => 'months',
+                     :major_unit        => 1,
+                     :major_unit_type   => 'years',
+                     :num_format        => 'dd/mm/yyyy',
+                     :num_format_linked => 1,
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:formatCode']}
+                                )
+  end
+end

data/test/regression/test_chart_stock01.rb

@@ -61,12 +61,7 @@ class TestRegressionChartStock01 < Test::Unit::TestCase
                                 File.join(@regression_output, @xlsx),
                                 @xlsx,
                                 nil,
-                                {
-                                  'xl/charts/chart1.xml' => [ '<c:formatCode', ],
-
-                                  # Ignore the workbookView.
-                                  'xl/workbook.xml' => ['<workbookView']
-                                  }
+                                {'xl/charts/chart1.xml' => [ '<c:formatCode', ]}
                                 )
   end
 end

data/test/regression/test_chart_title02.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartTitle02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_title02
+    @xlsx = 'chart_title02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [73655040, 73656576 ])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+
+    chart.set_title(:name => 'Title!')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_escapes01.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes01 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes01
+  def test_escapes01
     @xlsx = 'escapes01.xlsx'
     workbook    = WriteXLSX.new(@xlsx)
     worksheet   = workbook.add_worksheet('5&4')

data/test/regression/test_escapes02.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes02 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes02
+  def test_escapes02
     @xlsx = 'escapes02.xlsx'
     workbook    = WriteXLSX.new(@xlsx)
     worksheet   = workbook.add_worksheet

data/test/regression/test_escapes03.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes03 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes03
+  def test_escapes03
     @xlsx = 'escapes03.xlsx'
     workbook    = WriteXLSX.new(@xlsx)
     worksheet   = workbook.add_worksheet

data/test/regression/test_escapes04.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes04 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes04
+  def test_escapes04
     @xlsx = 'escapes04.xlsx'
     workbook    = WriteXLSX.new(@xlsx)
     worksheet   = workbook.add_worksheet

data/test/regression/test_escapes05.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes05 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes05
+  def test_escapes05
     @xlsx = 'escapes05.xlsx'
     workbook    = WriteXLSX.new(@xlsx)
     worksheet1  = workbook.add_worksheet('Start')

data/test/regression/test_escapes06.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes06 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes06
+  def test_escapes06
     @xlsx = 'escapes06.xlsx'
     workbook   = WriteXLSX.new(@xlsx)
     worksheet  = workbook.add_worksheet

data/test/regression/test_escapes07.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes07 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes07
+  def test_escapes07
     @xlsx = 'escapes07.xlsx'
     workbook   = WriteXLSX.new(@xlsx)
     worksheet  = workbook.add_worksheet

data/test/regression/test_escapes08.rb

@@ -10,7 +10,7 @@ class TestRegressionEscapes08 < Test::Unit::TestCase
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_chart_escapes08
+  def test_escapes08
     @xlsx = 'escapes08.xlsx'
     workbook   = WriteXLSX.new(@xlsx)
     worksheet  = workbook.add_worksheet

data/test/regression/test_set_column09.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionSetColumn09 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_set_column09
+    @xlsx = 'set_column09.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    # Test the order and overwriting of columns.
+    worksheet.set_column('A:A', 100)
+    worksheet.set_column('F:H',   8)
+    worksheet.set_column('C:D',  12)
+    worksheet.set_column('A:A',  10)
+    worksheet.set_column('XFD:XFD', 5)
+    worksheet.set_column('ZZ:ZZ', 3)
+
+    workbook.close
+
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+
+  end
+end

data/test/regression/test_shared_strings_encoding.rb

@@ -0,0 +1,103 @@
+# -*- coding: iso-8859-8 -*-
+
+require 'helper'
+
+class TestRegressionSharedStringsEncoding < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+    @f = File.open(File.join(@test_dir, 'regression', 'klt.csv'), "r:iso-8859-8")
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_shared_strings_encoding
+    sizes = [10, 10, 18, 10, 18, 18, 12, 16, 16, 25,
+             18, 36, 60, 16, 16, 16, 18, 16, 16, 22,
+             14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+             14, 14, 14, 14, 14, 14]
+
+#    input_file = ARGV[0]
+#    output_file = ARGV[1]
+
+    # coding: ISO-8859-8
+#    Encoding.default_external = Encoding.find("ISO-8859-8")
+
+    # define an array to hold the Sikum records
+
+    # loop through each record in the csv file, adding
+    # each record to our array.
+    #f = File.open(input_file, "r")
+    @xlsx = 'shared_strings_encoding.xlsx'
+    workbook = WriteXLSX.new(@xlsx)
+    heading1 = workbook.add_format(:align => 'center', :bold => 1 , :size => 12 , :color => 'blue', :bg_color => 27)
+    heading2 = workbook.add_format(:align => 'center', :bold => 1 , :size => 12 , :color => 'blue', :bg_color => 'silver')
+    format1 = workbook.add_format(:align => 'right', :color => 'blue', :bg_color => 9 )
+    format11 = workbook.add_format(:align => 'right', :color => 'blue', :bg_color => 9 )
+    format11.set_num_format('0.00')
+    format3 = workbook.add_format(:align => 'right', :color => 'red', :bg_color => 9 )
+    worksheet = workbook.add_worksheet
+    worksheet.right_to_left
+
+    i=0
+
+    @f.each_line { |line|
+      words = line.split(',')
+      if i == 0 then
+        for j in 0..words.size-1
+
+          word = words[j].to_s.gsub(/"/," ")
+          word = word.gsub(/\n/, "" )
+          word = word.gsub(/\r/, "" )
+
+#          worksheet.merge_range( 'A1:L1', word.force_encoding('iso-8859-8').encode("UTF-8"), heading1)
+          worksheet.merge_range( 'A1:L1', word, heading1)
+        end
+      elsif i == 1 then
+        for j in 0..words.size-1
+
+          word = words[j].to_s.gsub(/"/," ")
+          word = word.gsub(/\n/, "" )
+          word = word.gsub(/\r/, "" )
+
+          worksheet.set_column(j,0,sizes[j])
+#          worksheet.write( i, j, word.force_encoding('iso-8859-8').encode("UTF-8"), heading2)
+          worksheet.write( i, j, word, heading2)
+        end
+      else
+
+        heara = words[11].to_s
+        for j in 0..words.size-1
+
+          jj=j
+          word = words[j].to_s.gsub("_"," ")
+          word = word.gsub(/\n/, "" )
+          word = word.gsub(/\r/, "" )
+          word = word.lstrip.rstrip
+
+          if heara.include?('abcdefghijklml') then
+#            worksheet.write( i, jj, word.force_encoding('iso-8859-8').encode("UTF-8"), format3)
+            worksheet.write( i, jj, word, format3)
+          else
+#            worksheet.write( i, jj, word.force_encoding('iso-8859-8').encode("UTF-8"), format1)
+            worksheet.write( i, jj, word, format1)
+          end
+        end
+      end
+      i = i+1
+    }
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+
+  def input_file
+    <<EOS
+����� ������� ������ ������
+����� ����,��� ����,�� ����,���� ����,���� ����,��,���� ������,����,����,����,�����,����
+01/11/2012,09:04:20,_����                                             ,      131, 39977777,�����������         ,00171044973,                    ,                    ,�� �����                 ,                         ,����� ����/����� �� ���� ������
+01/11/2012,09:04:24,_����                                             ,      131, 36888865,�������             ,00171081635,���� ������         ,���� ������         ,�� �����                 ,                         ,
+EOS
+  end
+end

data/test/worksheet/test_write_hyperlink.rb

@@ -9,36 +9,31 @@ class TestWriteHyperlink < Test::Unit::TestCase
     @worksheet = @workbook.add_worksheet('')
   end
 
-  def test_write_hyperlink_external
+  def test_attributes
     hyperlink = Writexlsx::Worksheet::Hyperlink.factory('')
-    @worksheet.__send__('write_hyperlink_external', hyperlink, 0, 0, 1)
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = '<hyperlink ref="A1" r:id="rId1"/>'
+    result    = hyperlink.attributes(0, 0, 1)
+    expected  = [ ['ref', 'A1'], ['r:id', 'rId1']]
     assert_equal(expected, result)
   end
 
   def test_write_hyperlink_internal_sheet2
     hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1')
-    @worksheet.__send__('write_hyperlink_internal', hyperlink, 0, 0)
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = '<hyperlink ref="A1" location="Sheet2!A1" display="Sheet2!A1"/>'
+    result = hyperlink.attributes(0, 0)
+    expected = [%w(ref A1), %w(location Sheet2!A1), %w(display Sheet2!A1)]
     assert_equal(expected, result)
   end
 
   def test_write_hyperlink_internal_quoted_sheet
     hyperlink = Writexlsx::Worksheet::Hyperlink.factory("internal:'Data Sheet'!D5", "'Data Sheet'!D5")
-    @worksheet.__send__('write_hyperlink_internal', hyperlink, 4, 0)
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = %q{<hyperlink ref="A5" location="'Data Sheet'!D5" display="'Data Sheet'!D5"/>}
+    result = hyperlink.attributes(4, 0)
+    expected = [%w(ref A5), ["location", "'Data Sheet'!D5"], ["display", "'Data Sheet'!D5"]]
     assert_equal(expected, result)
   end
 
   def test_write_hyperlink_internal_tooltip
-    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1')
-    hyperlink.tip = 'Screen Tip 1'
-    @worksheet.__send__('write_hyperlink_internal', hyperlink, 17, 0)
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = '<hyperlink ref="A18" location="Sheet2!A1" tooltip="Screen Tip 1" display="Sheet2!A1"/>'
+    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1', 'Screen Tip 1')
+    result = hyperlink.attributes(17, 0)
+    expected = [%w(ref A18), %w(location Sheet2!A1), ["tooltip", "Screen Tip 1"], %w(display Sheet2!A1)]
     assert_equal(expected, result)
   end
 end

data/write_xlsx.gemspec

@@ -22,7 +22,4 @@ Gem::Specification.new do |gem|
     "README.md",
     "Changes"
   ]
-
-  gem.add_runtime_dependency(%q<rubyzip>, [">=1.0.0"])
-  gem.add_development_dependency(%q<simplecov>) if RUBY_VERSION >= "1.9"
 end