writeexcel 0.4.0 → 0.4.1

data/.gitignore

@@ -19,3 +19,6 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+
+## NETBEANS
+nbproject

data/README.rdoc

@@ -4,6 +4,10 @@ Write to a cross-platform Excel binary file.
 
 == Recent Changes
 
+v0.4.1
+* Bug fix. Workbook#add_format() doesn't work when received two or more parameters.
+* Bug fix. Worksheet#write_formula() doesn't work when formula contains utf8 string.
+
 v0.4.0
 * works also on Ruby 1.9.1.
 * modify README.rdoc below.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/examples/utf8.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby -w
+# -*- coding: utf-8 -*-
+
+$debug = true
+
+require 'writeexcel'
+
+workbook = WriteExcel.new('utf8.xls')
+worksheet = workbook.add_worksheet('シート１')
+format = workbook.add_format(:font => 'ＭＳ 明朝')
+worksheet.set_footer('フッター')
+worksheet.set_header('ヘッダー')
+worksheet.write('A1', 'ＵＴＦ８文字列', format)
+worksheet.write('A2', '=CONCATENATE(A1,"の連結")', format)
+workbook.close

data/lib/writeexcel.rb

@@ -10,7 +10,24 @@
 # original written in Perl by John McNamara
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
+require 'writeexcel/biffwriter'
+require 'writeexcel/olewriter'
+require 'writeexcel/formula'
+require 'writeexcel/format'
+require 'writeexcel/worksheet'
 require "writeexcel/workbook"
+require 'writeexcel/chart'
+require 'writeexcel/charts/area'
+require 'writeexcel/charts/bar'
+require 'writeexcel/charts/column'
+require 'writeexcel/charts/external'
+require 'writeexcel/charts/line'
+require 'writeexcel/charts/pie'
+require 'writeexcel/charts/scatter'
+require 'writeexcel/charts/stock'
+require 'writeexcel/storage_lite'
+require 'writeexcel/compatibility'
+require 'writeexcel/debug_info'
 #
 # = WriteExcel - Write to a cross-platform Excel binary file.
 #
@@ -58,6 +75,9 @@
 #     worksheet.write('A3', 1.2345)
 #     worksheet.write('A4', '=SIN(PI()/4)')
 #
+#     # Save to ruby.xls
+#     workbook.close
+#
 # == Description
 #
 # WriteExcel can be used to create a cross-platform Excel binary file.
@@ -83,7 +103,7 @@
 # possible. As a result there is a lot of documentation to accompany the
 # interface and it can be difficult at first glance to see what it important
 # and what is not. So for those of you who prefer to assemble Ikea furniture
-# first and then read the instructions, here are three easy steps:
+# first and then read the instructions, here are four easy steps:
 #
 # 1. Create a new Excel workbook (i.e. file) using new().
 #
@@ -91,6 +111,8 @@
 #
 # 3. Write to the worksheet using write().
 #
+# 4. Save to file.
+#
 # Like this:
 #
 #     require 'WriteExcel'                     # Step 0
@@ -98,6 +120,7 @@
 #     workbook  = WriteExcel.new('ruby.xls')   # Step 1
 #     worksheet = workbook.add_worksheet       # Step 2
 #     worksheet.write('A1', 'Hi Excel!')       # Step 3
+#     workbook.close                           # Step 4
 #
 # This will create an Excel file called ruby.xls with a single worksheet and the
 # text 'Hi Excel!' in the relevant cell. And that's it. Okay, so there is

data/lib/writeexcel/biffwriter.rb

@@ -13,8 +13,9 @@
 
 
 require 'tempfile'
+require 'writeexcel/write_file'
 
-class BIFFWriter       #:nodoc:
+class BIFFWriter < WriteFile       #:nodoc:
 
   BIFF_Version = 0x0600
   BigEndian    = [1].pack("I") == [1].pack("N")
@@ -70,47 +71,6 @@ def set_byte_order
     end
   end
 
-  ###############################################################################
-  #
-  # _prepend($data)
-  #
-  # General storage function
-  #
-  def prepend(*args)
-    d = args.join
-    d = add_continue(d) if d.bytesize > @limit
-
-    @datasize += d.bytesize
-    @data      = d + @data
-
-    print "prepend\n" if defined?($debug)
-    print d.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ') + "\n\n" if defined?($debug)
-    d
-  end
-
-  ###############################################################################
-  #
-  # _append($data)
-  #
-  # General storage function
-  #
-  def append(*args)
-    d = args.collect{ |a| a.dup.force_encoding('ASCII-8BIT') }.join
-    # Add CONTINUE records if necessary
-    d = add_continue(d) if d.bytesize > @limit
-    if @using_tmpfile
-      @filehandle.write d
-      @datasize += d.bytesize
-    else
-      @datasize += d.bytesize
-      @data      = @data + d
-    end
-
-    print "append\n" if defined?($debug)
-    print d.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ') + "\n\n" if defined?($debug)
-    d
-  end
-
   ###############################################################################
   #
   # get_data().
@@ -168,7 +128,6 @@ def store_bof(type = 0x0005)
     header  = [record,length].pack("vv")
     data    = [BIFF_Version,type,build,year,bfh,sfo].pack("vvvvVV")
 
-    print "store_bof in #{__FILE__}\n" if defined?($debug)
     prepend(header, data)
   end
 
@@ -183,7 +142,6 @@ def store_eof
     length = 0x0000
     header = [record,length].pack("vv")
 
-    print "store_eof in #{__FILE__}\n" if defined?($debug)
     append(header)
   end
 

data/lib/writeexcel/caller_info.rb

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+module CallerInfo
+  #
+  # return stack trace info if defined?($debug).
+  #
+  def caller_info
+    caller(3).collect { |info|
+      file = File.expand_path(info.sub(/:(\d+)[^\d`]*(`([^']+)')?/, ''))
+      { :file => file, :line => $1, :method => $3 }
+    }.select { |info| info[:method] }  # delete if info[:method] == nil
+  end
+end

data/lib/writeexcel/chart.rb

@@ -13,6 +13,7 @@
 #
 
 require 'writeexcel/worksheet'
+require 'writeexcel/colors'
 
 ###############################################################################
 #
@@ -481,7 +482,6 @@ def embedded=(val)  # :nodoc:
   #
   def prepend(*args)  # :nodoc:
     @using_tmpfile = false
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(*args)
   end
 
@@ -602,7 +602,6 @@ def store_window2   # :nodoc:
     header = [record, length].pack("vv")
     data = [grbit, rwTop, colLeft, rgbHdr].pack("vvvV")
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -672,8 +671,7 @@ def encode_utf16(str, encoding = 0)  # :nodoc:
 
     # Handle utf8 strings.
     if string.encoding == Encoding::UTF_8
-      string = NKF.nkf('-w16B0 -m0 -W', string)
-      string.force_encoding('UTF-16BE')
+      utf8_to_16be(string)
       encoding = 1
     end
 
@@ -696,49 +694,15 @@ def encode_utf16(str, encoding = 0)  # :nodoc:
   # RGB colour number.
   #
   def get_color_indices(color)   # :nodoc:
-    return [nil, nil] if color.nil?
-
-    colors = {
-      :aqua    => 0x0F,
-      :cyan    => 0x0F,
-      :black   => 0x08,
-      :blue    => 0x0C,
-      :brown   => 0x10,
-      :magenta => 0x0E,
-      :fuchsia => 0x0E,
-      :gray    => 0x17,
-      :grey    => 0x17,
-      :green   => 0x11,
-      :lime    => 0x0B,
-      :navy    => 0x12,
-      :orange  => 0x35,
-      :pink    => 0x21,
-      :purple  => 0x14,
-      :red     => 0x0A,
-      :silver  => 0x16,
-      :white   => 0x09,
-      :yellow  => 0x0D,
-    }
+    invalid = 0x7FFF   # return from Colors#get_color when color is invalid
 
-    # Check for the various supported colour index/name possibilities.
-    color = color.downcase.to_sym if color.kind_of?(String)
-    if color.kind_of?(Symbol)
-      if colors.has_key?(color)
-        # Colour matches one of the supported colour names.
-        index = colors[color]
-      else
-        return [nil, nil]
-      end
-    elsif color < 8 || color > 63
-      # Return undef if index is out of range.
-      return [nil, nil]
+    index = Colors.new.get_color(color)
+    index = invalid if color.respond_to?(:coerce) && (color < 8 || color > 63)
+    if index == invalid
+      [nil, nil]
     else
-      # We should have a valid color index in a valid range.
-      index = color
+      [index, get_color_rbg(index)]
     end
-
-    rgb = get_color_rbg(index)
-    [index, rgb]
   end
 
   ###############################################################################
@@ -763,7 +727,7 @@ def get_color_rbg(index)   # :nodoc:
   # defined value.
   #
   def get_line_pattern(value)   # :nodoc:
-    value = value.downcase if value.kind_of?(String)
+    value = value.downcase if value.respond_to?(:to_str)
     default = 0
 
     patterns = {
@@ -802,7 +766,7 @@ def get_line_pattern(value)   # :nodoc:
   # defined value.
   #
   def get_line_weight(value)   # :nodoc:
-    value = value.downcase if value.kind_of?(String)
+    value = value.downcase if value.respond_to?(:to_str)
     default = 0
 
     weights = {
@@ -1239,7 +1203,6 @@ def store_3dbarshape   # :nodoc:
     data   = [riser].pack('C')
     data  += [taper].pack('C')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1271,13 +1234,12 @@ def store_ai(id, type, formula, format_index = 0)   # :nodoc:
     data  += [grbit].pack('v')
     data  += [format_index].pack('v')
     data  += [formula_length].pack('v')
-    if formula.kind_of?(Array)
+    if formula.respond_to?(:to_array)
       data += formula[0].encode('BINARY')
     else
       data += formula.encode('BINARY') unless formula.nil?
     end
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1306,7 +1268,6 @@ def store_areaformat(rgbFore, rgbBack, pattern, grbit, indexFore, indexBack)  #
     data += [indexFore].pack('v')
     data += [indexBack].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1340,7 +1301,6 @@ def store_axcext  # :nodoc:
     data += [catCrossDate].pack('v')
     data += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1358,7 +1318,6 @@ def store_axesused(num_axes)   # :nodoc:
     header = [record, length].pack('vv')
     data = [num_axes].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1384,7 +1343,6 @@ def store_axis(type)   # :nodoc:
     data += [reserved3].pack('V')
     data += [reserved4].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1402,7 +1360,6 @@ def store_axislineformat   # :nodoc:
     header = [record, length].pack('vv')
     data = [line_format].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1428,7 +1385,6 @@ def store_axisparent(iax, x, y, dx, dy)  # :nodoc:
     data  += [dx].pack('V')
     data  += [dy].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1444,7 +1400,6 @@ def store_begin   # :nodoc:
 
     header = [record, length].pack('vv')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header)
   end
 
@@ -1468,7 +1423,6 @@ def store_catserrange   # :nodoc:
     data  += [catMark].pack('v')
     data  += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1494,7 +1448,6 @@ def store_chart(x_pos, y_pos, dx, dy)   # :nodoc:
     data  += [dx].pack('V')
     data  += [dy].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1523,7 +1476,6 @@ def store_chartformat(grbit = 0)   # :nodoc:
     data  += [grbit].pack('v')
     data  += [icrt].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1541,7 +1493,6 @@ def store_chartline   # :nodoc:
     header = [record, length].pack('vv')
     data   = [type].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1581,7 +1532,6 @@ def store_charttext   # :nodoc:
     data += [grbit2].pack('v')
     data += [rotation].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1606,7 +1556,6 @@ def store_dataformat(series_index, series_number, point_number)   # :nodoc:
     data += [series_number].pack('v')
     data += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1625,7 +1574,6 @@ def store_defaulttext   # :nodoc:
     header = [record, length].pack('vv')
     data  = [type].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1643,7 +1591,6 @@ def store_dropbar   # :nodoc:
     header = [record, length].pack('vv')
     data  = [percent_gap].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1659,7 +1606,6 @@ def store_end   # :nodoc:
 
     header = [record, length].pack('vv')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header)
   end
 
@@ -1685,7 +1631,6 @@ def store_fbi(index, height, width_basis, height_basis, scale_basis)  # :nodoc:
     data  += [scale_basis].pack('v')
     data  += [index].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1704,7 +1649,6 @@ def store_fontx(index)   # :nodoc:
     header = [record, length].pack('vv')
     data   = [index].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1724,7 +1668,6 @@ def store_frame(frame_type, grbit)   # :nodoc:
     data  = [frame_type].pack('v')
     data += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1754,7 +1697,6 @@ def store_legend(x, y, width, height, wType, wSpacing, grbit)  # :nodoc:
     data += [wSpacing].pack('C')
     data += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1780,7 +1722,6 @@ def store_lineformat(rgb, lns, we, grbit, index)  # :nodoc:
     data += [grbit].pack('v')
     data += [index].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1810,7 +1751,6 @@ def store_markerformat(rgbFore, rgbBack, marker, grbit, icvFore, icvBack, miSize
     data += [icvBack].pack('v')
     data += [miSize].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1832,7 +1772,6 @@ def store_objectlink(link_type)   # :nodoc:
     data += [link_index1].pack('v')
     data += [link_index2].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1850,7 +1789,6 @@ def store_pieformat   # :nodoc:
     header = [record, length].pack('vv')
     data   = [percent].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1867,7 +1805,6 @@ def store_plotarea   # :nodoc:
 
     header = [record, length].pack('vv')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header)
   end
 
@@ -1887,7 +1824,6 @@ def store_plotgrowth  # :nodoc:
     data  = [dx_plot].pack('V')
     data += [dy_plot].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1916,7 +1852,6 @@ def store_pos(mdTopLt, mdBotRt, x1, y1, x2, y2)  # :nodoc:
     data += [x2].pack('V')
     data += [y2].pack('V')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1952,7 +1887,6 @@ def store_serauxtrend(reg_type, poly_order, equation, r_squared)  # :nodoc:
     data += forecast
     data += backcast
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -1980,7 +1914,6 @@ def store_series(category_count, value_count)  # :nodoc:
     data += [bubble_type].pack('v')
     data += [bubble_count].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2015,7 +1948,6 @@ def store_seriestext(str, encoding)  # :nodoc:
     data += [cch].pack('C')
     data += [encoding].pack('C')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data, str)
   end
 
@@ -2033,7 +1965,6 @@ def store_serparent(series)  # :nodoc:
     header = [record, length].pack('vv')
     data = [series].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2051,7 +1982,6 @@ def store_sertocrt   # :nodoc:
     header = [record, length].pack('vv')
     data = [chartgroup].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2073,7 +2003,6 @@ def store_shtprops   # :nodoc:
     data  = [grbit].pack('v')
     data += [empty_cells].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2113,7 +2042,6 @@ def store_text(x, y, dx, dy, grbit1, grbit2, rotation = 0x00)# :nodoc:
     data += [grbit2].pack('v')
     data += [rotation].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2153,7 +2081,6 @@ def store_tick   # :nodoc:
     data += [index].pack('v')
     data += [reserved5].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end
 
@@ -2183,7 +2110,6 @@ def store_valuerange   # :nodoc:
     data += [numCross].pack('d')
     data += [grbit].pack('v')
 
-    print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
   end