write_xlsx 0.76.3 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cccf903a0440d80c679c3f73e25c63b3d037cf7
-  data.tar.gz: 3afa8c95fd2de24ba25f961f4fe61c29e905ba00
+  metadata.gz: 95c46c19ee5fb6110f768981941274fb0aa6e4cf
+  data.tar.gz: 5a78de00b1824fa2f063b7444ab6653412a923c7
 SHA512:
-  metadata.gz: 07920b8fd8e547879d3b410785a06f52922bf00795fc99f00001b4ac2f92304b34c1f190a45e125fc886d3664c506d6458553e93ec85113025afadeba0dc8144
-  data.tar.gz: 7d1cb56c622e9e63a73893948ac40025b5511449f8dd46e23958e13a16321eb48da73558a53f757acc37a0f8e63256924e29febec6864cec8699ec6d8d6bb40e
+  metadata.gz: f7e82cd896dae420cf28961abebb3103fe0c204c3313115e6a32eada176c10ef4efeb657bf8267b6891e82b53d65501db26596b8ee8fb9f756df99815d076530
+  data.tar.gz: 67820ece81fa1ce10e9a014df0aaa2db41992849ac08785f7f2c35e095821d477b1e99b354beb1336d2fe630b2c3b15e99911395af19a39fc3fb1b0b948b0cd1

data/Changes

@@ -1,4 +1,7 @@
 Change history of write_xlsx rubygem.
+2014-05-12 v0.77.0
+   Fix for incorrect chart offsets in insert_chart() and set_size().
+
 2014-04-10 v0.76.3
    dependency must be written in gemspec
 

data/README.md

@@ -4,7 +4,7 @@
 
 gem to create a new file in the Excel 2007+ XLSX format, and you can use the
 same interface as writeexcel gem. write_xlsx is converted from Perl's module
-[Excel::Writer::XLSX-0.76](https://github.com/jmcnamara/excel-writer-xlsx) .
+[Excel::Writer::XLSX-0.77](https://github.com/jmcnamara/excel-writer-xlsx) .
 
 ## Description
 

data/lib/write_xlsx/chart/series.rb

@@ -253,6 +253,7 @@ def positions
           :above       => 't',
           :bottom      => 'b',
           :below       => 'b',
+          :inside_base => 'inBase',
           :inside_end  => 'inEnd',
           :outside_end => 'outEnd',
           :best_fit    => 'bestFit'

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.76.3"
+  VERSION = "0.77.0"
 end

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -49,6 +49,14 @@ def initialize(*args)
         @error_type = has_key?(:error_type) ? error_type_hash[@error_type.downcase] : 0
 
         convert_date_time_value_if_required
+        # Check that the input title doesn't exceed the maximum length.
+        if @input_title && @input_title.length > 32
+          raise "Length of input title '#{@input_title}' exceeds Excel's limit of 32"
+        end
+        # Check that the input message doesn't exceed the maximum length.
+        if @input_message && @input_message.length > 255
+          raise "Length of input message '#{@input_message}' exceeds Excel's limit of 255"
+        end
         set_some_defaults
 
       # A (for now) undocumented parameter to pass additional cell ranges.

data/test/regression/test_chart_format19.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFormat19 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_format19
+    @xlsx = 'chart_format19.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(
+                                     :type     => 'column',
+                                     :subtype  => 'stacked',
+                                     :embedded => 1
+                                     )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [56127488, 57455360])
+
+    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.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(
+                     :values      => '=Sheet1!$C$1:$C$5',
+                     :data_labels => { :value => 1, :position => :inside_base }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_size04.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartSize04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_size04
+    @xlsx = 'chart_size04.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, [73773440, 73774976])
+
+    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.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_size(:x_offset => 8, :y_offset => 9)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_size05.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartSize05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_size05
+    @xlsx = 'chart_size04.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, [73773440, 73774976])
+
+    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.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    worksheet.insert_chart('E9', chart, 8, 9)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_data_validation01.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_data_validation01
+    @xlsx = 'data_validation01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.data_validation('C2', validate: 'list', value: ['Foo', 'Bar', 'Baz'])
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_data_validation02.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_data_validation02
+    @xlsx = 'data_validation02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.data_validation('C2',
+                              validate:      'list',
+                              value:         ['Foo', 'Bar', 'Baz'],
+                              input_title:   'This is the input title',
+                              input_message: 'This is the input message'
+                              )
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_data_validation03.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_data_validation03
+    @xlsx = 'data_validation03.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.data_validation('C2',
+                              validate:      'list',
+                              value:         ['Foo', 'Bar', 'Baz'],
+                              input_title:   'This is the input title',
+                              input_message: 'This is the input message'
+                              )
+
+    values = [
+              "Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
+              "Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
+              "Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",
+              "Foobbm", "Foobbn", "Foobbo", "Foobbp", "Foobbq", "Foobbr", "Foobbs",
+              "Foobbt", "Foobbu", "Foobbv", "Foobbw", "Foobbx", "Foobby", "Foobbz",
+              "Foobca", "End"
+             ]
+
+    worksheet.data_validation('D6',
+                              validate:      'list',
+                              value:         values,
+                              input_title:   'This is the longest input title1',
+                              input_message: 'This is the longest input message ' + "a"*221
+                              )
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_data_validation04.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_data_validation04
+    @xlsx = 'data_validation02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    values = [
+              "Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
+              "Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
+              "Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",
+              "Foobbm", "Foobbn", "Foobbo", "Foobbp", "Foobbq", "Foobbr", "Foobbs",
+              "Foobbt", "Foobbu", "Foobbv", "Foobbw", "Foobbx", "Foobby", "Foobbz",
+              "Foobca", "End"
+             ]
+
+    input_title = 'a' * 33
+    e = assert_raise(RuntimeError) do
+      worksheet.data_validation('D6',
+                                validate:      'list',
+                                value:         values,
+                                input_title:   input_title.dup,
+                                input_message: 'This is the longest input message ' + "a"*221
+                                )
+    end
+    message = e.message
+    assert_equal("Length of input title '#{input_title}' exceeds Excel's limit of 32",
+                 message)
+    workbook.close
+  end
+end

data/test/regression/test_data_validation05.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_data_validation05
+    @xlsx = 'data_validation02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    values = [
+              "Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
+              "Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
+              "Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",
+              "Foobbm", "Foobbn", "Foobbo", "Foobbp", "Foobbq", "Foobbr", "Foobbs",
+              "Foobbt", "Foobbu", "Foobbv", "Foobbw", "Foobbx", "Foobby", "Foobbz",
+              "Foobca", "End"
+             ]
+    input_message = 'a' * 256
+    e = assert_raise(RuntimeError) do
+      worksheet.data_validation('D6',
+                                validate:      'list',
+                                value:         values,
+                                input_title:   'This is the longest input title',
+                                input_message: input_message.dup
+                                )
+    end
+    message = e.message
+    assert_equal("Length of input message '#{input_message}' exceeds Excel's limit of 255",
+                 message)
+    workbook.close
+  end
+end

data/test/regression/test_merge_cells01.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionMergeCells01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_merge_cells01
+    @xlsx = 'merge_cells01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    format    = workbook.add_format(:align => 'center')
+
+    worksheet.set_selection('A4')
+
+    worksheet.merge_range('A1:A2', 'col1', format)
+    worksheet.merge_range('B1:B2', 'col2', format)
+    worksheet.merge_range('C1:C2', 'col3', format)
+    worksheet.merge_range('D1:D2', 'col4', format)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.76.3
+  version: 0.77.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -497,6 +497,7 @@ files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_format19.rb
 - test/regression/test_chart_gap01.rb
 - test/regression/test_chart_gap02.rb
 - test/regression/test_chart_gap03.rb
@@ -559,6 +560,8 @@ files:
 - test/regression/test_chart_size01.rb
 - test/regression/test_chart_size02.rb
 - test/regression/test_chart_size03.rb
+- test/regression/test_chart_size04.rb
+- test/regression/test_chart_size05.rb
 - test/regression/test_chart_sparse01.rb
 - test/regression/test_chart_stock01.rb
 - test/regression/test_chart_stock02.rb
@@ -601,6 +604,11 @@ files:
 - test/regression/test_cond_format12.rb
 - test/regression/test_cond_format13.rb
 - test/regression/test_custom_colors01.rb
+- test/regression/test_data_validation01.rb
+- test/regression/test_data_validation02.rb
+- test/regression/test_data_validation03.rb
+- test/regression/test_data_validation04.rb
+- test/regression/test_data_validation05.rb
 - test/regression/test_date_1904_01.rb
 - test/regression/test_date_1904_02.rb
 - test/regression/test_date_examples01.rb
@@ -672,6 +680,7 @@ files:
 - test/regression/test_image18.rb
 - test/regression/test_image19.rb
 - test/regression/test_macro01.rb
+- test/regression/test_merge_cells01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -950,6 +959,7 @@ files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_format19.xlsx
 - test/regression/xlsx_files/chart_gap01.xlsx
 - test/regression/xlsx_files/chart_gap02.xlsx
 - test/regression/xlsx_files/chart_gap03.xlsx
@@ -1007,6 +1017,7 @@ files:
 - test/regression/xlsx_files/chart_scatter12.xlsx
 - test/regression/xlsx_files/chart_scatter14.xlsx
 - test/regression/xlsx_files/chart_size01.xlsx
+- test/regression/xlsx_files/chart_size04.xlsx
 - test/regression/xlsx_files/chart_sparse01.xlsx
 - test/regression/xlsx_files/chart_stock01.xlsx
 - test/regression/xlsx_files/chart_stock02.xlsx
@@ -1049,6 +1060,9 @@ files:
 - test/regression/xlsx_files/cond_format11.xlsx
 - test/regression/xlsx_files/cond_format12.xlsx
 - test/regression/xlsx_files/custom_colors01.xlsx
+- test/regression/xlsx_files/data_validation01.xlsx
+- test/regression/xlsx_files/data_validation02.xlsx
+- test/regression/xlsx_files/data_validation03.xlsx
 - test/regression/xlsx_files/date_1904_01.xlsx
 - test/regression/xlsx_files/date_1904_02.xlsx
 - test/regression/xlsx_files/date_examples01.xlsx
@@ -1121,6 +1135,7 @@ files:
 - test/regression/xlsx_files/image18.xlsx
 - test/regression/xlsx_files/image19.xlsx
 - test/regression/xlsx_files/macro01.xlsm
+- test/regression/xlsx_files/merge_cells01.xlsx
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx
@@ -1714,6 +1729,7 @@ test_files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_format19.rb
 - test/regression/test_chart_gap01.rb
 - test/regression/test_chart_gap02.rb
 - test/regression/test_chart_gap03.rb
@@ -1776,6 +1792,8 @@ test_files:
 - test/regression/test_chart_size01.rb
 - test/regression/test_chart_size02.rb
 - test/regression/test_chart_size03.rb
+- test/regression/test_chart_size04.rb
+- test/regression/test_chart_size05.rb
 - test/regression/test_chart_sparse01.rb
 - test/regression/test_chart_stock01.rb
 - test/regression/test_chart_stock02.rb
@@ -1818,6 +1836,11 @@ test_files:
 - test/regression/test_cond_format12.rb
 - test/regression/test_cond_format13.rb
 - test/regression/test_custom_colors01.rb
+- test/regression/test_data_validation01.rb
+- test/regression/test_data_validation02.rb
+- test/regression/test_data_validation03.rb
+- test/regression/test_data_validation04.rb
+- test/regression/test_data_validation05.rb
 - test/regression/test_date_1904_01.rb
 - test/regression/test_date_1904_02.rb
 - test/regression/test_date_examples01.rb
@@ -1889,6 +1912,7 @@ test_files:
 - test/regression/test_image18.rb
 - test/regression/test_image19.rb
 - test/regression/test_macro01.rb
+- test/regression/test_merge_cells01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -2167,6 +2191,7 @@ test_files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_format19.xlsx
 - test/regression/xlsx_files/chart_gap01.xlsx
 - test/regression/xlsx_files/chart_gap02.xlsx
 - test/regression/xlsx_files/chart_gap03.xlsx
@@ -2224,6 +2249,7 @@ test_files:
 - test/regression/xlsx_files/chart_scatter12.xlsx
 - test/regression/xlsx_files/chart_scatter14.xlsx
 - test/regression/xlsx_files/chart_size01.xlsx
+- test/regression/xlsx_files/chart_size04.xlsx
 - test/regression/xlsx_files/chart_sparse01.xlsx
 - test/regression/xlsx_files/chart_stock01.xlsx
 - test/regression/xlsx_files/chart_stock02.xlsx
@@ -2266,6 +2292,9 @@ test_files:
 - test/regression/xlsx_files/cond_format11.xlsx
 - test/regression/xlsx_files/cond_format12.xlsx
 - test/regression/xlsx_files/custom_colors01.xlsx
+- test/regression/xlsx_files/data_validation01.xlsx
+- test/regression/xlsx_files/data_validation02.xlsx
+- test/regression/xlsx_files/data_validation03.xlsx
 - test/regression/xlsx_files/date_1904_01.xlsx
 - test/regression/xlsx_files/date_1904_02.xlsx
 - test/regression/xlsx_files/date_examples01.xlsx
@@ -2338,6 +2367,7 @@ test_files:
 - test/regression/xlsx_files/image18.xlsx
 - test/regression/xlsx_files/image19.xlsx
 - test/regression/xlsx_files/macro01.xlsm
+- test/regression/xlsx_files/merge_cells01.xlsx
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx