xlsxwriter 0.2.1.pre → 0.2.2

data/ext/xlsxwriter/workbook.c

@@ -2,8 +2,12 @@
 #include <ruby.h>
 #include <ruby/thread.h>
 #include <xlsxwriter.h>
+
 #include "chart.h"
+#include "chartsheet.h"
+#include "common.h"
 #include "format.h"
+#include "shared_strings.h"
 #include "workbook.h"
 #include "workbook_properties.h"
 #include "worksheet.h"
@@ -197,6 +201,38 @@ workbook_add_worksheet_(int argc, VALUE *argv, VALUE self) {
   return worksheet;
 }
 
+/* call-seq:
+ *    wb.add_chartsheet([name]) -> cs
+ *    wb.add_chartsheet([name]) { |ws| block } -> obj
+ *
+ * Adds a chartsheet named +name+ to the workbook.
+ *
+ * If a block is passed, the last statement is returned.
+ *
+ *    wb.add_chartsheet('Cool chart') do |cs|
+ *      cs.chart = chart
+ *    end
+ */
+VALUE
+workbook_add_chartsheet_(int argc, VALUE *argv, VALUE self) {
+  VALUE chartsheet = Qnil;
+
+  rb_check_arity(argc, 0, 1);
+
+  struct workbook *ptr;
+  Data_Get_Struct(self, struct workbook, ptr);
+  if (ptr->workbook) {
+    chartsheet = rb_funcall(cChartsheet, rb_intern("new"), argc + 1, self, argv[0]);
+  }
+
+  if (rb_block_given_p()) {
+    VALUE res = rb_yield(chartsheet);
+    return res;
+  }
+
+  return chartsheet;
+}
+
 /* call-seq:
  *    wb.add_format(key, definition) -> wb
  *
@@ -210,7 +246,7 @@ workbook_add_worksheet_(int argc, VALUE *argv, VALUE self) {
  * :font_color:: Text color.
  * :bold, :italic, underline :: Bold, italic, underlined text.
  * :font_strikeout:: Striked out text.
- * :font_script:: Superscript (XlsxWrtiter::Format::FONT_SUPERSCRIPT) or subscript (XlsxWriter::Format::FONT_SUBSCRIPT).
+ * :font_script:: Superscript (XlsxWriter::Format::FONT_SUPERSCRIPT) or subscript (XlsxWriter::Format::FONT_SUBSCRIPT).
  * :num_format:: Defines numerical format with mask, like <code>'d mmm yyyy'</code>
  *               or <code>'#,##0.00'</code>.
  * :num_format_index:: Defines numerical format from special {pre-defined set}[https://libxlsxwriter.github.io/format_8h.html#a688aa42bcc703d17e125d9a34c721872].
@@ -291,12 +327,7 @@ workbook_add_chart_(VALUE self, VALUE type) {
  */
 VALUE
 workbook_add_vba_project_(VALUE self, VALUE filename) {
-  struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
-
-  lxw_error err = workbook_add_vba_project(ptr->workbook, StringValueCStr(filename));
-  handle_lxw_error(err);
-
+  LXW_ERR_RESULT_CALL(workbook, add_vba_project, StringValueCStr(filename));
   return self;
 }
 
@@ -316,18 +347,13 @@ workbook_set_default_xf_indices_(VALUE self) {
  */
 VALUE
 workbook_set_vba_name_(VALUE self, VALUE name) {
-  struct workbook *ptr;
-  Data_Get_Struct(self, struct workbook, ptr);
-
-  lxw_error err = workbook_set_vba_name(ptr->workbook, StringValueCStr(name));
-  handle_lxw_error(err);
-
+  LXW_ERR_RESULT_CALL(workbook, set_vba_name, StringValueCStr(name));
   return name;
 }
 
 /*  call-seq: wb.properties -> wb_properties
  *
- *  Returns worbook properties accessor object.
+ *  Returns workbook properties accessor object.
  *
  *    wb.properties.title = 'My awesome sheet'
  */
@@ -346,12 +372,61 @@ workbook_properties_(VALUE self) {
  */
 VALUE
 workbook_define_name_(VALUE self, VALUE name, VALUE formula) {
+  LXW_ERR_RESULT_CALL(workbook, define_name, StringValueCStr(name), StringValueCStr(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;
+
   Data_Get_Struct(self, struct workbook, ptr);
-  workbook_define_name(ptr->workbook, StringValueCStr(name), StringValueCStr(formula));
+  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;
+  Data_Get_Struct(self, struct workbook, 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;
+
+  Data_Get_Struct(self, struct workbook, 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;
+
+  Data_Get_Struct(self, struct workbook, 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
@@ -362,11 +437,7 @@ workbook_define_name_(VALUE self, VALUE name, VALUE formula) {
  */
 VALUE
 workbook_validate_sheet_name_(VALUE self, VALUE name) {
-  struct workbook *ptr;
-  lxw_error err;
-  Data_Get_Struct(self, struct workbook, ptr);
-  err = workbook_validate_sheet_name(ptr->workbook, StringValueCStr(name));
-  handle_lxw_error(err);
+  LXW_ERR_RESULT_CALL(workbook, validate_sheet_name, StringValueCStr(name));
   return Qtrue;
 }
 
@@ -428,12 +499,17 @@ init_xlsxwriter_workbook() {
   rb_define_method(cWorkbook, "add_format", workbook_add_format_, 2);
   rb_define_method(cWorkbook, "add_vba_project", workbook_add_vba_project_, 1);
   rb_define_method(cWorkbook, "add_worksheet", workbook_add_worksheet_, -1);
+  rb_define_method(cWorkbook, "add_chartsheet", workbook_add_chartsheet_, -1);
   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