fast_excel 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5919483e8d5ac1277efefe8399926f14b45d10
-  data.tar.gz: 2a8bd5f6067c8903778f3f7227f90d4c95d31868
+  metadata.gz: ac39efd3391a98291ae2c1f5ba4102850b8ad678
+  data.tar.gz: 7d2eb11896d20f80f20405778b009e09ac1b41ea
 SHA512:
-  metadata.gz: dd0f959fe4eb08bd7506f63b4f666c3d47c05765aa8213c775f873264dd561e8aa2c9dd7f61d1ea5f1e6498199248dfef80bb9b5f7693025ec0c3f192671dd27
-  data.tar.gz: 5168323f914545536e1f36ed30aa0f689a98e92a93875abb7137109c20c2adfbd78b905a6cf6339c36e9ae391c23d7461e24a6d15ad92cc28e43ef955b16ce1c
+  metadata.gz: ae26296476e89298ff1d584ae59e87e81f46a118e0c7583f5328fb12845afe970e1fe040c8783388e541d3b4077948957cec5923cd124d325475629e5272c495
+  data.tar.gz: 921ca060bf7cb21c541dc0664767a13d5f95be2f76d7947c24e2677133c06cc21d558f925e372b4d49f4fc56977650a13c876883e3b0f3850ba2f4953ab565a5

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+#### Version 0.2.1 - 20 jun 2017
+
+* Add FastExcel::Formula
+
+#### Version 0.2.0 - 24 apr 2017
+
+* Add FastExcel.date_num
+* Add feature to use user default font
+* Add benchmarks
+
+#### Version 0.1.0 - 24 feb 2017
+
+Initial

data/README.md

@@ -1,6 +1,8 @@
 # Ultra Fast Excel Writter for Ruby
 
 ```ruby
+require 'fast_excel'
+
 workbook = FastExcel.open("hello_world_ffi.xlsx", constant_memory: true)
 workbook.default_format.set(
   font_size: 0, # user's default
@@ -24,6 +26,8 @@ for i in 1..1000
   worksheet.write_row(i, ["Hello", (rand * 10_000_000).round(2), Time.now])
 end
 
+worksheet.write_row(1001, ["Sum", FastExcel::Formula.new("SUM(B2:B1001)")], bold)
+
 workbook.close
 ```
 
@@ -35,7 +39,7 @@ This repositiry and gem contain sources of [libxlsxwriter](https://github.com/jm
 ```
 Comparison:
            FastExcel:       31.7 i/s
-               Axslx:        8.0 i/s - 3.98x  slower
+               Axlsx:        8.0 i/s - 3.98x  slower
           write_xlsx:        6.9 i/s - 4.62x  slower
 ```
 
@@ -43,15 +47,15 @@ Comparison:
 ```
 Comparison:
            FastExcel:        1.4 i/s
-               Axslx:        0.4 i/s - 3.46x  slower
+               Axlsx:        0.4 i/s - 3.46x  slower
           write_xlsx:        0.1 i/s - 17.04x  slower
 ```
 
 Max memory usage, generating 100k rows:
 ```
 FastExcel   - 20 MB
-Axslx       - 60 MB
-write_axslx - 100 MB
+Axlsx       - 60 MB
+write_xlsx - 100 MB
 ```
 
 ## Install

data/benchmarks/1k_rows.rb

@@ -21,8 +21,8 @@ Benchmark.ips do |x|
     workbook.read_string
   end
 
-  x.report("Axslx") do
-    filename = "#{Dir.mktmpdir}/axslx.xslx"
+  x.report("Axlsx") do
+    filename = "#{Dir.mktmpdir}/axlsx.xlsx"
     Axlsx::Package.new do |package|
       package.use_autowidth = false
       package.workbook.add_worksheet do |sheet|
@@ -38,7 +38,7 @@ Benchmark.ips do |x|
   end
 
   x.report("write_xlsx") do
-    filename = "#{Dir.mktmpdir}/write_xlsx.xslx"
+    filename = "#{Dir.mktmpdir}/write_xlsx.xlsx"
     workbook = WriteXLSX.new(filename)
     worksheet = workbook.add_worksheet
     HEADERS.each_with_index do |value, i|

data/benchmarks/20k_rows.rb

@@ -14,8 +14,8 @@ Benchmark.ips do |x|
     write_fast_excel_20k
   end
 
-  x.report("Axslx") do
-    write_axslx_20k
+  x.report("Axlsx") do
+    write_axlsx_20k
   end
 
   x.report("write_xlsx") do

data/benchmarks/init.rb

@@ -24,7 +24,7 @@ def write_fast_excel_20k
 end
 
 def write_xlsx_20k
-  filename = "#{Dir.mktmpdir}/write_xlsx.xslx"
+  filename = "#{Dir.mktmpdir}/write_xlsx.xlsx"
   workbook = WriteXLSX.new(filename)
   worksheet = workbook.add_worksheet
   HEADERS.each_with_index do |value, i|
@@ -42,8 +42,8 @@ def write_xlsx_20k
   File.delete(filename)
 end
 
-def write_axslx_20k
-  filename = "#{Dir.mktmpdir}/axslx.xslx"
+def write_axlsx_20k
+  filename = "#{Dir.mktmpdir}/axlsx.xlsx"
   Axlsx::Package.new do |package|
     package.use_autowidth = false
     package.workbook.add_worksheet do |sheet|

data/benchmarks/memory.rb

@@ -9,11 +9,11 @@ end
 
 puts "warm up..."
 write_fast_excel_20k
-write_axslx_20k
+write_axlsx_20k
 write_xlsx_20k
 
 DATA.clear
-100_000.times do |n|
+50_000.times do |n|
   DATA << [n, "String string #{n}" * 5, (n * rand * 10).round, Time.at(n * 1000 + 1492922688), n * 100]
 end
 
@@ -37,13 +37,13 @@ end
 GC.start
 sleep 5
 
-measure_memory("Axslx") do
-  write_axslx_20k
+measure_memory("Axlsx") do
+  write_axlsx_20k
 end
 
 GC.start
 sleep 5
 
-measure_memory("write_axslx") do
-  write_axslx_20k
+measure_memory("write_xlsx") do
+  write_xlsx_20k
 end

data/examples/example.rb

@@ -1,7 +1,7 @@
-require_relative './lib/fast_excel'
+require_relative '../lib/fast_excel'
 require 'pp'
 
-workbook = FastExcel.open("ffi_example.xlsx", constant_memory: true)
+workbook = FastExcel.open("example.xlsx", constant_memory: true)
 
 workbook.default_format.set(
   font_size: 0, # user's default
@@ -39,4 +39,5 @@ for i in 1..1000
   # worksheet.write_datetime(i, 2, date, nil)
 end
 
-workbook.close
+workbook.close
+puts "Saved to file example.xlsx"

data/examples/example_chart.rb

@@ -1,6 +1,6 @@
-require_relative './lib/fast_excel'
+require_relative '../lib/fast_excel'
 
-workbook = FastExcel.open("chart_ffi.xlsx", constant_memory: true)
+workbook = FastExcel.open("example_chart.xlsx", constant_memory: true)
 worksheet = workbook.add_worksheet
 
 for i in 0..5
@@ -18,3 +18,4 @@ chart.add_series("Montgomery", "Sheet1!$C$1:$C$5")
 worksheet.insert_chart(1, 7, chart)
 
 workbook.close
+puts "Saved to file example_chart.xlsx"

data/examples/example_formula.rb

@@ -0,0 +1,20 @@
+require_relative '../lib/fast_excel'
+require 'pp'
+require 'looksee'
+
+workbook = FastExcel.open("example_formula.xlsx", constant_memory: false)
+
+worksheet = workbook.add_worksheet
+
+worksheet.write_row(0, ["Item", "Weight"])
+worksheet.write_row(1, ["Laptop", 1.37])
+worksheet.write_row(2, ["Phone", 0.138])
+worksheet.write_row(3, ["Mouse", 0.099])
+worksheet.write_row(4, ["Speaker", 2.5])
+worksheet.write_row(5, ["Camera", 0.383])
+worksheet.write_row(6, ["Total", FastExcel::Formula.new("SUM(B2:B6)")], workbook.bold_cell_format)
+
+bold = workbook.bold_cell_format
+
+workbook.close
+puts "Saved to file example_formula.xlsx"

data/examples/example_image.rb

@@ -1,6 +1,6 @@
-require_relative './lib/fast_excel'
+require_relative '../lib/fast_excel'
 
-workbook = FastExcel.open("ffi_example_image.xlsx", constant_memory: false)
+workbook = FastExcel.open("example_image.xlsx", constant_memory: false)
 worksheet = workbook.add_worksheet
 
 img_options = Libxlsxwriter::ImageOptions.new
@@ -10,3 +10,4 @@ img_options[:y_offset] = 0
 worksheet.insert_image_opt(3, 3, "libxlsxwriter/examples/logo.png", img_options)
 
 workbook.close
+puts "Saved to file example_image.xlsx"

data/fast_excel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "fast_excel"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.author      = ["Pavel Evstigneev"]
   s.email       = ["pavel.evst@gmail.com"]
   s.homepage    = "https://github.com/paxa/fast_excel"

data/lib/fast_excel.rb

@@ -1,13 +1,21 @@
 require_relative './fast_excel/binding'
 
 module FastExcel
+
+  class Formula
+    attr_accessor :fml
+    def initialize(fml)
+      @fml = fml
+    end
+  end
+
   DEF_COL_WIDTH = 8.43
 
   def self.open(filename = nil, constant_memory: false, default_format: nil)
     tmp_file = false
     unless filename
       require 'tmpdir'
-      filename = "#{Dir.mktmpdir}/fast_excel.xslx"
+      filename = "#{Dir.mktmpdir}/fast_excel.xlsx"
       tmp_file = true
     end
 
@@ -86,17 +94,20 @@ module FastExcel
   def self.print_ffi_obj(value)
     puts "#{value.class}"
     value.members.each do |key|
-      field_val = if value[key].is_a?(FFI::Pointer) && value[key].null?
+      field_val = if value[key].is_a?(FFI::Pointer) && value[key].null? || value[key].nil?
         "nil"
       elsif value[key].is_a?(FFI::StructLayout::CharArray)
         value[key].to_str.inspect
       elsif value[key].is_a?(String)
         value[key].inspect
+      elsif value[key].is_a?(Symbol)
+        value[key].inspect
       else
         value[key]
       end
       puts "* #{key}: #{field_val}"
     end
+    nil
   end
 
   module AttributeHelper
@@ -110,12 +121,17 @@ module FastExcel
       end
     end
 
-    def pretty_print(pp)
+    def fields_hash
       res = {}
       members.each do |key|
+        #p [key, self[key]]
         res[key] = respond_to?(key) ? send(key) : self[key]
       end
-      pp res
+      res
+    end
+
+    def pretty_print(pp)
+      pp fields_hash
     end
   end
 
@@ -180,6 +196,8 @@ module FastExcel
           write_datetime(row_number, index, FastExcel.lxw_datetime(value), format)
         elsif value.is_a?(Time)
           write_datetime(row_number, index, FastExcel.lxw_time(value), format)
+        elsif value.is_a?(Formula)
+          write_formula(row_number, index, value.fml, format)
         else
           write_string(row_number, index, value.to_s, format)
         end
@@ -234,6 +252,60 @@ module FastExcel
       self.font_name = value
     end
   end
+
+  module RowExt
+    include AttributeHelper
+
+    def inspect
+      attr_str = fields_hash.map do |key, val|
+        "@#{key}=#{val.inspect}"
+      end
+      "<Libxlsxwriter::Row #{attr_str.join(" ")}>"
+    end
+  end
+
+  module CellExt
+    include AttributeHelper
+
+    def value
+      if self[:type] == :number_cell
+        self[:u][:number]
+      elsif self[:type] == :string_cell
+        pointer = self[:u][:string]
+        p pointer
+        pointer.null? ? nil : pointer.to_ptr.read_string
+      else
+        self[:user_data1]
+      end
+    end
+
+    def user_data1
+      value
+      #self[:user_data1] && !self[:user_data1].null? ? self[:user_data1].to_ptr.read_string : nil
+    end
+
+    def user_data2
+      self[:user_data2] #&& !self[:user_data2].null? ? self[:user_data2].to_ptr.read_string : nil
+    end
+
+    def sst_string
+      self[:sst_string] #&& !self[:sst_string].null? ? self[:sst_string].to_ptr.read_string : nil
+    end
+
+    #def inspect
+    #  attr_str = fields_hash.map do |key, val|
+    #    "@#{key}=#{val.inspect}"
+    #  end
+    #  "<Libxlsxwriter::Row #{attr_str.join(" ")}>"
+    #end
+
+    def inspect
+      attr_str = fields_hash.map do |key, val|
+        "@#{key}=#{val.inspect}"
+      end
+      "<Libxlsxwriter::Row #{attr_str.join(" ")}>"
+    end
+  end
 end
 
 Libxlsxwriter::Workbook.instance_eval do
@@ -246,4 +318,12 @@ end
 
 Libxlsxwriter::Worksheet.instance_eval do
   include FastExcel::WorksheetExt
-end
+end
+
+Libxlsxwriter::Row.instance_eval do
+  include FastExcel::RowExt
+end
+
+Libxlsxwriter::Cell.instance_eval do
+  include FastExcel::CellExt
+end

data/lib/fast_excel/binding.rb

@@ -1066,45 +1066,6 @@ module Libxlsxwriter
     :show_all, 3
   ]
   
-  # <em>This entry is only for documentation and no real method. The FFI::Enum can be accessed via #enum_type(:cell_types).</em>
-  # 
-  # === Options:
-  # :number_cell ::
-  #   
-  # :string_cell ::
-  #   
-  # :inline_string_cell ::
-  #   
-  # :formula_cell ::
-  #   
-  # :array_formula_cell ::
-  #   
-  # :blank_cell ::
-  #   
-  # :boolean_cell ::
-  #   
-  # :hyperlink_url ::
-  #   
-  # :hyperlink_internal ::
-  #   
-  # :hyperlink_external ::
-  #   
-  # 
-  # @method _enum_cell_types_
-  # @return [Symbol]
-  # @scope class
-  enum :cell_types, [
-    :number_cell, 1,
-    :string_cell, 2,
-    :inline_string_cell, 3,
-    :formula_cell, 4,
-    :array_formula_cell, 5,
-    :blank_cell, 6,
-    :boolean_cell, 7,
-    :hyperlink_url, 8,
-    :hyperlink_internal, 9,
-    :hyperlink_external, 10
-  ]
   
   # <em>This entry is only for documentation and no real method. The FFI::Enum can be accessed via #enum_type(:pane_types).</em>
   # 

data/lib/fast_excel/binding/worksheet.rb

@@ -656,7 +656,7 @@ module Libxlsxwriter
     # @param [Integer] row_num 
     # @return [Row] 
     def find_row(row_num)
-      Row.new Libxlsxwriter.worksheet_find_row(self, row_num)
+      Row.new(Libxlsxwriter.worksheet_find_row(self, row_num))
     end
   end
 
@@ -847,7 +847,7 @@ module Libxlsxwriter
   # :tree_pointers ::
   #   (RowTreePointers) 
   class Row < FFI::Struct
-    layout :row_num, :uint,
+    layout :row_num, :uint32,
            :height, :double,
            :format, Format,
            :hidden, :uchar,
@@ -860,6 +860,46 @@ module Libxlsxwriter
            :tree_pointers, RowTreePointers.by_value
   end
 
+  # <em>This entry is only for documentation and no real method. The FFI::Enum can be accessed via #enum_type(:cell_types).</em>
+  # 
+  # === Options:
+  # :number_cell ::
+  #   
+  # :string_cell ::
+  #   
+  # :inline_string_cell ::
+  #   
+  # :formula_cell ::
+  #   
+  # :array_formula_cell ::
+  #   
+  # :blank_cell ::
+  #   
+  # :boolean_cell ::
+  #   
+  # :hyperlink_url ::
+  #   
+  # :hyperlink_internal ::
+  #   
+  # :hyperlink_external ::
+  #   
+  # 
+  # @method _enum_cell_types_
+  # @return [Symbol]
+  # @scope class
+  enum :cell_types, [
+    :number_cell, 1,
+    :string_cell, 2,
+    :inline_string_cell, 3,
+    :formula_cell, 4,
+    :array_formula_cell, 5,
+    :blank_cell, 6,
+    :boolean_cell, 7,
+    :hyperlink_url, 8,
+    :hyperlink_internal, 9,
+    :hyperlink_external, 10
+  ]
+
   # = Fields:
   # :number ::
   #   (Float) 
@@ -870,7 +910,7 @@ module Libxlsxwriter
   class CellU < FFI::Union
     layout :number, :double,
            :string_id, :int,
-           :string, :string
+           :string, :pointer
   end
 
   # = Fields:
@@ -911,15 +951,15 @@ module Libxlsxwriter
   # :tree_pointers ::
   #   (CellTreePointers) 
   class Cell < FFI::Struct
-    layout :row_num, :uint,
-           :col_num, :ushort,
+    layout :row_num, :uint32,
+           :col_num, :uint16,
            :type, :cell_types,
-           :format, Format,
+           :format, :pointer,
            :u, CellU.by_value,
            :formula_result, :double,
-           :user_data1, :string,
-           :user_data2, :string,
-           :sst_string, :string,
+           :user_data1, :pointer,
+           :user_data2, :pointer,
+           :sst_string, :pointer,
            :tree_pointers, CellTreePointers.by_value
   end
 
@@ -931,7 +971,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_number, :worksheet_write_number, [Worksheet, :uint, :ushort, :double, Format], :error
+  attach_function :worksheet_write_number, :worksheet_write_number, [Worksheet, :uint32, :ushort, :double, Format], :error
 
   # @method worksheet_write_string(worksheet, row, col, string, format)
   # @param [Worksheet] worksheet 
@@ -941,7 +981,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_string, :worksheet_write_string, [Worksheet, :uint, :ushort, :string, Format], :error
+  attach_function :worksheet_write_string, :worksheet_write_string, [Worksheet, :uint32, :ushort, :string, Format], :error
 
   # @method worksheet_write_formula(worksheet, row, col, formula, format)
   # @param [Worksheet] worksheet 
@@ -951,7 +991,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_formula, :worksheet_write_formula, [Worksheet, :uint, :ushort, :string, Format], :error
+  attach_function :worksheet_write_formula, :worksheet_write_formula, [Worksheet, :uint32, :ushort, :string, Format], :error
 
   # @method worksheet_write_array_formula(worksheet, first_row, first_col, last_row, last_col, formula, format)
   # @param [Worksheet] worksheet 
@@ -963,7 +1003,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_array_formula, :worksheet_write_array_formula, [Worksheet, :uint, :ushort, :uint, :ushort, :string, Format], :error
+  attach_function :worksheet_write_array_formula, :worksheet_write_array_formula, [Worksheet, :uint32, :ushort, :uint, :ushort, :string, Format], :error
 
   # @method worksheet_write_array_formula_num(worksheet, first_row, first_col, last_row, last_col, formula, format, result)
   # @param [Worksheet] worksheet 
@@ -976,7 +1016,7 @@ module Libxlsxwriter
   # @param [Float] result 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_array_formula_num, :worksheet_write_array_formula_num, [Worksheet, :uint, :ushort, :uint, :ushort, :string, Format, :double], :error
+  attach_function :worksheet_write_array_formula_num, :worksheet_write_array_formula_num, [Worksheet, :uint32, :ushort, :uint, :ushort, :string, Format, :double], :error
 
   # @method worksheet_write_datetime(worksheet, row, col, datetime, format)
   # @param [Worksheet] worksheet 
@@ -986,7 +1026,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_datetime, :worksheet_write_datetime, [Worksheet, :uint, :ushort, Datetime, Format], :error
+  attach_function :worksheet_write_datetime, :worksheet_write_datetime, [Worksheet, :uint32, :ushort, Datetime, Format], :error
 
   # @method worksheet_write_url_opt(worksheet, row_num, col_num, url, format, string, tooltip)
   # @param [Worksheet] worksheet 
@@ -998,7 +1038,7 @@ module Libxlsxwriter
   # @param [String] tooltip 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_url_opt, :worksheet_write_url_opt, [Worksheet, :uint, :ushort, :string, Format, :string, :string], :error
+  attach_function :worksheet_write_url_opt, :worksheet_write_url_opt, [Worksheet, :uint32, :ushort, :string, Format, :string, :string], :error
 
   # @method worksheet_write_url(worksheet, row, col, url, format)
   # @param [Worksheet] worksheet 
@@ -1008,7 +1048,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_url, :worksheet_write_url, [Worksheet, :uint, :ushort, :string, Format], :error
+  attach_function :worksheet_write_url, :worksheet_write_url, [Worksheet, :uint32, :ushort, :string, Format], :error
 
   # @method worksheet_write_boolean(worksheet, row, col, value, format)
   # @param [Worksheet] worksheet 
@@ -1018,7 +1058,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_boolean, :worksheet_write_boolean, [Worksheet, :uint, :ushort, :int, Format], :error
+  attach_function :worksheet_write_boolean, :worksheet_write_boolean, [Worksheet, :uint32, :ushort, :int, Format], :error
 
   # @method worksheet_write_blank(worksheet, row, col, format)
   # @param [Worksheet] worksheet 
@@ -1027,7 +1067,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_blank, :worksheet_write_blank, [Worksheet, :uint, :ushort, Format], :error
+  attach_function :worksheet_write_blank, :worksheet_write_blank, [Worksheet, :uint32, :ushort, Format], :error
 
   # @method worksheet_write_formula_num(worksheet, row, col, formula, format, result)
   # @param [Worksheet] worksheet 
@@ -1038,7 +1078,7 @@ module Libxlsxwriter
   # @param [Float] result 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_write_formula_num, :worksheet_write_formula_num, [Worksheet, :uint, :ushort, :string, Format, :double], :error
+  attach_function :worksheet_write_formula_num, :worksheet_write_formula_num, [Worksheet, :uint32, :ushort, :string, Format, :double], :error
 
   # @method worksheet_set_row(worksheet, row, height, format)
   # @param [Worksheet] worksheet 
@@ -1047,7 +1087,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_set_row, :worksheet_set_row, [Worksheet, :uint, :double, Format], :error
+  attach_function :worksheet_set_row, :worksheet_set_row, [Worksheet, :uint32, :double, Format], :error
 
   # @method worksheet_set_row_opt(worksheet, row, height, format, options)
   # @param [Worksheet] worksheet 
@@ -1057,7 +1097,7 @@ module Libxlsxwriter
   # @param [RowColOptions] options 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_set_row_opt, :worksheet_set_row_opt, [Worksheet, :uint, :double, Format, RowColOptions], :error
+  attach_function :worksheet_set_row_opt, :worksheet_set_row_opt, [Worksheet, :uint32, :double, Format, RowColOptions], :error
 
   # @method worksheet_set_column(worksheet, first_col, last_col, width, format)
   # @param [Worksheet] worksheet 
@@ -1087,7 +1127,7 @@ module Libxlsxwriter
   # @param [String] filename 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_insert_image, :worksheet_insert_image, [Worksheet, :uint, :ushort, :string], :error
+  attach_function :worksheet_insert_image, :worksheet_insert_image, [Worksheet, :uint32, :ushort, :string], :error
 
   # @method worksheet_insert_image_opt(worksheet, row, col, filename, options)
   # @param [Worksheet] worksheet 
@@ -1097,7 +1137,7 @@ module Libxlsxwriter
   # @param [ImageOptions] options 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_insert_image_opt, :worksheet_insert_image_opt, [Worksheet, :uint, :ushort, :string, ImageOptions], :error
+  attach_function :worksheet_insert_image_opt, :worksheet_insert_image_opt, [Worksheet, :uint32, :ushort, :string, ImageOptions], :error
 
   # @method worksheet_insert_chart(worksheet, row, col, chart)
   # @param [Worksheet] worksheet 
@@ -1106,7 +1146,7 @@ module Libxlsxwriter
   # @param [Chart] chart 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_insert_chart, :worksheet_insert_chart, [Worksheet, :uint, :ushort, Chart], :error
+  attach_function :worksheet_insert_chart, :worksheet_insert_chart, [Worksheet, :uint32, :ushort, Chart], :error
 
   # @method worksheet_insert_chart_opt(worksheet, row, col, chart, user_options)
   # @param [Worksheet] worksheet 
@@ -1116,7 +1156,7 @@ module Libxlsxwriter
   # @param [ImageOptions] user_options 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_insert_chart_opt, :worksheet_insert_chart_opt, [Worksheet, :uint, :ushort, Chart, ImageOptions], :error
+  attach_function :worksheet_insert_chart_opt, :worksheet_insert_chart_opt, [Worksheet, :uint32, :ushort, Chart, ImageOptions], :error
 
   # @method worksheet_merge_range(worksheet, first_row, first_col, last_row, last_col, string, format)
   # @param [Worksheet] worksheet 
@@ -1128,7 +1168,7 @@ module Libxlsxwriter
   # @param [Format] format 
   # @return [Symbol from _enum_error_] 
   # @scope class
-  attach_function :worksheet_merge_range, :worksheet_merge_range, [Worksheet, :uint, :ushort, :uint, :ushort, :string, Format], :error
+  attach_function :worksheet_merge_range, :worksheet_merge_range, [Worksheet, :uint32, :ushort, :uint32, :ushort, :string, Format], :error
 
   # @method worksheet_autofilter(worksheet, first_row, first_col, last_row, last_col)
   # @param [Worksheet] worksheet 
@@ -1458,7 +1498,7 @@ module Libxlsxwriter
   # @param [Integer] row_num 
   # @return [Row] 
   # @scope class
-  attach_function :worksheet_find_row, :lxw_worksheet_find_row, [Worksheet, :uint], Row
+  attach_function :worksheet_find_row, :lxw_worksheet_find_row, [Worksheet, :uint32], Row
 
   # @method worksheet_find_cell(row, col_num)
   # @param [Row] row 

data/test/tmpfile_test.rb

@@ -6,7 +6,7 @@ describe "FastExcel" do
     workbook = FastExcel.open(constant_memory: true)
 
     assert(workbook.tmp_file)
-    assert_match(/fast_excel.xslx$/, workbook.filename)
+    assert_match(/fast_excel.xlsx$/, workbook.filename)
 
     result = workbook.read_string
     assert(result.size > 1000)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_excel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,6 +39,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Makefile
@@ -50,6 +51,7 @@ files:
 - benchmarks/memory.rb
 - examples/example.rb
 - examples/example_chart.rb
+- examples/example_formula.rb
 - examples/example_image.rb
 - extconf.rb
 - fast_excel.gemspec