xlsxwriter 0.2.1.pre.2 → 0.2.3.pre.1

data/ext/xlsxwriter/workbook.c

@@ -7,6 +7,7 @@
 #include "chartsheet.h"
 #include "common.h"
 #include "format.h"
+#include "shared_strings.h"
 #include "workbook.h"
 #include "workbook_properties.h"
 #include "worksheet.h"
@@ -14,16 +15,30 @@
 
 VALUE cWorkbook;
 
+void workbook_clear(void *p);
 void workbook_free(void *p);
 VALUE workbook_release(VALUE self);
 
+size_t
+workbook_size(const void *data) {
+  return sizeof(struct workbook);
+}
+
+const rb_data_type_t workbook_type = {
+	.wrap_struct_name = "workbook",
+	.function = {
+		.dmark = NULL,
+		.dfree = workbook_free,
+		.dsize = workbook_size,
+	},
+	.data = NULL,
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 VALUE
 workbook_alloc(VALUE klass) {
-  VALUE obj;
   struct workbook *ptr;
-
-  obj = Data_Make_Struct(klass, struct workbook, NULL, workbook_free, ptr);
+  VALUE obj = TypedData_Make_Struct(klass, struct workbook, &workbook_type, ptr);
 
   ptr->path = NULL;
   ptr->workbook = NULL;
@@ -88,7 +103,7 @@ workbook_init(int argc, VALUE *argv, VALUE self) {
     }
   }
 
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
   size_t len = RSTRING_LEN(argv[0]);
   ptr->path = malloc(len + 1);
@@ -119,14 +134,14 @@ workbook_init(int argc, VALUE *argv, VALUE self) {
 VALUE
 workbook_release(VALUE self) {
   struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
-  workbook_free(ptr);
+  workbook_clear(ptr);
   return self;
 }
 
 void
-workbook_free(void *p) {
+workbook_clear(void *p) {
   struct workbook *ptr = p;
 
   if (ptr->workbook) {
@@ -168,6 +183,11 @@ workbook_free(void *p) {
   }
 }
 
+void workbook_free(void *p) {
+  workbook_clear(p);
+  ruby_xfree(p);
+};
+
 /* call-seq:
  *    wb.add_worksheet([name]) -> ws
  *    wb.add_worksheet([name]) { |ws| block } -> obj
@@ -187,7 +207,7 @@ workbook_add_worksheet_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 0, 1);
 
   struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
   if (ptr->workbook) {
     worksheet = rb_funcall(cWorksheet, rb_intern("new"), argc + 1, self, argv[0]);
   }
@@ -219,7 +239,7 @@ workbook_add_chartsheet_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 0, 1);
 
   struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
   if (ptr->workbook) {
     chartsheet = rb_funcall(cChartsheet, rb_intern("new"), argc + 1, self, argv[0]);
   }
@@ -267,7 +287,7 @@ VALUE
 workbook_add_format_(VALUE self, VALUE key, VALUE opts) {
   struct workbook *ptr;
   lxw_format *format;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
   if (!ptr->formats) {
     ptr->formats = st_init_numtable();
@@ -334,7 +354,7 @@ workbook_add_vba_project_(VALUE self, VALUE filename) {
 VALUE
 workbook_set_default_xf_indices_(VALUE self) {
   struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
   lxw_workbook_set_default_xf_indices(ptr->workbook);
   return self;
 }
@@ -352,7 +372,7 @@ workbook_set_vba_name_(VALUE self, VALUE name) {
 
 /*  call-seq: wb.properties -> wb_properties
  *
- *  Returns worbook properties accessor object.
+ *  Returns workbook properties accessor object.
  *
  *    wb.properties.title = 'My awesome sheet'
  */
@@ -376,6 +396,56 @@ workbook_define_name_(VALUE self, VALUE name, VALUE formula) {
   return self;
 }
 
+/*  call-seq: wb.unset_default_url_format -> wb
+ *
+ *  Unsets default url format
+ */
+VALUE
+workbook_unset_default_url_format_(VALUE self) {
+  struct workbook *ptr;
+
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
+  workbook_unset_default_url_format(ptr->workbook);
+
+  return self;
+}
+
+/*  call-seq: wb.max_url_length -> Integer
+ */
+VALUE
+workbook_max_url_length_(VALUE self) {
+  struct workbook *ptr;
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
+  return INT2NUM(ptr->workbook->max_url_length);
+}
+
+/*  call-seq: wb.max_url_length = 255
+ */
+VALUE
+workbook_max_url_length_set_(VALUE self, VALUE value) {
+  struct workbook *ptr;
+
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
+
+  ptr->workbook->max_url_length = NUM2INT(value);
+
+  return value;
+}
+
+/*  call-seq:
+ *    wb.sst.string_count -> 0
+ *
+ *  Returns special accessor object for shared strings table.
+ */
+VALUE
+workbook_sst_(VALUE self) {
+  struct workbook *ptr;
+
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
+
+  return alloc_shared_strings_table_by_ref(ptr->workbook->sst);
+}
+
 /*  call-seq:
  *    wb.validate_sheet_name(name) -> true
  *    wb.validate_worksheet_name(name) -> true
@@ -399,7 +469,7 @@ workbook_get_format(VALUE self, VALUE key) {
   if (NIL_P(key))
     return NULL;
 
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
   if (!ptr->formats)
     return NULL;
@@ -452,9 +522,13 @@ init_xlsxwriter_workbook() {
   rb_define_method(cWorkbook, "define_name", workbook_define_name_, 2);
   rb_define_method(cWorkbook, "properties", workbook_properties_, 0);
   rb_define_method(cWorkbook, "set_default_xf_indices", workbook_set_default_xf_indices_, 0);
+  rb_define_method(cWorkbook, "unset_default_url_format", workbook_unset_default_url_format_, 0);
   rb_define_method(cWorkbook, "validate_sheet_name", workbook_validate_sheet_name_, 1);
   rb_define_method(cWorkbook, "validate_worksheet_name", workbook_validate_sheet_name_, 1);
   rb_define_method(cWorkbook, "vba_name=", workbook_set_vba_name_, 1);
+  rb_define_method(cWorkbook, "max_url_length", workbook_max_url_length_, 0);
+  rb_define_method(cWorkbook, "max_url_length=", workbook_max_url_length_set_, 1);
+  rb_define_method(cWorkbook, "sst", workbook_sst_, 0);
 
   /*
    * This attribute contains effective font widths used for automatic column

data/ext/xlsxwriter/workbook.h

@@ -17,5 +17,6 @@ void init_xlsxwriter_workbook();
 
 extern VALUE mXlsxWriter;
 extern VALUE cWorkbook;
+extern const rb_data_type_t workbook_type;
 
 #endif // __WORKBOOK__

data/ext/xlsxwriter/workbook_properties.c

@@ -11,7 +11,7 @@ VALUE
 workbook_properties_init_(VALUE self, VALUE workbook) {
   struct workbook *wb_ptr;
   rb_iv_set(self, "@workbook", workbook);
-  Data_Get_Struct(workbook, struct workbook, wb_ptr);
+  TypedData_Get_Struct(workbook, struct workbook, &workbook_type, wb_ptr);
   if (!wb_ptr->properties) {
     wb_ptr->properties = calloc(1, sizeof(lxw_doc_properties));
   }
@@ -42,7 +42,7 @@ workbook_properties_set_(VALUE self, VALUE key, VALUE value) {
   }
 
   struct workbook *wb_ptr;
-  Data_Get_Struct(rb_iv_get(self, "@workbook"), struct workbook, wb_ptr);
+  TypedData_Get_Struct(rb_iv_get(self, "@workbook"), struct workbook, &workbook_type, wb_ptr);
   lxw_doc_properties *props = wb_ptr->properties;
   if (!props) {
     rb_raise(rb_eRuntimeError, "Workbook properties are already freed.");

data/ext/xlsxwriter/worksheet.c

@@ -7,15 +7,32 @@
 
 VALUE cWorksheet;
 
+void worksheet_clear(void *p);
 void worksheet_free(void *p);
 
+size_t worksheet_size(const void *data) {
+  return sizeof(struct worksheet);
+}
+
+const rb_data_type_t worksheet_type = {
+    .wrap_struct_name = "worksheet",
+    .function =
+        {
+            .dmark = NULL,
+            .dfree = worksheet_free,
+            .dsize = worksheet_size,
+        },
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 
 VALUE
 worksheet_alloc(VALUE klass) {
   VALUE obj;
   struct worksheet *ptr;
 
-  obj = Data_Make_Struct(klass, struct worksheet, NULL, worksheet_free, ptr);
+  obj = TypedData_Make_Struct(klass, struct worksheet, &worksheet_type, ptr);
 
   ptr->worksheet = NULL;
 
@@ -31,7 +48,7 @@ worksheet_init(int argc, VALUE *argv, VALUE self) {
   struct workbook *wb_ptr;
   struct worksheet *ptr;
 
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
 
   rb_check_arity(argc, 1, 2);
   if (argc == 2) {
@@ -66,7 +83,7 @@ worksheet_init(int argc, VALUE *argv, VALUE self) {
   rb_iv_set(self, "@use_auto_width", auto_width);
   rb_iv_set(self, "@col_auto_widths", rb_ary_new());
 
-  Data_Get_Struct(argv[0], struct workbook, wb_ptr);
+  TypedData_Get_Struct(argv[0], struct workbook, &workbook_type, wb_ptr);
   ptr->worksheet = workbook_add_worksheet(wb_ptr->workbook, name);
   if (!ptr->worksheet)
     rb_raise(eXlsxWriterError, "worksheet was not created");
@@ -77,14 +94,14 @@ worksheet_init(int argc, VALUE *argv, VALUE self) {
 VALUE
 worksheet_release(VALUE self) {
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
 
-  worksheet_free(ptr);
+  worksheet_clear(ptr);
   return self;
 }
 
 void
-worksheet_free(void *p) {
+worksheet_clear(void *p) {
   struct worksheet *ptr = p;
 
   if (ptr->worksheet) {
@@ -92,6 +109,12 @@ worksheet_free(void *p) {
   }
 }
 
+void
+worksheet_free(void *p) {
+  worksheet_clear(p);
+  ruby_xfree(p);
+}
+
 /*  call-seq:
  *     ws.write_string(cell, value, format = nil) -> self
  *     ws.write_string(row, col, value, format = nil) -> self
@@ -314,7 +337,7 @@ worksheet_write_url_(int argc, VALUE *argv, VALUE self) {
   struct worksheet *ptr;
   VALUE workbook = rb_iv_get(self, "@workbook");
   lxw_format *format = workbook_get_format(workbook, format_key);
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   if (string || tooltip) {
     worksheet_write_url_opt(ptr->worksheet, row, col, url_str, format, string, tooltip);
   } else {
@@ -500,7 +523,7 @@ worksheet_set_row_(VALUE self, VALUE row, VALUE opts) {
     options.level = NUM2INT(val);
 
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   if (options.hidden || options.collapsed || options.level) {
     worksheet_set_row_opt(ptr->worksheet, NUM2INT(row), height, format, &options);
   } else {
@@ -547,7 +570,7 @@ worksheet_set_column_(VALUE self, VALUE col_from, VALUE col_to, VALUE opts) {
     options.level = NUM2INT(val);
 
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   if (options.hidden || options.collapsed || options.level) {
     worksheet_set_column_opt(ptr->worksheet, col1, col2, width, format, &options);
   } else {
@@ -589,7 +612,7 @@ worksheet_insert_image_(int argc, VALUE *argv, VALUE self) {
   }
 
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
 
   if (!NIL_P(opts)) {
     options = val_to_lxw_image_options(opts, &with_options);
@@ -634,7 +657,7 @@ worksheet_insert_image_buffer_(int argc, VALUE *argv, VALUE self) {
     ++larg;
   }
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
 
   if (!NIL_P(opts)) {
     options = val_to_lxw_image_options(opts, &with_options);
@@ -664,7 +687,7 @@ worksheet_insert_chart_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row;
   lxw_col_t col;
   VALUE chart, opts = Qnil;
-  lxw_image_options options;
+  lxw_chart_options options;
   char with_options = '\0';
 
   rb_check_arity(argc, 2, 4);
@@ -683,13 +706,13 @@ worksheet_insert_chart_(int argc, VALUE *argv, VALUE self) {
   }
 
   if (!NIL_P(opts)) {
-    options = val_to_lxw_image_options(opts, &with_options);
+    options = val_to_lxw_chart_options(opts, &with_options);
   }
 
   struct worksheet *ptr;
   struct chart *chart_ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
-  Data_Get_Struct(chart, struct chart, chart_ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
+  TypedData_Get_Struct(chart, struct chart, &chart_type, chart_ptr);
 
   if (with_options) {
     worksheet_insert_chart_opt(ptr->worksheet, row, col, chart_ptr->chart, &options);
@@ -820,7 +843,7 @@ worksheet_freeze_panes_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 5);
   int larg = extract_cell(argc, argv, &row, &col);
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   if (larg >= argc) {
     worksheet_freeze_panes(ptr->worksheet, row, col);
   } else {
@@ -928,7 +951,7 @@ worksheet_set_header_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = worksheet_set_header(ptr->worksheet, ho.str);
@@ -948,7 +971,7 @@ worksheet_set_footer_(int argc, VALUE *argv, VALUE self) {
   struct worksheet *ptr;
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = worksheet_set_footer(ptr->worksheet, ho.str);
@@ -1194,7 +1217,7 @@ worksheet_set_default_row_(VALUE self, VALUE height, VALUE hide_unused_rows) {
 VALUE
 worksheet_get_horizontal_dpi_(VALUE self) {
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   return INT2NUM(ptr->worksheet->horizontal_dpi);
 }
 
@@ -1205,7 +1228,7 @@ worksheet_get_horizontal_dpi_(VALUE self) {
 VALUE
 worksheet_set_horizontal_dpi_(VALUE self, VALUE val) {
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   ptr->worksheet->horizontal_dpi = NUM2INT(val);
   return val;
 }
@@ -1217,7 +1240,7 @@ worksheet_set_horizontal_dpi_(VALUE self, VALUE val) {
 VALUE
 worksheet_get_vertical_dpi_(VALUE self) {
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   return INT2NUM(ptr->worksheet->vertical_dpi);
 }
 
@@ -1228,7 +1251,7 @@ worksheet_get_vertical_dpi_(VALUE self) {
 VALUE
 worksheet_set_vertical_dpi_(VALUE self, VALUE val) {
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   ptr->worksheet->vertical_dpi = NUM2INT(val);
   return val;
 }
@@ -1379,7 +1402,7 @@ worksheet_data_validation_(int argc, VALUE *argv, VALUE self) {
 #undef parse_value
 
   struct worksheet *ptr;
-  Data_Get_Struct(self, struct worksheet, ptr);
+  TypedData_Get_Struct(self, struct worksheet, &worksheet_type, ptr);
   lxw_error err;
   if (range) {
     err = worksheet_data_validation_range(ptr->worksheet, row, col, row2, col2, &data_validation);
@@ -1508,6 +1531,25 @@ int extract_range(int argc, VALUE *argv, lxw_row_t *row_from, lxw_col_t *col_fro
       setter;                                         \
     }                                                 \
   }
+lxw_chart_options
+val_to_lxw_chart_options(VALUE opts, char *with_options) {
+  VALUE val;
+  lxw_chart_options options = {
+    .x_offset = 0,
+    .y_offset = 0,
+    .x_scale = 1.0,
+    .y_scale = 1.0
+  };
+  SET_IMG_OPT("offset",   options.x_offset = options.y_offset = NUM2INT(val));
+  SET_IMG_OPT("x_offset", options.x_offset =                    NUM2INT(val));
+  SET_IMG_OPT("y_offset",                    options.y_offset = NUM2INT(val));
+  SET_IMG_OPT("scale",    options.x_scale  = options.y_scale  = NUM2DBL(val));
+  SET_IMG_OPT("x_scale",  options.x_scale  =                    NUM2DBL(val));
+  SET_IMG_OPT("y_scale",                     options.y_scale  = NUM2DBL(val));
+  SET_IMG_OPT("object_position", options.object_position = NUM2INT(val));
+  return options;
+}
+
 lxw_image_options
 val_to_lxw_image_options(VALUE opts, char *with_options) {
   VALUE val;
@@ -1523,7 +1565,10 @@ val_to_lxw_image_options(VALUE opts, char *with_options) {
   SET_IMG_OPT("scale",    options.x_scale  = options.y_scale  = NUM2DBL(val));
   SET_IMG_OPT("x_scale",  options.x_scale  =                    NUM2DBL(val));
   SET_IMG_OPT("y_scale",                     options.y_scale  = NUM2DBL(val));
+  SET_IMG_OPT("object_position", options.object_position = NUM2INT(val));
   SET_IMG_OPT("description", options.description = StringValueCStr(val));
+  SET_IMG_OPT("url", options.url = StringValueCStr(val));
+  SET_IMG_OPT("tip", options.tip = StringValueCStr(val));
   return options;
 }
 #undef SET_IMG_OPT
@@ -1535,6 +1580,7 @@ init_xlsxwriter_worksheet() {
   cWorksheet = rb_define_class_under(mXlsxWriter, "Worksheet", rb_cObject);
 
   rb_define_alloc_func(cWorksheet, worksheet_alloc);
+  rb_define_attr(cWorksheet, "workbook", 1, 0);
   rb_define_method(cWorksheet, "initialize", worksheet_init, -1);
   rb_define_method(cWorksheet, "free", worksheet_release, 0);
   rb_define_method(cWorksheet, "write_string", worksheet_write_string_, -1);
@@ -1632,6 +1678,12 @@ init_xlsxwriter_worksheet() {
   MAP_LXW_WH_CONST1(VALIDATION_CRITERIA_LESS_THAN);
   MAP_LXW_WH_CONST1(VALIDATION_CRITERIA_GREATER_THAN_OR_EQUAL_TO);
   MAP_LXW_WH_CONST1(VALIDATION_CRITERIA_LESS_THAN_OR_EQUAL_TO);
+
+  MAP_LXW_WH_CONST1(OBJECT_POSITION_DEFAULT);
+  MAP_LXW_WH_CONST1(OBJECT_MOVE_AND_SIZE);
+  MAP_LXW_WH_CONST1(OBJECT_MOVE_DONT_SIZE);
+  MAP_LXW_WH_CONST1(OBJECT_DONT_MOVE_DONT_SIZE);
+  MAP_LXW_WH_CONST1(OBJECT_MOVE_AND_SIZE_AFTER);
 #undef MAP_LXW_WH_CONST1
 #undef MAP_LXW_WH_CONST
 }

data/ext/xlsxwriter/worksheet.h

@@ -12,6 +12,7 @@ lxw_col_t value_to_col(VALUE value);
 int extract_cell(int argc, VALUE *argv, lxw_row_t *row, lxw_col_t *col);
 int extract_range(int argc, VALUE *argv, lxw_row_t *row1, lxw_col_t *col1,
                                          lxw_row_t *row2, lxw_col_t *col2);
+lxw_chart_options val_to_lxw_chart_options(VALUE opts, char *with_options);
 lxw_image_options val_to_lxw_image_options(VALUE opts, char *with_options);
 
 void init_xlsxwriter_worksheet();

data/ext/xlsxwriter/xlsxwriter.c

@@ -4,6 +4,7 @@
 #include "chartsheet.h"
 #include "format.h"
 #include "rich_string.h"
+#include "shared_strings.h"
 #include "workbook.h"
 #include "workbook_properties.h"
 #include "worksheet.h"
@@ -44,4 +45,5 @@ void Init_xlsxwriter() {
   init_xlsxwriter_chart();
   init_xlsxwriter_chartsheet();
   init_xlsxwriter_rich_string();
+  init_xlsxwriter_shared_strings_table();
 }

data/lib/xlsxwriter/rich_string.rb

@@ -55,10 +55,8 @@ module XlsxWriter
       parts.map(&:first)
     end
 
-
     private
 
-
     def make_part(str, format)
       [
         str.frozen? ? str.to_str : str.to_str.clone.freeze,

data/lib/xlsxwriter/version.rb

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

data/lib/xlsxwriter/worksheet.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 module XlsxWriter
-
   class Worksheet
     # Last row number written with #add_row
     attr_reader :current_row, :col_auto_widths
 
     # Thiner characters list used for column width logic mimicking axlsx behaviour
-    THIN_CHARS = '^.acfijklrstxzFIJL()-'.freeze
+    THIN_CHARS = '^.acfijklrstxzFIJL()-'
 
     # Write a +row+. If no +types+ passed XlsxWriter tries to deduce them automatically.
     #
@@ -51,6 +50,7 @@ module XlsxWriter
           write_blank(row_idx, idx, cell_style)
         when :skip, :empty
           # write nothing
+          nil
         when nil
           case value
           when Numeric

data/test/{run-test.rb → run_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-lib_dir = File.join(base_dir, "lib")
-test_dir = File.join(base_dir, "test")
+base_dir = File.expand_path('..', __dir__)
+lib_dir = File.join(base_dir, 'lib')
+test_dir = File.join(base_dir, 'test')
 
 $LOAD_PATH.unshift(lib_dir)
 

data/test/support/chart_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module ChartTest
-  def chart_test(fname, type, data = self::DATA, &block)
-    test fname do |wb|
+  def chart_test(fname, type, data = self::DATA, ref_file_name: nil, &_block)
+    test fname, ref_file_name: ref_file_name do |wb|
       wb.add_worksheet do |ws|
         data.each { |row| ws.add_row row }
 
         wb.add_chart(type) do |chart|
-          yield chart
+          yield chart, ws
 
           ws.insert_chart 'E9', chart
         end

data/test/support/with_xlsx_file.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'xlsxwriter'
 
 module WithXlsxFile
-  def with_xlsx_file(file_path = 'tmp/test.xlsx', **opts)
+  def with_xlsx_file(file_path = 'tmp/test.xlsx', **opts, &block)
     after = opts.delete :after
     XlsxWriter::Workbook.open(file_path, opts) do |wb|
-      yield wb
+      block.call(wb)
     end
     after.call if after
   ensure