fast_excel 0.2.2 → 0.4.0

data/libxlsxwriter/src/xmlwriter.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, 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:
@@ -349,7 +358,7 @@ lxw_new_attribute_dbl(const char *key, double value)
     struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
 
     LXW_ATTRIBUTE_COPY(attribute->key, key);
-    lxw_snprintf(attribute->value, LXW_MAX_ATTRIBUTE_LENGTH, "%.16g", value);
+    lxw_sprintf_dbl(attribute->value, value);
 
     return attribute;
 }

data/libxlsxwriter/third_party/minizip/Makefile

@@ -9,7 +9,7 @@ ifdef V
 Q=
 endif
 
-UNAME := $(shell uname)
+UNAME := $(shell uname -sr)
 
 # Check for MinGW/MinGW64/Cygwin environments.
 ifneq (,$(findstring MINGW, $(UNAME)))
@@ -32,6 +32,11 @@ CC = gcc
 CFLAGS += -DUSE_FILE32API
 endif
 
+# Fix for modified zconf.h on Gentoo.
+ifneq (,$(findstring gentoo, $(UNAME)))
+CFLAGS += -DOF=_Z_OF
+endif
+
 all: ioapi.o zip.o  ioapi.so zip.so
 
 %.o  : %.c

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 @@
-2017-02-28 20:35:27 +0800 c8064ee
+2019-06-17 01:19:43 +0800 56b73bb

data/test/auto_width_test.rb

@@ -0,0 +1,19 @@
+require_relative 'test_helper'
+
+describe "FastExcel text_width" do
+
+  it "should calculate text width" do
+    workbook = FastExcel.open(constant_memory: false)
+    sheet = workbook.add_worksheet
+    sheet.auto_width = true
+
+    sheet.append_row([
+      "tini",
+      "Longer",
+      "Some longer text!",
+      "This gem is FFI binding for libxlsxwriter C library"
+    ])
+
+    assert_equal(sheet.calculated_column_widths, {0 => 3.52, 1 => 5.28, 2 => 14.96, 3 => 44.88})
+  end
+end

data/test/date_test.rb

@@ -20,3 +20,37 @@ describe "FastExcel.date_num" do
   end
 
 end
+
+describe "FastExcel.write_value" do
+
+  it "should save correct datetime" do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet
+
+    format = workbook.number_format("yyyy-mm-dd hh:mm:ss")
+    value = DateTime.parse('2017-03-01 15:15:15 +0000')
+
+    worksheet.write_value(0, 0, value, format)
+    workbook.close
+
+    data = parse_xlsx_as_matrix(workbook.filename)
+
+    assert_equal(data[0][0], value)
+  end
+
+  it "should save correct date" do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet
+
+    format = workbook.number_format("yyyy-mm-dd")
+    value = Date.parse('2017-03-01')
+
+    worksheet.write_value(0, 0, value, format)
+    workbook.close
+
+    data = parse_xlsx_as_matrix(workbook.filename)
+
+    assert_equal(data[0][0], value)
+  end
+
+end

data/test/format_test.rb

@@ -168,4 +168,12 @@ describe "FastExcel::FormatExt border" do
     assert_equal(:border_thin, @format.border_bottom)
   end
 
+  it "should define aliases" do
+    @format.font_size = 20
+    assert_equal(@format.font_size, 20)
+
+    @format.font_name = "XXX"
+    assert_equal(@format.font_name, "XXX")
+  end
+
 end

data/test/reopen_test.rb

@@ -0,0 +1,22 @@
+require_relative 'test_helper'
+
+describe "FastExcel::Worksheet" do
+
+  it "should get_worksheet_by_name" do
+    workbook = FastExcel.open(constant_memory: false)
+    workbook.add_worksheet("Page1")
+
+    ws = workbook.get_worksheet_by_name("Page1")
+    ws.write_row(0, ['1'])
+
+    workbook.close
+
+    error = assert_raises do
+      FastExcel.open(workbook.filename, constant_memory: false)
+    end
+
+    assert_equal(error.class, ArgumentError)
+    assert_equal(error.message, "File '#{workbook.filename}' already exists. FastExcel can not open existing files, only create new files")
+  end
+
+end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 require 'minitest/autorun'
 require "minitest/reporters"
+require 'pp'
 
 ##Encoding.default_external = Encoding::UTF_8
 ##Encoding.default_internal = Encoding::UTF_8
@@ -40,12 +41,14 @@ def parse_xlsx_as_matrix(file_path)
   sheet = excel.sheet(0)
 
   rows = []
-  1.upto(sheet.last_row) do |row_number|
-    row = 1.upto(sheet.last_column).map do |col|
-      sheet.cell(row_number, col)
-    end
+  if sheet.last_row
+    1.upto(sheet.last_row) do |row_number|
+      row = 1.upto(sheet.last_column).map do |col|
+        sheet.cell(row_number, col)
+      end
 
-    rows << row
+      rows << row
+    end
   end
 
   return rows

data/test/text_width_test.rb

@@ -0,0 +1,80 @@
+require_relative 'test_helper'
+
+
+describe "FastExcel Arial text_width" do
+
+  before do
+    skip "Use basic width calc for now"
+  end
+
+  it "should calculate width for character" do
+    assert_in_delta(FastExcel.arial_text_width('a'), 55.61, 0.1)
+  end
+
+  it "should calculate width with kerning" do
+    assert_in_delta(FastExcel.arial_text_width('A'), 66.69, 0.1)
+    assert_in_delta(FastExcel.arial_text_width('V'), 66.69, 0.1)
+
+    assert_in_delta(FastExcel.arial_text_width('AV'), 125.97, 0.1)
+
+    assert_in_delta(FastExcel.arial_text_width('11'), 103.80, 0.1)
+  end
+
+  it "should skip system characters" do
+    assert_in_delta(FastExcel.arial_text_width(10.chr), 0.0)
+  end
+
+  it "should handle multiline text" do
+    assert_in_delta(FastExcel.arial_text_width("More\nThen\nOne Line"), 405.85, 0.1)
+  end
+end
+
+describe "FastExcel Calibri text_width" do
+
+  before do
+    skip "Use basic width calc for now"
+  end
+
+  it "should calculate width for character" do
+    assert_in_delta(FastExcel.calibri_text_width('a'), 47.90, 0.1)
+  end
+
+  it "should calculate width with kerning" do
+    assert_in_delta(FastExcel.calibri_text_width('A'), 57.86, 0.1)
+    assert_in_delta(FastExcel.calibri_text_width('V'), 56.73, 0.1)
+
+    assert_in_delta(FastExcel.calibri_text_width('AV'), 110.25, 0.1)
+
+    assert_in_delta(FastExcel.calibri_text_width('11'), 101.36, 0.1)
+  end
+
+  it "should skip system characters" do
+    assert_in_delta(FastExcel.calibri_text_width(10.chr), 0.0)
+  end
+
+end
+
+describe "FastExcel Times New Roman text_width" do
+
+  before do
+    skip "Use basic width calc for now"
+  end
+
+  it "should calculate width for character" do
+    assert_in_delta(FastExcel.times_new_roman_text_width('a'), 44.38, 0.1)
+  end
+
+  it "should calculate width with kerning" do
+    assert_in_delta(FastExcel.times_new_roman_text_width('A'), 72.21, 0.1)
+    assert_in_delta(FastExcel.times_new_roman_text_width('V'), 72.21, 0.1)
+
+    assert_in_delta(FastExcel.times_new_roman_text_width('AV'), 131.54, 0.1)
+
+    assert_in_delta(FastExcel.times_new_roman_text_width('11'), 96.28, 0.1)
+  end
+
+  it "should skip system characters" do
+    assert_in_delta(FastExcel.times_new_roman_text_width(10.chr), 0.0)
+  end
+
+end

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

@@ -0,0 +1,47 @@
+require_relative 'test_helper'
+
+describe "FastExcel validations" do
+
+  it "should raise error when duplicate sheet name" do
+    workbook = FastExcel.open(constant_memory: true)
+
+    workbook.add_worksheet("Payments Report")
+    error = assert_raises do
+      workbook.add_worksheet("Payments Report")
+    end
+
+    assert_equal(ArgumentError, error.class)
+    assert_equal("Worksheet name 'Payments Report' is already in use", error.message)
+  end
+
+  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()
+    ws2.write_value(0, 2, "aaa")
+
+    assert_equal("Sheet1", ws1[:name])
+    assert_equal("Sheet2", ws2[:name])
+  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