xlsxwriter 0.2.0.pre.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 851dae6d52bb43129e9a28421a8f9bdffcce9fffe682106f53d6adbed52d2d81
-  data.tar.gz: a7587dbc467434582ad1a89dcaa31d6070d71703551f1b70f2b0ff94a830c152
+  metadata.gz: 5952e238ec4dc55988d50bacd80e39132daca19f62ad8c6191705b240ad40cf1
+  data.tar.gz: '05824be3c90e0ebbf3a44df01034b3d300191ea8712cb7e4d24643aa68b0beef'
 SHA512:
-  metadata.gz: 6a30288f6cdef1492a37cfdb8e0627b47e9be3bdcece23fb43713e098894979c0549fc05e22f796f5cc3913f9849b82dae1bc64417bfbcefe6936c47bbf3808b
-  data.tar.gz: eb3a75578949b0d1a2f606686886fd1718abf6791ce9853a04e41fb126d1326dc95517d4bfd23667ca09c1f990e23f6fd57ffd69a5f3168c154ea71d9bc41e74
+  metadata.gz: b3733fc664a8e74657d194268b3b653a28bb886078fe92a35cdbcfefc1665d47add6117b35598726db1159caca7b983db0358f6e0c28be27a2a6d503b06fea81
+  data.tar.gz: 630f607d92e91c348b0a126f121242fcafd81bece774f642363b272c721c5d10d4a12ac8213290c7fbef1b8b4519f745c7ee6b5c364cc19a84fe26af256f8411

data/Rakefile

@@ -18,7 +18,7 @@ desc "Checkout xlsxwriter C library"
 task :patch_dep do
   patches = Dir["#{pwd}/dep_patches/*.patch"]
   chdir(DEP_DIR) do
-    if Dir.exist?('.git')
+    if File.exist?('.git')
       sh 'git reset --hard'
 
       patches.each do |patch|

data/ext/xlsxwriter/chart.c

@@ -221,7 +221,8 @@ chart_legend_delete_series_(VALUE self, VALUE series) {
   series = rb_check_array_type(series);
   const size_t len = RARRAY_LEN(series);
   int16_t series_arr[len+1];
-  for (size_t i = 0; i < len; ++i) {
+  size_t i;
+  for (i = 0; i < len; ++i) {
     series_arr[i] = NUM2INT(rb_check_to_int(rb_ary_entry(series, i)));
   }
   series_arr[len] = -1;

data/ext/xlsxwriter/extconf.rb

@@ -7,7 +7,7 @@ raise 'Make failed for xlsxwriter' unless $? == 0
 
 # enable_config('static', true)
 # find_library('xlsxwriter', 'workbook_new', File.expand_path('../libxlsxwriter/lib', __FILE__))
-$CFLAGS="-I'#{libxlsxwriter_dir}/include' -g -Wall -std=c99 -O2"
+$CFLAGS="-I'#{libxlsxwriter_dir}/include' -g -Wall -O2"
 # $LDFLAGS="-L./libxlsxwriter/lib/ -Wl,-Bstatic -lxlsxwriter -Wl,-Bdynamic"
 $LDFLAGS="-lz #{libxlsxwriter_dir}/lib/libxlsxwriter.a"
 

data/ext/xlsxwriter/rich_string.c

@@ -59,7 +59,8 @@ serialize_rich_string(VALUE rs) {
   lxw_rich_string_tuple **res = *(lxw_rich_string_tuple ***)ptr;
 
   lxw_rich_string_tuple *base_ptr = ((void *)*ptr + sizeof(lxw_rich_string_tuple *) * (len + 1));
-  for (int i = 0; i < len; ++i) {
+  int i;
+  for (i = 0; i < len; ++i) {
     VALUE part = rb_ary_entry(arr, i);
     VALUE text = rb_ary_entry(part, 0);
     VALUE format = rb_ary_entry(part, 1);

data/ext/xlsxwriter/workbook.c

@@ -7,6 +7,7 @@
 #include "workbook.h"
 #include "workbook_properties.h"
 #include "worksheet.h"
+#include "xlsxwriter_ext.h"
 
 VALUE cWorkbook;
 

data/ext/xlsxwriter/worksheet.c

@@ -983,7 +983,8 @@ VALUE
 worksheet_set_h_pagebreaks_(VALUE self, VALUE val) {
   const size_t len = RARRAY_LEN(val);
   lxw_row_t rows[len+1];
-  for (size_t i = 0; i<len; ++i) {
+  size_t i;
+  for (i = 0; i<len; ++i) {
     rows[i] = NUM2INT(rb_ary_entry(val, i));
   }
   rows[len] = 0;
@@ -1003,7 +1004,8 @@ VALUE
 worksheet_set_v_pagebreaks_(VALUE self, VALUE val) {
   const size_t len = RARRAY_LEN(val);
   lxw_col_t cols[len+1];
-  for (size_t i = 0; i<len; ++i) {
+  size_t i;
+  for (i = 0; i<len; ++i) {
     cols[i] = value_to_col(rb_ary_entry(val, i));
   }
   cols[len] = 0;
@@ -1422,9 +1424,10 @@ worksheet_data_validation_(int argc, VALUE *argv, VALUE self) {
 #define parse_array_1(prefix)                                           \
     if (TYPE(val) == T_ARRAY) {                                         \
       int len = RARRAY_LEN(val);                                        \
+      int i;                                                            \
       data_validation.prefix##_list = malloc(sizeof(char *) * (len + 1)); \
       data_validation.prefix##_list[len] = NULL;                        \
-      for (int i = 0; i < len; ++i) {                                   \
+      for (i = 0; i < len; ++i) {                                       \
         data_validation.prefix##_list[i] = RSTRING_PTR(rb_ary_entry(val, i)); \
       }                                                                 \
     } else

data/ext/xlsxwriter/xlsxwriter_ext.h

@@ -6,7 +6,7 @@
 extern VALUE mXlsxWriter;
 extern VALUE eXlsxWriterError;
 
-inline void handle_lxw_error(lxw_error err) {
+static inline void handle_lxw_error(lxw_error err) {
   if (err) {
     rb_exc_raise(rb_funcall(eXlsxWriterError, rb_intern("new"), 2, rb_str_new_cstr(lxw_strerror(err)), INT2NUM(err)));
   }

data/lib/xlsxwriter/version.rb

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

data/test/test-chart-legend.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require_relative './xlsx-func-testcase'
+
+class TestChartLegend < XlsxWriterTestCase
+  DATA = [
+    [1,  2,  3],
+    [2,  4,  6],
+    [3,  6,  9],
+    [4,  8, 12],
+    [5, 10, 15]
+  ]
+
+  test 'chart_legend01' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::COLUMN) do |chart|
+        chart.axis_id_1 = 54_461_952
+        chart.axis_id_2 = 54_463_872
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        chart.legend_position = XlsxWriter::Workbook::Chart::LEGEND_NONE
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
+
+  test 'chart_legend03' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::LINE) do |chart|
+        chart.axis_id_1 = 93_548_928
+        chart.axis_id_2 = 93_550_464
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        chart.legend_position = XlsxWriter::Workbook::Chart::LEGEND_TOP_RIGHT
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
+
+  test 'chart_legend04' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::LINE) do |chart|
+        chart.axis_id_1 = 93_548_928
+        chart.axis_id_2 = 93_550_464
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+        chart.legend_position = XlsxWriter::Workbook::Chart::LEGEND_OVERLAY_TOP_RIGHT
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -154,6 +154,7 @@ files:
 - test/test-chart-bar.rb
 - test/test-chart-column.rb
 - test/test-chart-doughnut.rb
+- test/test-chart-legend.rb
 - test/test-chart-pie.rb
 - test/test-chart-scatter.rb
 - test/test-chart-size.rb
@@ -205,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -220,6 +221,7 @@ test_files:
 - test/test-page-breaks.rb
 - test/test-protect.rb
 - test/test-ruby-worksheet.rb
+- test/test-chart-legend.rb
 - test/test-chart-axis.rb
 - test/test-print-area.rb
 - test/test-default-row.rb