xlsxwriter 0.2.0 → 0.2.1.pre

data/test/test-chart-bar.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 require_relative './xlsx-func-testcase'
+require_relative './support/chart_test'
 
 class TestChartBar < XlsxWriterTestCase
+  extend ChartTest
+
   DATA = [
     [1,  2,  3],
     [2,  4,  6],
@@ -11,26 +14,61 @@ class TestChartBar < XlsxWriterTestCase
     [5, 10, 15]
   ]
 
-  # 61, 01 does not add any coverage
-  test 'chart_bar01' do |wb|
+  chart_test 'chart_bar01', XlsxWriter::Workbook::Chart::BAR do |chart|
+    chart.axis_id_1 = 64_052_224
+    chart.axis_id_2 = 64_055_552
+
+    series1 = chart.add_series
+    series2 = chart.add_series
+
+    series1.set_categories 'Sheet1', 0, 0, 4, 0
+    series1.set_values     'Sheet1', 0, 1, 4, 1
+
+    series2.set_categories 'Sheet1', 0, 0, 4, 0
+    series2.set_values     'Sheet1', 0, 2, 4, 2
+  end
+
+  test 'chart_bar02' do |wb|
+    ws1 = wb.add_worksheet
     wb.add_worksheet do |ws|
       DATA.each { |row| ws.add_row row }
+      ws1.write_string('A1', 'Foo')
 
       wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
-        chart.axis_id_1 = 64_052_224
-        chart.axis_id_2 = 64_055_552
+        chart.axis_id_1 = 93_218_304
+        chart.axis_id_2 = 93_219_840
+
+        chart.add_series '=Sheet2!$A$1:$A$5', '=Sheet2!$B$1:$B$5'
+        chart.add_series '=Sheet2!$A$1:$A$5', '=Sheet2!$C$1:$C$5'
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
 
-        series1 = chart.add_series
-        series2 = chart.add_series
+  test 'chart_bar03' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
 
-        series1.set_categories 'Sheet1', 0, 0, 4, 0
-        series1.set_values     'Sheet1', 0, 1, 4, 1
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 64265216
+        chart.axis_id_2 = 64447616
 
-        series2.set_categories 'Sheet1', 0, 0, 4, 0
-        series2.set_values     'Sheet1', 0, 2, 4, 2
+        chart.add_series '=Sheet1!$A$1:$A$5', '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$A$1:$A$5', '=Sheet1!$C$1:$C$5'
 
         ws.insert_chart 'E9', chart
       end
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 86048128
+        chart.axis_id_2 = 86058112
+
+        chart.add_series '=Sheet1!$A$1:$A$4', '=Sheet1!$B$1:$B$4'
+        chart.add_series '=Sheet1!$A$1:$A$4', '=Sheet1!$C$1:$C$4'
+
+        ws.insert_chart 'F25', chart
+      end
     end
   end
 end

data/test/test-image.rb

@@ -111,4 +111,19 @@ class TestImage < XlsxWriterTestCase
       .insert_image('E9', image_path('red.png'))
       .set_row(9, hide: true)
   end
+
+  test('image81', ref_file_name: 'image01') do |wb|
+    wb.add_worksheet
+      .insert_image_buffer('E9', File.binread(image_path('red.png')), description: 'red.png')
+  end
+
+  test 'image82' do |wb|
+    wb.add_worksheet
+      .insert_image_buffer('E9', File.binread(image_path('red.png')))
+  end
+
+  test('image83', ref_file_name: 'image02') do |wb|
+    wb.add_worksheet
+      .insert_image_buffer('D7', File.binread(image_path('yellow.png')), x_offset: 1, y_offset: 2, description: 'yellow.png')
+  end
 end

data/test/test-macro.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative './xlsx-func-testcase'
+
+class TestMacro < XlsxWriterTestCase
+  test 'macro01.xlsm' do |wb|
+    wb
+      .add_vba_project(image_path('vbaProject01.bin'))
+      .add_worksheet
+      .write_number(0, 0, 123)
+  end
+
+  test 'macro02.xlsm' do |wb|
+    wb.add_vba_project(image_path('vbaProject03.bin'))
+    wb.vba_name = 'MyWorkbook'
+    ws = wb.add_worksheet
+    ws.vba_name = 'MySheet1'
+    ws.write_number(0, 0, 123)
+  end
+end

data/test/xlsx-func-testcase.rb

@@ -20,7 +20,8 @@ class XlsxWriterTestCase < Test::Unit::TestCase
     define_method(:"test_#{name}") do
       file_path = "tmp/#{name}.xlsx"
       ref_name = opts && opts.delete(:ref_file_name) || name
-      ref_file_path = "ext/xlsxwriter/libxlsxwriter/test/functional/xlsx_files/#{ref_name}.xlsx"
+      ref_file_path = "ext/xlsxwriter/libxlsxwriter/test/functional/xlsx_files/#{ref_name}"
+      ref_file_path += '.xlsx' if File.extname(ref_file_path) == ''
       tc = XlsxWriterTestCaseConfig.new
 
       compare_files = proc {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1.pre
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -145,6 +145,7 @@ files:
 - lib/xlsxwriter/version.rb
 - lib/xlsxwriter/worksheet.rb
 - test/run-test.rb
+- test/support/chart_test.rb
 - test/support/with_xlsx_file.rb
 - test/support/xlsx_comparable.rb
 - test/test-array-formula.rb
@@ -170,6 +171,7 @@ files:
 - test/test-gridlines.rb
 - test/test-hyperlink.rb
 - test/test-image.rb
+- test/test-macro.rb
 - test/test-merge-range.rb
 - test/test-misc.rb
 - test/test-optimize.rb
@@ -206,11 +208,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby interface to libxlsxwriter
@@ -233,11 +235,13 @@ test_files:
 - test/test-types.rb
 - test/test-set-start-page.rb
 - test/test-chart-pie.rb
+- test/test-macro.rb
 - test/test-repeat.rb
 - test/test-chart-doughnut.rb
 - test/test-row-col-format.rb
 - test/test-escapes.rb
 - test/test-formatting.rb
+- test/support/chart_test.rb
 - test/support/with_xlsx_file.rb
 - test/support/xlsx_comparable.rb
 - test/test-image.rb