xlsxwriter 0.2.1.pre → 0.2.1.pre.2

data/ext/xlsxwriter/worksheet.h

@@ -18,4 +18,4 @@ void init_xlsxwriter_worksheet();
 
 extern VALUE cWorksheet;
 
-#endif /// __WORKSHEET__
+#endif // __WORKSHEET__

data/ext/xlsxwriter/xlsxwriter.c

@@ -1,6 +1,7 @@
 #include <ruby.h>
 #include <xlsxwriter.h>
 #include "chart.h"
+#include "chartsheet.h"
 #include "format.h"
 #include "rich_string.h"
 #include "workbook.h"
@@ -41,5 +42,6 @@ void Init_xlsxwriter() {
   init_xlsxwriter_format();
   init_xlsxwriter_worksheet();
   init_xlsxwriter_chart();
+  init_xlsxwriter_chartsheet();
   init_xlsxwriter_rich_string();
 }

data/lib/xlsxwriter/version.rb

@@ -2,5 +2,5 @@
 
 module XlsxWriter
   # :nodoc:
-  VERSION = '0.2.1.pre'.freeze
+  VERSION = '0.2.1.pre.2'.freeze
 end

data/test/test-chartsheet.rb

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require_relative './xlsx-func-testcase'
+
+class TestChartsheet < XlsxWriterTestCase
+  DATA = [
+    [1,  2,  3],
+    [2,  4,  6],
+    [3,  6,  9],
+    [4,  8, 12],
+    [5, 10, 15]
+  ]
+
+  test 'chartsheet01' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.activate
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 79_858_304
+        chart.axis_id_2 = 79_860_096
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet02' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.activate
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 79_858_304
+        chart.axis_id_2 = 79_860_096
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+    wb.add_worksheet.select
+  end
+
+  test 'chartsheet03' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.hide
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 43_794_816
+        chart.axis_id_2 = 43_796_352
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet04' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.protect
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 43_913_216
+        chart.axis_id_2 = 43_914_752
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet05' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.zoom = 75
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 43_695_104
+        chart.axis_id_2 = 43_787_008
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet06' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.tab_color = XlsxWriter::Format::COLOR_RED
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 43_778_432
+        chart.axis_id_2 = 43_780_352
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet07' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.set_portrait
+      cs.paper = 9
+      cs.horizontal_dpi = cs.vertical_dpi = 200
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 61_296_640
+        chart.axis_id_2 = 61_298_176
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet08' do |wb, t|
+    t.ignore_files = ['xl/drawings/drawing1.xml']
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.set_margins(
+        0.511811023622047,
+        0.511811023622047,
+        0.551181102362204,
+        0.944881889763779
+      )
+      cs.paper = 9
+      cs.set_portrait
+      cs.set_header('&CPage &P', margin: 0.118110236220472)
+      cs.set_footer('&C&A', margin: 0.118110236220472)
+      cs.horizontal_dpi = cs.vertical_dpi = 200
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 61_297_792
+        chart.axis_id_2 = 61_299_328
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        cs.chart = chart
+      end
+    end
+  end
+
+  test 'chartsheet09' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      cs = wb.add_chartsheet
+      cs.activate
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 49_044_480
+        chart.axis_id_2 = 49_055_232
+
+        series = chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+
+        series.set_line(color: XlsxWriter::Format::COLOR_YELLOW)
+        series.set_fill(color: XlsxWriter::Format::COLOR_RED)
+        cs.chart = chart
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre
+  version: 0.2.1.pre.2
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -62,6 +62,9 @@ files:
 - Rakefile
 - ext/xlsxwriter/chart.c
 - ext/xlsxwriter/chart.h
+- ext/xlsxwriter/chartsheet.c
+- ext/xlsxwriter/chartsheet.h
+- ext/xlsxwriter/common.h
 - ext/xlsxwriter/extconf.rb
 - ext/xlsxwriter/format.c
 - ext/xlsxwriter/format.h
@@ -160,6 +163,7 @@ files:
 - test/test-chart-scatter.rb
 - test/test-chart-size.rb
 - test/test-chart-title.rb
+- test/test-chartsheet.rb
 - test/test-data-validation.rb
 - test/test-data.rb
 - test/test-default-row.rb
@@ -221,6 +225,7 @@ test_files:
 - test/test-chart-bar.rb
 - test/test-page-setup.rb
 - test/test-page-breaks.rb
+- test/test-chartsheet.rb
 - test/test-protect.rb
 - test/test-ruby-worksheet.rb
 - test/test-chart-legend.rb