fast_excel 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac39efd3391a98291ae2c1f5ba4102850b8ad678
-  data.tar.gz: 7d2eb11896d20f80f20405778b009e09ac1b41ea
+  metadata.gz: f0bf8afa4f1566ae7cc27fe6b7a59e1d9c0dc0d0
+  data.tar.gz: eeac6d37268bfc90e54a338e098224acd382309d
 SHA512:
-  metadata.gz: ae26296476e89298ff1d584ae59e87e81f46a118e0c7583f5328fb12845afe970e1fe040c8783388e541d3b4077948957cec5923cd124d325475629e5272c495
-  data.tar.gz: 921ca060bf7cb21c541dc0664767a13d5f95be2f76d7947c24e2677133c06cc21d558f925e372b4d49f4fc56977650a13c876883e3b0f3850ba2f4953ab565a5
+  metadata.gz: 75345de42e34f5e4db76737ba2c1ad8d8c2fa74fb44653d1d0c5a86137d635aab3c2abb5297ad32fe6a67e4813e6c57dbd50c543ea5a75404a44ada017e45c2b
+  data.tar.gz: c37550f5d67c501b16e9199f0a8aab489ea760257d2405f3b0ffbabcb41e20625ee80dfbb89bc7dec1ddb0bf93cc65c5e59b89de55f1727dbb5d85ead3a1e049

data/.travis.yml

@@ -0,0 +1,28 @@
+---
+language: ruby
+
+matrix:
+  include:
+  - os: linux
+    rvm: 2.1
+  - os: osx
+    rvm: 2.1
+  - os: linux
+    rvm: 2.2.7
+  - os: osx
+    rvm: 2.2.7
+  - os: linux
+    rvm: 2.3.4
+  - os: osx
+    rvm: 2.3.4
+  - os: linux
+    rvm: 2.4.0
+  - os: osx
+    rvm: 2.4.0
+  fast_finish: true
+
+script:
+  - bundle install
+  - make
+  - bundle exec rake test
+  - bundle exec rake examples

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+#### Version 0.2.2 - 20 sep 2017
+
+* Nice setters and getters for format.align
+* Add nice setters for colors and borders
+* Add sheet.append_row, sheet.last_row_number
+* Run tests in CI
+* Performance optimizations and type check refactoring
+* Add styles_example.rb
+* Fix assigning align from other format
+
 #### Version 0.2.1 - 20 jun 2017
 
 * Add FastExcel::Formula

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gem 'ffi'
 gem 'ffi_gen', require: false
 
+gem 'rake'
+
 gem 'roo', '2.7.1', git: 'https://github.com/roo-rb/roo.git'
 
 gem 'minitest'
@@ -12,4 +14,4 @@ gem 'minitest-reporters'
 gem 'axlsx', git: 'https://github.com/randym/axlsx.git'
 gem 'write_xlsx'
 gem 'benchmark-ips'
-gem 'process_memory', git: 'https://github.com/paxa/process_memory'
+gem 'process_memory', git: 'https://github.com/paxa/process_memory', platforms: :ruby

data/Gemfile.lock

@@ -16,7 +16,7 @@ GIT
 
 GIT
   remote: https://github.com/roo-rb/roo.git
-  revision: 6bde8588dfd97d7a18981ee3ac7b444fec165a2c
+  revision: 85c2736b0ea1c984391688c5aeb4acf85f225405
   specs:
     roo (2.7.1)
       nokogiri (~> 1)
@@ -33,18 +33,19 @@ GEM
       ffi (~> 1.0)
     htmlentities (4.3.4)
     mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
     minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rake (12.0.0)
     ruby-progressbar (1.8.1)
     rubyzip (1.2.1)
-    write_xlsx (0.83.0)
+    write_xlsx (0.85.1)
       rubyzip (>= 1.0.0)
       zip-zip
     zip-zip (0.3)
@@ -61,8 +62,9 @@ DEPENDENCIES
   minitest
   minitest-reporters
   process_memory!
+  rake
   roo (= 2.7.1)!
   write_xlsx
 
 BUNDLED WITH
-   1.14.5
+   1.15.1

data/Rakefile

@@ -16,3 +16,9 @@ Rake::TestTask.new do |test|
 end
 
 #task :default => :test
+
+task :examples do
+  Dir.glob('examples/**/*.rb').each do |file|
+    require './' + file.sub(/\.rb$/, '')
+  end
+end

data/appveyor.yml

@@ -0,0 +1,25 @@
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - SET PATH=C:\MinGW\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
+  - ruby --version
+  - gem --version
+  - bundle install
+  - make
+
+build: off
+
+test_script:
+  - bundle exec rake test
+
+environment:
+  matrix:
+    - ruby_version: "24"
+    - ruby_version: "24-x64"
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"

data/examples/example.rb

@@ -1,5 +1,4 @@
 require_relative '../lib/fast_excel'
-require 'pp'
 
 workbook = FastExcel.open("example.xlsx", constant_memory: true)
 

data/examples/example_align.rb

@@ -0,0 +1,23 @@
+require_relative '../lib/fast_excel'
+
+workbook = FastExcel.open("example_align.xlsx", constant_memory: true)
+
+worksheet = workbook.add_worksheet
+
+row_format = workbook.add_format
+
+row_format.align = {h: :center, v: :center}
+# Can also be called as:
+# row_format.align = :align_center
+# row_format.align = :align_vertical_center
+
+print "Align set as: "
+p row_format.align # => {horizontal: :align_center, vertical: :align_vertical_center}
+
+worksheet.set_column_width(0, 30)
+worksheet.set_row(0, 30, row_format)
+
+worksheet.write_row(0, ["Hello"])
+
+workbook.close
+puts "Saved to file example_align.xlsx"

data/examples/example_colors.rb

@@ -0,0 +1,37 @@
+require_relative '../lib/fast_excel'
+
+workbook = FastExcel.open("example_colors.xlsx", constant_memory: true)
+
+worksheet = workbook.add_worksheet
+
+color_format = workbook.add_format
+
+# We can use color names as string and symbols, color hex codes and color hex numbers
+
+color_format.set(
+  font_color: '9900FF',
+  bg_color: '#FFAAAA',
+
+  border_bottom: :medium,
+  border_bottom_color: 'green',
+
+  border_left: :slant_dash_dot,
+  border_left_color: 0x00FF00,
+
+  border_right: :double,
+  border_right_color: :crimson,
+
+  border_top: :border_hair,
+  border_top_color: :medium_blue
+)
+
+# Possible border styles:
+# [:none, :thin, :medium, :dashed, :dotted, :thick, :double, :hair, :medium_dashed,
+#  :dash_dot, :medium_dash_dot, :dash_dot_dot, :medium_dash_dot_dot, :slant_dash_dot]
+
+worksheet.set_column_width(1, 30)
+
+worksheet.write_value(1, 1, "Hello", color_format)
+
+workbook.close
+puts "Saved to file example_colors.xlsx"

data/examples/example_formula.rb

@@ -1,6 +1,4 @@
 require_relative '../lib/fast_excel'
-require 'pp'
-require 'looksee'
 
 workbook = FastExcel.open("example_formula.xlsx", constant_memory: false)
 

data/examples/example_image.rb

@@ -7,7 +7,7 @@ img_options = Libxlsxwriter::ImageOptions.new
 img_options[:x_offset] = 0
 img_options[:y_offset] = 0
 
-worksheet.insert_image_opt(3, 3, "libxlsxwriter/examples/logo.png", img_options)
+worksheet.insert_image_opt(3, 3, "examples/logo.png", img_options)
 
 workbook.close
 puts "Saved to file example_image.xlsx"

data/examples/example_styles.rb

@@ -0,0 +1,27 @@
+require_relative '../lib/fast_excel'
+
+workbook = FastExcel.open("example_styles.xlsx", constant_memory: true)
+
+#workbook.default_format.set(
+#  font_size: 0, # user's default
+#  #font_family: "Arial"
+#)
+
+worksheet = workbook.add_worksheet
+
+worksheet.set_columns_width(0, 11, 11)
+
+worksheet.write_value(0, 0, "Bold",        workbook.add_format(bold: true))
+worksheet.write_value(0, 1, "Italic",      workbook.add_format(italic: true))
+worksheet.write_value(0, 2, "Underline",   workbook.add_format(underline: :underline_single))
+worksheet.write_value(0, 3, "Double line", workbook.add_format(underline: :underline_double))
+worksheet.write_value(0, 4, "Indent",      workbook.add_format(indent: 1))
+worksheet.write_value(0, 5, "Border",      workbook.add_format(border: :border_thin))
+worksheet.write_value(0, 6, "Border2",     workbook.add_format(border: :border_medium))
+worksheet.write_value(0, 7, "Pattern",     workbook.add_format(pattern: :pattern_light_up, bg_color: :yellow))
+worksheet.write_value(0, 8, "Script",      workbook.add_format(font_script: :font_subscript))
+worksheet.write_value(0, 9, "Strike",      workbook.add_format(font_strikeout: true))
+worksheet.write_value(0, 10, "Shaddow",    workbook.add_format(font_shadow: true))
+
+workbook.close
+puts "Saved to file example_styles.xlsx"

data/fast_excel.gemspec

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

data/lib/fast_excel.rb

@@ -110,15 +110,197 @@ module FastExcel
     nil
   end
 
+
+  COLOR_ENUM = Libxlsxwriter.enum_type(:defined_colors)
+  EXTRA_COLORS = {
+    alice_blue: 0xF0F8FF,
+    antique_white: 0xFAEBD7,
+    aqua: 0x00FFFF,
+    aquamarine: 0x7FFFD4,
+    azure: 0xF0FFFF,
+    beige: 0xF5F5DC,
+    bisque: 0xFFE4C4,
+    black: 0x000000,
+    blanched_almond: 0xFFEBCD,
+    blue: 0x0000FF,
+    blue_violet: 0x8A2BE2,
+    brown: 0xA52A2A,
+    burly_wood: 0xDEB887,
+    cadet_blue: 0x5F9EA0,
+    chartreuse: 0x7FFF00,
+    chocolate: 0xD2691E,
+    coral: 0xFF7F50,
+    cornflower_blue: 0x6495ED,
+    cornsilk: 0xFFF8DC,
+    crimson: 0xDC143C,
+    cyan: 0x00FFFF,
+    dark_blue: 0x00008B,
+    dark_cyan: 0x008B8B,
+    dark_golden_rod: 0xB8860B,
+    dark_gray: 0xA9A9A9,
+    dark_grey: 0xA9A9A9,
+    dark_green: 0x006400,
+    dark_khaki: 0xBDB76B,
+    dark_magenta: 0x8B008B,
+    dark_olive_green: 0x556B2F,
+    dark_orange: 0xFF8C00,
+    dark_orchid: 0x9932CC,
+    dark_red: 0x8B0000,
+    dark_salmon: 0xE9967A,
+    dark_sea_green: 0x8FBC8F,
+    dark_slate_blue: 0x483D8B,
+    dark_slate_gray: 0x2F4F4F,
+    dark_slate_grey: 0x2F4F4F,
+    dark_turquoise: 0x00CED1,
+    dark_violet: 0x9400D3,
+    deep_pink: 0xFF1493,
+    deep_sky_blue: 0x00BFFF,
+    dim_gray: 0x696969,
+    dim_grey: 0x696969,
+    dodger_blue: 0x1E90FF,
+    fire_brick: 0xB22222,
+    floral_white: 0xFFFAF0,
+    forest_green: 0x228B22,
+    fuchsia: 0xFF00FF,
+    gainsboro: 0xDCDCDC,
+    ghost_white: 0xF8F8FF,
+    gold: 0xFFD700,
+    golden_rod: 0xDAA520,
+    gray: 0x808080,
+    grey: 0x808080,
+    green: 0x008000,
+    green_yellow: 0xADFF2F,
+    honey_dew: 0xF0FFF0,
+    hot_pink: 0xFF69B4,
+    indian_red: 0xCD5C5C,
+    indigo: 0x4B0082,
+    ivory: 0xFFFFF0,
+    khaki: 0xF0E68C,
+    lavender: 0xE6E6FA,
+    lavender_blush: 0xFFF0F5,
+    lawn_green: 0x7CFC00,
+    lemon_chiffon: 0xFFFACD,
+    light_blue: 0xADD8E6,
+    light_coral: 0xF08080,
+    light_cyan: 0xE0FFFF,
+    light_golden_rod_yellow: 0xFAFAD2,
+    light_gray: 0xD3D3D3,
+    light_grey: 0xD3D3D3,
+    light_green: 0x90EE90,
+    light_pink: 0xFFB6C1,
+    light_salmon: 0xFFA07A,
+    light_sea_green: 0x20B2AA,
+    light_sky_blue: 0x87CEFA,
+    light_slate_gray: 0x778899,
+    light_slate_grey: 0x778899,
+    light_steel_blue: 0xB0C4DE,
+    light_yellow: 0xFFFFE0,
+    lime: 0x00FF00,
+    lime_green: 0x32CD32,
+    linen: 0xFAF0E6,
+    magenta: 0xFF00FF,
+    maroon: 0x800000,
+    medium_aqua_marine: 0x66CDAA,
+    medium_blue: 0x0000CD,
+    medium_orchid: 0xBA55D3,
+    medium_purple: 0x9370DB,
+    medium_sea_green: 0x3CB371,
+    medium_slate_blue: 0x7B68EE,
+    medium_spring_green: 0x00FA9A,
+    medium_turquoise: 0x48D1CC,
+    medium_violet_red: 0xC71585,
+    midnight_blue: 0x191970,
+    mint_cream: 0xF5FFFA,
+    misty_rose: 0xFFE4E1,
+    moccasin: 0xFFE4B5,
+    navajo_white: 0xFFDEAD,
+    navy: 0x000080,
+    old_lace: 0xFDF5E6,
+    olive: 0x808000,
+    olive_drab: 0x6B8E23,
+    orange: 0xFFA500,
+    orange_red: 0xFF4500,
+    orchid: 0xDA70D6,
+    pale_golden_rod: 0xEEE8AA,
+    pale_green: 0x98FB98,
+    pale_turquoise: 0xAFEEEE,
+    pale_violet_red: 0xDB7093,
+    papaya_whip: 0xFFEFD5,
+    peach_puff: 0xFFDAB9,
+    peru: 0xCD853F,
+    pink: 0xFFC0CB,
+    plum: 0xDDA0DD,
+    powder_blue: 0xB0E0E6,
+    purple: 0x800080,
+    rebecca_purple: 0x663399,
+    red: 0xFF0000,
+    rosy_brown: 0xBC8F8F,
+    royal_blue: 0x4169E1,
+    saddle_brown: 0x8B4513,
+    salmon: 0xFA8072,
+    sandy_brown: 0xF4A460,
+    sea_green: 0x2E8B57,
+    sea_shell: 0xFFF5EE,
+    sienna: 0xA0522D,
+    silver: 0xC0C0C0,
+    sky_blue: 0x87CEEB,
+    slate_blue: 0x6A5ACD,
+    slate_gray: 0x708090,
+    slate_grey: 0x708090,
+    snow: 0xFFFAFA,
+    spring_green: 0x00FF7F,
+    steel_blue: 0x4682B4,
+    tan: 0xD2B48C,
+    teal: 0x008080,
+    thistle: 0xD8BFD8,
+    tomato: 0xFF6347,
+    turquoise: 0x40E0D0,
+    violet: 0xEE82EE,
+    wheat: 0xF5DEB3,
+    white: 0xFFFFFF,
+    white_smoke: 0xF5F5F5,
+    yellow: 0xFFFF00,
+    yellow_green: 0x9ACD32
+  }.freeze
+
+  # Convert hex string, color name or hex number to color hex number
+  def self.color_to_hex(value)
+    orig_value = value
+    value = value.to_s if value.is_a?(Symbol)
+
+    if value.is_a?(String)
+      if EXTRA_COLORS[value.to_sym]
+        return EXTRA_COLORS[value.to_sym]
+      elsif COLOR_ENUM.find(value.to_sym)
+        return COLOR_ENUM.find(value.to_sym)
+      elsif COLOR_ENUM.find("color_#{value.to_sym}")
+        return COLOR_ENUM.find("color_#{value.to_sym}")
+      elsif value =~ /^#?(0x)?([\da-f]){6}$/i
+        value = value.sub('#', '') if value.start_with?('#')
+        return value.start_with?('0x') ? value.to_i(16) : "0x#{value}".to_i(16)
+      else
+        raise ArgumentError, "Unknown color value #{orig_value.inspect}, expected hex string or color name"
+      end
+    end
+
+    return value if value.is_a?(Numeric)
+
+    raise ArgumentError, "Can not use #{value.class} (#{value.inspect}) for color value, expected String or Hex Number"
+  end
+
   module AttributeHelper
     def set(values)
       values.each do |key, value|
         if respond_to?("#{key}=")
           send("#{key}=", value)
+        elsif respond_to?("set_#{key}=")
+            send("set_#{key}=", value)
         else
           self[key] = value
         end
       end
+
+      self
     end
 
     def fields_hash
@@ -144,6 +326,12 @@ module FastExcel
       super(struct)
     end
 
+    def add_format(options = nil)
+      new_format = super()
+      new_format.set(options) if options
+      new_format
+    end
+
     def bold_cell_format
       bold = add_format
       bold.set_bold
@@ -159,7 +347,9 @@ module FastExcel
     end
 
     def add_worksheet(sheetname = nil)
-      super
+      sheet = super
+      sheet.workbook = self
+      sheet
     end
 
     def close
@@ -177,9 +367,16 @@ module FastExcel
     def remove_tmp_file
       File.delete(filename) if tmp_file
     end
+
+    def constant_memory?
+      #FastExcel.print_ffi_obj(self[:options])
+      @constant_memory ||= self[:options][:constant_memory] != 0
+    end
   end
 
   module WorksheetExt
+    attr_accessor :workbook
+
     include AttributeHelper
 
     def write_row(row_number, values, formats = nil)
@@ -188,28 +385,62 @@ module FastExcel
           formats.is_a?(Array) ? formats[index] : formats
         end
 
-        if value.is_a?(Integer) || value.is_a?(Numeric) || value.is_a?(Float)
-          write_number(row_number, index, value, format)
-        elsif defined?(BigDecimal) && value.is_a?(BigDecimal)
-          write_number(row_number, index, value.to_f, format)
-        elsif defined?(DateTime) && value.is_a?(DateTime)
-          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
+        write_value(row_number, index, value, format)
       end
     end
 
+    def write_value(row_number, cell_number, value, format = nil)
+
+      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)
+      elsif value.is_a?(Formula)
+        write_formula(row_number, cell_number, value.fml, format)
+      else
+        write_string(row_number, cell_number, value.to_s, format)
+      end
+
+      @last_row_number = row_number > last_row_number ? row_number : last_row_number
+    end
+
+    def append_row(values, formats = nil)
+      increment_last_row_number!
+      write_row(last_row_number, values, formats)
+    end
+
+    def last_row_number
+      defined?(@last_row_number) ? @last_row_number : -1
+    end
+
+    def increment_last_row_number!
+      @last_row_number = last_row_number + 1
+    end
+
+    def set_column(start_col, end_col, width, format = nil)
+      super(start_col, end_col, width, format)
+    end
+
+    def set_column_width(col, width)
+      set_column(col, col, width, nil)
+    end
+
+    def set_columns_width(start_col, end_col, width)
+      set_column(start_col, end_col, width, nil)
+    end
+
   end
 
   module FormatExt
     include AttributeHelper
 
-    [:font_size, :underline, :font_script, :align, :rotation, :indent, :pattern, :border].each do |prop|
+    [:font_size, :underline, :font_script, :rotation, :indent, :pattern, :border].each do |prop|
       define_method(prop) do
         self[prop]
       end
@@ -237,73 +468,121 @@ module FastExcel
       end
     end
 
-    def set_font_size(value)
-      if value < 0
-        raise ArgumentError, "font size should be >= 0 (use 0 for user default font size)"
+    ALIGN_ENUM = Libxlsxwriter.enum_type(:format_alignments)
+
+    # Can be called as:
+    #
+    #  format.align = :align_center
+    #  format.align = "align_center"
+    #  format.align = :center
+    #  format.align = :align_center
+    #  format.align = {v: "center", h: "center"}
+    #
+    # Possible values:
+    #
+    #   :align_none, :align_left, :align_center, :align_right, :align_fill, :align_justify,
+    #   :align_center_across, :align_distributed, :align_vertical_top, :align_vertical_bottom,
+    #   :align_vertical_center, :align_vertical_justify, :align_vertical_distributed
+    #
+    def align=(value)
+      value = value.to_sym if value.is_a?(String)
+
+      if value.is_a?(Symbol)
+        if ALIGN_ENUM.find(value)
+          set_align(value)
+        elsif ALIGN_ENUM.find(prefixed = "align_#{value}".to_sym)
+          set_align(prefixed)
+        else
+          raise ArgumentError, "Can not set align = #{value.inspect}, possible values are: #{ALIGN_ENUM.symbols}"
+        end
+      elsif value.is_a?(Hash)
+        if value[:horizontal]
+          self.align = "align_#{value[:horizontal].to_s.sub(/^align_/, '')}".to_sym
+        end
+        if value[:h]
+          self.align = "align_#{value[:h].to_s.sub(/^align_/, '')}".to_sym
+        end
+        if value[:vertical]
+          self.align = "align_vertical_#{value[:vertical].to_s.sub(/^align_vertical_/, '')}".to_sym
+        end
+        if value[:v]
+          self.align = "align_vertical_#{value[:v].to_s.sub(/^align_vertical_/, '')}".to_sym
+        end
+        possible = [:horizontal, :h, :vertical, :v]
+        extras = value.keys - possible
+        if extras.size > 0
+          raise ArgumentError, "Not allowed keys for align: #{extras.inspect}, possible keys: #{possible.inspect}"
+        end
+      else
+        raise ArgumentError, "value must be a symbol or a hash"
       end
-      super(value)
     end
 
-    def font_family
-      font_name
+    def align
+      {
+        horizontal: ALIGN_ENUM.find(self[:text_h_align]),
+        vertical:   ALIGN_ENUM.find(self[:text_v_align])
+      }
     end
 
-    def font_family=(value)
-      self.font_name = value
+    [:font_color, :bg_color, :fg_color, :bottom_color, :diag_color, :left_color, :right_color, :top_color].each do |prop|
+      define_method("#{prop}=") do |value|
+        send("set_#{prop}", FastExcel.color_to_hex(value))
+      end
+      define_method(prop) do
+        self[prop]
+      end
     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(" ")}>"
+    [:bottom_color, :left_color, :right_color, :top_color].each do |prop|
+      alias_method :"border_#{prop}=", :"#{prop}="
+      alias_method :"border_#{prop}", :"#{prop}"
     end
-  end
 
-  module CellExt
-    include AttributeHelper
+    BORDER_ENUM = Libxlsxwriter.enum_type(:format_borders)
 
-    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]
+    [:bottom, :diag_border, :left, :right, :top].each do |prop|
+      define_method("#{prop}=") do |value|
+
+        send("set_#{prop}", border_value(value))
+      end
+      define_method(prop) do
+        BORDER_ENUM.find(self[prop])
       end
-    end
 
-    def user_data1
-      value
-      #self[:user_data1] && !self[:user_data1].null? ? self[:user_data1].to_ptr.read_string : nil
+      unless prop == :diag_border
+        alias_method :"border_#{prop}=", :"#{prop}="
+        alias_method :"border_#{prop}", :"#{prop}"
+      end
     end
 
-    def user_data2
-      self[:user_data2] #&& !self[:user_data2].null? ? self[:user_data2].to_ptr.read_string : nil
+    def border_value(value)
+      # if a number
+      return value if value.is_a?(Numeric) && BORDER_ENUM.find(value)
+
+      orig_value = value
+      value = value.to_sym if value.is_a?(String)
+
+      return BORDER_ENUM.find(value) if BORDER_ENUM.find(value)
+      return BORDER_ENUM.find(:"border_#{value}") if BORDER_ENUM.find(:"border_#{value}")
+
+      short_symbols = BORDER_ENUM.symbols.map {|s| s.to_s.sub(/^border_/, '').to_sym }
+      raise ArgumentError, "Unknown value #{orig_value.inspect} for border. Possible values: #{short_symbols}"
     end
 
-    def sst_string
-      self[:sst_string] #&& !self[:sst_string].null? ? self[:sst_string].to_ptr.read_string : nil
+    def set_font_size(value)
+      if value < 0
+        raise ArgumentError, "font size should be >= 0 (use 0 for user default font size)"
+      end
+      super(value)
     end
 
-    #def inspect
-    #  attr_str = fields_hash.map do |key, val|
-    #    "@#{key}=#{val.inspect}"
-    #  end
-    #  "<Libxlsxwriter::Row #{attr_str.join(" ")}>"
-    #end
+    def font_family
+      font_name
+    end
 
-    def inspect
-      attr_str = fields_hash.map do |key, val|
-        "@#{key}=#{val.inspect}"
-      end
-      "<Libxlsxwriter::Row #{attr_str.join(" ")}>"
+    def font_family=(value)
+      self.font_name = value
     end
   end
 end
@@ -319,11 +598,3 @@ end
 Libxlsxwriter::Worksheet.instance_eval do
   include FastExcel::WorksheetExt
 end
-
-Libxlsxwriter::Row.instance_eval do
-  include FastExcel::RowExt
-end
-
-Libxlsxwriter::Cell.instance_eval do
-  include FastExcel::CellExt
-end

data/test/format_test.rb

@@ -0,0 +1,171 @@
+require_relative 'test_helper'
+
+describe "FastExcel::FormatExt align" do
+
+  before do
+    @workbook = FastExcel.open(constant_memory: true)
+    @format = @workbook.add_format
+  end
+
+  it "should give default aligns" do
+    assert_equal({horizontal: :align_none, vertical: :align_none}, @format.align)
+  end
+
+  it "should set align by full name" do
+    @format.align = :align_center
+    assert_equal({horizontal: :align_center, vertical: :align_none}, @format.align)
+  end
+
+  it "should set by string" do
+    @format.align = "align_center"
+    assert_equal({horizontal: :align_center, vertical: :align_none}, @format.align)
+  end
+
+  it "should set by short name" do
+    @format.align = :center
+    assert_equal({horizontal: :align_center, vertical: :align_none}, @format.align)
+  end
+
+  it "should set by hash" do
+    @format.align = {v: "center", h: "center"}
+    assert_equal({horizontal: :align_center, vertical: :align_vertical_center}, @format.align)
+  end
+
+  it "should raise exception for unknown value" do
+    error = assert_raises(ArgumentError) do
+      @format.align = :aaa
+    end
+
+    assert_equal(error.message, "Can not set align = :aaa, possible values are: [:align_none, :align_left, "\
+      ":align_center, :align_right, :align_fill, :align_justify, :align_center_across, :align_distributed, "\
+      ":align_vertical_top, :align_vertical_bottom, :align_vertical_center, :align_vertical_justify, :align_vertical_distributed]")
+  end
+
+  it "should raise exception for unknown hash key" do
+    error = assert_raises(ArgumentError) do
+      @format.align = {aaa: 1}
+    end
+
+    assert_equal(error.message, "Not allowed keys for align: [:aaa], possible keys: [:horizontal, :h, :vertical, :v]")
+  end
+
+  it "should get and set" do
+    @format.align = {h: :center, v: :center}
+    format2 = @workbook.add_format(align: @format.align)
+
+    assert_equal({horizontal: :align_center, vertical: :align_vertical_center}, format2.align)
+  end
+
+end
+
+
+describe "FastExcel::FormatExt colors" do
+
+  before do
+    workbook = FastExcel.open(constant_memory: true)
+    @format = workbook.add_format
+  end
+
+  it "should set font color as hex num" do
+    @format.font_color = 0xFF0000
+    assert_equal(0xFF0000, @format.font_color)
+  end
+
+  it "should set font color as hex string" do
+    @format.font_color = '0xFF0000'
+    assert_equal(0xFF0000, @format.font_color)
+  end
+
+  it "should set font color as css hex string" do
+    @format.font_color = '#FF0000'
+    assert_equal(0xFF0000, @format.font_color)
+  end
+
+  it "should set font color as short hex string" do
+    @format.font_color = 'FF0000'
+    assert_equal(0xFF0000, @format.font_color)
+  end
+
+  it "should set font color as name" do
+    @format.font_color = 'red'
+    assert_equal(0xFF0000, @format.font_color)
+  end
+
+  it "should set font css color" do
+    @format.font_color = 'alice_blue'
+    assert_equal(0xF0F8FF, @format.font_color)
+  end
+
+  it "should allow to use symbol" do
+    @format.font_color = :alice_blue
+    assert_equal(0xF0F8FF, @format.font_color)
+  end
+
+  it "should have long method for border colors" do
+    @format.border_bottom_color = :alice_blue
+    assert_equal(0xF0F8FF, @format.border_bottom_color)
+    assert_equal(0xF0F8FF, @format.bottom_color)
+  end
+
+  it "should raise for unexpected type" do
+    error = assert_raises(ArgumentError) do
+      @format.font_color = {aaa: 1}
+    end
+
+    assert_equal(error.message, "Can not use Hash ({:aaa=>1}) for color value, expected String or Hex Number")
+  end
+
+  it "should raise for unexpected color" do
+    error = assert_raises(ArgumentError) do
+      @format.font_color = :aaa
+    end
+
+    assert_equal(error.message, "Unknown color value :aaa, expected hex string or color name")
+  end
+
+end
+
+
+describe "FastExcel::FormatExt border" do
+
+  before do
+    workbook = FastExcel.open(constant_memory: true)
+    @format = workbook.add_format
+  end
+
+  it "should set border as symbol" do
+    @format.bottom = :border_thin
+    assert_equal(:border_thin, @format.bottom)
+  end
+
+  it "should set border as short symbol" do
+    @format.bottom = :thin
+    assert_equal(:border_thin, @format.bottom)
+  end
+
+  it "should set border as string" do
+    @format.bottom = "thin"
+    assert_equal(:border_thin, @format.bottom)
+  end
+
+  it "should set border as number" do
+    @format.bottom = 1
+    assert_equal(:border_thin, @format.bottom)
+  end
+
+  it "should set border with long prop name" do
+    error = assert_raises(ArgumentError) do
+      @format.border_bottom = :aaa
+    end
+
+    assert_equal(error.message, "Unknown value :aaa for border. Possible values: "\
+      "[:none, :thin, :medium, :dashed, :dotted, :thick, :double, :hair, :medium_dashed, "\
+      ":dash_dot, :medium_dash_dot, :dash_dot_dot, :medium_dash_dot_dot, :slant_dash_dot]")
+  end
+
+  it "should get value with long name" do
+    @format.bottom = "thin"
+    assert_equal(:border_thin, @format.border_bottom)
+  end
+
+end

data/test/test_helper.rb

@@ -20,9 +20,13 @@ ensure
   File.delete(file_path)
 end
 
+def get_arrays(workbook)
+  workbook.close
+  parse_xlsx_as_matrix(workbook.filename)
+end
+
 def parse_xlsx_as_array(file_path)
-  excel = parse_xlsx(file_path)
-  data = excel.to_matrix.to_a
+  data = parse_xlsx_as_matrix(file_path)
   headers = data.shift
 
   data.map do |row|
@@ -32,5 +36,17 @@ end
 
 def parse_xlsx_as_matrix(file_path)
   excel = parse_xlsx(file_path)
-  excel.to_matrix.to_a
-end
+
+  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
+
+    rows << row
+  end
+
+  return rows
+end

data/test/worksheet_test.rb

@@ -0,0 +1,86 @@
+require_relative 'test_helper'
+
+describe "FastExcel::WorksheetExt append_row" do
+
+  before do
+    @workbook = FastExcel.open(constant_memory: false)
+    @worksheet = @workbook.add_worksheet
+  end
+
+  it "should have last_row_number = -1" do
+    assert_equal(-1, @worksheet.last_row_number)
+  end
+
+  it "should write_value and update last_row_number" do
+    @worksheet.write_value(0, 2, "aaa")
+    assert_equal(0, @worksheet.last_row_number)
+    assert_equal([[nil, nil, "aaa"]], get_arrays(@workbook))
+  end
+
+  it "should append row and update last_row_number" do
+    @worksheet.append_row(["aaa", "bbb", "ccc"])
+    @worksheet.append_row(["ddd", "eee", "fff"])
+
+    assert_equal(1, @worksheet.last_row_number)
+    assert_equal([["aaa", "bbb", "ccc"], ["ddd", "eee", "fff"]], get_arrays(@workbook))
+  end
+
+  it "should write_row then append and update last_row_number" do
+    @worksheet.write_row(3, ["aaa", "bbb", "ccc"])
+    @worksheet.append_row(["ddd", "eee", "fff"])
+
+    assert_equal(4, @worksheet.last_row_number)
+    assert_equal(
+      [
+        [nil, nil, nil],
+        [nil, nil, nil],
+        [nil, nil, nil],
+        ["aaa", "bbb", "ccc"],
+        ["ddd", "eee", "fff"]
+      ],
+      get_arrays(@workbook)
+    )
+  end
+
+  it "should not reduce last_row_number" do
+    @worksheet.append_row(["aaa", "bbb", "ccc"])
+    @worksheet.append_row(["ddd", "eee", "fff"])
+    @worksheet.write_value(0, 4, "foo")
+    @worksheet.append_row(["111", "222", "333"])
+
+    assert_equal(2, @worksheet.last_row_number)
+    assert_equal(
+      [
+        ["aaa", "bbb", "ccc", nil, "foo"],
+        ["ddd", "eee", "fff", nil, nil],
+        ["111", "222", "333", nil, nil]
+      ],
+      get_arrays(@workbook)
+    )
+  end
+
+  it "should not allow to write rows that already saved" do
+    @workbook = FastExcel.open(constant_memory: true)
+    @worksheet = @workbook.add_worksheet
+
+    @worksheet.append_row(["aaa", "bbb", "ccc"])
+    @worksheet.append_row(["ddd", "eee", "fff"])
+
+    error = assert_raises(ArgumentError) do
+      @worksheet.write_value(0, 4, "foo")
+    end
+
+    assert_equal("Can not write to saved row in constant_memory mode (attempted row: 0, last saved row: 1)", error.message)
+  end
+
+  it "should write bigdecimal as a number" do
+    require 'bigdecimal'
+
+    @workbook = FastExcel.open(constant_memory: true)
+    @worksheet = @workbook.add_worksheet
+
+    @worksheet.append_row([BigDecimal.new("0.1234")])
+
+    assert_equal([[0.1234]], get_arrays(@workbook))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_excel
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,20 +39,26 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Makefile
 - README.md
 - Rakefile
+- appveyor.yml
 - benchmarks/1k_rows.rb
 - benchmarks/20k_rows.rb
 - benchmarks/init.rb
 - benchmarks/memory.rb
 - examples/example.rb
+- examples/example_align.rb
 - examples/example_chart.rb
+- examples/example_colors.rb
 - examples/example_formula.rb
 - examples/example_image.rb
+- examples/example_styles.rb
+- examples/logo.png
 - extconf.rb
 - fast_excel.gemspec
 - lib/fast_excel.rb
@@ -145,8 +151,10 @@ files:
 - libxlsxwriter/version.txt
 - test/date_test.rb
 - test/default_format_test.rb
+- test/format_test.rb
 - test/test_helper.rb
 - test/tmpfile_test.rb
+- test/worksheet_test.rb
 homepage: https://github.com/paxa/fast_excel
 licenses:
 - MIT