write_xlsx 0.0.3 → 0.0.4

data/test/chart/test_write_format_code.rb

@@ -9,7 +9,8 @@ def setup
 
   def test_write_format_code
     expected = '<c:formatCode>General</c:formatCode>'
-    result = @chart.__send__('write_format_code', 'General')
+    @chart.__send__('write_format_code', 'General')
+    result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)
   end
 end

data/test/helper.rb

@@ -14,6 +14,15 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'write_xlsx'
 
+class Writexlsx::Workbook
+  #
+  # Set the default index for each format. This is mainly used for testing.
+  #
+  def set_default_xf_indices #:nodoc:
+    @formats.each { |format| format.get_xf_index }
+  end
+end
+
 class Test::Unit::TestCase
   def setup_dir_var
     @test_dir = File.dirname(__FILE__)

data/test/test_example_match.rb

@@ -2705,6 +2705,43 @@ def test_autofilter
     compare_xlsx(@expected_dir, @result_dir, xlsx)
   end
 
+  def test_chart_scatter06
+    xlsx = 'chart_scatter06.xlsx'
+    workbook  = WriteXLSX.new(xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'scatter', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [57708544, 44297600])
+
+    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$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                    )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5',
+                    )
+
+    chart.set_x_axis(:minor_unit => 1, :major_unit => 3)
+    chart.set_y_axis(:minor_unit => 2, :major_unit => 4)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx(@expected_dir, @result_dir, xlsx)
+  end
+
   def autofilter_data
 <<EOS
     Region    Item      Volume    Month

data/test/test_xml_writer_simple.rb

@@ -44,10 +44,10 @@ def test_character_data
   end
 
   def test_data_element_with_empty_attr
-    assert_equal(
-      "<foo>data</foo>",
-      @obj.data_element('foo', 'data')
-    )
+    expected = "<foo>data</foo>"
+    @obj.data_element('foo', 'data')
+    result = @obj.string
+    assert_equal(expected, result)
   end
 
   def test_data_element
@@ -55,9 +55,10 @@ def test_data_element
       'name', '_xlnm.Print_Titles',
       'localSheetId', 0
     ]
-    assert_equal(
-      "<definedName name=\"_xlnm.Print_Titles\" localSheetId=\"0\">Sheet1!$1:$1</definedName>",
-      @obj.data_element('definedName', 'Sheet1!$1:$1', attributes)
-    )
+    expected = 
+      "<definedName name=\"_xlnm.Print_Titles\" localSheetId=\"0\">Sheet1!$1:$1</definedName>"
+    @obj.data_element('definedName', 'Sheet1!$1:$1', attributes)
+    result = @obj.string
+    assert_equal(expected, result)
   end
 end

data/test/worksheet/test_write_cell.rb

@@ -10,16 +10,16 @@ def setup
   end
 
   def test_write_cell_0_0_n_1
-    cell_data = Writexlsx::Worksheet::NumberCellData.new(0, 0, 1, nil)
-    cell_data.write_cell(@worksheet)
+    cell_data = Writexlsx::Worksheet::NumberCellData.new(@worksheet, 0, 0, 1, nil)
+    cell_data.write_cell
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<c r="A1"><v>1</v></c>'
     assert_equal(expected, result)
   end
 
   def test_write_cell_3_1_s_0
-    cell_data = Writexlsx::Worksheet::StringCellData.new(3, 1, 0, nil)
-    cell_data.write_cell(@worksheet)
+    cell_data = Writexlsx::Worksheet::StringCellData.new(@worksheet, 3, 1, 0, nil)
+    cell_data.write_cell
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<c r="B4" t="s"><v>0</v></c>'
     assert_equal(expected, result)
@@ -27,8 +27,8 @@ def test_write_cell_3_1_s_0
 
   def test_write_cell_1_2_f_formula_nil_0
     format = nil
-    cell_data = Writexlsx::Worksheet::FormulaCellData.new(1, 2, 'A3+A5', format, 0)
-    cell_data.write_cell(@worksheet)
+    cell_data = Writexlsx::Worksheet::FormulaCellData.new(@worksheet, 1, 2, 'A3+A5', format, 0)
+    cell_data.write_cell
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<c r="C2"><f>A3+A5</f><v>0</v></c>'
     assert_equal(expected, result)
@@ -36,8 +36,8 @@ def test_write_cell_1_2_f_formula_nil_0
 
   def test_write_cell_1_2_f_formula
     format = nil
-    cell_data = Writexlsx::Worksheet::FormulaCellData.new(1, 2, 'A3+A5', nil, nil)
-    cell_data.write_cell(@worksheet)
+    cell_data = Writexlsx::Worksheet::FormulaCellData.new(@worksheet, 1, 2, 'A3+A5', nil, nil)
+    cell_data.write_cell
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<c r="C2"><f>A3+A5</f><v>0</v></c>'
     assert_equal(expected, result)
@@ -45,8 +45,8 @@ def test_write_cell_1_2_f_formula
 
   def test_write_cell_0_0_a_formula_nil_a1_9500
     format = nil
-    cell_data = Writexlsx::Worksheet::FormulaArrayCellData.new(0, 0, 'SUM(B1:C1*B2:C2)', format, 'A1', 9500)
-    cell_data.write_cell(@worksheet)
+    cell_data = Writexlsx::Worksheet::FormulaArrayCellData.new(@worksheet, 0, 0, 'SUM(B1:C1*B2:C2)', format, 'A1', 9500)
+    cell_data.write_cell
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<c r="A1"><f t="array" ref="A1">SUM(B1:C1*B2:C2)</f><v>9500</v></c>'
     assert_equal(expected, result)

data/write_xlsx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "write_xlsx"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hideo NAKAMURA"]
-  s.date = "2012-01-25"
+  s.date = "2012-02-13"
   s.description = "write_xlsx s a gem to create a new file in the Excel 2007+ XLSX format, and you can use the same interface as writeexcel gem.\nThe WriteXLSX supports the following features:\n  * Multiple worksheets\n  * Strings and numbers\n  * Unicode text\n  * Rich string formats\n  * Formulas (including array formats)\n  * cell formatting\n  * Embedded images\n  * Charts\n  * Autofilters\n  * Data validation\n  * Hyperlinks\n  * Defined names\n  * Grouping/Outlines\n  * Cell comments\n  * Panes\n  * Page set-up and printing options\n\nwrite_xlsx uses the same interface as writeexcel gem.\n\ndocumentation is not completed, but writeexcel\u{2019}s documentation will help you. See http://writeexcel.web.fc2.com/\n\nAnd you can find many examples in this gem.\n"
   s.email = "cxn03651@msj.biglobe.ne.jp"
   s.extra_rdoc_files = [
@@ -174,6 +174,7 @@ Gem::Specification.new do |s|
     "test/perl_output/chart_line.xlsx",
     "test/perl_output/chart_pie.xlsx",
     "test/perl_output/chart_scatter.xlsx",
+    "test/perl_output/chart_scatter06.xlsx",
     "test/perl_output/chart_stock.xlsx",
     "test/perl_output/comments1.xlsx",
     "test/perl_output/comments2.xlsx",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &82050180 !ruby/object:Gem::Requirement
+  requirement: &71968630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82050180
+  version_requirements: *71968630
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82048270 !ruby/object:Gem::Requirement
+  requirement: &71967640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82048270
+  version_requirements: *71967640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82046040 !ruby/object:Gem::Requirement
+  requirement: &71967360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82046040
+  version_requirements: *71967360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &82044170 !ruby/object:Gem::Requirement
+  requirement: &71967110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82044170
+  version_requirements: *71967110
 description: ! "write_xlsx s a gem to create a new file in the Excel 2007+ XLSX format,
   and you can use the same interface as writeexcel gem.\nThe WriteXLSX supports the
   following features:\n  * Multiple worksheets\n  * Strings and numbers\n  * Unicode
@@ -229,6 +229,7 @@ files:
 - test/perl_output/chart_line.xlsx
 - test/perl_output/chart_pie.xlsx
 - test/perl_output/chart_scatter.xlsx
+- test/perl_output/chart_scatter06.xlsx
 - test/perl_output/chart_stock.xlsx
 - test/perl_output/comments1.xlsx
 - test/perl_output/comments2.xlsx
@@ -347,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 70680049
+      hash: 986643521
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: