Small fixes and memory optimizations

Author: Paxa

benchmarks/auto_width.rb

@@ -0,0 +1,37 @@
+require_relative 'init'
+
+HEADERS = ["id", "name", "age", "date"]
+
+DATA = []
+1000.times do |n|
+  DATA << [n, "String string #{n}", (n * rand * 10).round, Time.at(n * 1000 + 1492922688)]
+end
+
+Benchmark.ips do |x|
+  x.config(time: 10, warmup: 2)
+
+  x.report("Normal") do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet("benchmark")
+
+    worksheet.write_row(0, HEADERS)
+    DATA.each_with_index do |row, i|
+      worksheet.write_row(i + 1, row)
+    end
+    workbook.read_string
+  end
+
+  x.report("With auto_width") do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet("benchmark")
+    worksheet.auto_width = true
+
+    worksheet.write_row(0, HEADERS)
+    DATA.each_with_index do |row, i|
+      worksheet.write_row(i + 1, row)
+    end
+    workbook.read_string
+  end
+
+  x.compare!
+end

benchmarks/init.rb

@@ -10,8 +10,6 @@
 require 'write_xlsx'
 require 'process_memory'
 
-require_relative 'init'
-
 def write_fast_excel_20k
   workbook = FastExcel.open(constant_memory: true)
   worksheet = workbook.add_worksheet("benchmark")

benchmarks/profiler.rb

@@ -0,0 +1,27 @@
+require_relative '../lib/fast_excel'
+require 'ruby-prof'
+
+DATA = []
+1000.times do |n|
+  DATA << [n, "String string #{n}", (n * rand * 10).round, Time.at(n * 1000 + 1492922688)]
+end
+
+RubyProf.start
+
+100.times do
+  workbook = FastExcel.open(constant_memory: true)
+  worksheet = workbook.add_worksheet("benchmark")
+  worksheet.auto_width = true
+
+  DATA.each_with_index do |row, i|
+    worksheet.write_row(i + 1, row)
+  end
+  workbook.read_string
+
+  print '.'
+end
+result = RubyProf.stop
+
+# print a flat profile to text
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT)

benchmarks/write_value.rb

@@ -0,0 +1,62 @@
+require_relative '../lib/fast_excel'
+require "benchmark/memory"
+require "benchmark/ips"
+
+DATA = []
+1000.times do |n|
+  DATA << [n, "String string #{n}", (n * rand * 10).round, Time.at(n * 1000 + 1492922688)]
+end
+
+5.times do
+  workbook = FastExcel.open(constant_memory: true)
+  worksheet = workbook.add_worksheet("benchmark")
+
+  DATA.each_with_index do |row, row_num|
+    row.each_with_index do |val, cell_num|
+      worksheet.write_value(row_num + 1, cell_num + 1, val)
+    end
+  end
+  workbook.read_string
+end
+
+
+workbook = FastExcel.open(constant_memory: true)
+worksheet = workbook.add_worksheet("benchmark")
+
+DATA.each_with_index do |row, row_num|
+  row.each_with_index do |val, cell_num|
+    worksheet.write_value(row_num + 1, cell_num + 1, val)
+  end
+end
+workbook.read_string
+
+Benchmark.ips do |x|
+  #x.config(time: 10, warmup: 2)
+
+  x.report("Normal") do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet("benchmark")
+
+    DATA.each_with_index do |row, row_num|
+      row.each_with_index do |val, cell_num|
+        worksheet.write_value(row_num + 1, cell_num + 1, val)
+      end
+    end
+    workbook.read_string
+  end
+
+  x.report("Auto-width") do
+    workbook = FastExcel.open(constant_memory: true)
+    worksheet = workbook.add_worksheet("benchmark")
+    worksheet.auto_width = true
+
+    DATA.each_with_index do |row, row_num|
+      row.each_with_index do |val, cell_num|
+        worksheet.write_value(row_num + 1, cell_num + 1, val)
+      end
+    end
+    workbook.read_string
+  end
+
+  x.compare!
+end

lib/fast_excel.rb

@@ -386,6 +386,7 @@ module WorksheetExt
     def initialize(struct)
       @is_open = true
       @col_formats = {}
+      @last_row_number = -1
       super(struct)
     end
 
@@ -410,16 +411,16 @@ def auto_width=(v)
 
     def write_value(row_number, cell_number, value, format = nil)
 
-      if workbook.constant_memory? && row_number < last_row_number
+      if workbook.constant_memory? && row_number < @last_row_number
         raise ArgumentError, "Can not write to saved row in constant_memory mode (attempted row: #{row_number}, last saved row: #{last_row_number})"
       end
 
       if value.is_a?(Numeric)
         write_number(row_number, cell_number, value, format)
-      elsif defined?(DateTime) && value.is_a?(DateTime)
-        write_datetime(row_number, cell_number, FastExcel.lxw_datetime(value), format)
       elsif value.is_a?(Time)
-        write_datetime(row_number, cell_number, FastExcel.lxw_time(value), format)
+        write_number(row_number, cell_number, FastExcel.date_num(value), format)
+      elsif defined?(DateTime) && value.is_a?(DateTime)
+        write_number(row_number, cell_number, FastExcel.date_num(value), format)
       elsif value.is_a?(Formula)
         write_formula(row_number, cell_number, value.fml, format)
       else
@@ -428,7 +429,7 @@ def write_value(row_number, cell_number, value, format = nil)
         add_text_width(value, format, cell_number) if auto_width?
       end
 
-      @last_row_number = row_number > last_row_number ? row_number : last_row_number
+      @last_row_number = row_number > @last_row_number ? row_number : @last_row_number
     end
 
     def add_text_width(value, format, cell_number)
@@ -444,14 +445,14 @@ def add_text_width(value, format, cell_number)
       end
 
       if font_size == 0
-        workbook.default_format.font_size
+        font_size = workbook.default_format.font_size
       end
 
       font_size = 13 if font_size == nil || font_size == 0
 
       font_family = ''
       if format
-        font_size = format.font_family
+        font_family = format.font_family
       end
 
       if font_family == ''
@@ -482,11 +483,11 @@ def append_row(values, formats = nil)
     end
 
     def last_row_number
-      defined?(@last_row_number) ? @last_row_number : -1
+      @last_row_number
     end
 
     def increment_last_row_number!
-      @last_row_number = last_row_number + 1
+      @last_row_number += 1
     end
 
     def set_column(start_col, end_col, width, format = nil)
@@ -531,15 +532,6 @@ def close
   module FormatExt
     include AttributeHelper
 
-    [:font_size, :underline, :font_script, :rotation, :indent, :pattern, :border].each do |prop|
-      define_method(prop) do
-        self[prop]
-      end
-      define_method("#{prop}=") do |value|
-        send("set_#{prop}", value)
-      end
-    end
-
     [:bold, :italic, :font_outline, :font_shadow, :hidden, :text_wrap, :font_strikeout, :shrink, :text_justlast].each do |prop|
       define_method(prop) do
         self[prop]
@@ -553,10 +545,6 @@ module FormatExt
       define_method(prop) do
         self[prop].to_ptr.read_string
       end
-
-      define_method("#{prop}=") do |value|
-        send("set_#{prop}", value)
-      end
     end
 
     ALIGN_ENUM = Libxlsxwriter.enum_type(:format_alignments)

lib/fast_excel/binding/format.rb

@@ -684,6 +684,13 @@ def set_reading_order(value)
     def set_theme(value)
       Libxlsxwriter.format_set_theme(self, value)
     end
+
+    [:font_size, :underline, :font_script, :rotation, :indent, :pattern, :border, :num_format, :font_name].each do |prop|
+      alias :"#{prop}=" :"set_#{prop}"
+      define_method(prop) do
+        self[prop]
+      end
+    end
   end
 
   class Format < FFI::Struct

test/format_test.rb

@@ -161,4 +161,12 @@
     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