xlsxwriter 0.2.1.pre → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258446b7479b3f3677923a46fe56f3206d313a81776e797bf4232e08bbaa1926
-  data.tar.gz: '029fd9139e2047cbbd7e248f324c517c09383fa332f02edd83dabaf75c328886'
+  metadata.gz: 8f03eb87d448a902c6067b95d4a3d7598cecd3456a3f8097e40da1bd0351c8d4
+  data.tar.gz: 2af72c3d678d22a1990f960ee0b7f2315e39d37a780b5e589ebce7794b1b23f6
 SHA512:
-  metadata.gz: 356595ae4d443af888c87a9402727dae8438db5ee666fe75887762a3140d905e9473d7e9c63967c6cd94c92c7cc643696d9a044658691d8164c0464ed9b50a32
-  data.tar.gz: 96d899fd65b2b01a7ffb64f38749b71baa849786fc7a5cd61fecbafbae245aa2b7aff3d5e9b852694ad70a1bb399517a1ba8611b12ab52b8f5c8a33998f850f1
+  metadata.gz: 2ebcf14300b3cbaf46fc3a784c2ad9b5c114fa2ea3dccca08976ae8af7f50265beb05ed4233da92db1398bed7e17144779ca2c973cab59dad55e95fb3ee926ae
+  data.tar.gz: 0cd298302d3c354ced238ed5fba71b7b05498db56c76df2b307d90603c122308c79780db9af55d1f46c7aece7f30da517a39d30f5d0b56acfd3107f79fbc9fb5

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rake/extensiontask'
 
 task default: :test
@@ -12,9 +13,9 @@ Rake::Task['compile'].prerequisites.unshift :patch_dep
 Gem::PackageTask.new(spec) do |pkg|
 end
 
-DEP_DIR='ext/xlsxwriter/libxlsxwriter'
+DEP_DIR = 'ext/xlsxwriter/libxlsxwriter'
 
-desc "Checkout xlsxwriter C library"
+desc 'Checkout xlsxwriter C library'
 task :patch_dep do
   patches = Dir["#{pwd}/dep_patches/*.patch"]
   chdir(DEP_DIR) do
@@ -30,5 +31,5 @@ end
 
 desc 'Run specs'
 task test: :compile do
-  ruby('test/run-test.rb')
+  ruby 'test/run_test.rb'
 end

data/ext/xlsxwriter/chart.c

@@ -1,5 +1,8 @@
-#include "chart.h"
+#include <ruby.h>
 #include <ruby/encoding.h>
+
+#include "chart.h"
+#include "common.h"
 #include "workbook.h"
 #include "worksheet.h"
 
@@ -7,10 +10,10 @@ VALUE cChart;
 VALUE cChartSeries;
 VALUE cChartAxis;
 
-#define DEF_PROP_SETTER(type, field, value, ptr_field) VALUE type ## _set_ ## field ## _ (VALUE self, VALUE val) { \
+#define DEF_PROP_SETTER(type, field, value) VALUE type ## _set_ ## field ## _ (VALUE self, VALUE val) { \
     struct type *ptr;                                                   \
     Data_Get_Struct(self, struct type, ptr);                            \
-    type ## _set_ ## field (ptr->ptr_field, value);                     \
+    type ## _set_ ## field (ptr->type, value);                          \
     return val;                                                         \
 }
 
@@ -66,13 +69,13 @@ chart_axis_init(VALUE self, VALUE chart, VALUE type) {
   if (c_ptr && c_ptr->chart) {
     ID axis = rb_check_id_cstr("x", 1, NULL);
     if (axis && axis == rb_check_id(&type)) {
-      ptr->axis = c_ptr->chart->x_axis;
+      ptr->chart_axis = c_ptr->chart->x_axis;
       return self;
     }
 
     axis = rb_check_id_cstr("y", 1, NULL);
     if (axis && axis == rb_check_id(&type)) {
-      ptr->axis = c_ptr->chart->y_axis;
+      ptr->chart_axis = c_ptr->chart->y_axis;
       return self;
     }
 
@@ -91,7 +94,7 @@ chart_series_alloc(VALUE klass) {
 
   obj = Data_Make_Struct(klass, struct chart_series, NULL, NULL, ptr);
 
-  ptr->series = NULL;
+  ptr->chart_series = NULL;
 
   return obj;
 }
@@ -114,7 +117,7 @@ chart_series_init(int argc, VALUE *argv, VALUE self) {
     vals = StringValueCStr(argv[1]);
   }
   if (c_ptr && c_ptr->chart) {
-    ptr->series = chart_add_series(c_ptr->chart, cats, vals);
+    ptr->chart_series = chart_add_series(c_ptr->chart, cats, vals);
   }
 
   return self;
@@ -181,9 +184,8 @@ chart_title_set_name_range_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row;
   lxw_col_t col;
   extract_cell(argc - 1, argv + 1, &row, &col);
-  struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
-  chart_title_set_name_range(ptr->chart, str, row, col);
+
+  LXW_NO_RESULT_CALL(chart, title_set_name_range, str, row, col);
   return self;
 }
 
@@ -195,10 +197,7 @@ chart_title_set_name_range_(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 chart_legend_set_position_(VALUE self, VALUE pos) {
-  struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
-
-  chart_legend_set_position(ptr->chart, NUM2UINT(rb_check_to_int(pos)));
+  LXW_NO_RESULT_CALL(chart, legend_set_position, NUM2UINT(rb_check_to_int(pos)));
   return pos;
 }
 
@@ -209,11 +208,8 @@ chart_legend_set_position_(VALUE self, VALUE pos) {
  */
 VALUE
 chart_legend_set_font_(VALUE self, VALUE opts) {
-  struct chart *ptr;
   lxw_chart_font font = val_to_lxw_chart_font(opts);
-  Data_Get_Struct(self, struct chart, ptr);
-
-  chart_legend_set_font(ptr->chart, &font);
+  LXW_NO_RESULT_CALL(chart, legend_set_font, &font);
   return self;
 }
 
@@ -234,9 +230,7 @@ chart_legend_delete_series_(VALUE self, VALUE series) {
   }
   series_arr[len] = -1;
 
-  struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
-  chart_legend_delete_series(ptr->chart, series_arr);
+  LXW_ERR_RESULT_CALL(chart, legend_delete_series, series_arr);
   return self;
 }
 
@@ -246,18 +240,29 @@ chart_legend_delete_series_(VALUE self, VALUE series) {
  *
  *  Sets the chart +style+ (integer from 1 to 48, default is 2).
  */
-DEF_PROP_SETTER(chart, style, NUM2INT(rb_check_to_int(val)), chart)
+DEF_PROP_SETTER(chart, style, NUM2INT(rb_check_to_int(val)))
 
 
 /*  Document-method: XlsxWriter::Workbook::Chart#rotation=
  *
  */
-DEF_PROP_SETTER(chart, rotation, NUM2UINT(rb_check_to_int(val)), chart)
+DEF_PROP_SETTER(chart, rotation, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart#hole_size=
  *
  */
-DEF_PROP_SETTER(chart, hole_size, NUM2UINT(rb_check_to_int(val)), chart)
+DEF_PROP_SETTER(chart, hole_size, NUM2UINT(rb_check_to_int(val)))
+
+/* Document-method: XlsxWriter::Workbook::Chart#show_blanks_as=
+ *
+ */
+VALUE
+chart_set_show_blank_as_(VALUE self, VALUE val) {
+  struct chart *ptr;
+  Data_Get_Struct(self, struct chart, ptr);
+  ptr->chart->show_blanks_as = NUM2INT(rb_check_to_int(val));
+  return val;
+}
 
 
 /* :nodoc: */
@@ -273,7 +278,7 @@ VALUE
 chart_set_axis_id_1_(VALUE self, VALUE val) {
   struct chart *ptr;
   Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_1 = NUM2UINT(val);
+  ptr->chart->axis_id_1 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -290,7 +295,7 @@ VALUE
 chart_set_axis_id_2_(VALUE self, VALUE val) {
   struct chart *ptr;
   Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_2 = NUM2UINT(val);
+  ptr->chart->axis_id_2 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -301,17 +306,17 @@ chart_set_axis_id_2_(VALUE self, VALUE val) {
  *
  *  Sets the chart axis +name+.
  */
-DEF_PROP_SETTER(chart_axis, name, StringValueCStr(val), axis)
+DEF_PROP_SETTER(chart_axis, name, StringValueCStr(val))
 
 /*  Document-method XlsxWriter::Workbook::Chart::Axis#interval_unit=
  *
  */
-DEF_PROP_SETTER(chart_axis, interval_unit, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, interval_unit, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method XlsxWriter::Workbook::Chart::Axis#interval_tick=
  *
  */
-DEF_PROP_SETTER(chart_axis, interval_tick, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, interval_tick, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#max=
  *
@@ -319,7 +324,7 @@ DEF_PROP_SETTER(chart_axis, interval_tick, NUM2UINT(rb_check_to_int(val)), axis)
  *
  *  Sets the chart axis +max+ value.
  */
-DEF_PROP_SETTER(chart_axis, max, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, max, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#min=
  *
@@ -327,47 +332,47 @@ DEF_PROP_SETTER(chart_axis, max, NUM2DBL(rb_check_to_float(val)), axis)
  *
  *  Sets the chart axis +min+ value.
  */
-DEF_PROP_SETTER(chart_axis, min, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, min, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#major_tick_mark=
  *
  */
-DEF_PROP_SETTER(chart_axis, major_tick_mark, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, major_tick_mark, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#minor_tick_mark=
  *
  */
-DEF_PROP_SETTER(chart_axis, minor_tick_mark, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, minor_tick_mark, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#major_unit=
  *
  */
-DEF_PROP_SETTER(chart_axis, major_unit, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, major_unit, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#minor_unit=
  *
  */
-DEF_PROP_SETTER(chart_axis, minor_unit, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, minor_unit, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#label_align=
  *
  */
-DEF_PROP_SETTER(chart_axis, label_align, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, label_align, NUM2UINT(rb_check_to_int(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#label_position=
  *
  */
-DEF_PROP_SETTER(chart_axis, label_position, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, label_position, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#log_base=
  *
  */
-DEF_PROP_SETTER(chart_axis, log_base, NUM2DBL(rb_check_to_float(val)), axis)
+DEF_PROP_SETTER(chart_axis, log_base, NUM2DBL(rb_check_to_float(val)))
 
 /*  Document-method: XlsxWriter::Workbook::Chart::Axis#num_format=
  *
  */
-DEF_PROP_SETTER(chart_axis, num_format, StringValueCStr(val), axis)
+DEF_PROP_SETTER(chart_axis, num_format, StringValueCStr(val))
 
 /*  call-seq:
  *     axis.set_name_range(name, cell) -> self
@@ -382,9 +387,7 @@ chart_axis_set_name_range_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row;
   lxw_col_t col;
   extract_cell(argc - 1, argv + 1, &row, &col);
-  struct chart_axis *ptr;
-  Data_Get_Struct(self, struct chart_axis, ptr);
-  chart_axis_set_name_range(ptr->axis, str, row, col);
+  LXW_NO_RESULT_CALL(chart_axis, set_name_range, str, row, col);
   return self;
 }
 
@@ -394,11 +397,8 @@ chart_axis_set_name_range_(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 chart_axis_set_name_font_(VALUE self, VALUE value) {
-  struct chart_axis *ptr;
   lxw_chart_font font = val_to_lxw_chart_font(value);
-  Data_Get_Struct(self, struct chart_axis, ptr);
-
-  chart_axis_set_name_font(ptr->axis, &font);
+  LXW_NO_RESULT_CALL(chart_axis, set_name_font, &font);
   return self;
 }
 
@@ -408,11 +408,8 @@ chart_axis_set_name_font_(VALUE self, VALUE value) {
  */
 VALUE
 chart_axis_set_num_font_(VALUE self, VALUE value) {
-  struct chart_axis *ptr;
   lxw_chart_font font = val_to_lxw_chart_font(value);
-  Data_Get_Struct(self, struct chart_axis, ptr);
-
-  chart_axis_set_num_font(ptr->axis, &font);
+  LXW_NO_RESULT_CALL(chart_axis, set_num_font, &font);
   return self;
 }
 
@@ -422,12 +419,8 @@ chart_axis_set_num_font_(VALUE self, VALUE value) {
  */
 VALUE
 chart_axis_set_line_(VALUE self, VALUE opts) {
-  struct chart_axis *ptr;
   lxw_chart_line line = val_to_lxw_chart_line(opts);
-
-  Data_Get_Struct(self, struct chart_axis, ptr);
-
-  chart_axis_set_line(ptr->axis, &line);
+  LXW_NO_RESULT_CALL(chart_axis, set_line, &line);
   return self;
 }
 
@@ -437,19 +430,15 @@ chart_axis_set_line_(VALUE self, VALUE opts) {
  */
 VALUE
 chart_axis_set_fill_(VALUE self, VALUE opts) {
-  struct chart_axis *ptr;
   lxw_chart_fill fill = val_to_lxw_chart_fill(opts);
-
-  Data_Get_Struct(self, struct chart_axis, ptr);
-
-  chart_axis_set_fill(ptr->axis, &fill);
+  LXW_NO_RESULT_CALL(chart_axis, set_fill, &fill);
   return self;
 }
 
 /*  Document-method XlsxWriter::Workbook::Chart::Axis#position=
  *
  */
-DEF_PROP_SETTER(chart_axis, position, NUM2UINT(rb_check_to_int(val)), axis)
+DEF_PROP_SETTER(chart_axis, position, NUM2UINT(rb_check_to_int(val)))
 
 /*  call-seq: axis.reverse = true
  *
@@ -457,11 +446,8 @@ DEF_PROP_SETTER(chart_axis, position, NUM2UINT(rb_check_to_int(val)), axis)
  */
 VALUE
 chart_axis_set_reverse_(VALUE self, VALUE p) {
-  struct chart_axis *ptr;
   if (RTEST(p)) {
-    Data_Get_Struct(self, struct chart_axis, ptr);
-
-    chart_axis_set_reverse(ptr->axis);
+    LXW_NO_RESULT_CALL(chart_axis, set_reverse);
   }
   return p;
 }
@@ -472,7 +458,7 @@ chart_axis_set_source_linked_(VALUE self, VALUE val) {
 
   Data_Get_Struct(self, struct chart_axis, ptr);
 
-  ptr->axis->source_linked = NUM2UINT(rb_check_to_int(val));
+  ptr->chart_axis->source_linked = NUM2UINT(rb_check_to_int(val));
 
   return val;
 }
@@ -493,9 +479,29 @@ chart_series_set_categories_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row_from, row_to;
   lxw_col_t col_from, col_to;
   extract_range(argc - 1, argv + 1, &row_from, &col_from, &row_to, &col_to);
-  struct chart_series *ptr;
-  Data_Get_Struct(self, struct chart_series, ptr);
-  chart_series_set_categories(ptr->series, str, row_from, col_from, row_to, col_to);
+  LXW_NO_RESULT_CALL(chart_series, set_categories, str, row_from, col_from, row_to, col_to);
+  return self;
+}
+
+/*  call-seq: series.set_fill(options)
+ *
+ *  Sets chart series fill options. See {libxlsxwriter doc}[https://libxlsxwriter.github.io/structlxw__chart__fill.html] for details.
+ */
+VALUE
+chart_series_set_fill_(VALUE self, VALUE opts) {
+  lxw_chart_fill fill = val_to_lxw_chart_fill(opts);
+  LXW_NO_RESULT_CALL(chart_series, set_fill, &fill);
+  return self;
+}
+
+/*  call-seq: series.set_line(options)
+ *
+ *  Sets chart series line options. See {libxlsxwriter doc}[https://libxlsxwriter.github.io/structlxw__chart__line.html] for details.
+ */
+VALUE
+chart_series_set_line_(VALUE self, VALUE opts) {
+  lxw_chart_line line = val_to_lxw_chart_line(opts);
+  LXW_NO_RESULT_CALL(chart_series, set_line, &line);
   return self;
 }
 
@@ -513,9 +519,7 @@ chart_series_set_values_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row_from, row_to;
   lxw_col_t col_from, col_to;
   extract_range(argc - 1, argv + 1, &row_from, &col_from, &row_to, &col_to);
-  struct chart_series *ptr;
-  Data_Get_Struct(self, struct chart_series, ptr);
-  chart_series_set_values(ptr->series, str, row_from, col_from, row_to, col_to);
+  LXW_NO_RESULT_CALL(chart_series, set_values, str, row_from, col_from, row_to, col_to);
   return self;
 }
 
@@ -525,7 +529,7 @@ chart_series_set_values_(int argc, VALUE *argv, VALUE self) {
  *
  *  Set chart series name.
  */
-DEF_PROP_SETTER(chart_series, name, StringValueCStr(val), series)
+DEF_PROP_SETTER(chart_series, name, StringValueCStr(val))
 
 /*  call-seq:
  *     series.set_name_range(name, cell) -> self
@@ -540,19 +544,14 @@ chart_series_set_name_range_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row;
   lxw_col_t col;
   extract_cell(argc - 1, argv + 1, &row, &col);
-  struct chart_series *ptr;
-  Data_Get_Struct(self, struct chart_series, ptr);
-  chart_series_set_name_range(ptr->series, str, row, col);
+  LXW_NO_RESULT_CALL(chart_series, set_name_range, str, row, col);
   return self;
 }
 
 VALUE
 chart_series_set_invert_if_negative_(VALUE self, VALUE p) {
-  struct chart_series *ptr;
   if (RTEST(p)) {
-    Data_Get_Struct(self, struct chart_series, ptr);
-
-    chart_series_set_invert_if_negative(ptr->series);
+    LXW_NO_RESULT_CALL(chart_series, set_invert_if_negative);
   }
   return p;
 }
@@ -623,17 +622,20 @@ void init_xlsxwriter_chart() {
 
 
   rb_define_alloc_func(cChart, chart_alloc);
+  rb_define_attr(cChart, "workbook", 1, 0);
   rb_define_method(cChart, "initialize", chart_init, 2);
   rb_define_method(cChart, "add_series", chart_add_series_, -1);
   rb_define_method(cChart, "x_axis", chart_x_axis_, 0);
   rb_define_method(cChart, "y_axis", chart_y_axis_, 0);
   rb_define_method(cChart, "title=", chart_title_set_name_, 1);
+  rb_define_method(cChart, "set_name_range", chart_title_set_name_range_, -1);
   rb_define_method(cChart, "legend_position=", chart_legend_set_position_, 1);
   rb_define_method(cChart, "legend_set_font", chart_legend_set_font_, 1);
   rb_define_method(cChart, "legend_delete_series", chart_legend_delete_series_, 1);
   rb_define_method(cChart, "style=", chart_set_style_, 1);
   rb_define_method(cChart, "rotation=", chart_set_rotation_, 1);
   rb_define_method(cChart, "hole_size=", chart_set_hole_size_, 1);
+  rb_define_method(cChart, "show_blank_as=", chart_set_show_blank_as_, 1);
 
   rb_define_method(cChart, "axis_id_1",  chart_get_axis_id_1_, 0);
   rb_define_method(cChart, "axis_id_1=", chart_set_axis_id_1_, 1);
@@ -669,6 +671,8 @@ void init_xlsxwriter_chart() {
   rb_define_method(cChartSeries, "initialize", chart_series_init, -1);
 
   rb_define_method(cChartSeries, "set_categories", chart_series_set_categories_, -1);
+  rb_define_method(cChartSeries, "set_fill", chart_series_set_fill_, 1);
+  rb_define_method(cChartSeries, "set_line", chart_series_set_line_, 1);
   rb_define_method(cChartSeries, "set_values", chart_series_set_values_, -1);
   rb_define_method(cChartSeries, "name=", chart_series_set_name_, 1);
   rb_define_method(cChartSeries, "set_name_range", chart_series_set_name_range_, -1);
@@ -710,6 +714,10 @@ void init_xlsxwriter_chart() {
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_CENTER);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_LEFT);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_RIGHT);
+
+  MAP_CHART_CONST(BLANKS_AS_GAP);
+  MAP_CHART_CONST(BLANKS_AS_ZERO);
+  MAP_CHART_CONST(BLANKS_AS_CONNECTED);
 #undef MAP_CHART_CONST
 
 #define MAP_CHART_AXIS_CONST(name) rb_define_const(cChartAxis, #name, INT2NUM(LXW_CHART_AXIS_##name))

data/ext/xlsxwriter/chart.h

@@ -9,11 +9,11 @@ struct chart {
 };
 
 struct chart_axis {
-  lxw_chart_axis *axis;
+  lxw_chart_axis *chart_axis;
 };
 
 struct chart_series {
-  lxw_chart_series *series;
+  lxw_chart_series *chart_series;
 };
 
 lxw_chart_fill val_to_lxw_chart_fill(VALUE opts);