fast_excel 0.2.6 → 0.3.0

data/libxlsxwriter/src/xmlwriter.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -140,6 +140,15 @@ lxw_xml_data_element(FILE * xmlfile,
     fprintf(xmlfile, "</%s>", tag);
 }
 
+/*
+ * Write an XML <si> element for rich strings, without encoding.
+ */
+void
+lxw_xml_rich_si_element(FILE * xmlfile, const char *string)
+{
+    fprintf(xmlfile, "<si>%s</si>", string);
+}
+
 /*
  * Escape XML characters in attributes.
  */
@@ -153,19 +162,19 @@ _escape_attributes(struct xml_attribute *attribute)
     while (*p_attr) {
         switch (*p_attr) {
             case '&':
-                strncat(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
+                memcpy(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
                 p_encoded += sizeof(LXW_AMP) - 1;
                 break;
             case '<':
-                strncat(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
+                memcpy(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
                 p_encoded += sizeof(LXW_LT) - 1;
                 break;
             case '>':
-                strncat(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
+                memcpy(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
                 p_encoded += sizeof(LXW_GT) - 1;
                 break;
             case '"':
-                strncat(p_encoded, LXW_QUOT, sizeof(LXW_QUOT) - 1);
+                memcpy(p_encoded, LXW_QUOT, sizeof(LXW_QUOT) - 1);
                 p_encoded += sizeof(LXW_QUOT) - 1;
                 break;
             default:
@@ -195,15 +204,15 @@ lxw_escape_data(const char *data)
     while (*data) {
         switch (*data) {
             case '&':
-                strncat(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
+                memcpy(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
                 p_encoded += sizeof(LXW_AMP) - 1;
                 break;
             case '<':
-                strncat(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
+                memcpy(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
                 p_encoded += sizeof(LXW_LT) - 1;
                 break;
             case '>':
-                strncat(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
+                memcpy(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
                 p_encoded += sizeof(LXW_GT) - 1;
                 break;
             default:

data/libxlsxwriter/third_party/minizip/ioapi.c

@@ -96,6 +96,7 @@ static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, in
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void) opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -114,6 +115,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void) opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -132,6 +134,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
 {
     uLong ret;
+    (void) opaque;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
@@ -139,6 +142,7 @@ static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf,
 static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
 {
     uLong ret;
+    (void) opaque;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
@@ -146,6 +150,7 @@ static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const voi
 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
     long ret;
+    (void) opaque;
     ret = ftell((FILE *)stream);
     return ret;
 }
@@ -154,6 +159,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
 {
     ZPOS64_T ret;
+    (void) opaque;
     ret = FTELLO_FUNC((FILE *)stream);
     return ret;
 }
@@ -162,6 +168,7 @@ static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offs
 {
     int fseek_origin=0;
     long ret;
+    (void) opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -185,6 +192,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
 {
     int fseek_origin=0;
     long ret;
+    (void) opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -210,6 +218,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
+    (void) opaque;
     ret = fclose((FILE *)stream);
     return ret;
 }
@@ -217,6 +226,7 @@ static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
+    (void) opaque;
     ret = ferror((FILE *)stream);
     return ret;
 }

data/libxlsxwriter/third_party/minizip/zip.c

@@ -519,12 +519,14 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
       break;
 
     for (i=(int)uReadSize-3; (i--)>0;)
+    {
       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
         ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
       {
         uPosFound = uReadPos+i;
         break;
       }
+    }
 
       if (uPosFound!=0)
         break;

data/libxlsxwriter/third_party/tmpfileplus/tmpfileplus.c

@@ -169,7 +169,7 @@ static char *getenv_save(const char *varname, char *buf, size_t bufsize)
 	buf[0] = '\0';
 	if (ptr)
 	{
-		strncpy(buf, ptr, bufsize);
+		strncpy(buf, ptr, bufsize-1);
 		buf[bufsize-1] = '\0';
 		return buf;
 	}
@@ -189,7 +189,7 @@ static FILE *mktempfile_internal(const char *tmpdir, const char *pfx, char **tmp
  */
 {
 	FILE *fp;
-	int fd;
+	int fd = 0;
 	char randpart[] = "1234567890";
 	size_t lentempname;
 	int i;

data/libxlsxwriter/version.txt

@@ -1 +1 @@
-2018-06-22 01:06:44 +0800 54dc4d0
+2019-06-17 01:19:43 +0800 56b73bb

data/test/tmpfile_test.rb

@@ -17,6 +17,7 @@ describe "FastExcel" do
     workbook.read_string
 
     refute(File.exist?(workbook.filename))
+    refute(File.exist?(File.dirname(workbook.filename)))
     refute(workbook.is_open)
   end
 

data/test/validations_test.rb

@@ -14,14 +14,34 @@ describe "FastExcel validations" do
     assert_equal("Worksheet name 'Payments Report' is already in use", error.message)
   end
 
-  it "should not raise error when worksheet name is empty string" do
+  it "should not raise error when worksheet name is null" do
     workbook = FastExcel.open(constant_memory: true)
 
-    ws1 = workbook.add_worksheet("")
-    ws2 = workbook.add_worksheet("")
+    ws1 = workbook.add_worksheet()
+    ws2 = workbook.add_worksheet()
     ws2.write_value(0, 2, "aaa")
 
-    assert_equal("", ws1[:name])
-    assert_equal("", ws2[:name])
+    assert_equal("Sheet1", ws1[:name])
+    assert_equal("Sheet2", ws2[:name])
   end
-end
+
+  it "should raise error when the sheet name exceeds maximum length" do
+    workbook = FastExcel.open(constant_memory: true)
+
+    error = assert_raises do
+      workbook.add_worksheet("ABCDEFGHIJKLMNOPQRSTUVWXYZ012345")
+    end
+
+    assert_equal(ArgumentError, error.class)
+    assert_equal("Worksheet name 'ABCDEFGHIJKLMNOPQRSTUVWXYZ012345' exceeds Excel's limit of 31 characters", error.message)
+  end
+
+  it "should not raise error when the sheet name is at maximum length" do
+    workbook = FastExcel.open(constant_memory: true)
+
+    worksheet = workbook.add_worksheet("ABCDEFGHIJKLMNOPQRSTUVWXYZ01234")
+    worksheet.append_row(["aaa", "bbb", "ccc"])
+
+    assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZ01234", worksheet[:name])
+  end
+end

data/test/worksheet_test.rb

@@ -83,4 +83,47 @@ describe "FastExcel::WorksheetExt append_row" do
 
     assert_equal([[0.1234]], get_arrays(@workbook))
   end
+
+  it "should set name correctly" do
+    workbook = FastExcel.open(constant_memory: true)
+    ws1 = workbook.add_worksheet("foo")
+    ws2 = workbook.add_worksheet("")
+
+    assert_equal("foo", ws1[:name])
+    assert_equal("", ws2[:name])
+  end
+
+  it "should map fields correctly" do
+    workbook = FastExcel.open(constant_memory: true)
+
+    ws = workbook.add_worksheet
+    ws.set_right_to_left
+    assert_equal(ws[:right_to_left], 1)
+
+    ws = workbook.add_worksheet
+    ws.center_vertically
+    assert_equal(ws[:print_options_changed], 1)
+    assert_equal(ws[:vcenter], 1)
+
+    ws = workbook.add_worksheet
+    ws.print_row_col_headers
+    assert_equal(ws[:print_headers], 1)
+    assert_equal(ws[:print_options_changed], 1)
+
+    ws = workbook.add_worksheet
+    ws.set_margins(1.5, 2.5, 3.5, 4.5)
+    assert_equal(ws[:margin_left], 1.5)
+    assert_equal(ws[:margin_right], 2.5)
+    assert_equal(ws[:margin_top], 3.5)
+    assert_equal(ws[:margin_bottom], 4.5)
+
+
+    breaks = [20, 40, 60, 20, 0]
+    FFI::MemoryPointer.new(:uint16, breaks.size) do |buffer|
+      buffer.write_array_of_uint16(breaks)
+      ws.set_v_pagebreaks(buffer)
+    end
+
+    assert_equal(ws[:vbreaks_count], 4)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_excel
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,9 +38,11 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile.test
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -60,7 +62,9 @@ files:
 - examples/example_auto_width.rb
 - examples/example_chart.rb
 - examples/example_colors.rb
+- examples/example_filters.rb
 - examples/example_formula.rb
+- examples/example_hyperlink.rb
 - examples/example_image.rb
 - examples/example_styles.rb
 - examples/logo.png
@@ -75,7 +79,6 @@ files:
 - lib/fast_excel/binding/format.rb
 - lib/fast_excel/binding/workbook.rb
 - lib/fast_excel/binding/worksheet.rb
-- libxlsxwriter/.drone.yml
 - libxlsxwriter/.gitignore
 - libxlsxwriter/.indent.pro
 - libxlsxwriter/.travis.yml
@@ -85,16 +88,15 @@ files:
 - libxlsxwriter/LICENSE.txt
 - libxlsxwriter/Makefile
 - libxlsxwriter/Readme.md
-- libxlsxwriter/appveyor.yml
 - libxlsxwriter/cmake/FindMINIZIP.cmake
 - libxlsxwriter/cmake/FindPackage.cmake
-- libxlsxwriter/cmake/FindZLIB.cmake
 - libxlsxwriter/cmake/i686-toolchain.cmake
 - libxlsxwriter/cocoapods/libxlsxwriter-umbrella.h
 - libxlsxwriter/cocoapods/libxlsxwriter.modulemap
 - libxlsxwriter/include/xlsxwriter.h
 - libxlsxwriter/include/xlsxwriter/app.h
 - libxlsxwriter/include/xlsxwriter/chart.h
+- libxlsxwriter/include/xlsxwriter/chartsheet.h
 - libxlsxwriter/include/xlsxwriter/common.h
 - libxlsxwriter/include/xlsxwriter/content_types.h
 - libxlsxwriter/include/xlsxwriter/core.h
@@ -121,6 +123,7 @@ files:
 - libxlsxwriter/src/Makefile
 - libxlsxwriter/src/app.c
 - libxlsxwriter/src/chart.c
+- libxlsxwriter/src/chartsheet.c
 - libxlsxwriter/src/content_types.c
 - libxlsxwriter/src/core.c
 - libxlsxwriter/src/custom.c
@@ -193,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ultra Fast Excel Writer

data/libxlsxwriter/.drone.yml

@@ -1,27 +0,0 @@
-build:
-  image: teaci/msys$$arch
-  pull: true
-  shell: msys$$arch
-  commands:
-    - if [ $$arch = 32 ]; then target=i686; fi
-    - if [ $$arch = 64 ]; then target=x86_64; fi
-    - pacman -S --needed --noconfirm --noprogressbar mingw-w64-${target}-pkg-config cmake zlib-devel
-    - git submodule update --init --recursive
-    - cmake -DBUILD_STATIC=$STATIC -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTS=ON -DIOAPI_NO_64=ON .
-    - make -j 8
-    - make install
-    - ctest -C $BUILD_TYPE -V
-
-matrix:
-  arch:
-# Bug with 64-bit MSYS2 on WINE currently, disable temporarily.
-#    - 64
-    - 32
-
-  STATIC:
-    - OFF
-    - ON
-
-  BUILD_TYPE:
-    - Debug
-    - Release

data/libxlsxwriter/appveyor.yml

@@ -1,65 +0,0 @@
-version: '{build}'
-
-clone_depth: 1
-
-platform:
-  - x64
-  - x86
-
-os:
-  - Visual Studio 2015
-  - Visual Studio 2017
-
-environment:
-  matrix:
-    - additional_flags: ""
-      STATIC: ON
-      ZLIB_LIB: zlibstatic
-
-    - additional_flags: "/std:c++latest"
-      STATIC: ON
-      ZLIB_LIB: zlibstatic
-
-    - additional_flags: ""
-      STATIC: OFF
-      ZLIB_LIB: zlib
-
-    - additional_flags: "/std:c++latest"
-      STATIC: OFF
-      ZLIB_LIB: zlib
-
-matrix:
-  fast_finish: true
-  exclude:
-    - additional_flags: "/std:c++latest"
-      os: Visual Studio 2015
-
-configuration:
-  #- Debug
-  - Release
-
-init: []
-
-install: []
-
-build_script:
-  # Set the correct generator
-  - IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( SET GEN="Visual Studio 14 2015") ELSE (SET GEN="Visual Studio 15 2017")
-  # ZLIB isn't included on Windows, and no package manager has a static,
-  # /MT-linked build, so we can download it and build it ourselves
-  - appveyor DownloadFile http://zlib.net/zlib-1.2.11.tar.gz -FileName zlib-1.2.11.tar.gz
-  - 7z x zlib-1.2.11.tar.gz > NUL
-  - 7z x zlib-1.2.11.tar > NUL
-  - cd zlib-1.2.11
-  - cmake -G %GEN% -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_C_FLAGS_RELEASE="/MT"
-  - cmake --build . --config %configuration%
-  # Configure libxlsxwriter to use the static ZLIB
-  - cd ..
-  - cmake . -G%GEN% -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_C_FLAGS_RELEASE="/MT" -DBUILD_STATIC=%STATIC% -DBUILD_TESTS=ON -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\Release\%ZLIB_LIB%.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11
-  - cmake --build . --config %configuration% --target install
-
-test_script:
-  # Currently disable tests for MSVC: There's an issue with the test runner, not the library.
-  # All the examples work properly.
-#  - IF "%STATIC%" == OFF ( copy %APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\Release\%ZLIB_LIB%.dll %APPVEYOR_BUILD_FOLDER%\%configuration%\%ZLIB_LIB%.dll )
-  - IF %STATIC% == ON ( ctest -C %configuration% -V )