xlsxwriter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c37e7b981c1632bac997c8d660435d17a8240863fbb0878b682b5ebd2a6f1b
-  data.tar.gz: 1dbfe32328dd2a7a4728982061539fed19b78cd8408ffbeda18e1021cc2b1dbe
+  metadata.gz: c4803495a8461935936f93daa7b11167935d977415e3a64279ace94a15a9ee55
+  data.tar.gz: 7c9b3293a7166a11739bb1ec794a852248914fcac8d5f759058b035c6a0f4e84
 SHA512:
-  metadata.gz: f7931484a9239a3cfea028e212d79fa51f67cadcc377d5c7f06337f408add6446a3b988b5018510d2a92a33062525bf2294b992a385843755d9307581810c89b
-  data.tar.gz: 3ff9f83786a755d0ce8c5a02418da3931f0f7a9d8fe808594b7ee2bba42eedbe77d09ca691f20f0db8f96e5f8d049a1fd0c0041278436aac07c79bbad932caf1
+  metadata.gz: 6dd4d9ab1eb21b5b2eb2f92d8f5b6d7753af94ad85dfeadbff8dad24f0c7c2ca7a3791762bed349560f3165226c47f573020f5318173232a9d16644aa1346a72
+  data.tar.gz: 18730b942a2015143aceb297014755da8465a6db55b51033e97a73f2d57f335efd2c4fafceb3b665ea0797b1df6bdcf11eb373ef6e330025943e7414281bfb19

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter.h

@@ -18,6 +18,6 @@
 #include "xlsxwriter/format.h"
 #include "xlsxwriter/utility.h"
 
-#define LXW_VERSION "0.8.5"
+#define LXW_VERSION "0.8.6"
 
 #endif /* __LXW_XLSXWRITER_H__ */

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/packager.h

@@ -55,9 +55,6 @@ typedef struct lxw_packager {
     char *buffer;
     char *tmpdir;
 
-    uint16_t chart_count;
-    uint16_t drawing_count;
-
 } lxw_packager;
 
 

data/ext/xlsxwriter/libxlsxwriter/src/format.c

@@ -454,7 +454,7 @@ format_set_rotation(lxw_format *self, int16_t angle)
     if (angle == 270) {
         self->rotation = 255;
     }
-    else if (angle >= -90 || angle <= 90) {
+    else if (angle >= -90 && angle <= 90) {
         if (angle < 0)
             angle = -angle + 90;
 

data/ext/xlsxwriter/libxlsxwriter/src/packager.c

@@ -319,14 +319,29 @@ _write_chart_files(lxw_packager *self)
         err = _add_file_to_zip(self, chart->file, sheetname);
         RETURN_ON_ERROR(err);
 
-        self->chart_count++;
-
         fclose(chart->file);
     }
 
     return LXW_NO_ERROR;
 }
 
+/*
+ * Count the chart files.
+ */
+uint16_t
+_get_chart_count(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+    lxw_chart *chart;
+    uint16_t chart_count = 0;
+
+    STAILQ_FOREACH(chart, workbook->ordered_charts, ordered_list_pointers) {
+        chart_count++;
+    }
+
+    return chart_count;
+}
+
 /*
  * Write the drawing files.
  */
@@ -362,14 +377,39 @@ _write_drawing_files(lxw_packager *self)
             RETURN_ON_ERROR(err);
 
             fclose(drawing->file);
-
-            self->drawing_count++;
         }
     }
 
     return LXW_NO_ERROR;
 }
 
+/*
+ * Count  the drawing files.
+ */
+uint16_t
+_get_drawing_count(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
+    lxw_worksheet *worksheet;
+    lxw_drawing *drawing;
+    uint16_t drawing_count = 0;
+
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            worksheet = sheet->u.chartsheet->worksheet;
+        else
+            worksheet = sheet->u.worksheet;
+
+        drawing = worksheet->drawing;
+
+        if (drawing)
+            drawing_count++;
+    }
+
+    return drawing_count;
+}
+
 /*
  * Write the sharedStrings.xml file.
  */
@@ -657,6 +697,8 @@ _write_content_types_file(lxw_packager *self)
     uint16_t index = 1;
     uint16_t worksheet_index = 1;
     uint16_t chartsheet_index = 1;
+    uint16_t drawing_count = _get_drawing_count(self);
+    uint16_t chart_count = _get_chart_count(self);
     lxw_error err = LXW_NO_ERROR;
 
     if (!content_types) {
@@ -692,13 +734,13 @@ _write_content_types_file(lxw_packager *self)
         }
     }
 
-    for (index = 1; index <= self->chart_count; index++) {
+    for (index = 1; index <= chart_count; index++) {
         lxw_snprintf(filename, LXW_FILENAME_LENGTH, "/xl/charts/chart%d.xml",
                      index);
         lxw_ct_add_chart_name(content_types, filename);
     }
 
-    for (index = 1; index <= self->drawing_count; index++) {
+    for (index = 1; index <= drawing_count; index++) {
         lxw_snprintf(filename, LXW_FILENAME_LENGTH,
                      "/xl/drawings/drawing%d.xml", index);
         lxw_ct_add_drawing_name(content_types, filename);
@@ -1056,16 +1098,11 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
         size_read = fread(self->buffer, 1, self->buffer_size, file);
     }
 
-    if (error < 0) {
+    error = zipCloseFileInZip(self->zipfile);
+    if (error != ZIP_OK) {
+        LXW_ERROR("Error in closing member in the zipfile");
         RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
     }
-    else {
-        error = zipCloseFileInZip(self->zipfile);
-        if (error != ZIP_OK) {
-            LXW_ERROR("Error in closing member in the zipfile");
-            RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
-        }
-    }
 
     return LXW_NO_ERROR;
 }
@@ -1097,16 +1134,11 @@ _add_buffer_to_zip(lxw_packager *self, unsigned char *buffer,
         RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
     }
 
-    if (error < 0) {
+    error = zipCloseFileInZip(self->zipfile);
+    if (error != ZIP_OK) {
+        LXW_ERROR("Error in closing member in the zipfile");
         RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
     }
-    else {
-        error = zipCloseFileInZip(self->zipfile);
-        if (error != ZIP_OK) {
-            LXW_ERROR("Error in closing member in the zipfile");
-            RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
-        }
-    }
 
     return LXW_NO_ERROR;
 }
@@ -1120,6 +1152,15 @@ lxw_create_package(lxw_packager *self)
     lxw_error error;
     int8_t zip_error;
 
+    error = _write_content_types_file(self);
+    RETURN_ON_ERROR(error);
+
+    error = _write_root_rels_file(self);
+    RETURN_ON_ERROR(error);
+
+    error = _write_workbook_rels_file(self);
+    RETURN_ON_ERROR(error);
+
     error = _write_worksheet_files(self);
     RETURN_ON_ERROR(error);
 
@@ -1138,12 +1179,6 @@ lxw_create_package(lxw_packager *self)
     error = _write_shared_strings_file(self);
     RETURN_ON_ERROR(error);
 
-    error = _write_app_file(self);
-    RETURN_ON_ERROR(error);
-
-    error = _write_core_file(self);
-    RETURN_ON_ERROR(error);
-
     error = _write_custom_file(self);
     RETURN_ON_ERROR(error);
 
@@ -1153,12 +1188,6 @@ lxw_create_package(lxw_packager *self)
     error = _write_styles_file(self);
     RETURN_ON_ERROR(error);
 
-    error = _write_content_types_file(self);
-    RETURN_ON_ERROR(error);
-
-    error = _write_workbook_rels_file(self);
-    RETURN_ON_ERROR(error);
-
     error = _write_worksheet_rels_file(self);
     RETURN_ON_ERROR(error);
 
@@ -1171,7 +1200,10 @@ lxw_create_package(lxw_packager *self)
     error = _write_image_files(self);
     RETURN_ON_ERROR(error);
 
-    error = _write_root_rels_file(self);
+    error = _write_core_file(self);
+    RETURN_ON_ERROR(error);
+
+    error = _write_app_file(self);
     RETURN_ON_ERROR(error);
 
     zip_error = zipClose(self->zipfile, NULL);

data/ext/xlsxwriter/libxlsxwriter/src/worksheet.c

@@ -1740,6 +1740,9 @@ _worksheet_size_col(lxw_worksheet *self, lxw_col_t col_num)
     }
 
     if (col_opt) {
+        if (col_opt->hidden)
+            return 0;
+
         width = col_opt->width;
 
         /* Convert to pixels. */
@@ -1775,6 +1778,9 @@ _worksheet_size_row(lxw_worksheet *self, lxw_row_t row_num)
     row = lxw_worksheet_find_row(self, row_num);
 
     if (row) {
+        if (row->hidden)
+            return 0;
+
         height = row->height;
 
         if (height == 0)
@@ -1901,23 +1907,30 @@ _worksheet_position_object_pixels(lxw_worksheet *self,
     y_abs += y1;
 
     /* Adjust start col for offsets that are greater than the col width. */
-    while (x1 >= _worksheet_size_col(self, col_start)) {
-        x1 -= _worksheet_size_col(self, col_start);
-        col_start++;
+    if (_worksheet_size_col(self, col_start) > 0) {
+        while (x1 >= _worksheet_size_col(self, col_start)) {
+            x1 -= _worksheet_size_col(self, col_start);
+            col_start++;
+        }
     }
 
     /* Adjust start row for offsets that are greater than the row height. */
-    while (y1 >= _worksheet_size_row(self, row_start)) {
-        y1 -= _worksheet_size_row(self, row_start);
-        row_start++;
+    if (_worksheet_size_row(self, row_start) > 0) {
+        while (y1 >= _worksheet_size_row(self, row_start)) {
+            y1 -= _worksheet_size_row(self, row_start);
+            row_start++;
+        }
     }
 
     /* Initialize end cell to the same as the start cell. */
     col_end = col_start;
     row_end = row_start;
 
-    width = width + x1;
-    height = height + y1;
+    /* Only offset the image in the cell if the row/col isn't hidden. */
+    if (_worksheet_size_col(self, col_start) > 0)
+        width = width + x1;
+    if (_worksheet_size_row(self, row_start) > 0)
+        height = height + y1;
 
     /* Subtract the underlying cell widths to find the end cell. */
     while (width >= _worksheet_size_col(self, col_end)) {

data/lib/xlsxwriter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby interface to libxlsxwriter