xlsxwriter 0.2.2 → 0.2.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f03eb87d448a902c6067b95d4a3d7598cecd3456a3f8097e40da1bd0351c8d4
-  data.tar.gz: 2af72c3d678d22a1990f960ee0b7f2315e39d37a780b5e589ebce7794b1b23f6
+  metadata.gz: 5bf5fbd1b3f4d6e80dc28c189f63478ff9a7d6253e6630abf697ebfd5c9b7cb5
+  data.tar.gz: a75bd6805709c6688497e5df0bcc9a4b3a53b94361e7cc09d9d67843f2cd0501
 SHA512:
-  metadata.gz: 2ebcf14300b3cbaf46fc3a784c2ad9b5c114fa2ea3dccca08976ae8af7f50265beb05ed4233da92db1398bed7e17144779ca2c973cab59dad55e95fb3ee926ae
-  data.tar.gz: 0cd298302d3c354ced238ed5fba71b7b05498db56c76df2b307d90603c122308c79780db9af55d1f46c7aece7f30da517a39d30f5d0b56acfd3107f79fbc9fb5
+  metadata.gz: d5be08fe10209e21d0956b58366fb06a0480f8f0145e3607cffeb78ecc12b0eec375a450165384278a0a0770a4d409c1e4bd9f3bb9852297c421cae481d10591
+  data.tar.gz: 83d7ed483b2f2245b5fc4f22afeca555f8216eb1f084504df8075855c50a49a96b24878638b6a63a8e8eb84c1dcdca46c4c3c92bba37c9de85a6ea73a0b887fe

data/ext/xlsxwriter/chart.c

@@ -10,9 +10,57 @@ VALUE cChart;
 VALUE cChartSeries;
 VALUE cChartAxis;
 
+size_t
+chart_size(const void *data) {
+  return sizeof(struct chart);
+}
+
+const rb_data_type_t chart_type = {
+	.wrap_struct_name = "chart",
+	.function = {
+		.dmark = NULL,
+		.dfree = ruby_xfree,
+		.dsize = chart_size,
+	},
+	.data = NULL,
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+size_t
+chart_axis_size(const void *data) {
+  return sizeof(struct chart_axis);
+}
+
+const rb_data_type_t chart_axis_type = {
+  .wrap_struct_name = "chart_axis",
+  .function = {
+    .dmark = NULL,
+    .dfree = ruby_xfree,
+    .dsize = chart_axis_size,
+  },
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+size_t
+chart_series_size(const void *data) {
+  return sizeof(struct chart_series);
+}
+
+const rb_data_type_t chart_series_type = {
+  .wrap_struct_name = "chart_series",
+  .function = {
+    .dmark = NULL,
+    .dfree = ruby_xfree,
+    .dsize = chart_series_size,
+  },
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 #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);                            \
+    TypedData_Get_Struct(self, struct type, &(type ## _type), ptr);     \
     type ## _set_ ## field (ptr->type, value);                          \
     return val;                                                         \
 }
@@ -20,10 +68,8 @@ VALUE cChartAxis;
 
 VALUE
 chart_alloc(VALUE klass) {
-  VALUE obj;
   struct chart *ptr;
-
-  obj = Data_Make_Struct(klass, struct chart, NULL, NULL, ptr);
+  VALUE obj = TypedData_Make_Struct(klass, struct chart, &chart_type, ptr);
 
   ptr->chart = NULL;
 
@@ -36,8 +82,8 @@ chart_init(VALUE self, VALUE workbook, VALUE type) {
   struct chart *ptr;
   struct workbook *wb_ptr;
 
-  Data_Get_Struct(workbook, struct workbook, wb_ptr);
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(workbook, struct workbook, &workbook_type, wb_ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   if (wb_ptr && wb_ptr->workbook) {
     ptr->chart = workbook_add_chart(wb_ptr->workbook, NUM2INT(type));
   }
@@ -52,7 +98,7 @@ chart_axis_alloc(VALUE klass) {
   VALUE obj;
   struct chart_axis *ptr;
 
-  obj = Data_Make_Struct(klass, struct chart_axis, NULL, NULL, ptr);
+  obj = TypedData_Make_Struct(klass, struct chart_axis, &chart_axis_type, ptr);
 
   return obj;
 }
@@ -63,8 +109,8 @@ chart_axis_init(VALUE self, VALUE chart, VALUE type) {
   struct chart_axis *ptr;
   struct chart *c_ptr;
 
-  Data_Get_Struct(chart, struct chart, c_ptr);
-  Data_Get_Struct(self, struct chart_axis, ptr);
+  TypedData_Get_Struct(chart, struct chart, &chart_type, c_ptr);
+  TypedData_Get_Struct(self, struct chart_axis, &chart_axis_type, ptr);
   rb_iv_set(self, "@chart", chart);
   if (c_ptr && c_ptr->chart) {
     ID axis = rb_check_id_cstr("x", 1, NULL);
@@ -92,7 +138,7 @@ chart_series_alloc(VALUE klass) {
   VALUE obj;
   struct chart_series *ptr;
 
-  obj = Data_Make_Struct(klass, struct chart_series, NULL, NULL, ptr);
+  obj = TypedData_Make_Struct(klass, struct chart_series, &chart_series_type, ptr);
 
   ptr->chart_series = NULL;
 
@@ -107,8 +153,8 @@ chart_series_init(int argc, VALUE *argv, VALUE self) {
   char *cats = NULL, *vals = NULL;
   rb_check_arity(argc, 1, 3);
 
-  Data_Get_Struct(argv[0], struct chart, c_ptr);
-  Data_Get_Struct(self, struct chart_series, ptr);
+  TypedData_Get_Struct(argv[0], struct chart, &chart_type, c_ptr);
+  TypedData_Get_Struct(self, struct chart_series, &chart_series_type, ptr);
 
   if (argc > 2) {
     cats = StringValueCStr(argv[1]);
@@ -160,7 +206,7 @@ chart_y_axis_(VALUE self) {
 VALUE
 chart_title_set_name_(VALUE self, VALUE name) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
 
   if (RTEST(name)) {
     chart_title_set_name(ptr->chart, StringValueCStr(name));
@@ -259,7 +305,7 @@ DEF_PROP_SETTER(chart, hole_size, NUM2UINT(rb_check_to_int(val)))
 VALUE
 chart_set_show_blank_as_(VALUE self, VALUE val) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   ptr->chart->show_blanks_as = NUM2INT(rb_check_to_int(val));
   return val;
 }
@@ -269,7 +315,7 @@ chart_set_show_blank_as_(VALUE self, VALUE val) {
 VALUE
 chart_get_axis_id_1_(VALUE self) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   return UINT2NUM(ptr->chart->axis_id_1);
 }
 
@@ -277,7 +323,7 @@ chart_get_axis_id_1_(VALUE self) {
 VALUE
 chart_set_axis_id_1_(VALUE self, VALUE val) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   ptr->chart->axis_id_1 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
@@ -286,7 +332,7 @@ chart_set_axis_id_1_(VALUE self, VALUE val) {
 VALUE
 chart_get_axis_id_2_(VALUE self) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   return UINT2NUM(ptr->chart->axis_id_2);
 }
 
@@ -294,7 +340,7 @@ chart_get_axis_id_2_(VALUE self) {
 VALUE
 chart_set_axis_id_2_(VALUE self, VALUE val) {
   struct chart *ptr;
-  Data_Get_Struct(self, struct chart, ptr);
+  TypedData_Get_Struct(self, struct chart, &chart_type, ptr);
   ptr->chart->axis_id_2 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
@@ -456,7 +502,7 @@ VALUE
 chart_axis_set_source_linked_(VALUE self, VALUE val) {
   struct chart_axis *ptr;
 
-  Data_Get_Struct(self, struct chart_axis, ptr);
+  TypedData_Get_Struct(self, struct chart_axis, &chart_axis_type, ptr);
 
   ptr->chart_axis->source_linked = NUM2UINT(rb_check_to_int(val));
 

data/ext/xlsxwriter/chart.h

@@ -25,5 +25,6 @@ void init_xlsxwriter_chart();
 extern VALUE cChart;
 extern VALUE cChartSeries;
 extern VALUE cChartAxis;
+extern const rb_data_type_t chart_type;
 
 #endif // __CHART__

data/ext/xlsxwriter/chartsheet.c

@@ -6,15 +6,31 @@
 
 VALUE cChartsheet;
 
+void chartsheet_clear(void *p);
 void chartsheet_free(void *p);
 
+size_t
+chartsheet_size(const void *data) {
+  return sizeof(struct chartsheet);
+}
+
+const rb_data_type_t chartsheet_type = {
+	.wrap_struct_name = "chartsheet",
+	.function = {
+		.dmark = NULL,
+		.dfree = chartsheet_free,
+		.dsize = chartsheet_size,
+	},
+	.data = NULL,
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 VALUE
 chartsheet_alloc(VALUE klass) {
   VALUE obj;
   struct chartsheet *ptr;
 
-  obj = Data_Make_Struct(klass, struct chartsheet, NULL, chartsheet_free, ptr);
+  obj = TypedData_Make_Struct(klass, struct chartsheet, &chartsheet_type, ptr);
 
   ptr->chartsheet = NULL;
 
@@ -28,7 +44,7 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
   struct workbook *wb_ptr;
   struct chartsheet *ptr;
 
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
 
   if (argc == 2) {
     name = StringValueCStr(argv[1]);
@@ -36,7 +52,7 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
 
   rb_iv_set(self, "@workbook", argv[0]);
 
-  Data_Get_Struct(argv[0], struct workbook, wb_ptr);
+  TypedData_Get_Struct(argv[0], struct workbook, &workbook_type, wb_ptr);
   ptr->chartsheet = workbook_add_chartsheet(wb_ptr->workbook, name);
   if (!ptr->chartsheet)
     rb_raise(eXlsxWriterError, "chartsheet was not created");
@@ -47,20 +63,25 @@ chartsheet_init(int argc, VALUE *argv, VALUE self) {
 VALUE
 chartsheet_release(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
 
-  chartsheet_free(ptr);
+  chartsheet_clear(ptr);
   return self;
 }
 
 void
-chartsheet_free(void *p) {
+chartsheet_clear(void *p) {
   struct chartsheet *ptr = p;
 
   if (ptr->chartsheet)
     ptr->chartsheet = NULL;
 }
 
+void
+chartsheet_free(void *p) {
+  chartsheet_clear(p);
+  ruby_xfree(p);
+}
 
 /*  call-seq: cs.activate -> self
  *
@@ -79,7 +100,7 @@ chartsheet_activate_(VALUE self) {
 VALUE
 chartsheet_set_chart_(VALUE self, VALUE chart) {
   struct chart *chart_ptr;
-  Data_Get_Struct(chart, struct chart, chart_ptr);
+  TypedData_Get_Struct(chart, struct chart, &chart_type, chart_ptr);
 
   LXW_ERR_RESULT_CALL(chartsheet, set_chart, chart_ptr->chart);
   return self;
@@ -139,7 +160,7 @@ chartsheet_set_footer_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = chartsheet_set_footer(ptr->chartsheet, ho.str);
@@ -169,7 +190,7 @@ chartsheet_set_header_(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 1, 2);
   struct _header_options ho = _extract_header_options(argc, argv);
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   lxw_error err;
   if (!ho.with_options) {
     err = chartsheet_set_header(ptr->chartsheet, ho.str);
@@ -236,7 +257,7 @@ chartsheet_set_zoom_(VALUE self, VALUE val) {
 VALUE
 chartsheet_get_horizontal_dpi_(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   return INT2NUM(ptr->chartsheet->worksheet->horizontal_dpi);
 }
 
@@ -247,7 +268,7 @@ chartsheet_get_horizontal_dpi_(VALUE self) {
 VALUE
 chartsheet_set_horizontal_dpi_(VALUE self, VALUE val) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   ptr->chartsheet->worksheet->horizontal_dpi = NUM2INT(val);
   return val;
 }
@@ -259,7 +280,7 @@ chartsheet_set_horizontal_dpi_(VALUE self, VALUE val) {
 VALUE
 chartsheet_get_vertical_dpi_(VALUE self) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   return INT2NUM(ptr->chartsheet->worksheet->vertical_dpi);
 }
 
@@ -270,7 +291,7 @@ chartsheet_get_vertical_dpi_(VALUE self) {
 VALUE
 chartsheet_set_vertical_dpi_(VALUE self, VALUE val) {
   struct chartsheet *ptr;
-  Data_Get_Struct(self, struct chartsheet, ptr);
+  TypedData_Get_Struct(self, struct chartsheet, &chartsheet_type, ptr);
   ptr->chartsheet->worksheet->vertical_dpi = NUM2INT(val);
   return val;
 }

data/ext/xlsxwriter/common.h

@@ -1,18 +1,18 @@
 #include <ruby.h>
 #include <ruby/intern.h>
-#include <xlsxwriter_ext.h>
+#include "xlsxwriter_ext.h"
 
 #ifndef __COMMON__
 #define __COMMON__
 
 #define LXW_NO_RESULT_CALL(cls, method, ...) {  \
   struct cls *ptr;                              \
-  Data_Get_Struct(self, struct cls, ptr);       \
+  TypedData_Get_Struct(self, struct cls, &(cls ## _type), ptr); \
   cls ## _ ## method(ptr->cls, ##__VA_ARGS__); }
 
 #define LXW_ERR_RESULT_CALL(cls, method, ...) {      \
     struct cls *ptr;                                \
-    Data_Get_Struct(self, struct cls, ptr);         \
+    TypedData_Get_Struct(self, struct cls, &(cls ## _type), ptr);             \
     lxw_error err = cls ## _ ## method(ptr->cls, ##__VA_ARGS__); \
     handle_lxw_error(err); }
 
@@ -38,7 +38,7 @@ _extract_protect_options(int argc, VALUE *argv) {
       opts = argv[0];
       break;
     default:
-      rb_raise(rb_eArgError, "Wrong argument %"PRIsVALUE", expected a String or Hash", rb_obj_class(argv[0]));
+      rb_raise(rb_eArgError, "Wrong argument %" PRIsVALUE ", expected a String or Hash", rb_obj_class(argv[0]));
     }
   }
 
@@ -46,7 +46,7 @@ _extract_protect_options(int argc, VALUE *argv) {
     if (TYPE(argv[1]) == T_HASH) {
       opts = argv[1];
     } else {
-      rb_raise(rb_eArgError, "Expected a Hash, but got %"PRIsVALUE, rb_obj_class(argv[1]));
+      rb_raise(rb_eArgError, "Expected a Hash, but got %" PRIsVALUE, rb_obj_class(argv[1]));
     }
   }
 

data/ext/xlsxwriter/rich_string.c

@@ -5,22 +5,39 @@
 
 VALUE cRichString;
 
+void rich_string_clear(void *p);
 void rich_string_free(void *p);
 
+size_t
+rich_string_size(const void *data) {
+  return sizeof(lxw_rich_string_tuple *);
+}
+
+const rb_data_type_t rich_string_type = {
+    .wrap_struct_name = "lxw_rich_string_tuple",
+    .function =
+        {
+            .dmark = NULL,
+            .dfree = rich_string_free,
+            .dsize = rich_string_size,
+        },
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 VALUE
 rich_string_alloc(VALUE klass) {
   VALUE obj;
   lxw_rich_string_tuple **ptr;
 
-  obj = Data_Make_Struct(klass, lxw_rich_string_tuple *, NULL, rich_string_free, ptr);
+  obj = TypedData_Make_Struct(klass, lxw_rich_string_tuple *, &rich_string_type, ptr);
   *ptr = NULL;
 
   return obj;
 }
 
 void
-rich_string_free(void *p) {
+rich_string_clear(void *p) {
   lxw_rich_string_tuple **ptr = p;
   if (*ptr) {
     ruby_xfree(*ptr);
@@ -28,16 +45,18 @@ rich_string_free(void *p) {
   }
 }
 
+void
+rich_string_free(void *p) {
+  rich_string_clear(p);
+  ruby_xfree(p);
+}
+
 VALUE
 rich_string_cached_p(VALUE self) {
   lxw_rich_string_tuple **ptr;
-  Data_Get_Struct(self, lxw_rich_string_tuple *, ptr);
+  TypedData_Get_Struct(self, lxw_rich_string_tuple *, &rich_string_type, ptr);
 
-  if (*ptr) {
-    return Qtrue;
-  } else {
-    return Qfalse;
-  }
+  return (*ptr ? Qtrue : Qfalse);
 }
 
 lxw_rich_string_tuple **
@@ -48,7 +67,7 @@ serialize_rich_string(VALUE rs) {
   int len = RARRAY_LEN(arr);
 
   lxw_rich_string_tuple **ptr;
-  Data_Get_Struct(rs, lxw_rich_string_tuple *, ptr);
+  TypedData_Get_Struct(rs, lxw_rich_string_tuple *, &rich_string_type, ptr);
 
   if (*ptr) { // cached
     return (lxw_rich_string_tuple **) *ptr;

data/ext/xlsxwriter/shared_strings.c

@@ -10,14 +10,28 @@ struct sst {
 
 VALUE cSharedStringsTable;
 
-void sst_free(void *p);
+size_t sst_size(const void *data) {
+  return sizeof(struct sst);
+}
+
+const rb_data_type_t sst_type = {
+    .wrap_struct_name = "lxw_rich_string_tuple",
+    .function =
+        {
+            .dmark = NULL,
+            .dfree = ruby_xfree,
+            .dsize = sst_size,
+        },
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 /* :nodoc: */
 VALUE
 sst_alloc(VALUE klass) {
   VALUE obj;
   struct sst *sst_ptr;
-  obj = Data_Make_Struct(klass, struct sst, NULL, sst_free, sst_ptr);
+  obj = TypedData_Make_Struct(klass, struct sst, &sst_type, sst_ptr);
   sst_ptr->sst = NULL;
 
   return obj;
@@ -30,26 +44,22 @@ alloc_shared_strings_table_by_ref(struct lxw_sst *sst) {
 
   VALUE object = rb_obj_alloc(cSharedStringsTable);
   struct sst *sst_ptr;
-  Data_Get_Struct(object, struct sst, sst_ptr);
+  TypedData_Get_Struct(object, struct sst, &sst_type, sst_ptr);
   sst_ptr->sst = sst;
   return object;
 }
 
-void
-sst_free(void *p) {
-}
-
 VALUE
 sst_string_count_get_(VALUE self) {
   struct sst *sst_ptr;
-  Data_Get_Struct(self, struct sst, sst_ptr);
+  TypedData_Get_Struct(self, struct sst, &sst_type, sst_ptr);
   return INT2NUM(sst_ptr->sst->string_count);
 }
 
 VALUE
 sst_string_count_set_(VALUE self, VALUE val) {
   struct sst *sst_ptr;
-  Data_Get_Struct(self, struct sst, sst_ptr);
+  TypedData_Get_Struct(self, struct sst, &sst_type, sst_ptr);
 
   sst_ptr->sst->string_count = NUM2INT(val);
   return val;

data/ext/xlsxwriter/workbook.c

@@ -15,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;
@@ -89,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);
@@ -120,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) {
@@ -169,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
@@ -188,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]);
   }
@@ -220,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]);
   }
@@ -268,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();
@@ -335,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;
 }
@@ -385,7 +404,7 @@ VALUE
 workbook_unset_default_url_format_(VALUE self) {
   struct workbook *ptr;
 
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
   workbook_unset_default_url_format(ptr->workbook);
 
   return self;
@@ -396,7 +415,7 @@ workbook_unset_default_url_format_(VALUE self) {
 VALUE
 workbook_max_url_length_(VALUE self) {
   struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
   return INT2NUM(ptr->workbook->max_url_length);
 }
 
@@ -406,7 +425,7 @@ VALUE
 workbook_max_url_length_set_(VALUE self, VALUE value) {
   struct workbook *ptr;
 
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
   ptr->workbook->max_url_length = NUM2INT(value);
 
@@ -422,7 +441,7 @@ VALUE
 workbook_sst_(VALUE self) {
   struct workbook *ptr;
 
-  Data_Get_Struct(self, struct workbook, ptr);
+  TypedData_Get_Struct(self, struct workbook, &workbook_type, ptr);
 
   return alloc_shared_strings_table_by_ref(ptr->workbook->sst);
 }
@@ -450,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;

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);
@@ -688,8 +711,8 @@ worksheet_insert_chart_(int argc, VALUE *argv, VALUE self) {
 
   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);

data/lib/xlsxwriter/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3.pre.1
 platform: ruby
 authors:
 - Nick H
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -66,8 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description:
-email:
 executables: []
 extensions:
 - ext/xlsxwriter/extconf.rb
@@ -226,7 +223,6 @@ homepage: https://github.com/gekola/xlsxwriter-rb
 licenses:
 - BSD-2-Clause-FreeBSD
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -241,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby interface to libxlsxwriter
 test_files: