xlsxwriter 0.2.1.pre.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785d6f62717613d9737bd4879dedc8077ac690de96bf3f4fafd7b2c7917956c9
-  data.tar.gz: 73d5337504d25eb891c34eeaa37fcebfa5961dd9e5d49276d27243198287af8a
+  metadata.gz: 8f03eb87d448a902c6067b95d4a3d7598cecd3456a3f8097e40da1bd0351c8d4
+  data.tar.gz: 2af72c3d678d22a1990f960ee0b7f2315e39d37a780b5e589ebce7794b1b23f6
 SHA512:
-  metadata.gz: c0b99c9b0b3bf2ce4499f33acceda7596910beede83721018a38c04ae4b754b56b793b861bb5af59dc0bcdbeb55f473eaa7b9b16c34cef021575c14ec001c382
-  data.tar.gz: 00e8d80d92f11aec6366f3ead33d64251787d54cffb77bfd0769299079d904595ed22d5eaaa8dcc40d4a098eedfeecdf4d553a0a0a30f1a8710c4be8f33577e0
+  metadata.gz: 2ebcf14300b3cbaf46fc3a784c2ad9b5c114fa2ea3dccca08976ae8af7f50265beb05ed4233da92db1398bed7e17144779ca2c973cab59dad55e95fb3ee926ae
+  data.tar.gz: 0cd298302d3c354ced238ed5fba71b7b05498db56c76df2b307d90603c122308c79780db9af55d1f46c7aece7f30da517a39d30f5d0b56acfd3107f79fbc9fb5

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rake/extensiontask'
 
 task default: :test
@@ -12,9 +13,9 @@ Rake::Task['compile'].prerequisites.unshift :patch_dep
 Gem::PackageTask.new(spec) do |pkg|
 end
 
-DEP_DIR='ext/xlsxwriter/libxlsxwriter'
+DEP_DIR = 'ext/xlsxwriter/libxlsxwriter'
 
-desc "Checkout xlsxwriter C library"
+desc 'Checkout xlsxwriter C library'
 task :patch_dep do
   patches = Dir["#{pwd}/dep_patches/*.patch"]
   chdir(DEP_DIR) do
@@ -30,5 +31,5 @@ end
 
 desc 'Run specs'
 task test: :compile do
-  ruby('test/run-test.rb')
+  ruby 'test/run_test.rb'
 end

data/ext/xlsxwriter/chart.c

@@ -253,6 +253,17 @@ DEF_PROP_SETTER(chart, rotation, NUM2UINT(rb_check_to_int(val)))
  */
 DEF_PROP_SETTER(chart, hole_size, NUM2UINT(rb_check_to_int(val)))
 
+/* Document-method: XlsxWriter::Workbook::Chart#show_blanks_as=
+ *
+ */
+VALUE
+chart_set_show_blank_as_(VALUE self, VALUE val) {
+  struct chart *ptr;
+  Data_Get_Struct(self, struct chart, ptr);
+  ptr->chart->show_blanks_as = NUM2INT(rb_check_to_int(val));
+  return val;
+}
+
 
 /* :nodoc: */
 VALUE
@@ -267,7 +278,7 @@ VALUE
 chart_set_axis_id_1_(VALUE self, VALUE val) {
   struct chart *ptr;
   Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_1 = NUM2UINT(val);
+  ptr->chart->axis_id_1 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -284,7 +295,7 @@ VALUE
 chart_set_axis_id_2_(VALUE self, VALUE val) {
   struct chart *ptr;
   Data_Get_Struct(self, struct chart, ptr);
-  ptr->chart->axis_id_2 = NUM2UINT(val);
+  ptr->chart->axis_id_2 = NUM2UINT(rb_check_to_int(val));
   return val;
 }
 
@@ -611,17 +622,20 @@ void init_xlsxwriter_chart() {
 
 
   rb_define_alloc_func(cChart, chart_alloc);
+  rb_define_attr(cChart, "workbook", 1, 0);
   rb_define_method(cChart, "initialize", chart_init, 2);
   rb_define_method(cChart, "add_series", chart_add_series_, -1);
   rb_define_method(cChart, "x_axis", chart_x_axis_, 0);
   rb_define_method(cChart, "y_axis", chart_y_axis_, 0);
   rb_define_method(cChart, "title=", chart_title_set_name_, 1);
+  rb_define_method(cChart, "set_name_range", chart_title_set_name_range_, -1);
   rb_define_method(cChart, "legend_position=", chart_legend_set_position_, 1);
   rb_define_method(cChart, "legend_set_font", chart_legend_set_font_, 1);
   rb_define_method(cChart, "legend_delete_series", chart_legend_delete_series_, 1);
   rb_define_method(cChart, "style=", chart_set_style_, 1);
   rb_define_method(cChart, "rotation=", chart_set_rotation_, 1);
   rb_define_method(cChart, "hole_size=", chart_set_hole_size_, 1);
+  rb_define_method(cChart, "show_blank_as=", chart_set_show_blank_as_, 1);
 
   rb_define_method(cChart, "axis_id_1",  chart_get_axis_id_1_, 0);
   rb_define_method(cChart, "axis_id_1=", chart_set_axis_id_1_, 1);
@@ -700,6 +714,10 @@ void init_xlsxwriter_chart() {
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_CENTER);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_LEFT);
   MAP_CHART_CONST(AXIS_LABEL_ALIGN_RIGHT);
+
+  MAP_CHART_CONST(BLANKS_AS_GAP);
+  MAP_CHART_CONST(BLANKS_AS_ZERO);
+  MAP_CHART_CONST(BLANKS_AS_CONNECTED);
 #undef MAP_CHART_CONST
 
 #define MAP_CHART_AXIS_CONST(name) rb_define_const(cChartAxis, #name, INT2NUM(LXW_CHART_AXIS_##name))

data/ext/xlsxwriter/extconf.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 require 'mkmf'
+require 'English'
 
-libxlsxwriter_dir = File.expand_path('../libxlsxwriter', __FILE__)
-make_pid = spawn({'CFLAGS' => '-fPIC -O2'}, $make, chdir: libxlsxwriter_dir)
+libxlsxwriter_dir = File.expand_path('libxlsxwriter', __dir__)
+make_pid = spawn({ 'CFLAGS' => '-fPIC -O2' }, $make, chdir: libxlsxwriter_dir)
 Process.wait(make_pid)
-raise 'Make failed for xlsxwriter' unless $? == 0
+raise 'Make failed for xlsxwriter' unless $CHILD_STATUS.success?
 
-# enable_config('static', true)
-# find_library('xlsxwriter', 'workbook_new', File.expand_path('../libxlsxwriter/lib', __FILE__))
-$CFLAGS="-I'#{libxlsxwriter_dir}/include' -g -Wall -O2"
-# $LDFLAGS="-L./libxlsxwriter/lib/ -Wl,-Bstatic -lxlsxwriter -Wl,-Bdynamic"
-$LDFLAGS="-lz #{libxlsxwriter_dir}/lib/libxlsxwriter.a"
+$CFLAGS = "-I'#{libxlsxwriter_dir}/include' -g -Wall -Werror -O2"
+$LDFLAGS = "-lz #{libxlsxwriter_dir}/lib/libxlsxwriter.a"
 
 create_makefile 'xlsxwriter/xlsxwriter'

data/ext/xlsxwriter/libxlsxwriter/License.txt

@@ -4,7 +4,7 @@
 
 Libxlsxwriter is released under a FreeBSD license:
 
-    Copyright 2014-2019, John McNamara <jmcnamara@cpan.org>
+    Copyright 2014-2020, John McNamara <jmcnamara@cpan.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,8 @@ Libxlsxwriter is released under a FreeBSD license:
 
 
 Libxlsxwriter includes `queue.h` and `tree.h` from FreeBSD, the `minizip`
-component of `zlib` and `tmpfileplus` which have the following licenses:
+component of `zlib`, `tmpfileplus` and `md5` which have the following
+licenses:
 
 
 Queue.h from FreeBSD:
@@ -146,5 +147,26 @@ See the [Mozilla Public License, v. 2.0](http://mozilla.org/MPL/2.0/).
 Note, it is possible to compile libxlsxwriter using the standard library
 `tmpfile()` function instead of `tmpfileplus`, see @ref gsg_tmpdir.
 
+[Openwall MD5](https://openwall.info/wiki/people/solar/software/public-domain-source-code/md5)
+has the following licence:
+
+    This software was written by Alexander Peslyak in 2001.  No copyright is
+    claimed, and the software is hereby placed in the public domain.
+    In case this attempt to disclaim copyright and place the software in the
+    public domain is deemed null and void, then the software is
+    Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+    general public under the following terms:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted.
+
+    There's ABSOLUTELY NO WARRANTY, express or implied.
+
+    (This is a heavily cut-down "BSD license".)
+
+Note, the MD5 library is used to avoid including duplicate image files in the
+xlsx file. If this functionality isn't required it is possible to compile
+libxlsxwriter without this library by passing `USE_NO_MD5=1` to make.
+
 Next: @ref changes
 */

data/ext/xlsxwriter/libxlsxwriter/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter library.
 #
-# Copyright 2014-2019, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2020, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.
@@ -11,9 +11,11 @@ ifdef V
 Q=
 endif
 
-INSTALL_DIR ?= /usr/local
+DESTDIR ?=
+PREFIX  ?= /usr/local
 
 PYTEST ?= py.test
+PYTESTFILES ?= test
 
 .PHONY: docs tags examples
 
@@ -24,6 +26,9 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src
 
@@ -41,15 +46,18 @@ clean :
 	$(Q)rm -rf test/functional/__pycache__
 	$(Q)rm -f  test/functional/*.pyc
 	$(Q)rm -f  lib/*
-ifndef USE_STANDARD_TMPFILE
+ifndef USE_SYSTEM_MINIZIP
 	$(Q)$(MAKE) clean -C third_party/minizip
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) clean -C third_party/tmpfileplus
 endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) clean -C third_party/md5
+endif
 
 # Run the unit tests.
-test : all test_functional test_unit
+test : all test_unit test_functional
 
 # Test for C++ const correctness on APIs.
 test_const : all
@@ -60,7 +68,7 @@ test_const : all
 # Run the functional tests.
 test_functional : all
 	$(Q)$(MAKE) -C test/functional/src
-	$(Q)$(PYTEST) test/functional -v
+	$(Q)$(PYTEST) test/functional -v -k $(PYTESTFILES)
 
 # Run all tests.
 test_unit :
@@ -70,10 +78,26 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src test_lib
 	$(Q)$(MAKE) -C test/unit test
 
+# Test Cmake. This test should really be done with Cmake in the cmake dir but
+# this is a workaround for now.
+test_cmake :
+ifneq ($(findstring m32,$(CFLAGS)),m32)
+	$(Q)$(MAKE) -C src clean
+	$(Q)cd cmake; cmake .. -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON; make clean; make; cp libxlsxwriter.a ../src/
+	$(Q)cmake/xlsxwriter_unit
+	$(Q)$(MAKE) -C test/functional/src
+	$(Q)$(PYTEST) test/functional -v -k $(PYTESTFILES)
+else
+	@echo "Skipping Cmake tests on 32 bit target."
+endif
+
 # Test the functional test exes with valgrind (in 64bit mode only).
 test_valgrind : all
 ifndef NO_VALGRIND
@@ -98,17 +122,20 @@ doc: docs
 docs:
 	$(Q)$(MAKE) -C docs
 
+docs_doxygen_only:
+	$(Q)$(MAKE) -C docs docs_doxygen_only
+
 # Simple minded install.
 install: all
-	$(Q)mkdir -p        $(INSTALL_DIR)/include
-	$(Q)cp -R include/* $(INSTALL_DIR)/include
-	$(Q)mkdir -p        $(INSTALL_DIR)/lib
-	$(Q)cp lib/*        $(INSTALL_DIR)/lib
+	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/include
+	$(Q)cp -R include/* $(DESTDIR)$(PREFIX)/include
+	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/lib
+	$(Q)cp lib/*        $(DESTDIR)$(PREFIX)/lib
 
 # Simpler minded uninstall.
 uninstall:
-	$(Q)rm -rf $(INSTALL_DIR)/include/xlsxwriter*
-	$(Q)rm     $(INSTALL_DIR)/lib/libxlsxwriter.*
+	$(Q)rm -rf $(DESTDIR)$(PREFIX)/include/xlsxwriter*
+	$(Q)rm     $(DESTDIR)$(PREFIX)/lib/libxlsxwriter.*
 
 # Strip the lib files.
 strip:
@@ -121,12 +148,15 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
 	$(Q)rm -rf  cov-int
 	$(Q)rm -f libxlsxwriter-coverity.tgz
-	$(Q)../../cov-analysis-linux64-8.7.0/bin/cov-build --dir cov-int make -C src libxlsxwriter.a
+	$(Q)../../cov-analysis-linux64-2019.03/bin/cov-build --dir cov-int make -C src libxlsxwriter.a
 	$(Q)tar -czf libxlsxwriter-coverity.tgz cov-int
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
@@ -138,6 +168,9 @@ ifndef USE_SYSTEM_MINIZIP
 endif
 ifndef USE_STANDARD_TMPFILE
 	$(Q)$(MAKE) -C third_party/tmpfileplus
+endif
+ifndef USE_NO_MD5
+	$(Q)$(MAKE) -C third_party/md5
 endif
 	$(Q)$(MAKE) -C src clean
 	$(Q)rm -f  lib/*
@@ -152,6 +185,7 @@ spellcheck:
 	$(Q)for f in examples/*.c;           do aspell --lang=en_US --check $$f; done
 	$(Q)aspell --lang=en_US --check Changes.txt
 	$(Q)aspell --lang=en_US --check Readme.md
+	$(Q)aspell --lang=en_US --check docs/src/examples.txt
 
 releasecheck:
 	$(Q)dev/release/release_check.sh

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

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * app - A libxlsxwriter library for creating Excel XLSX app files.
  *